diff --git a/ci/common.jsonnet b/ci/common.jsonnet index 95118ad4500e..580e417bee9d 100644 --- a/ci/common.jsonnet +++ b/ci/common.jsonnet @@ -270,9 +270,9 @@ local common_json = import "../common.json"; local common = mx + { catch_files+: [ - # Keep in sync with jdk.compiler.graal.debug.StandardPathUtilitiesProvider#DIAGNOSTIC_OUTPUT_DIRECTORY_MESSAGE_REGEXP + # Keep in sync with jdk.graal.compiler.debug.StandardPathUtilitiesProvider#DIAGNOSTIC_OUTPUT_DIRECTORY_MESSAGE_REGEXP "Graal diagnostic output saved in '(?P[^']+)'", - # Keep in sync with jdk.compiler.graal.debug.DebugContext#DUMP_FILE_MESSAGE_REGEXP + # Keep in sync with jdk.graal.compiler.debug.DebugContext#DUMP_FILE_MESSAGE_REGEXP "Dumping debug output to '(?P[^']+)'", # Keep in sync with com.oracle.svm.hosted.NativeImageOptions#DEFAULT_ERROR_FILE_NAME " (?P.+/svm_err_b_\\d+T\\d+\\.\\d+_pid\\d+\\.md)", diff --git a/ci_includes/publish-javadoc.jsonnet b/ci_includes/publish-javadoc.jsonnet index 933965e4216f..a64e0eef6eaa 100644 --- a/ci_includes/publish-javadoc.jsonnet +++ b/ci_includes/publish-javadoc.jsonnet @@ -20,8 +20,8 @@ ["zip", "-r", "javadoc.zip", "javadoc"], ["cd", "../compiler"], ["mx", "build"], - ["mx", "javadoc", "--projects", "jdk.compiler.graal", "--packages", "jdk.compiler.graal.graphio"], - ["cd", "src/jdk.compiler.graal/"], + ["mx", "javadoc", "--projects", "jdk.graal.compiler", "--packages", "jdk.graal.compiler.graphio"], + ["cd", "src/jdk.graal.compiler/"], ["zip", "-r", "../../graphio-javadoc.zip", "javadoc"], ["cd", "../../.."], ["set-export", "GRAAL_REPO", ["pwd"]], diff --git a/common.json b/common.json index 6d7615d74acf..525cbf950225 100644 --- a/common.json +++ b/common.json @@ -35,20 +35,20 @@ "labsjdk-ee-20-llvm": {"name": "labsjdk", "version": "ee-20.0.2+2-jvmci-23.1-b02-sulong", "platformspecific": true }, "oraclejdk21": {"name": "jpg-jdk", "version": "21", "build_id": "33", "release": true, "platformspecific": true, "extrabundles": ["static-libs"]}, - "labsjdk-ce-21": {"name": "labsjdk", "version": "ce-21+35-jvmci-23.1-b21", "platformspecific": true }, - "labsjdk-ce-21Debug": {"name": "labsjdk", "version": "ce-21+35-jvmci-23.1-b21-debug", "platformspecific": true }, - "labsjdk-ce-21-llvm": {"name": "labsjdk", "version": "ce-21+35-jvmci-23.1-b21-sulong", "platformspecific": true }, - "labsjdk-ee-21": {"name": "labsjdk", "version": "ee-21.0.1+11-jvmci-23.1-b21", "platformspecific": true }, - "labsjdk-ee-21Debug": {"name": "labsjdk", "version": "ee-21.0.1+11-jvmci-23.1-b21-debug", "platformspecific": true }, - "labsjdk-ee-21-llvm": {"name": "labsjdk", "version": "ee-21.0.1+11-jvmci-23.1-b21-sulong", "platformspecific": true }, + "labsjdk-ce-21": {"name": "labsjdk", "version": "ce-21.0.1+12-jvmci-23.1-b22", "platformspecific": true }, + "labsjdk-ce-21Debug": {"name": "labsjdk", "version": "ce-21.0.1+12-jvmci-23.1-b22-debug", "platformspecific": true }, + "labsjdk-ce-21-llvm": {"name": "labsjdk", "version": "ce-21.0.1+12-jvmci-23.1-b22-sulong", "platformspecific": true }, + "labsjdk-ee-21": {"name": "labsjdk", "version": "ee-21.0.1+11-jvmci-23.1-b22", "platformspecific": true }, + "labsjdk-ee-21Debug": {"name": "labsjdk", "version": "ee-21.0.1+11-jvmci-23.1-b22-debug", "platformspecific": true }, + "labsjdk-ee-21-llvm": {"name": "labsjdk", "version": "ee-21.0.1+11-jvmci-23.1-b22-sulong", "platformspecific": true }, "oraclejdk-latest": {"name": "jpg-jdk", "version": "22", "build_id": "18", "release": true, "platformspecific": true, "extrabundles": ["static-libs"]}, - "labsjdk-ce-latest": {"name": "labsjdk", "version": "ce-22+18-jvmci-b02", "platformspecific": true }, - "labsjdk-ce-latestDebug": {"name": "labsjdk", "version": "ce-22+18-jvmci-b02-debug", "platformspecific": true }, - "labsjdk-ce-latest-llvm": {"name": "labsjdk", "version": "ce-22+18-jvmci-b02-sulong", "platformspecific": true }, - "labsjdk-ee-latest": {"name": "labsjdk", "version": "ee-22+18-jvmci-b02", "platformspecific": true }, - "labsjdk-ee-latestDebug": {"name": "labsjdk", "version": "ee-22+18-jvmci-b02-debug", "platformspecific": true }, - "labsjdk-ee-latest-llvm": {"name": "labsjdk", "version": "ee-22+18-jvmci-b02-sulong", "platformspecific": true } + "labsjdk-ce-latest": {"name": "labsjdk", "version": "ce-22+18-jvmci-b03", "platformspecific": true }, + "labsjdk-ce-latestDebug": {"name": "labsjdk", "version": "ce-22+18-jvmci-b03-debug", "platformspecific": true }, + "labsjdk-ce-latest-llvm": {"name": "labsjdk", "version": "ce-22+18-jvmci-b03-sulong", "platformspecific": true }, + "labsjdk-ee-latest": {"name": "labsjdk", "version": "ee-22+18-jvmci-b03", "platformspecific": true }, + "labsjdk-ee-latestDebug": {"name": "labsjdk", "version": "ee-22+18-jvmci-b03-debug", "platformspecific": true }, + "labsjdk-ee-latest-llvm": {"name": "labsjdk", "version": "ee-22+18-jvmci-b03-sulong", "platformspecific": true } }, "eclipse": { diff --git a/compiler/CHANGELOG.md b/compiler/CHANGELOG.md index 7da44adbe7cd..fe60b8207d2a 100644 --- a/compiler/CHANGELOG.md +++ b/compiler/CHANGELOG.md @@ -3,8 +3,8 @@ This changelog summarizes newly introduced optimizations and other compiler related changes. ## GraalVM for JDK 22 (Internal Version 24.0.0) -* (GR-48318): The Graal module has been renamed from `jdk.internal.vm.compiler` to `jdk.compiler.graal`. - Likewise, the compiler packages moved into the `jdk.compiler.graal` namespace. +* (GR-49610): The Graal module has been renamed from `jdk.internal.vm.compiler` to `jdk.graal.compiler`. + Likewise, the compiler packages moved into the `jdk.graal.compiler` namespace. These renamings were done in preparation for [Project Galahad](https://openjdk.org/projects/galahad/). ## GraalVM for JDK 21 (Internal Version 23.1.0) diff --git a/compiler/docs/CompilationPlanFuzzing.md b/compiler/docs/CompilationPlanFuzzing.md index 61855ceaa0d9..2f3812701809 100644 --- a/compiler/docs/CompilationPlanFuzzing.md +++ b/compiler/docs/CompilationPlanFuzzing.md @@ -1,7 +1,7 @@ # Compilation plan fuzzing This page covers the creation and usage of fuzzed compilation plans instead of the usual phase orderings specified by the different `CompilerConfiguration`s. ## Abstraction design -The following design can be found in the package `jdk.compiler.graal.core.phases.fuzzing`. +The following design can be found in the package `jdk.graal.compiler.core.phases.fuzzing`. ### Diagram ``` Suites > FuzzedSuites diff --git a/compiler/docs/Debugging.md b/compiler/docs/Debugging.md index 0d03325325b0..1da77219eec9 100644 --- a/compiler/docs/Debugging.md +++ b/compiler/docs/Debugging.md @@ -38,7 +38,7 @@ In addition to IDE debugging, there is support for *printf* style debugging. The simplest is to place temporary usages of `System.out` where ever you need them. For more permanent logging statements, use the `log(...)` methods in -[`DebugContext`](../src/jdk.compiler.graal.debug/src/jdk/compiler/graal/debug/DebugContext.java). +[`DebugContext`](../src/jdk.graal.compiler.debug/src/jdk/graal/compiler/debug/DebugContext.java). A (nestable) debug scope is entered via one of the `scope(...)` methods in that class. For example: ```java @@ -54,9 +54,9 @@ try (Scope s = debug.scope("CodeInstall", method)) { The `debug.log` statement will send output to the console if `CodeInstall` is matched by the `-Dgraal.Log` option. The matching logic for this option is implemented in -[DebugFilter](../src/jdk.compiler.graal/src/jdk/compiler/graal/debug/DebugFilter.java) +[DebugFilter](../src/jdk.graal.compiler/src/jdk/graal/compiler/debug/DebugFilter.java) and documented in the -[Dump help message](../src/jdk.compiler.graal/src/jdk/compiler/graal/debug/doc-files/DumpHelp.txt). As +[Dump help message](../src/jdk.graal.compiler/src/jdk/graal/compiler/debug/doc-files/DumpHelp.txt). As mentioned in the javadoc, the same matching logic also applies to the `-Dgraal.Dump`, `-Dgraal.Time`, `-Dgraal.Count` and `-Dgraal.TrackMemUse` options. @@ -194,9 +194,9 @@ Specifying one of the debug scope options (i.e., `-Dgraal.Log`, `-Dgraal.Dump`, interesting in compiler output related to a single or few methods. In this case, use the `-Dgraal.MethodFilter` option to specify a method filter. The matching logic for this option is described in -[MethodFilter](../src/jdk.compiler.graal/src/jdk/compiler/graal/debug/MethodFilter.java#L33-L92) +[MethodFilter](../src/jdk.graal.compiler/src/jdk/graal/compiler/debug/MethodFilter.java#L33-L92) and documented in the -[MethodFilter help message](../src/jdk.compiler.graal/src/jdk/compiler/graal/debug/doc-files/MethodFilterHelp.txt). +[MethodFilter help message](../src/jdk.graal.compiler/src/jdk/graal/compiler/debug/doc-files/MethodFilterHelp.txt). ## Metric filtering @@ -214,7 +214,7 @@ In addition to logging, there is support for generating (or dumping) more detail visualizations of certain compiler data structures. Currently, there is support for dumping: * HIR graphs (i.e., instances of - [Graph](../src/jdk.compiler.graal/src/jdk/compiler/graal/graph/Graph.java)) to the + [Graph](../src/jdk.graal.compiler/src/jdk/graal/compiler/graph/Graph.java)) to the [Ideal Graph Visualizer (IGV)](../../docs/tools/ideal-graph-visualizer.md), and * LIR register allocation and generated code to the [C1Visualizer](https://github.com/zakkak/c1visualizer) @@ -258,8 +258,8 @@ java version "1.8.0_212" Java(TM) SE Runtime Environment (build 1.8.0_212-b31) Java HotSpot(TM) 64-Bit Server VM (build 25.212-b31-jvmci-20-b01, mixed mode) > find dumps/1497910458736 -type f -dumps/1497910458736/HotSpotCompilation-539[jdk.compiler.graal.graph.Node.updateUsages(Node, Node)].bgv -dumps/1497910458736/HotSpotCompilation-539[jdk.compiler.graal.graph.Node.updateUsages(Node, Node)].cfg +dumps/1497910458736/HotSpotCompilation-539[jdk.graal.compiler.graph.Node.updateUsages(Node, Node)].bgv +dumps/1497910458736/HotSpotCompilation-539[jdk.graal.compiler.graph.Node.updateUsages(Node, Node)].cfg ``` As you become familiar with the scope names used in the compiler, you can refine the `-Dgraal.Dump` option diff --git a/compiler/docs/JMH.md b/compiler/docs/JMH.md index faf37d0d6963..cd13a69f91c1 100644 --- a/compiler/docs/JMH.md +++ b/compiler/docs/JMH.md @@ -133,7 +133,7 @@ mx benchmark jmh-whitebox:* --results-file=results.json -- --jvm-config=graal-co The command above runs all *whitebox* benchmarks. That are all benchmark distributions that have either a dependency on a `GRAAL*` distribution, -or include projects starting with `jdk.compiler.graal` in their distribution jar. +or include projects starting with `jdk.graal.compiler` in their distribution jar. Refer to the [mx documentation][mx in-repo] for further information. diff --git a/compiler/mx.compiler/mx_compiler.py b/compiler/mx.compiler/mx_compiler.py index a5fa78d93e34..c313b6351669 100644 --- a/compiler/mx.compiler/mx_compiler.py +++ b/compiler/mx.compiler/mx_compiler.py @@ -106,7 +106,7 @@ def compare(this_version, other_version, jdk): cached = JavaLangRuntimeVersion._cmp_cache.get(key, None) if cached is not None: return cached - source_path = join(_suite.dir, 'src', 'jdk.compiler.graal', 'src', 'org', 'graalvm', 'compiler', + source_path = join(_suite.dir, 'src', 'jdk.graal.compiler', 'src', 'jdk', 'graal', 'compiler', 'hotspot', 'JVMCIVersionCompare.java') out = mx.OutputCapture() @@ -155,7 +155,7 @@ def _capture_jvmci_version(args=None): @mx.command(_suite.name, 'jvmci-version-check') def _run_jvmci_version_check(args=None, jdk=jdk, **kwargs): - source_path = join(_suite.dir, 'src', 'jdk.compiler.graal', 'src', 'jdk', 'compiler', 'graal', 'hotspot', + source_path = join(_suite.dir, 'src', 'jdk.graal.compiler', 'src', 'jdk', 'graal', 'compiler', 'hotspot', 'JVMCIVersionCheck.java') return mx.run([jdk.java, '-Xlog:disable', source_path] + (args or []), **kwargs) @@ -164,7 +164,7 @@ def _run_jvmci_version_check(args=None, jdk=jdk, **kwargs): _check_jvmci_version(jdk) mx_gate.add_jacoco_includes(['org.graalvm.*']) -mx_gate.add_jacoco_includes(['jdk.compiler.graal.*']) +mx_gate.add_jacoco_includes(['jdk.graal.compiler.*']) mx_gate.add_jacoco_excludes(['com.oracle.truffle']) mx_gate.add_jacoco_excluded_annotations(['@Snippet', '@ClassSubstitution', '@ExcludeFromJacocoInstrumentation']) @@ -227,7 +227,7 @@ def _ctw_system_properties_suffix(): out.data = 'System properties for CTW:\n\n' args = ['-XX:+EnableJVMCI'] + _ctw_jvmci_export_args() cp = _remove_redundant_entries(mx.classpath('GRAAL_TEST', jdk=jdk)) - args.extend(['-cp', cp, '-DCompileTheWorld.Help=true', 'jdk.compiler.graal.hotspot.test.CompileTheWorld']) + args.extend(['-cp', cp, '-DCompileTheWorld.Help=true', 'jdk.graal.compiler.hotspot.test.CompileTheWorld']) run_java(args, out=out, addDefaultArgs=False) return out.data @@ -280,7 +280,7 @@ def ctw(args, extraVMarguments=None): vmargs.append('-DCompileTheWorld.Classpath=' + cp) cp = _remove_redundant_entries(mx.classpath('GRAAL_TEST', jdk=jdk)) vmargs.extend(_ctw_jvmci_export_args() + ['-cp', cp]) - mainClassAndArgs = ['jdk.compiler.graal.hotspot.test.CompileTheWorld'] + mainClassAndArgs = ['jdk.graal.compiler.hotspot.test.CompileTheWorld'] run_vm(vmargs + mainClassAndArgs) @@ -467,7 +467,7 @@ def _check_forbidden_imports(projects, package_substrings, exceptions=None): def compiler_gate_runner(suites, unit_test_runs, bootstrap_tests, tasks, extraVMarguments=None, extraUnitTestArguments=None): with Task('CheckForbiddenImports:Compiler', tasks, tags=['style']) as t: # Ensure HotSpot-independent compiler classes do not import HotSpot-specific classes - if t: _check_forbidden_imports([mx.project('jdk.compiler.graal')], ('hotspot', 'libgraal')) + if t: _check_forbidden_imports([mx.project('jdk.graal.compiler')], ('hotspot', 'libgraal')) with Task('JDK_java_base_test', tasks, tags=['javabasetest'], report=True) as t: if t: java_base_unittest(_remove_empty_entries(extraVMarguments) + []) @@ -783,7 +783,7 @@ def _unittest_config_participant(config): # for the junit harness which uses reflection to find @Test methods. In addition, the # tests widely use JVMCI classes so JVMCI needs to also export all its packages to # ALL-UNNAMED. - mainClassArgs.extend(['-JUnitOpenPackages', 'jdk.internal.vm.ci/*=org.graalvm.truffle.runtime,jdk.compiler.graal,ALL-UNNAMED']) + mainClassArgs.extend(['-JUnitOpenPackages', 'jdk.internal.vm.ci/*=org.graalvm.truffle.runtime,jdk.graal.compiler,ALL-UNNAMED']) limited_modules = None for arg in vmArgs: @@ -1051,7 +1051,7 @@ def collate_metrics(args): if not filename.endswith('.csv'): mx.abort('Cannot collate metrics from non-CSV files: ' + filename) - # Keep in sync with jdk.compiler.graal.debug.GlobalMetrics.print(OptionValues) + # Keep in sync with jdk.graal.compiler.debug.GlobalMetrics.print(OptionValues) abs_filename = join(os.getcwd(), filename) directory = dirname(abs_filename) rootname = basename(filename)[0:-len('.csv')] @@ -1279,7 +1279,7 @@ def add_serviceprovider(service, provider, version): else: version = None provider = arcname[:-len('.class'):].replace('/', '.') - service = 'jdk.compiler.graal.options.OptionDescriptors' + service = 'jdk.graal.compiler.options.OptionDescriptors' add_serviceprovider(service, provider, version) return False @@ -1364,7 +1364,7 @@ def phaseplan_fuzz_jtt_tests(args, extraVMarguments=None, extraUnitTestArguments target_tests.append(arg) args.remove(arg) if not target_tests: - target_tests = ['jdk.compiler.graal.jtt.'] + target_tests = ['jdk.graal.compiler.jtt.'] for test in target_tests: UnitTestRun("Fuzz phase plan for tests matching substring " + test, [], tags=GraalTags.unittest + GraalTags.phaseplan_fuzz_jtt_tests).\ diff --git a/compiler/mx.compiler/mx_graal_benchmark.py b/compiler/mx.compiler/mx_graal_benchmark.py index 373e48dda6eb..7052bc6c460c 100644 --- a/compiler/mx.compiler/mx_graal_benchmark.py +++ b/compiler/mx.compiler/mx_graal_benchmark.py @@ -517,7 +517,7 @@ def subgroup(self): def whitebox_dependency(dist): return itertools.chain( (dep.name.startswith('GRAAL') for dep in dist.deps), - (dep.name.startswith('jdk.compiler.graal') for dep in dist.archived_deps()) + (dep.name.startswith('jdk.graal.compiler') for dep in dist.archived_deps()) ) def filter_distribution(self, dist): @@ -533,7 +533,7 @@ def extraVmArgs(self): '--add-exports=jdk.internal.vm.ci/jdk.vm.ci.runtime=ALL-UNNAMED', '--add-exports=jdk.internal.vm.ci/jdk.vm.ci.meta=ALL-UNNAMED', '--add-exports=jdk.internal.vm.ci/jdk.vm.ci.code=ALL-UNNAMED', - '--add-exports=jdk.compiler.graal/jdk.compiler.graal.graph=ALL-UNNAMED', + '--add-exports=jdk.graal.compiler/jdk.graal.compiler.graph=ALL-UNNAMED', '--add-exports=org.graalvm.truffle/com.oracle.truffle.api.benchmark=ALL-UNNAMED', '--add-exports=org.graalvm.truffle/com.oracle.truffle.api.debug=ALL-UNNAMED', '--add-exports=org.graalvm.truffle/com.oracle.truffle.api.library=ALL-UNNAMED', diff --git a/compiler/mx.compiler/suite.py b/compiler/mx.compiler/suite.py index 86e0a4455129..bfa72c513957 100644 --- a/compiler/mx.compiler/suite.py +++ b/compiler/mx.compiler/suite.py @@ -158,7 +158,7 @@ # ------------- Graal ------------- - "jdk.compiler.graal" : { + "jdk.graal.compiler" : { "subDir" : "src", "sourceDirs" : ["src"], "dependencies" : [ @@ -188,11 +188,11 @@ ], }, "uses" : [ - "jdk.compiler.graal.hotspot.meta.HotSpotInvocationPluginProvider", - "jdk.compiler.graal.lir.LIRInstructionVerifier", - "jdk.compiler.graal.core.common.CompilerProfiler", - "jdk.compiler.graal.truffle.substitutions.GraphBuilderInvocationPluginProvider", - "jdk.compiler.graal.truffle.phases.inlining.InliningPolicyProvider", + "jdk.graal.compiler.hotspot.meta.HotSpotInvocationPluginProvider", + "jdk.graal.compiler.lir.LIRInstructionVerifier", + "jdk.graal.compiler.core.common.CompilerProfiler", + "jdk.graal.compiler.truffle.substitutions.GraphBuilderInvocationPluginProvider", + "jdk.graal.compiler.truffle.phases.inlining.InliningPolicyProvider", ], "annotationProcessors" : [ "GRAAL_PROCESSOR" @@ -203,38 +203,38 @@ "workingSets" : "API,Graal", "jacoco" : "include", "jacocoExcludePackages" : [ - "jdk.compiler.graal.test", + "jdk.graal.compiler.test", "org.graalvm.libgraal.jni", - "jdk.compiler.graal.replacements", - "jdk.compiler.graal.hotspot.test", - "jdk.compiler.graal.replacements.test", - "jdk.compiler.graal.api.directives.test", - "jdk.compiler.graal.test", - "jdk.compiler.graal.core.test", - "jdk.compiler.graal.nodes.test", - "jdk.compiler.graal.loop.test", - "jdk.compiler.graal.core.aarch64.test", - "jdk.compiler.graal.jtt", - "jdk.compiler.graal.truffle.test", + "jdk.graal.compiler.replacements", + "jdk.graal.compiler.hotspot.test", + "jdk.graal.compiler.replacements.test", + "jdk.graal.compiler.api.directives.test", + "jdk.graal.compiler.test", + "jdk.graal.compiler.core.test", + "jdk.graal.compiler.nodes.test", + "jdk.graal.compiler.loop.test", + "jdk.graal.compiler.core.aarch64.test", + "jdk.graal.compiler.jtt", + "jdk.graal.compiler.truffle.test", ], }, - "jdk.compiler.graal.processor" : { + "jdk.graal.compiler.processor" : { "subDir" : "src", "sourceDirs" : ["src"], "requires" : [ "java.compiler" # javax.annotation.processing.* ], "checkPackagePrefix": "false", - "checkstyle" : "jdk.compiler.graal", + "checkstyle" : "jdk.graal.compiler", "javaCompliance" : "21+", }, - "jdk.compiler.graal.test" : { + "jdk.graal.compiler.test" : { "subDir" : "src", "sourceDirs" : ["src"], "dependencies" : [ - "jdk.compiler.graal", + "jdk.graal.compiler", "mx:JUNIT", "ASM_TREE_9.5", "ASM_UTIL_9.5", @@ -279,23 +279,23 @@ "GRAAL_PROCESSOR", "truffle:TRUFFLE_DSL_PROCESSOR" ], - "checkstyle" : "jdk.compiler.graal", + "checkstyle" : "jdk.graal.compiler", "javaCompliance" : "21+", "jacoco" : "exclude", }, - "jdk.compiler.graal.management" : { + "jdk.graal.compiler.management" : { "subDir" : "src", "sourceDirs" : ["src"], "dependencies" : [ - "jdk.compiler.graal", + "jdk.graal.compiler", ], "requires" : [ "jdk.internal.vm.ci", "jdk.management", ], "checkPackagePrefix": "false", - "checkstyle" : "jdk.compiler.graal", + "checkstyle" : "jdk.graal.compiler", "annotationProcessors" : [ "GRAAL_PROCESSOR", ], @@ -303,29 +303,29 @@ "workingSets" : "Graal,HotSpot", }, - "jdk.compiler.graal.hotspot.jdk21.test" : { + "jdk.graal.compiler.hotspot.jdk21.test" : { "testProject" : True, "subDir" : "src", "sourceDirs" : ["src"], "dependencies" : [ - "jdk.compiler.graal.test", + "jdk.graal.compiler.test", ], "requiresConcealed" : { "java.base" : [ "jdk.internal.util", ], }, - "checkstyle": "jdk.compiler.graal", + "checkstyle": "jdk.graal.compiler", "javaCompliance" : "21+", "javaPreviewNeeded": "21+", "workingSets" : "Graal,HotSpot,Test", }, - "jdk.compiler.graal.virtual.bench" : { + "jdk.graal.compiler.virtual.bench" : { "subDir" : "src", "sourceDirs" : ["src"], - "dependencies" : ["mx:JMH_1_21", "jdk.compiler.graal.microbenchmarks"], - "checkstyle" : "jdk.compiler.graal", + "dependencies" : ["mx:JMH_1_21", "jdk.graal.compiler.microbenchmarks"], + "checkstyle" : "jdk.graal.compiler", "javaCompliance" : "21+", "annotationProcessors" : ["mx:JMH_1_21"], "spotbugsIgnoresGenerated" : True, @@ -333,20 +333,20 @@ "testProject" : True, }, - "jdk.compiler.graal.microbenchmarks" : { + "jdk.graal.compiler.microbenchmarks" : { "subDir" : "src", "sourceDirs" : ["src"], "dependencies" : [ "mx:JMH_1_21", - "jdk.compiler.graal", - "jdk.compiler.graal.test", + "jdk.graal.compiler", + "jdk.graal.compiler.test", ], "requiresConcealed" : { "jdk.internal.vm.ci" : [ "jdk.vm.ci.meta", ], }, - "checkstyle" : "jdk.compiler.graal", + "checkstyle" : "jdk.graal.compiler", "javaCompliance" : "21+", "checkPackagePrefix" : "false", "annotationProcessors" : ["mx:JMH_1_21"], @@ -357,18 +357,18 @@ # ------------- GraalTruffle ------------- - "jdk.compiler.graal.truffle.test.jdk21" : { + "jdk.graal.compiler.truffle.test.jdk21" : { "subDir" : "src", "sourceDirs" : ["src"], "dependencies": [ - "jdk.compiler.graal.test", + "jdk.graal.compiler.test", ], "annotationProcessors" : [ "GRAAL_PROCESSOR", ], - "overlayTarget" : "jdk.compiler.graal.test", + "overlayTarget" : "jdk.graal.compiler.test", "multiReleaseJarVersion" : "21", - "checkstyle" : "jdk.compiler.graal", + "checkstyle" : "jdk.graal.compiler", "javaCompliance" : "21+", "checkPackagePrefix" : "false", "jacoco": "exclude", @@ -383,7 +383,7 @@ "dependencies" : [ "mx:JMH_1_21", ], - "checkstyle" : "jdk.compiler.graal", + "checkstyle" : "jdk.graal.compiler", "javaCompliance" : "21+", "checkPackagePrefix" : "false", "annotationProcessors" : ["mx:JMH_1_21"], @@ -396,10 +396,10 @@ "subDir" : "src", "sourceDirs" : ["src"], "dependencies" : [ - "jdk.compiler.graal", + "jdk.graal.compiler", "sdk:COLLECTIONS", ], - "checkstyle" : "jdk.compiler.graal", + "checkstyle" : "jdk.graal.compiler", "javaCompliance" : "21+", }, @@ -410,7 +410,7 @@ "org.graalvm.profdiff", "mx:JUNIT", ], - "checkstyle" : "jdk.compiler.graal", + "checkstyle" : "jdk.graal.compiler", "javaCompliance" : "21+", "workingSets" : "Graal,Test", }, @@ -423,7 +423,7 @@ "GRAAL_TEST" : { "subDir" : "src", "dependencies" : [ - "jdk.compiler.graal.test", + "jdk.graal.compiler.test", ], "distDependencies" : [ "GRAAL", @@ -445,7 +445,7 @@ "GRAAL_TEST_PREVIEW_FEATURE" : { "subDir" : "src", "dependencies" : [ - "jdk.compiler.graal.hotspot.jdk21.test", + "jdk.graal.compiler.hotspot.jdk21.test", ], "distDependencies" : [ "GRAAL_TEST", @@ -459,7 +459,7 @@ "GRAAL_PROCESSOR" : { "subDir": "src", "dependencies" : [ - "jdk.compiler.graal.processor", + "jdk.graal.compiler.processor", ], "maven": False, }, @@ -467,7 +467,7 @@ "GRAAL" : { # This distribution defines a module. "moduleInfo" : { - "name" : "jdk.compiler.graal", + "name" : "jdk.graal.compiler", "requires" : [ "jdk.unsupported" # sun.misc.Unsafe ], @@ -485,34 +485,34 @@ com.oracle.svm.extraimage_enterprise, org.graalvm.truffle.runtime.svm, com.oracle.truffle.enterprise.svm""", - "jdk.compiler.graal.java to org.graalvm.nativeimage.agent.tracing,org.graalvm.nativeimage.configure", - "jdk.compiler.graal.core.common to org.graalvm.nativeimage.agent.tracing,org.graalvm.nativeimage.objectfile", - "jdk.compiler.graal.debug to org.graalvm.nativeimage.objectfile", - "jdk.compiler.graal.nodes.graphbuilderconf to org.graalvm.nativeimage.driver,org.graalvm.nativeimage.librarysupport", - "jdk.compiler.graal.options to org.graalvm.nativeimage.driver,org.graalvm.nativeimage.junitsupport", - "jdk.compiler.graal.phases.common to org.graalvm.nativeimage.agent.tracing,org.graalvm.nativeimage.configure", - "jdk.compiler.graal.serviceprovider to jdk.compiler.graal.management,org.graalvm.nativeimage.driver,org.graalvm.nativeimage.agent.jvmtibase,org.graalvm.nativeimage.agent.diagnostics", - "jdk.compiler.graal.util.json to org.graalvm.nativeimage.librarysupport,org.graalvm.nativeimage.agent.tracing,org.graalvm.nativeimage.configure,org.graalvm.nativeimage.driver", + "jdk.graal.compiler.java to org.graalvm.nativeimage.agent.tracing,org.graalvm.nativeimage.configure", + "jdk.graal.compiler.core.common to org.graalvm.nativeimage.agent.tracing,org.graalvm.nativeimage.objectfile", + "jdk.graal.compiler.debug to org.graalvm.nativeimage.objectfile", + "jdk.graal.compiler.nodes.graphbuilderconf to org.graalvm.nativeimage.driver,org.graalvm.nativeimage.librarysupport", + "jdk.graal.compiler.options to org.graalvm.nativeimage.driver,org.graalvm.nativeimage.junitsupport", + "jdk.graal.compiler.phases.common to org.graalvm.nativeimage.agent.tracing,org.graalvm.nativeimage.configure", + "jdk.graal.compiler.serviceprovider to jdk.graal.compiler.management,org.graalvm.nativeimage.driver,org.graalvm.nativeimage.agent.jvmtibase,org.graalvm.nativeimage.agent.diagnostics", + "jdk.graal.compiler.util.json to org.graalvm.nativeimage.librarysupport,org.graalvm.nativeimage.agent.tracing,org.graalvm.nativeimage.configure,org.graalvm.nativeimage.driver", ], "uses" : [ - "jdk.compiler.graal.code.DisassemblerProvider", - "jdk.compiler.graal.core.match.MatchStatementSet", - "jdk.compiler.graal.debug.DebugHandlersFactory", - "jdk.compiler.graal.debug.TTYStreamProvider", - "jdk.compiler.graal.debug.PathUtilitiesProvider", - "jdk.compiler.graal.hotspot.HotSpotCodeCacheListener", - "jdk.compiler.graal.hotspot.HotSpotBackendFactory", - "jdk.compiler.graal.hotspot.meta.HotSpotInvocationPluginProvider", - "jdk.compiler.graal.nodes.graphbuilderconf.GeneratedPluginFactory", - "jdk.compiler.graal.options.OptionDescriptors", - "jdk.compiler.graal.serviceprovider.JMXService", - "jdk.compiler.graal.truffle.hotspot.TruffleCallBoundaryInstrumentationFactory", - "jdk.compiler.graal.truffle.substitutions.GraphBuilderInvocationPluginProvider", + "jdk.graal.compiler.code.DisassemblerProvider", + "jdk.graal.compiler.core.match.MatchStatementSet", + "jdk.graal.compiler.debug.DebugHandlersFactory", + "jdk.graal.compiler.debug.TTYStreamProvider", + "jdk.graal.compiler.debug.PathUtilitiesProvider", + "jdk.graal.compiler.hotspot.HotSpotCodeCacheListener", + "jdk.graal.compiler.hotspot.HotSpotBackendFactory", + "jdk.graal.compiler.hotspot.meta.HotSpotInvocationPluginProvider", + "jdk.graal.compiler.nodes.graphbuilderconf.GeneratedPluginFactory", + "jdk.graal.compiler.options.OptionDescriptors", + "jdk.graal.compiler.serviceprovider.JMXService", + "jdk.graal.compiler.truffle.hotspot.TruffleCallBoundaryInstrumentationFactory", + "jdk.graal.compiler.truffle.substitutions.GraphBuilderInvocationPluginProvider", ], }, "subDir" : "src", "dependencies" : [ - "jdk.compiler.graal" + "jdk.graal.compiler" ], "distDependencies" : [ "sdk:COLLECTIONS", @@ -530,11 +530,11 @@ "GRAAL_MANAGEMENT" : { # This distribution defines a module. "moduleInfo" : { - "name" : "jdk.compiler.graal.management", + "name" : "jdk.graal.compiler.management", }, "subDir" : "src", "dependencies" : [ - "jdk.compiler.graal.management", + "jdk.graal.compiler.management", ], "distDependencies" : [ "GRAAL", @@ -550,8 +550,8 @@ "GRAAL_COMPILER_WHITEBOX_MICRO_BENCHMARKS" : { "subDir" : "src", "dependencies" : [ - "jdk.compiler.graal.virtual.bench", - "jdk.compiler.graal.microbenchmarks", + "jdk.graal.compiler.virtual.bench", + "jdk.graal.compiler.microbenchmarks", ], "distDependencies" : [ "GRAAL_TEST" diff --git a/compiler/src/jdk.compiler.graal.processor/src/META-INF/services/javax.annotation.processing.Processor b/compiler/src/jdk.compiler.graal.processor/src/META-INF/services/javax.annotation.processing.Processor deleted file mode 100644 index 66a49ff01c60..000000000000 --- a/compiler/src/jdk.compiler.graal.processor/src/META-INF/services/javax.annotation.processing.Processor +++ /dev/null @@ -1,7 +0,0 @@ -jdk.compiler.graal.replacements.processor.ReplacementsAnnotationProcessor -jdk.compiler.graal.nodeinfo.processor.GraphNodeProcessor -jdk.compiler.graal.lir.processor.IntrinsicStubProcessor -jdk.compiler.graal.lir.processor.SyncPortProcessor -jdk.compiler.graal.core.match.processor.MatchProcessor -jdk.compiler.graal.options.processor.OptionProcessor -jdk.compiler.graal.serviceprovider.processor.ServiceProviderProcessor diff --git a/compiler/src/jdk.compiler.graal.hotspot.jdk21.test/src/jdk/compiler/graal/hotspot/jdk21/test/PreviewEnabledTest.java b/compiler/src/jdk.graal.compiler.hotspot.jdk21.test/src/jdk/graal/compiler/hotspot/jdk21/test/PreviewEnabledTest.java similarity index 87% rename from compiler/src/jdk.compiler.graal.hotspot.jdk21.test/src/jdk/compiler/graal/hotspot/jdk21/test/PreviewEnabledTest.java rename to compiler/src/jdk.graal.compiler.hotspot.jdk21.test/src/jdk/graal/compiler/hotspot/jdk21/test/PreviewEnabledTest.java index a8bf32325965..3c4a97ce5fe2 100644 --- a/compiler/src/jdk.compiler.graal.hotspot.jdk21.test/src/jdk/compiler/graal/hotspot/jdk21/test/PreviewEnabledTest.java +++ b/compiler/src/jdk.graal.compiler.hotspot.jdk21.test/src/jdk/graal/compiler/hotspot/jdk21/test/PreviewEnabledTest.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.jdk21.test; +package jdk.graal.compiler.hotspot.jdk21.test; import java.io.IOException; -import jdk.compiler.graal.api.test.ModuleSupport; -import jdk.compiler.graal.core.test.SubprocessTest; -import jdk.compiler.graal.hotspot.test.HotSpotGraalCompilerTest; -import jdk.compiler.graal.test.AddExports; -import jdk.compiler.graal.test.SubprocessUtil; +import jdk.graal.compiler.api.test.ModuleSupport; +import jdk.graal.compiler.core.test.SubprocessTest; +import jdk.graal.compiler.hotspot.test.HotSpotGraalCompilerTest; +import jdk.graal.compiler.test.AddExports; +import jdk.graal.compiler.test.SubprocessUtil; import org.junit.Assume; import org.junit.Before; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.hotspot.jdk21.test/src/jdk/compiler/graal/hotspot/jdk21/test/ScopedValueCacheTest.java b/compiler/src/jdk.graal.compiler.hotspot.jdk21.test/src/jdk/graal/compiler/hotspot/jdk21/test/ScopedValueCacheTest.java similarity index 93% rename from compiler/src/jdk.compiler.graal.hotspot.jdk21.test/src/jdk/compiler/graal/hotspot/jdk21/test/ScopedValueCacheTest.java rename to compiler/src/jdk.graal.compiler.hotspot.jdk21.test/src/jdk/graal/compiler/hotspot/jdk21/test/ScopedValueCacheTest.java index 1cc03a4bca05..99cf1214cc1d 100644 --- a/compiler/src/jdk.compiler.graal.hotspot.jdk21.test/src/jdk/compiler/graal/hotspot/jdk21/test/ScopedValueCacheTest.java +++ b/compiler/src/jdk.graal.compiler.hotspot.jdk21.test/src/jdk/graal/compiler/hotspot/jdk21/test/ScopedValueCacheTest.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.jdk21.test; +package jdk.graal.compiler.hotspot.jdk21.test; import java.lang.reflect.Method; -import jdk.compiler.graal.hotspot.test.HotSpotGraalCompilerTest; -import jdk.compiler.graal.test.AddExports; +import jdk.graal.compiler.hotspot.test.HotSpotGraalCompilerTest; +import jdk.graal.compiler.test.AddExports; @AddExports("java.base/jdk.internal.misc") public class ScopedValueCacheTest extends HotSpotGraalCompilerTest { diff --git a/compiler/src/jdk.compiler.graal.management/src/jdk/compiler/graal/management/JMXServiceProvider.java b/compiler/src/jdk.graal.compiler.management/src/jdk/graal/compiler/management/JMXServiceProvider.java similarity index 91% rename from compiler/src/jdk.compiler.graal.management/src/jdk/compiler/graal/management/JMXServiceProvider.java rename to compiler/src/jdk.graal.compiler.management/src/jdk/graal/compiler/management/JMXServiceProvider.java index e798f9bf411c..5626a5dc8351 100644 --- a/compiler/src/jdk.compiler.graal.management/src/jdk/compiler/graal/management/JMXServiceProvider.java +++ b/compiler/src/jdk.graal.compiler.management/src/jdk/graal/compiler/management/JMXServiceProvider.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.management; +package jdk.graal.compiler.management; -import static jdk.compiler.graal.serviceprovider.GraalServices.getCurrentThreadId; +import static jdk.graal.compiler.serviceprovider.GraalServices.getCurrentThreadId; import java.lang.management.ManagementFactory; import java.util.List; -import jdk.compiler.graal.serviceprovider.JMXService; -import jdk.compiler.graal.serviceprovider.ServiceProvider; +import jdk.graal.compiler.serviceprovider.JMXService; +import jdk.graal.compiler.serviceprovider.ServiceProvider; import com.sun.management.ThreadMXBean; diff --git a/compiler/src/jdk.compiler.graal.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/ConditionalEliminationBenchmark.java b/compiler/src/jdk.graal.compiler.microbenchmarks/src/jdk/graal/compiler/microbenchmarks/graal/ConditionalEliminationBenchmark.java similarity index 94% rename from compiler/src/jdk.compiler.graal.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/ConditionalEliminationBenchmark.java rename to compiler/src/jdk.graal.compiler.microbenchmarks/src/jdk/graal/compiler/microbenchmarks/graal/ConditionalEliminationBenchmark.java index cee203aa0080..089cf01afbbd 100644 --- a/compiler/src/jdk.compiler.graal.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/ConditionalEliminationBenchmark.java +++ b/compiler/src/jdk.graal.compiler.microbenchmarks/src/jdk/graal/compiler/microbenchmarks/graal/ConditionalEliminationBenchmark.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.microbenchmarks.graal; +package jdk.graal.compiler.microbenchmarks.graal; -import jdk.compiler.graal.microbenchmarks.graal.util.GraalState; -import jdk.compiler.graal.microbenchmarks.graal.util.GraphState; -import jdk.compiler.graal.microbenchmarks.graal.util.MethodSpec; -import jdk.compiler.graal.phases.common.ConditionalEliminationPhase; +import jdk.graal.compiler.microbenchmarks.graal.util.GraalState; +import jdk.graal.compiler.microbenchmarks.graal.util.GraphState; +import jdk.graal.compiler.microbenchmarks.graal.util.MethodSpec; +import jdk.graal.compiler.phases.common.ConditionalEliminationPhase; import org.openjdk.jmh.annotations.Benchmark; public class ConditionalEliminationBenchmark extends GraalBenchmark { diff --git a/compiler/src/jdk.compiler.graal.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/FrameStateAssigmentPhaseBenchmark.java b/compiler/src/jdk.graal.compiler.microbenchmarks/src/jdk/graal/compiler/microbenchmarks/graal/FrameStateAssigmentPhaseBenchmark.java similarity index 90% rename from compiler/src/jdk.compiler.graal.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/FrameStateAssigmentPhaseBenchmark.java rename to compiler/src/jdk.graal.compiler.microbenchmarks/src/jdk/graal/compiler/microbenchmarks/graal/FrameStateAssigmentPhaseBenchmark.java index f30a327febdc..c5d2fd2a9761 100644 --- a/compiler/src/jdk.compiler.graal.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/FrameStateAssigmentPhaseBenchmark.java +++ b/compiler/src/jdk.graal.compiler.microbenchmarks/src/jdk/graal/compiler/microbenchmarks/graal/FrameStateAssigmentPhaseBenchmark.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.microbenchmarks.graal; +package jdk.graal.compiler.microbenchmarks.graal; import java.util.StringTokenizer; import org.openjdk.jmh.annotations.Benchmark; -import jdk.compiler.graal.microbenchmarks.graal.util.FrameStateAssignmentState; -import jdk.compiler.graal.microbenchmarks.graal.util.MethodSpec; +import jdk.graal.compiler.microbenchmarks.graal.util.FrameStateAssignmentState; +import jdk.graal.compiler.microbenchmarks.graal.util.MethodSpec; public class FrameStateAssigmentPhaseBenchmark extends GraalBenchmark { diff --git a/compiler/src/jdk.compiler.graal.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/GraalBenchmark.java b/compiler/src/jdk.graal.compiler.microbenchmarks/src/jdk/graal/compiler/microbenchmarks/graal/GraalBenchmark.java similarity index 90% rename from compiler/src/jdk.compiler.graal.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/GraalBenchmark.java rename to compiler/src/jdk.graal.compiler.microbenchmarks/src/jdk/graal/compiler/microbenchmarks/graal/GraalBenchmark.java index 76cfd94819bc..bc708345a11d 100644 --- a/compiler/src/jdk.compiler.graal.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/GraalBenchmark.java +++ b/compiler/src/jdk.graal.compiler.microbenchmarks/src/jdk/graal/compiler/microbenchmarks/graal/GraalBenchmark.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.microbenchmarks.graal; +package jdk.graal.compiler.microbenchmarks.graal; -import jdk.compiler.graal.api.test.ModuleSupport; +import jdk.graal.compiler.api.test.ModuleSupport; import org.openjdk.jmh.annotations.Fork; import org.openjdk.jmh.annotations.Measurement; @@ -40,6 +40,6 @@ @Fork(3) public class GraalBenchmark { static { - ModuleSupport.exportAndOpenAllPackagesToUnnamed("jdk.compiler.graal"); + ModuleSupport.exportAndOpenAllPackagesToUnnamed("jdk.graal.compiler"); } } diff --git a/compiler/src/jdk.compiler.graal.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/GraphCopyBenchmark.java b/compiler/src/jdk.graal.compiler.microbenchmarks/src/jdk/graal/compiler/microbenchmarks/graal/GraphCopyBenchmark.java similarity index 91% rename from compiler/src/jdk.compiler.graal.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/GraphCopyBenchmark.java rename to compiler/src/jdk.graal.compiler.microbenchmarks/src/jdk/graal/compiler/microbenchmarks/graal/GraphCopyBenchmark.java index 48a2f6599bb8..09faff803607 100644 --- a/compiler/src/jdk.compiler.graal.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/GraphCopyBenchmark.java +++ b/compiler/src/jdk.graal.compiler.microbenchmarks/src/jdk/graal/compiler/microbenchmarks/graal/GraphCopyBenchmark.java @@ -22,16 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.microbenchmarks.graal; +package jdk.graal.compiler.microbenchmarks.graal; -import jdk.compiler.graal.debug.DebugContext; +import jdk.graal.compiler.debug.DebugContext; import org.openjdk.jmh.annotations.Benchmark; -import jdk.compiler.graal.graph.Graph; -import jdk.compiler.graal.microbenchmarks.graal.util.GraalState; -import jdk.compiler.graal.microbenchmarks.graal.util.GraphState; -import jdk.compiler.graal.microbenchmarks.graal.util.MethodSpec; -import jdk.compiler.graal.nodes.StructuredGraph; +import jdk.graal.compiler.graph.Graph; +import jdk.graal.compiler.microbenchmarks.graal.util.GraalState; +import jdk.graal.compiler.microbenchmarks.graal.util.GraphState; +import jdk.graal.compiler.microbenchmarks.graal.util.MethodSpec; +import jdk.graal.compiler.nodes.StructuredGraph; /** * Benchmarks the performance of {@link Graph#copy(DebugContext)}. diff --git a/compiler/src/jdk.compiler.graal.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/NodeBenchmark.java b/compiler/src/jdk.graal.compiler.microbenchmarks/src/jdk/graal/compiler/microbenchmarks/graal/NodeBenchmark.java similarity index 91% rename from compiler/src/jdk.compiler.graal.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/NodeBenchmark.java rename to compiler/src/jdk.graal.compiler.microbenchmarks/src/jdk/graal/compiler/microbenchmarks/graal/NodeBenchmark.java index a8cf993d39e0..c12a254c4c06 100644 --- a/compiler/src/jdk.compiler.graal.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/NodeBenchmark.java +++ b/compiler/src/jdk.graal.compiler.microbenchmarks/src/jdk/graal/compiler/microbenchmarks/graal/NodeBenchmark.java @@ -22,23 +22,23 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.microbenchmarks.graal; +package jdk.graal.compiler.microbenchmarks.graal; import java.util.HashMap; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.infra.Blackhole; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.graph.NodeBitMap; -import jdk.compiler.graal.microbenchmarks.graal.util.GraalState; -import jdk.compiler.graal.microbenchmarks.graal.util.MethodSpec; -import jdk.compiler.graal.microbenchmarks.graal.util.NodesState; -import jdk.compiler.graal.microbenchmarks.graal.util.NodesState.NodePair; -import jdk.compiler.graal.nodes.ConstantNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.calc.AddNode; -import jdk.compiler.graal.nodes.util.GraphUtil; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.graph.NodeBitMap; +import jdk.graal.compiler.microbenchmarks.graal.util.GraalState; +import jdk.graal.compiler.microbenchmarks.graal.util.MethodSpec; +import jdk.graal.compiler.microbenchmarks.graal.util.NodesState; +import jdk.graal.compiler.microbenchmarks.graal.util.NodesState.NodePair; +import jdk.graal.compiler.nodes.ConstantNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.calc.AddNode; +import jdk.graal.compiler.nodes.util.GraphUtil; public class NodeBenchmark extends GraalBenchmark { diff --git a/compiler/src/jdk.compiler.graal.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/SchedulePhaseBenchmark.java b/compiler/src/jdk.graal.compiler.microbenchmarks/src/jdk/graal/compiler/microbenchmarks/graal/SchedulePhaseBenchmark.java similarity index 95% rename from compiler/src/jdk.compiler.graal.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/SchedulePhaseBenchmark.java rename to compiler/src/jdk.graal.compiler.microbenchmarks/src/jdk/graal/compiler/microbenchmarks/graal/SchedulePhaseBenchmark.java index 7db0ce0f7212..522df38a87bd 100644 --- a/compiler/src/jdk.compiler.graal.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/SchedulePhaseBenchmark.java +++ b/compiler/src/jdk.graal.compiler.microbenchmarks/src/jdk/graal/compiler/microbenchmarks/graal/SchedulePhaseBenchmark.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.microbenchmarks.graal; +package jdk.graal.compiler.microbenchmarks.graal; -import jdk.compiler.graal.microbenchmarks.graal.util.MethodSpec; -import jdk.compiler.graal.microbenchmarks.graal.util.ScheduleState; -import jdk.compiler.graal.nodes.cfg.ControlFlowGraph; -import jdk.compiler.graal.phases.schedule.SchedulePhase; -import jdk.compiler.graal.phases.schedule.SchedulePhase.SchedulingStrategy; +import jdk.graal.compiler.microbenchmarks.graal.util.MethodSpec; +import jdk.graal.compiler.microbenchmarks.graal.util.ScheduleState; +import jdk.graal.compiler.nodes.cfg.ControlFlowGraph; +import jdk.graal.compiler.phases.schedule.SchedulePhase; +import jdk.graal.compiler.phases.schedule.SchedulePhase.SchedulingStrategy; import org.openjdk.jmh.annotations.Benchmark; public class SchedulePhaseBenchmark extends GraalBenchmark { diff --git a/compiler/src/jdk.compiler.graal.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/TestJMHWhitebox.java b/compiler/src/jdk.graal.compiler.microbenchmarks/src/jdk/graal/compiler/microbenchmarks/graal/TestJMHWhitebox.java similarity index 93% rename from compiler/src/jdk.compiler.graal.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/TestJMHWhitebox.java rename to compiler/src/jdk.graal.compiler.microbenchmarks/src/jdk/graal/compiler/microbenchmarks/graal/TestJMHWhitebox.java index 1a3986319dd3..a58675c849c8 100644 --- a/compiler/src/jdk.compiler.graal.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/TestJMHWhitebox.java +++ b/compiler/src/jdk.graal.compiler.microbenchmarks/src/jdk/graal/compiler/microbenchmarks/graal/TestJMHWhitebox.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.microbenchmarks.graal; +package jdk.graal.compiler.microbenchmarks.graal; -import jdk.compiler.graal.microbenchmarks.graal.util.GraalState; +import jdk.graal.compiler.microbenchmarks.graal.util.GraalState; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.Fork; import org.openjdk.jmh.annotations.Measurement; diff --git a/compiler/src/jdk.compiler.graal.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/util/FrameStateAssignmentState.java b/compiler/src/jdk.graal.compiler.microbenchmarks/src/jdk/graal/compiler/microbenchmarks/graal/util/FrameStateAssignmentState.java similarity index 88% rename from compiler/src/jdk.compiler.graal.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/util/FrameStateAssignmentState.java rename to compiler/src/jdk.graal.compiler.microbenchmarks/src/jdk/graal/compiler/microbenchmarks/graal/util/FrameStateAssignmentState.java index 709d1eb4abfe..44f3c34fa2f6 100644 --- a/compiler/src/jdk.compiler.graal.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/util/FrameStateAssignmentState.java +++ b/compiler/src/jdk.graal.compiler.microbenchmarks/src/jdk/graal/compiler/microbenchmarks/graal/util/FrameStateAssignmentState.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.microbenchmarks.graal.util; +package jdk.graal.compiler.microbenchmarks.graal.util; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.phases.common.FrameStateAssignmentPhase; -import jdk.compiler.graal.phases.common.GuardLoweringPhase; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.phases.common.FrameStateAssignmentPhase; +import jdk.graal.compiler.phases.common.GuardLoweringPhase; public class FrameStateAssignmentState extends GraphState { diff --git a/compiler/src/jdk.compiler.graal.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/util/GraalState.java b/compiler/src/jdk.graal.compiler.microbenchmarks/src/jdk/graal/compiler/microbenchmarks/graal/util/GraalState.java similarity index 84% rename from compiler/src/jdk.compiler.graal.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/util/GraalState.java rename to compiler/src/jdk.graal.compiler.microbenchmarks/src/jdk/graal/compiler/microbenchmarks/graal/util/GraalState.java index 945a911aa81c..e6455d21a34b 100644 --- a/compiler/src/jdk.compiler.graal.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/util/GraalState.java +++ b/compiler/src/jdk.graal.compiler.microbenchmarks/src/jdk/graal/compiler/microbenchmarks/graal/util/GraalState.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.microbenchmarks.graal.util; +package jdk.graal.compiler.microbenchmarks.graal.util; -import jdk.compiler.graal.api.test.Graal; -import jdk.compiler.graal.core.target.Backend; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.debug.DebugContext.Builder; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.phases.util.Providers; -import jdk.compiler.graal.runtime.RuntimeProvider; +import jdk.graal.compiler.api.test.Graal; +import jdk.graal.compiler.core.target.Backend; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.debug.DebugContext.Builder; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.phases.util.Providers; +import jdk.graal.compiler.runtime.RuntimeProvider; import org.openjdk.jmh.annotations.Scope; import org.openjdk.jmh.annotations.State; diff --git a/compiler/src/jdk.compiler.graal.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/util/GraalUtil.java b/compiler/src/jdk.graal.compiler.microbenchmarks/src/jdk/graal/compiler/microbenchmarks/graal/util/GraalUtil.java similarity index 90% rename from compiler/src/jdk.compiler.graal.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/util/GraalUtil.java rename to compiler/src/jdk.graal.compiler.microbenchmarks/src/jdk/graal/compiler/microbenchmarks/graal/util/GraalUtil.java index 59e17424bde9..a6fc3afa0006 100644 --- a/compiler/src/jdk.compiler.graal.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/util/GraalUtil.java +++ b/compiler/src/jdk.graal.compiler.microbenchmarks/src/jdk/graal/compiler/microbenchmarks/graal/util/GraalUtil.java @@ -22,21 +22,21 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.microbenchmarks.graal.util; +package jdk.graal.compiler.microbenchmarks.graal.util; import java.lang.reflect.Method; import java.util.List; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.java.GraphBuilderPhase; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins; -import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins; -import jdk.compiler.graal.phases.OptimisticOptimizations; -import jdk.compiler.graal.phases.PhaseSuite; -import jdk.compiler.graal.phases.tiers.HighTierContext; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.java.GraphBuilderPhase; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.StructuredGraph.AllowAssumptions; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins; +import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins; +import jdk.graal.compiler.phases.OptimisticOptimizations; +import jdk.graal.compiler.phases.PhaseSuite; +import jdk.graal.compiler.phases.tiers.HighTierContext; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.compiler.graal.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/util/GraphState.java b/compiler/src/jdk.graal.compiler.microbenchmarks/src/jdk/graal/compiler/microbenchmarks/graal/util/GraphState.java similarity index 90% rename from compiler/src/jdk.compiler.graal.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/util/GraphState.java rename to compiler/src/jdk.graal.compiler.microbenchmarks/src/jdk/graal/compiler/microbenchmarks/graal/util/GraphState.java index e51fd449ded5..92de77d9081a 100644 --- a/compiler/src/jdk.compiler.graal.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/util/GraphState.java +++ b/compiler/src/jdk.graal.compiler.microbenchmarks/src/jdk/graal/compiler/microbenchmarks/graal/util/GraphState.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.microbenchmarks.graal.util; +package jdk.graal.compiler.microbenchmarks.graal.util; -import static jdk.compiler.graal.microbenchmarks.graal.util.GraalUtil.getGraph; -import static jdk.compiler.graal.microbenchmarks.graal.util.GraalUtil.getMethodFromMethodSpec; +import static jdk.graal.compiler.microbenchmarks.graal.util.GraalUtil.getGraph; +import static jdk.graal.compiler.microbenchmarks.graal.util.GraalUtil.getMethodFromMethodSpec; -import jdk.compiler.graal.core.common.util.CompilationAlarm; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.nodes.StructuredGraph; +import jdk.graal.compiler.core.common.util.CompilationAlarm; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.nodes.StructuredGraph; import org.openjdk.jmh.annotations.Level; import org.openjdk.jmh.annotations.Scope; import org.openjdk.jmh.annotations.Setup; diff --git a/compiler/src/jdk.compiler.graal.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/util/MethodSpec.java b/compiler/src/jdk.graal.compiler.microbenchmarks/src/jdk/graal/compiler/microbenchmarks/graal/util/MethodSpec.java similarity index 97% rename from compiler/src/jdk.compiler.graal.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/util/MethodSpec.java rename to compiler/src/jdk.graal.compiler.microbenchmarks/src/jdk/graal/compiler/microbenchmarks/graal/util/MethodSpec.java index 2aa5d1923769..2afe3ebff747 100644 --- a/compiler/src/jdk.compiler.graal.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/util/MethodSpec.java +++ b/compiler/src/jdk.graal.compiler.microbenchmarks/src/jdk/graal/compiler/microbenchmarks/graal/util/MethodSpec.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.microbenchmarks.graal.util; +package jdk.graal.compiler.microbenchmarks.graal.util; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/compiler/src/jdk.compiler.graal.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/util/NodesState.java b/compiler/src/jdk.graal.compiler.microbenchmarks/src/jdk/graal/compiler/microbenchmarks/graal/util/NodesState.java similarity index 91% rename from compiler/src/jdk.compiler.graal.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/util/NodesState.java rename to compiler/src/jdk.graal.compiler.microbenchmarks/src/jdk/graal/compiler/microbenchmarks/graal/util/NodesState.java index c710a492b4f9..b8078cc1f615 100644 --- a/compiler/src/jdk.compiler.graal.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/util/NodesState.java +++ b/compiler/src/jdk.graal.compiler.microbenchmarks/src/jdk/graal/compiler/microbenchmarks/graal/util/NodesState.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.microbenchmarks.graal.util; +package jdk.graal.compiler.microbenchmarks.graal.util; -import static jdk.compiler.graal.microbenchmarks.graal.util.GraalUtil.getGraphFromMethodSpec; -import static jdk.compiler.graal.microbenchmarks.graal.util.GraalUtil.getNodes; +import static jdk.graal.compiler.microbenchmarks.graal.util.GraalUtil.getGraphFromMethodSpec; +import static jdk.graal.compiler.microbenchmarks.graal.util.GraalUtil.getNodes; import java.util.ArrayList; import java.util.List; @@ -35,10 +35,10 @@ import org.openjdk.jmh.annotations.Setup; import org.openjdk.jmh.annotations.State; import org.openjdk.jmh.annotations.TearDown; -import jdk.compiler.graal.core.common.util.CompilationAlarm; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.graph.NodeClass; -import jdk.compiler.graal.nodes.StructuredGraph; +import jdk.graal.compiler.core.common.util.CompilationAlarm; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.graph.NodeClass; +import jdk.graal.compiler.nodes.StructuredGraph; /** * State providing the nodes in a graph. Subclasses of this class are annotated with diff --git a/compiler/src/jdk.compiler.graal.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/util/ScheduleState.java b/compiler/src/jdk.graal.compiler.microbenchmarks/src/jdk/graal/compiler/microbenchmarks/graal/util/ScheduleState.java similarity index 86% rename from compiler/src/jdk.compiler.graal.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/util/ScheduleState.java rename to compiler/src/jdk.graal.compiler.microbenchmarks/src/jdk/graal/compiler/microbenchmarks/graal/util/ScheduleState.java index 9d7357e0c7d1..7a86ff3337f2 100644 --- a/compiler/src/jdk.compiler.graal.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/util/ScheduleState.java +++ b/compiler/src/jdk.graal.compiler.microbenchmarks/src/jdk/graal/compiler/microbenchmarks/graal/util/ScheduleState.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.microbenchmarks.graal.util; +package jdk.graal.compiler.microbenchmarks.graal.util; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.phases.OptimisticOptimizations; -import jdk.compiler.graal.phases.PhaseSuite; -import jdk.compiler.graal.phases.schedule.SchedulePhase.SchedulingStrategy; -import jdk.compiler.graal.phases.tiers.HighTierContext; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.phases.OptimisticOptimizations; +import jdk.graal.compiler.phases.PhaseSuite; +import jdk.graal.compiler.phases.schedule.SchedulePhase.SchedulingStrategy; +import jdk.graal.compiler.phases.tiers.HighTierContext; public class ScheduleState extends GraphState { diff --git a/compiler/src/jdk.compiler.graal.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/lir/CompileTimeBenchmark.java b/compiler/src/jdk.graal.compiler.microbenchmarks/src/jdk/graal/compiler/microbenchmarks/lir/CompileTimeBenchmark.java similarity index 92% rename from compiler/src/jdk.compiler.graal.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/lir/CompileTimeBenchmark.java rename to compiler/src/jdk.graal.compiler.microbenchmarks/src/jdk/graal/compiler/microbenchmarks/lir/CompileTimeBenchmark.java index 3804d603e30e..e679480bc031 100644 --- a/compiler/src/jdk.compiler.graal.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/lir/CompileTimeBenchmark.java +++ b/compiler/src/jdk.graal.compiler.microbenchmarks/src/jdk/graal/compiler/microbenchmarks/lir/CompileTimeBenchmark.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.microbenchmarks.lir; +package jdk.graal.compiler.microbenchmarks.lir; -import jdk.compiler.graal.microbenchmarks.graal.GraalBenchmark; +import jdk.graal.compiler.microbenchmarks.graal.GraalBenchmark; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.Param; -import jdk.compiler.graal.code.CompilationResult; -import jdk.compiler.graal.nodes.StructuredGraph; +import jdk.graal.compiler.code.CompilationResult; +import jdk.graal.compiler.nodes.StructuredGraph; public class CompileTimeBenchmark extends GraalBenchmark { diff --git a/compiler/src/jdk.compiler.graal.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/lir/GraalCompilerState.java b/compiler/src/jdk.graal.compiler.microbenchmarks/src/jdk/graal/compiler/microbenchmarks/lir/GraalCompilerState.java similarity index 88% rename from compiler/src/jdk.compiler.graal.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/lir/GraalCompilerState.java rename to compiler/src/jdk.graal.compiler.microbenchmarks/src/jdk/graal/compiler/microbenchmarks/lir/GraalCompilerState.java index 4ac94c1ca336..e111db3a7dfa 100644 --- a/compiler/src/jdk.compiler.graal.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/lir/GraalCompilerState.java +++ b/compiler/src/jdk.graal.compiler.microbenchmarks/src/jdk/graal/compiler/microbenchmarks/lir/GraalCompilerState.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.microbenchmarks.lir; +package jdk.graal.compiler.microbenchmarks.lir; -import static jdk.compiler.graal.microbenchmarks.graal.util.GraalUtil.getGraph; -import static jdk.compiler.graal.microbenchmarks.graal.util.GraalUtil.getMethodFromMethodSpec; +import static jdk.graal.compiler.microbenchmarks.graal.util.GraalUtil.getGraph; +import static jdk.graal.compiler.microbenchmarks.graal.util.GraalUtil.getMethodFromMethodSpec; import java.lang.annotation.Annotation; import java.lang.annotation.ElementType; @@ -36,48 +36,48 @@ import java.lang.reflect.Field; import java.lang.reflect.Method; -import jdk.compiler.graal.api.replacements.SnippetReflectionProvider; -import jdk.compiler.graal.api.test.Graal; -import jdk.compiler.graal.code.CompilationResult; -import jdk.compiler.graal.core.GraalCompiler; -import jdk.compiler.graal.core.GraalCompiler.Request; -import jdk.compiler.graal.core.LIRGenerationPhase; -import jdk.compiler.graal.core.LIRGenerationPhase.LIRGenerationContext; -import jdk.compiler.graal.core.common.CompilationIdentifier; -import jdk.compiler.graal.core.common.alloc.LinearScanOrder; -import jdk.compiler.graal.core.common.alloc.RegisterAllocationConfig; -import jdk.compiler.graal.core.common.cfg.CodeEmissionOrder; -import jdk.compiler.graal.core.gen.LIRCompilerBackend; -import jdk.compiler.graal.core.gen.LIRGenerationProvider; -import jdk.compiler.graal.core.target.Backend; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.debug.DebugContext.Builder; -import jdk.compiler.graal.lir.LIR; -import jdk.compiler.graal.lir.asm.CompilationResultBuilderFactory; -import jdk.compiler.graal.lir.gen.LIRGenerationResult; -import jdk.compiler.graal.lir.gen.LIRGeneratorTool; -import jdk.compiler.graal.lir.phases.AllocationPhase.AllocationContext; -import jdk.compiler.graal.lir.phases.LIRPhase; -import jdk.compiler.graal.lir.phases.LIRSuites; -import jdk.compiler.graal.lir.phases.PostAllocationOptimizationPhase.PostAllocationOptimizationContext; -import jdk.compiler.graal.lir.phases.PreAllocationOptimizationPhase.PreAllocationOptimizationContext; -import jdk.compiler.graal.microbenchmarks.graal.util.GraalState; -import jdk.compiler.graal.microbenchmarks.graal.util.GraalUtil; -import jdk.compiler.graal.microbenchmarks.graal.util.MethodSpec; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.StructuredGraph.ScheduleResult; -import jdk.compiler.graal.nodes.cfg.ControlFlowGraph; -import jdk.compiler.graal.nodes.cfg.HIRBlock; -import jdk.compiler.graal.nodes.spi.LoweringProvider; -import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.phases.OptimisticOptimizations; -import jdk.compiler.graal.phases.PhaseSuite; -import jdk.compiler.graal.phases.tiers.HighTierContext; -import jdk.compiler.graal.phases.tiers.Suites; -import jdk.compiler.graal.phases.tiers.TargetProvider; -import jdk.compiler.graal.phases.util.Providers; -import jdk.compiler.graal.runtime.RuntimeProvider; +import jdk.graal.compiler.api.replacements.SnippetReflectionProvider; +import jdk.graal.compiler.api.test.Graal; +import jdk.graal.compiler.code.CompilationResult; +import jdk.graal.compiler.core.GraalCompiler; +import jdk.graal.compiler.core.GraalCompiler.Request; +import jdk.graal.compiler.core.LIRGenerationPhase; +import jdk.graal.compiler.core.LIRGenerationPhase.LIRGenerationContext; +import jdk.graal.compiler.core.common.CompilationIdentifier; +import jdk.graal.compiler.core.common.alloc.LinearScanOrder; +import jdk.graal.compiler.core.common.alloc.RegisterAllocationConfig; +import jdk.graal.compiler.core.common.cfg.CodeEmissionOrder; +import jdk.graal.compiler.core.gen.LIRCompilerBackend; +import jdk.graal.compiler.core.gen.LIRGenerationProvider; +import jdk.graal.compiler.core.target.Backend; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.debug.DebugContext.Builder; +import jdk.graal.compiler.lir.LIR; +import jdk.graal.compiler.lir.asm.CompilationResultBuilderFactory; +import jdk.graal.compiler.lir.gen.LIRGenerationResult; +import jdk.graal.compiler.lir.gen.LIRGeneratorTool; +import jdk.graal.compiler.lir.phases.AllocationPhase.AllocationContext; +import jdk.graal.compiler.lir.phases.LIRPhase; +import jdk.graal.compiler.lir.phases.LIRSuites; +import jdk.graal.compiler.lir.phases.PostAllocationOptimizationPhase.PostAllocationOptimizationContext; +import jdk.graal.compiler.lir.phases.PreAllocationOptimizationPhase.PreAllocationOptimizationContext; +import jdk.graal.compiler.microbenchmarks.graal.util.GraalState; +import jdk.graal.compiler.microbenchmarks.graal.util.GraalUtil; +import jdk.graal.compiler.microbenchmarks.graal.util.MethodSpec; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.StructuredGraph.ScheduleResult; +import jdk.graal.compiler.nodes.cfg.ControlFlowGraph; +import jdk.graal.compiler.nodes.cfg.HIRBlock; +import jdk.graal.compiler.nodes.spi.LoweringProvider; +import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.phases.OptimisticOptimizations; +import jdk.graal.compiler.phases.PhaseSuite; +import jdk.graal.compiler.phases.tiers.HighTierContext; +import jdk.graal.compiler.phases.tiers.Suites; +import jdk.graal.compiler.phases.tiers.TargetProvider; +import jdk.graal.compiler.phases.util.Providers; +import jdk.graal.compiler.runtime.RuntimeProvider; import org.openjdk.jmh.annotations.Level; import org.openjdk.jmh.annotations.Param; import org.openjdk.jmh.annotations.Scope; diff --git a/compiler/src/jdk.compiler.graal.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/lir/RegisterAllocationTimeBenchmark.java b/compiler/src/jdk.graal.compiler.microbenchmarks/src/jdk/graal/compiler/microbenchmarks/lir/RegisterAllocationTimeBenchmark.java similarity index 91% rename from compiler/src/jdk.compiler.graal.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/lir/RegisterAllocationTimeBenchmark.java rename to compiler/src/jdk.graal.compiler.microbenchmarks/src/jdk/graal/compiler/microbenchmarks/lir/RegisterAllocationTimeBenchmark.java index 1b60f04fccd8..8d9b2c2e5c37 100644 --- a/compiler/src/jdk.compiler.graal.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/lir/RegisterAllocationTimeBenchmark.java +++ b/compiler/src/jdk.graal.compiler.microbenchmarks/src/jdk/graal/compiler/microbenchmarks/lir/RegisterAllocationTimeBenchmark.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.microbenchmarks.lir; +package jdk.graal.compiler.microbenchmarks.lir; -import jdk.compiler.graal.lir.gen.LIRGenerationResult; -import jdk.compiler.graal.microbenchmarks.graal.GraalBenchmark; +import jdk.graal.compiler.lir.gen.LIRGenerationResult; +import jdk.graal.compiler.microbenchmarks.graal.GraalBenchmark; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.Param; diff --git a/compiler/src/jdk.graal.compiler.processor/src/META-INF/services/javax.annotation.processing.Processor b/compiler/src/jdk.graal.compiler.processor/src/META-INF/services/javax.annotation.processing.Processor new file mode 100644 index 000000000000..5fe7f8c9737e --- /dev/null +++ b/compiler/src/jdk.graal.compiler.processor/src/META-INF/services/javax.annotation.processing.Processor @@ -0,0 +1,7 @@ +jdk.graal.compiler.replacements.processor.ReplacementsAnnotationProcessor +jdk.graal.compiler.nodeinfo.processor.GraphNodeProcessor +jdk.graal.compiler.lir.processor.IntrinsicStubProcessor +jdk.graal.compiler.lir.processor.SyncPortProcessor +jdk.graal.compiler.core.match.processor.MatchProcessor +jdk.graal.compiler.options.processor.OptionProcessor +jdk.graal.compiler.serviceprovider.processor.ServiceProviderProcessor diff --git a/compiler/src/jdk.compiler.graal.processor/src/jdk/compiler/graal/core/match/processor/MatchProcessor.java b/compiler/src/jdk.graal.compiler.processor/src/jdk/graal/compiler/core/match/processor/MatchProcessor.java similarity index 97% rename from compiler/src/jdk.compiler.graal.processor/src/jdk/compiler/graal/core/match/processor/MatchProcessor.java rename to compiler/src/jdk.graal.compiler.processor/src/jdk/graal/compiler/core/match/processor/MatchProcessor.java index 523842fb2e93..94578d1e808b 100644 --- a/compiler/src/jdk.compiler.graal.processor/src/jdk/compiler/graal/core/match/processor/MatchProcessor.java +++ b/compiler/src/jdk.graal.compiler.processor/src/jdk/graal/compiler/core/match/processor/MatchProcessor.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.match.processor; +package jdk.graal.compiler.core.match.processor; import java.io.FileWriter; import java.io.IOException; @@ -57,7 +57,7 @@ import javax.tools.FileObject; import javax.tools.StandardLocation; -import jdk.compiler.graal.processor.AbstractProcessor; +import jdk.graal.compiler.processor.AbstractProcessor; /** * Processes classes annotated with {@code MatchRule}. A {@code MatchStatementSet} service is @@ -71,16 +71,16 @@ * } * */ -@SupportedAnnotationTypes({"jdk.compiler.graal.core.match.MatchRule", "jdk.compiler.graal.core.match.MatchRules", "jdk.compiler.graal.core.match.MatchableNode", - "jdk.compiler.graal.core.match.MatchableNodes"}) +@SupportedAnnotationTypes({"jdk.graal.compiler.core.match.MatchRule", "jdk.graal.compiler.core.match.MatchRules", "jdk.graal.compiler.core.match.MatchableNode", + "jdk.graal.compiler.core.match.MatchableNodes"}) public class MatchProcessor extends AbstractProcessor { - private static final String VALUE_NODE_CLASS_NAME = "jdk.compiler.graal.nodes.ValueNode"; - private static final String COMPLEX_MATCH_RESULT_CLASS_NAME = "jdk.compiler.graal.core.match.ComplexMatchResult"; - private static final String MATCHABLE_NODES_CLASS_NAME = "jdk.compiler.graal.core.match.MatchableNodes"; - private static final String MATCHABLE_NODE_CLASS_NAME = "jdk.compiler.graal.core.match.MatchableNode"; - private static final String MATCH_RULE_CLASS_NAME = "jdk.compiler.graal.core.match.MatchRule"; - private static final String MATCH_RULES_CLASS_NAME = "jdk.compiler.graal.core.match.MatchRules"; + private static final String VALUE_NODE_CLASS_NAME = "jdk.graal.compiler.nodes.ValueNode"; + private static final String COMPLEX_MATCH_RESULT_CLASS_NAME = "jdk.graal.compiler.core.match.ComplexMatchResult"; + private static final String MATCHABLE_NODES_CLASS_NAME = "jdk.graal.compiler.core.match.MatchableNodes"; + private static final String MATCHABLE_NODE_CLASS_NAME = "jdk.graal.compiler.core.match.MatchableNode"; + private static final String MATCH_RULE_CLASS_NAME = "jdk.graal.compiler.core.match.MatchRule"; + private static final String MATCH_RULES_CLASS_NAME = "jdk.graal.compiler.core.match.MatchRules"; public MatchProcessor() { } @@ -515,9 +515,9 @@ private void createFiles(MatchRuleDescriptor info) { out.println("package " + pkg + ";"); out.println(""); out.println("import java.util.*;"); - out.println("import jdk.compiler.graal.core.match.*;"); - out.println("import jdk.compiler.graal.core.gen.NodeMatchRules;"); - out.println("import jdk.compiler.graal.graph.Position;"); + out.println("import jdk.graal.compiler.core.match.*;"); + out.println("import jdk.graal.compiler.core.gen.NodeMatchRules;"); + out.println("import jdk.graal.compiler.graph.Position;"); for (String p : info.requiredPackages) { if (p.equals(pkg)) { continue; @@ -595,7 +595,7 @@ private void createFiles(MatchRuleDescriptor info) { out.println("}"); } - this.createProviderFile(pkg + "." + matchStatementClassName, "jdk.compiler.graal.core.match.MatchStatementSet", originatingElements); + this.createProviderFile(pkg + "." + matchStatementClassName, "jdk.graal.compiler.core.match.MatchStatementSet", originatingElements); } /** @@ -716,7 +716,7 @@ public boolean doProcess(Set annotations, RoundEnvironmen // Define a TypeDescriptor for the generic node but don't enter it into the nodeTypes // table since it shouldn't be mentioned in match rules. TypeMirror valueTypeMirror = getTypeElement(VALUE_NODE_CLASS_NAME).asType(); - valueType = new TypeDescriptor(valueTypeMirror, "Value", "ValueNode", "jdk.compiler.graal.nodes", Collections.emptyList(), false, false, false, false); + valueType = new TypeDescriptor(valueTypeMirror, "Value", "ValueNode", "jdk.graal.compiler.nodes", Collections.emptyList(), false, false, false, false); Map map = new HashMap<>(); diff --git a/compiler/src/jdk.compiler.graal.processor/src/jdk/compiler/graal/lir/processor/IntrinsicStubProcessor.java b/compiler/src/jdk.graal.compiler.processor/src/jdk/graal/compiler/lir/processor/IntrinsicStubProcessor.java similarity index 96% rename from compiler/src/jdk.compiler.graal.processor/src/jdk/compiler/graal/lir/processor/IntrinsicStubProcessor.java rename to compiler/src/jdk.graal.compiler.processor/src/jdk/graal/compiler/lir/processor/IntrinsicStubProcessor.java index 45cad9e6d50b..7a57ac3012a7 100644 --- a/compiler/src/jdk.compiler.graal.processor/src/jdk/compiler/graal/lir/processor/IntrinsicStubProcessor.java +++ b/compiler/src/jdk.graal.compiler.processor/src/jdk/graal/compiler/lir/processor/IntrinsicStubProcessor.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.processor; +package jdk.graal.compiler.lir.processor; import static javax.lang.model.type.TypeKind.VOID; @@ -48,11 +48,11 @@ import javax.tools.Diagnostic; import javax.tools.JavaFileObject; -import jdk.compiler.graal.processor.AbstractProcessor; +import jdk.graal.compiler.processor.AbstractProcessor; /** - * Processor for the {@code jdk.compiler.graal.lir.GenerateStub} and - * {@code jdk.compiler.graal.lir.GeneratedStubsHolder} annotation. + * Processor for the {@code jdk.graal.compiler.lir.GenerateStub} and + * {@code jdk.graal.compiler.lir.GeneratedStubsHolder} annotation. */ public class IntrinsicStubProcessor extends AbstractProcessor { @@ -61,11 +61,11 @@ enum TargetVM { substrate } - private static final String NODE_INTRINSIC_CLASS_NAME = "jdk.compiler.graal.graph.Node.NodeIntrinsic"; - private static final String GENERATE_STUB_CLASS_NAME = "jdk.compiler.graal.lir.GenerateStub"; - private static final String GENERATE_STUBS_CLASS_NAME = "jdk.compiler.graal.lir.GenerateStubs"; - private static final String GENERATED_STUBS_HOLDER_CLASS_NAME = "jdk.compiler.graal.lir.GeneratedStubsHolder"; - private static final String CONSTANT_NODE_PARAMETER_CLASS_NAME = "jdk.compiler.graal.graph.Node.ConstantNodeParameter"; + private static final String NODE_INTRINSIC_CLASS_NAME = "jdk.graal.compiler.graph.Node.NodeIntrinsic"; + private static final String GENERATE_STUB_CLASS_NAME = "jdk.graal.compiler.lir.GenerateStub"; + private static final String GENERATE_STUBS_CLASS_NAME = "jdk.graal.compiler.lir.GenerateStubs"; + private static final String GENERATED_STUBS_HOLDER_CLASS_NAME = "jdk.graal.compiler.lir.GeneratedStubsHolder"; + private static final String CONSTANT_NODE_PARAMETER_CLASS_NAME = "jdk.graal.compiler.graph.Node.ConstantNodeParameter"; private TypeElement nodeIntrinsic; private TypeElement generatedStubsHolder; @@ -281,11 +281,11 @@ private void createStubs(AbstractProcessor processor, TargetVM targetVM, TypeEle switch (targetVM) { case hotspot: imports.addAll(List.of( - "jdk.compiler.graal.api.replacements.Snippet", - "jdk.compiler.graal.hotspot.HotSpotForeignCallLinkage", - "jdk.compiler.graal.hotspot.meta.HotSpotProviders", - "jdk.compiler.graal.options.OptionValues", - "jdk.compiler.graal.hotspot.stubs.SnippetStub")); + "jdk.graal.compiler.api.replacements.Snippet", + "jdk.graal.compiler.hotspot.HotSpotForeignCallLinkage", + "jdk.graal.compiler.hotspot.meta.HotSpotProviders", + "jdk.graal.compiler.options.OptionValues", + "jdk.graal.compiler.hotspot.stubs.SnippetStub")); break; case substrate: imports.addAll(List.of( @@ -294,8 +294,8 @@ private void createStubs(AbstractProcessor processor, TargetVM targetVM, TypeEle "com.oracle.svm.core.snippets.SubstrateForeignCallTarget", "com.oracle.svm.core.cpufeature.Stubs", "com.oracle.svm.graal.RuntimeCPUFeatureRegion", - "jdk.compiler.graal.api.replacements.Fold", - "jdk.compiler.graal.debug.GraalError", + "jdk.graal.compiler.api.replacements.Fold", + "jdk.graal.compiler.debug.GraalError", "org.graalvm.nativeimage.ImageSingletons", "java.util.EnumSet", "jdk.vm.ci.code.Architecture")); diff --git a/compiler/src/jdk.compiler.graal.processor/src/jdk/compiler/graal/lir/processor/SyncPortProcessor.java b/compiler/src/jdk.graal.compiler.processor/src/jdk/graal/compiler/lir/processor/SyncPortProcessor.java similarity index 97% rename from compiler/src/jdk.compiler.graal.processor/src/jdk/compiler/graal/lir/processor/SyncPortProcessor.java rename to compiler/src/jdk.graal.compiler.processor/src/jdk/graal/compiler/lir/processor/SyncPortProcessor.java index a3212a7aee62..a7f2a542c4a7 100644 --- a/compiler/src/jdk.compiler.graal.processor/src/jdk/compiler/graal/lir/processor/SyncPortProcessor.java +++ b/compiler/src/jdk.graal.compiler.processor/src/jdk/graal/compiler/lir/processor/SyncPortProcessor.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.processor; +package jdk.graal.compiler.lir.processor; import static javax.tools.Diagnostic.Kind.ERROR; import static javax.tools.Diagnostic.Kind.NOTE; @@ -54,10 +54,10 @@ import javax.lang.model.element.TypeElement; import javax.tools.Diagnostic; -import jdk.compiler.graal.processor.AbstractProcessor; +import jdk.graal.compiler.processor.AbstractProcessor; /** - * Processor for the {@code jdk.compiler.graal.lir.SyncPort} annotation. It verifies whether the + * Processor for the {@code jdk.graal.compiler.lir.SyncPort} annotation. It verifies whether the * digest of the latest source code from the OpenJDK repository matches the one specified in the * {@code SyncPort}. */ @@ -75,8 +75,8 @@ public class SyncPortProcessor extends AbstractProcessor { static final String JDK_LATEST_HUMAN = "https://github.com/openjdk/jdk/blob/master/"; static final String JDK_LATEST_INFO = "https://api.github.com/repos/openjdk/jdk/git/matching-refs/heads/master"; - static final String SYNC_PORT_CLASS_NAME = "jdk.compiler.graal.lir.SyncPort"; - static final String SYNC_PORTS_CLASS_NAME = "jdk.compiler.graal.lir.SyncPorts"; + static final String SYNC_PORT_CLASS_NAME = "jdk.graal.compiler.lir.SyncPort"; + static final String SYNC_PORTS_CLASS_NAME = "jdk.graal.compiler.lir.SyncPorts"; static final Pattern URL_PATTERN = Pattern.compile("^https://github.com/openjdk/jdk/blob/(?[0-9a-fA-F]{40})/(?[-_./A-Za-z0-9]+)#L(?[0-9]+)-L(?[0-9]+)$"); diff --git a/compiler/src/jdk.compiler.graal.processor/src/jdk/compiler/graal/nodeinfo/processor/ElementException.java b/compiler/src/jdk.graal.compiler.processor/src/jdk/graal/compiler/nodeinfo/processor/ElementException.java similarity index 97% rename from compiler/src/jdk.compiler.graal.processor/src/jdk/compiler/graal/nodeinfo/processor/ElementException.java rename to compiler/src/jdk.graal.compiler.processor/src/jdk/graal/compiler/nodeinfo/processor/ElementException.java index 334d581834f9..c38bb5031cab 100644 --- a/compiler/src/jdk.compiler.graal.processor/src/jdk/compiler/graal/nodeinfo/processor/ElementException.java +++ b/compiler/src/jdk.graal.compiler.processor/src/jdk/graal/compiler/nodeinfo/processor/ElementException.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.nodeinfo.processor; +package jdk.graal.compiler.nodeinfo.processor; import javax.lang.model.element.Element; diff --git a/compiler/src/jdk.compiler.graal.processor/src/jdk/compiler/graal/nodeinfo/processor/GraphNodeProcessor.java b/compiler/src/jdk.graal.compiler.processor/src/jdk/graal/compiler/nodeinfo/processor/GraphNodeProcessor.java similarity index 95% rename from compiler/src/jdk.compiler.graal.processor/src/jdk/compiler/graal/nodeinfo/processor/GraphNodeProcessor.java rename to compiler/src/jdk.graal.compiler.processor/src/jdk/graal/compiler/nodeinfo/processor/GraphNodeProcessor.java index eb3deaa5aa00..1c718651b692 100644 --- a/compiler/src/jdk.compiler.graal.processor/src/jdk/compiler/graal/nodeinfo/processor/GraphNodeProcessor.java +++ b/compiler/src/jdk.graal.compiler.processor/src/jdk/graal/compiler/nodeinfo/processor/GraphNodeProcessor.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.nodeinfo.processor; +package jdk.graal.compiler.nodeinfo.processor; import static java.util.Collections.reverse; @@ -46,15 +46,15 @@ import javax.lang.model.util.Types; import javax.tools.Diagnostic.Kind; -import jdk.compiler.graal.processor.AbstractProcessor; +import jdk.graal.compiler.processor.AbstractProcessor; /** * Processor for {@value #NODE_INFO_CLASS_NAME} annotation. */ @SupportedSourceVersion(SourceVersion.RELEASE_8) -@SupportedAnnotationTypes({"jdk.compiler.graal.nodeinfo.NodeInfo"}) +@SupportedAnnotationTypes({"jdk.graal.compiler.nodeinfo.NodeInfo"}) public class GraphNodeProcessor extends AbstractProcessor { - private static final String NODE_INFO_CLASS_NAME = "jdk.compiler.graal.nodeinfo.NodeInfo"; + private static final String NODE_INFO_CLASS_NAME = "jdk.graal.compiler.nodeinfo.NodeInfo"; /** * Node class currently being processed. @@ -115,7 +115,7 @@ boolean isNodeType(Element element) { Types types = processingEnv.getTypeUtils(); while (type != null) { - if (type.toString().equals("jdk.compiler.graal.graph.Node")) { + if (type.toString().equals("jdk.graal.compiler.graph.Node")) { return true; } type = (TypeElement) types.asElement(type.getSuperclass()); diff --git a/compiler/src/jdk.compiler.graal.processor/src/jdk/compiler/graal/nodeinfo/processor/GraphNodeVerifier.java b/compiler/src/jdk.graal.compiler.processor/src/jdk/graal/compiler/nodeinfo/processor/GraphNodeVerifier.java similarity index 95% rename from compiler/src/jdk.compiler.graal.processor/src/jdk/compiler/graal/nodeinfo/processor/GraphNodeVerifier.java rename to compiler/src/jdk.graal.compiler.processor/src/jdk/graal/compiler/nodeinfo/processor/GraphNodeVerifier.java index 988603a02aa2..40bd203b65a6 100644 --- a/compiler/src/jdk.compiler.graal.processor/src/jdk/compiler/graal/nodeinfo/processor/GraphNodeVerifier.java +++ b/compiler/src/jdk.graal.compiler.processor/src/jdk/graal/compiler/nodeinfo/processor/GraphNodeVerifier.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.nodeinfo.processor; +package jdk.graal.compiler.nodeinfo.processor; import static javax.lang.model.element.Modifier.FINAL; import static javax.lang.model.element.Modifier.PRIVATE; @@ -45,7 +45,7 @@ import javax.lang.model.util.ElementFilter; import javax.lang.model.util.Types; -import jdk.compiler.graal.processor.AbstractProcessor; +import jdk.graal.compiler.processor.AbstractProcessor; /** * Verifies static constraints on nodes. @@ -70,12 +70,12 @@ public class GraphNodeVerifier { @SuppressWarnings("this-escape") public GraphNodeVerifier(AbstractProcessor processor) { this.processor = processor; - this.Input = getTypeElement("jdk.compiler.graal.graph.Node.Input"); - this.OptionalInput = getTypeElement("jdk.compiler.graal.graph.Node.OptionalInput"); - this.Successor = getTypeElement("jdk.compiler.graal.graph.Node.Successor"); - this.Node = getTypeElement("jdk.compiler.graal.graph.Node"); - this.NodeInputList = getTypeElement("jdk.compiler.graal.graph.NodeInputList"); - this.NodeSuccessorList = getTypeElement("jdk.compiler.graal.graph.NodeSuccessorList"); + this.Input = getTypeElement("jdk.graal.compiler.graph.Node.Input"); + this.OptionalInput = getTypeElement("jdk.graal.compiler.graph.Node.OptionalInput"); + this.Successor = getTypeElement("jdk.graal.compiler.graph.Node.Successor"); + this.Node = getTypeElement("jdk.graal.compiler.graph.Node"); + this.NodeInputList = getTypeElement("jdk.graal.compiler.graph.NodeInputList"); + this.NodeSuccessorList = getTypeElement("jdk.graal.compiler.graph.NodeSuccessorList"); this.object = getTypeElement("java.lang.Object"); } diff --git a/compiler/src/jdk.compiler.graal.processor/src/jdk/compiler/graal/options/processor/OptionProcessor.java b/compiler/src/jdk.graal.compiler.processor/src/jdk/graal/compiler/options/processor/OptionProcessor.java similarity index 97% rename from compiler/src/jdk.compiler.graal.processor/src/jdk/compiler/graal/options/processor/OptionProcessor.java rename to compiler/src/jdk.graal.compiler.processor/src/jdk/graal/compiler/options/processor/OptionProcessor.java index 5a810a7e5d55..88e4069503f6 100644 --- a/compiler/src/jdk.compiler.graal.processor/src/jdk/compiler/graal/options/processor/OptionProcessor.java +++ b/compiler/src/jdk.graal.compiler.processor/src/jdk/graal/compiler/options/processor/OptionProcessor.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.options.processor; +package jdk.graal.compiler.options.processor; import java.io.BufferedReader; import java.io.IOException; @@ -56,7 +56,7 @@ import javax.tools.FileObject; import javax.tools.StandardLocation; -import jdk.compiler.graal.processor.AbstractProcessor; +import jdk.graal.compiler.processor.AbstractProcessor; /** * Processes static fields annotated with {@code Option}. An {@code OptionDescriptors} @@ -64,16 +64,16 @@ * of the generated class for top level class {@code com.foo.Bar} is * {@code com.foo.Bar_OptionDescriptors}. */ -@SupportedAnnotationTypes({"jdk.compiler.graal.options.Option"}) +@SupportedAnnotationTypes({"jdk.graal.compiler.options.Option"}) public class OptionProcessor extends AbstractProcessor { - private static final String OPTION_CLASS_NAME = "jdk.compiler.graal.options.Option"; - private static final String OPTION_KEY_CLASS_NAME = "jdk.compiler.graal.options.OptionKey"; - private static final String OPTION_TYPE_CLASS_NAME = "jdk.compiler.graal.options.OptionType"; - private static final String OPTION_STABILITY_CLASS_NAME = "jdk.compiler.graal.options.OptionStability"; - private static final String OPTION_TYPE_GROUP_NAME = "jdk.compiler.graal.options.OptionGroup"; - private static final String OPTION_DESCRIPTOR_CLASS_NAME = "jdk.compiler.graal.options.OptionDescriptor"; - private static final String OPTION_DESCRIPTORS_CLASS_NAME = "jdk.compiler.graal.options.OptionDescriptors"; + private static final String OPTION_CLASS_NAME = "jdk.graal.compiler.options.Option"; + private static final String OPTION_KEY_CLASS_NAME = "jdk.graal.compiler.options.OptionKey"; + private static final String OPTION_TYPE_CLASS_NAME = "jdk.graal.compiler.options.OptionType"; + private static final String OPTION_STABILITY_CLASS_NAME = "jdk.graal.compiler.options.OptionStability"; + private static final String OPTION_TYPE_GROUP_NAME = "jdk.graal.compiler.options.OptionGroup"; + private static final String OPTION_DESCRIPTOR_CLASS_NAME = "jdk.graal.compiler.options.OptionDescriptor"; + private static final String OPTION_DESCRIPTORS_CLASS_NAME = "jdk.graal.compiler.options.OptionDescriptors"; private final Set processed = new HashSet<>(); diff --git a/compiler/src/jdk.compiler.graal.processor/src/jdk/compiler/graal/processor/AbstractProcessor.java b/compiler/src/jdk.graal.compiler.processor/src/jdk/graal/compiler/processor/AbstractProcessor.java similarity index 99% rename from compiler/src/jdk.compiler.graal.processor/src/jdk/compiler/graal/processor/AbstractProcessor.java rename to compiler/src/jdk.graal.compiler.processor/src/jdk/graal/compiler/processor/AbstractProcessor.java index 50c7c2bc34bd..a28d4295064e 100644 --- a/compiler/src/jdk.compiler.graal.processor/src/jdk/compiler/graal/processor/AbstractProcessor.java +++ b/compiler/src/jdk.graal.compiler.processor/src/jdk/graal/compiler/processor/AbstractProcessor.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.processor; +package jdk.graal.compiler.processor; import java.io.IOException; import java.io.OutputStreamWriter; diff --git a/compiler/src/jdk.compiler.graal.processor/src/jdk/compiler/graal/processor/SuppressFBWarnings.java b/compiler/src/jdk.graal.compiler.processor/src/jdk/graal/compiler/processor/SuppressFBWarnings.java similarity index 97% rename from compiler/src/jdk.compiler.graal.processor/src/jdk/compiler/graal/processor/SuppressFBWarnings.java rename to compiler/src/jdk.graal.compiler.processor/src/jdk/graal/compiler/processor/SuppressFBWarnings.java index 0704d24421e1..e9a1fd8ce49e 100644 --- a/compiler/src/jdk.compiler.graal.processor/src/jdk/compiler/graal/processor/SuppressFBWarnings.java +++ b/compiler/src/jdk.graal.compiler.processor/src/jdk/graal/compiler/processor/SuppressFBWarnings.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.processor; +package jdk.graal.compiler.processor; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/compiler/src/jdk.compiler.graal.processor/src/jdk/compiler/graal/replacements/processor/APHotSpotSignature.java b/compiler/src/jdk.graal.compiler.processor/src/jdk/graal/compiler/replacements/processor/APHotSpotSignature.java similarity index 99% rename from compiler/src/jdk.compiler.graal.processor/src/jdk/compiler/graal/replacements/processor/APHotSpotSignature.java rename to compiler/src/jdk.graal.compiler.processor/src/jdk/graal/compiler/replacements/processor/APHotSpotSignature.java index dc688639d8ef..4d5be8bdcf00 100644 --- a/compiler/src/jdk.compiler.graal.processor/src/jdk/compiler/graal/replacements/processor/APHotSpotSignature.java +++ b/compiler/src/jdk.graal.compiler.processor/src/jdk/graal/compiler/replacements/processor/APHotSpotSignature.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.replacements.processor; +package jdk.graal.compiler.replacements.processor; import java.util.ArrayList; import java.util.List; diff --git a/compiler/src/jdk.compiler.graal.processor/src/jdk/compiler/graal/replacements/processor/AnnotationHandler.java b/compiler/src/jdk.graal.compiler.processor/src/jdk/graal/compiler/replacements/processor/AnnotationHandler.java similarity index 94% rename from compiler/src/jdk.compiler.graal.processor/src/jdk/compiler/graal/replacements/processor/AnnotationHandler.java rename to compiler/src/jdk.graal.compiler.processor/src/jdk/graal/compiler/replacements/processor/AnnotationHandler.java index e5755b72d005..93b19a96e5e2 100644 --- a/compiler/src/jdk.compiler.graal.processor/src/jdk/compiler/graal/replacements/processor/AnnotationHandler.java +++ b/compiler/src/jdk.graal.compiler.processor/src/jdk/graal/compiler/replacements/processor/AnnotationHandler.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.replacements.processor; +package jdk.graal.compiler.replacements.processor; import javax.lang.model.element.AnnotationMirror; import javax.lang.model.element.Element; -import jdk.compiler.graal.processor.AbstractProcessor; +import jdk.graal.compiler.processor.AbstractProcessor; /** * Handles processing of a single annotation type. diff --git a/compiler/src/jdk.compiler.graal.processor/src/jdk/compiler/graal/replacements/processor/FoldHandler.java b/compiler/src/jdk.graal.compiler.processor/src/jdk/graal/compiler/replacements/processor/FoldHandler.java similarity index 88% rename from compiler/src/jdk.compiler.graal.processor/src/jdk/compiler/graal/replacements/processor/FoldHandler.java rename to compiler/src/jdk.graal.compiler.processor/src/jdk/graal/compiler/replacements/processor/FoldHandler.java index 12cf71d27e80..fe94d96d2a67 100644 --- a/compiler/src/jdk.compiler.graal.processor/src/jdk/compiler/graal/replacements/processor/FoldHandler.java +++ b/compiler/src/jdk.graal.compiler.processor/src/jdk/graal/compiler/replacements/processor/FoldHandler.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.replacements.processor; +package jdk.graal.compiler.replacements.processor; -import static jdk.compiler.graal.processor.AbstractProcessor.getSimpleName; +import static jdk.graal.compiler.processor.AbstractProcessor.getSimpleName; import javax.lang.model.element.AnnotationMirror; import javax.lang.model.element.Element; @@ -34,15 +34,15 @@ import javax.lang.model.type.TypeKind; import javax.tools.Diagnostic.Kind; -import jdk.compiler.graal.processor.AbstractProcessor; +import jdk.graal.compiler.processor.AbstractProcessor; /** * Handler for the {@value #FOLD_CLASS_NAME} annotation. */ public final class FoldHandler extends AnnotationHandler { - static final String FOLD_CLASS_NAME = "jdk.compiler.graal.api.replacements.Fold"; - static final String INJECTED_PARAMETER_CLASS_NAME = "jdk.compiler.graal.api.replacements.Fold.InjectedParameter"; + static final String FOLD_CLASS_NAME = "jdk.graal.compiler.api.replacements.Fold"; + static final String INJECTED_PARAMETER_CLASS_NAME = "jdk.graal.compiler.api.replacements.Fold.InjectedParameter"; public FoldHandler(AbstractProcessor processor) { super(processor, FOLD_CLASS_NAME); diff --git a/compiler/src/jdk.compiler.graal.processor/src/jdk/compiler/graal/replacements/processor/GeneratedFoldPlugin.java b/compiler/src/jdk.graal.compiler.processor/src/jdk/graal/compiler/replacements/processor/GeneratedFoldPlugin.java similarity index 96% rename from compiler/src/jdk.compiler.graal.processor/src/jdk/compiler/graal/replacements/processor/GeneratedFoldPlugin.java rename to compiler/src/jdk.graal.compiler.processor/src/jdk/graal/compiler/replacements/processor/GeneratedFoldPlugin.java index efed0b2a9f67..0f1996f8f13f 100644 --- a/compiler/src/jdk.compiler.graal.processor/src/jdk/compiler/graal/replacements/processor/GeneratedFoldPlugin.java +++ b/compiler/src/jdk.graal.compiler.processor/src/jdk/graal/compiler/replacements/processor/GeneratedFoldPlugin.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.replacements.processor; +package jdk.graal.compiler.replacements.processor; -import static jdk.compiler.graal.replacements.processor.FoldHandler.FOLD_CLASS_NAME; -import static jdk.compiler.graal.replacements.processor.FoldHandler.INJECTED_PARAMETER_CLASS_NAME; +import static jdk.graal.compiler.replacements.processor.FoldHandler.FOLD_CLASS_NAME; +import static jdk.graal.compiler.replacements.processor.FoldHandler.INJECTED_PARAMETER_CLASS_NAME; import java.io.PrintWriter; import java.util.List; @@ -39,8 +39,8 @@ import javax.lang.model.type.DeclaredType; import javax.lang.model.type.TypeMirror; -import jdk.compiler.graal.processor.AbstractProcessor; -import jdk.compiler.graal.replacements.processor.InjectedDependencies.WellKnownDependency; +import jdk.graal.compiler.processor.AbstractProcessor; +import jdk.graal.compiler.replacements.processor.InjectedDependencies.WellKnownDependency; /** * Create graph builder plugins for {@code Fold} methods. @@ -65,8 +65,8 @@ protected String pluginSuperclass() { public void extraImports(AbstractProcessor processor, Set imports) { imports.add("jdk.vm.ci.meta.JavaConstant"); imports.add("jdk.vm.ci.meta.JavaKind"); - imports.add("jdk.compiler.graal.nodes.ConstantNode"); - imports.add("jdk.compiler.graal.core.common.type.Stamp"); + imports.add("jdk.graal.compiler.nodes.ConstantNode"); + imports.add("jdk.graal.compiler.core.common.type.Stamp"); } @Override diff --git a/compiler/src/jdk.compiler.graal.processor/src/jdk/compiler/graal/replacements/processor/GeneratedNodeIntrinsicPlugin.java b/compiler/src/jdk.graal.compiler.processor/src/jdk/graal/compiler/replacements/processor/GeneratedNodeIntrinsicPlugin.java similarity index 97% rename from compiler/src/jdk.compiler.graal.processor/src/jdk/compiler/graal/replacements/processor/GeneratedNodeIntrinsicPlugin.java rename to compiler/src/jdk.graal.compiler.processor/src/jdk/graal/compiler/replacements/processor/GeneratedNodeIntrinsicPlugin.java index 92f5c9e01517..696cfa7c86e6 100644 --- a/compiler/src/jdk.compiler.graal.processor/src/jdk/compiler/graal/replacements/processor/GeneratedNodeIntrinsicPlugin.java +++ b/compiler/src/jdk.graal.compiler.processor/src/jdk/graal/compiler/replacements/processor/GeneratedNodeIntrinsicPlugin.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.replacements.processor; +package jdk.graal.compiler.replacements.processor; import java.io.PrintWriter; import java.util.List; @@ -35,7 +35,7 @@ import javax.lang.model.type.TypeKind; import javax.lang.model.type.TypeMirror; -import jdk.compiler.graal.processor.AbstractProcessor; +import jdk.graal.compiler.processor.AbstractProcessor; /** * Create graph builder plugins for {@code NodeIntrinsic} methods. @@ -61,9 +61,9 @@ protected String pluginSuperclass() { @Override public void extraImports(AbstractProcessor processor, Set imports) { - imports.add("jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext"); + imports.add("jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext"); if (needsReplacement(processor)) { - imports.add("jdk.compiler.graal.core.common.type.Stamp"); + imports.add("jdk.graal.compiler.core.common.type.Stamp"); } } @@ -165,7 +165,7 @@ protected List getParameters() { @Override public void extraImports(AbstractProcessor processor, Set imports) { if (needsReplacement(processor)) { - imports.add("jdk.compiler.graal.debug.GraalError"); + imports.add("jdk.graal.compiler.debug.GraalError"); } super.extraImports(processor, imports); } diff --git a/compiler/src/jdk.compiler.graal.processor/src/jdk/compiler/graal/replacements/processor/GeneratedPlugin.java b/compiler/src/jdk.graal.compiler.processor/src/jdk/graal/compiler/replacements/processor/GeneratedPlugin.java similarity index 98% rename from compiler/src/jdk.compiler.graal.processor/src/jdk/compiler/graal/replacements/processor/GeneratedPlugin.java rename to compiler/src/jdk.graal.compiler.processor/src/jdk/graal/compiler/replacements/processor/GeneratedPlugin.java index c13693866f9f..c21b28381794 100644 --- a/compiler/src/jdk.compiler.graal.processor/src/jdk/compiler/graal/replacements/processor/GeneratedPlugin.java +++ b/compiler/src/jdk.graal.compiler.processor/src/jdk/graal/compiler/replacements/processor/GeneratedPlugin.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.replacements.processor; +package jdk.graal.compiler.replacements.processor; import java.io.PrintWriter; import java.util.Set; @@ -39,8 +39,8 @@ import javax.lang.model.type.TypeVariable; import javax.lang.model.type.WildcardType; -import jdk.compiler.graal.processor.AbstractProcessor; -import jdk.compiler.graal.replacements.processor.InjectedDependencies.WellKnownDependency; +import jdk.graal.compiler.processor.AbstractProcessor; +import jdk.graal.compiler.replacements.processor.InjectedDependencies.WellKnownDependency; public abstract class GeneratedPlugin { @@ -223,7 +223,7 @@ protected boolean needsReplacement(AbstractProcessor processor) { protected boolean isWithExceptionReplacement(AbstractProcessor processor) { Element nodeElement = intrinsicMethod.getEnclosingElement(); - TypeMirror withExceptionNodeType = processor.getType("jdk.compiler.graal.nodes.WithExceptionNode"); + TypeMirror withExceptionNodeType = processor.getType("jdk.graal.compiler.nodes.WithExceptionNode"); return processor.env().getTypeUtils().isAssignable(nodeElement.asType(), withExceptionNodeType); } diff --git a/compiler/src/jdk.compiler.graal.processor/src/jdk/compiler/graal/replacements/processor/InjectedDependencies.java b/compiler/src/jdk.graal.compiler.processor/src/jdk/graal/compiler/replacements/processor/InjectedDependencies.java similarity index 92% rename from compiler/src/jdk.compiler.graal.processor/src/jdk/compiler/graal/replacements/processor/InjectedDependencies.java rename to compiler/src/jdk.graal.compiler.processor/src/jdk/graal/compiler/replacements/processor/InjectedDependencies.java index a9ab2fea3603..010d9d5d9a15 100644 --- a/compiler/src/jdk.compiler.graal.processor/src/jdk/compiler/graal/replacements/processor/InjectedDependencies.java +++ b/compiler/src/jdk.graal.compiler.processor/src/jdk/graal/compiler/replacements/processor/InjectedDependencies.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.replacements.processor; +package jdk.graal.compiler.replacements.processor; -import static jdk.compiler.graal.processor.AbstractProcessor.getAnnotationValue; +import static jdk.graal.compiler.processor.AbstractProcessor.getAnnotationValue; import java.util.HashMap; import java.util.Iterator; @@ -34,7 +34,7 @@ import javax.lang.model.type.DeclaredType; import javax.lang.model.type.TypeMirror; -import jdk.compiler.graal.processor.AbstractProcessor; +import jdk.graal.compiler.processor.AbstractProcessor; public class InjectedDependencies implements Iterable { @@ -86,7 +86,7 @@ public String getExpression(AbstractProcessor processor, ExecutableElement injec private static final class InjectedStampDependency extends DependencyImpl { private InjectedStampDependency() { - super("stamp", "jdk.compiler.graal.core.common.type.Stamp"); + super("stamp", "jdk.graal.compiler.core.common.type.Stamp"); } @Override @@ -101,12 +101,12 @@ public enum WellKnownDependency implements Dependency { CONSTANT_REFLECTION("b.getConstantReflection()", "jdk.vm.ci.meta.ConstantReflectionProvider"), META_ACCESS("b.getMetaAccess()", "jdk.vm.ci.meta.MetaAccessProvider"), ASSUMPTIONS("b.getAssumptions()", "jdk.vm.ci.meta.Assumptions"), - OPTIONVALUES("b.getOptions()", "jdk.compiler.graal.options.OptionValues"), + OPTIONVALUES("b.getOptions()", "jdk.graal.compiler.options.OptionValues"), INJECTED_STAMP(new InjectedStampDependency()), - SNIPPET_REFLECTION(new InjectedDependency("snippetReflection", "jdk.compiler.graal.api.replacements.SnippetReflectionProvider")), - STAMP_PROVIDER("b.getStampProvider()", "jdk.compiler.graal.nodes.spi.StampProvider"), - INTRINSIC_CONTEXT("b.getIntrinsic()", "jdk.compiler.graal.nodes.graphbuilderconf.IntrinsicContext"), - STRUCTURED_GRAPH("b.getGraph()", "jdk.compiler.graal.nodes.StructuredGraph"); + SNIPPET_REFLECTION(new InjectedDependency("snippetReflection", "jdk.graal.compiler.api.replacements.SnippetReflectionProvider")), + STAMP_PROVIDER("b.getStampProvider()", "jdk.graal.compiler.nodes.spi.StampProvider"), + INTRINSIC_CONTEXT("b.getIntrinsic()", "jdk.graal.compiler.nodes.graphbuilderconf.IntrinsicContext"), + STRUCTURED_GRAPH("b.getGraph()", "jdk.graal.compiler.nodes.StructuredGraph"); private final String expr; private final String type; diff --git a/compiler/src/jdk.compiler.graal.processor/src/jdk/compiler/graal/replacements/processor/NodeIntrinsicHandler.java b/compiler/src/jdk.graal.compiler.processor/src/jdk/graal/compiler/replacements/processor/NodeIntrinsicHandler.java similarity index 94% rename from compiler/src/jdk.compiler.graal.processor/src/jdk/compiler/graal/replacements/processor/NodeIntrinsicHandler.java rename to compiler/src/jdk.graal.compiler.processor/src/jdk/graal/compiler/replacements/processor/NodeIntrinsicHandler.java index 90fb66abeaa8..90948d2ea30c 100644 --- a/compiler/src/jdk.compiler.graal.processor/src/jdk/compiler/graal/replacements/processor/NodeIntrinsicHandler.java +++ b/compiler/src/jdk.graal.compiler.processor/src/jdk/graal/compiler/replacements/processor/NodeIntrinsicHandler.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.replacements.processor; +package jdk.graal.compiler.replacements.processor; -import static jdk.compiler.graal.processor.AbstractProcessor.getAnnotationValue; -import static jdk.compiler.graal.processor.AbstractProcessor.getAnnotationValueList; -import static jdk.compiler.graal.processor.AbstractProcessor.getSimpleName; +import static jdk.graal.compiler.processor.AbstractProcessor.getAnnotationValue; +import static jdk.graal.compiler.processor.AbstractProcessor.getAnnotationValueList; +import static jdk.graal.compiler.processor.AbstractProcessor.getSimpleName; import java.util.ArrayList; import java.util.Formatter; @@ -49,26 +49,26 @@ import javax.lang.model.util.ElementFilter; import javax.tools.Diagnostic.Kind; -import jdk.compiler.graal.processor.AbstractProcessor; +import jdk.graal.compiler.processor.AbstractProcessor; /** * Handler for the {@value #NODE_INFO_CLASS_NAME} annotation. */ public final class NodeIntrinsicHandler extends AnnotationHandler { - static final String CONSTANT_NODE_PARAMETER_CLASS_NAME = "jdk.compiler.graal.graph.Node.ConstantNodeParameter"; - static final String MARKER_TYPE_CLASS_NAME = "jdk.compiler.graal.nodeinfo.StructuralInput.MarkerType"; - static final String GRAPH_BUILDER_CONTEXT_CLASS_NAME = "jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext"; - static final String STRUCTURAL_INPUT_CLASS_NAME = "jdk.compiler.graal.nodeinfo.StructuralInput"; + static final String CONSTANT_NODE_PARAMETER_CLASS_NAME = "jdk.graal.compiler.graph.Node.ConstantNodeParameter"; + static final String MARKER_TYPE_CLASS_NAME = "jdk.graal.compiler.nodeinfo.StructuralInput.MarkerType"; + static final String GRAPH_BUILDER_CONTEXT_CLASS_NAME = "jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext"; + static final String STRUCTURAL_INPUT_CLASS_NAME = "jdk.graal.compiler.nodeinfo.StructuralInput"; static final String RESOLVED_JAVA_TYPE_CLASS_NAME = "jdk.vm.ci.meta.ResolvedJavaType"; - static final String VALUE_NODE_CLASS_NAME = "jdk.compiler.graal.nodes.ValueNode"; - static final String STAMP_CLASS_NAME = "jdk.compiler.graal.core.common.type.Stamp"; - static final String NODE_CLASS_NAME = "jdk.compiler.graal.graph.Node"; - static final String NODE_INFO_CLASS_NAME = "jdk.compiler.graal.nodeinfo.NodeInfo"; - static final String NODE_INTRINSIC_CLASS_NAME = "jdk.compiler.graal.graph.Node.NodeIntrinsic"; - static final String NODE_INTRINSIC_FACTORY_CLASS_NAME = "jdk.compiler.graal.graph.Node.NodeIntrinsicFactory"; - static final String INJECTED_NODE_PARAMETER_CLASS_NAME = "jdk.compiler.graal.graph.Node.InjectedNodeParameter"; - static final String FOREIGN_CALL_DESCRIPTOR_CLASS_NAME = "jdk.compiler.graal.core.common.spi.ForeignCallDescriptor"; + static final String VALUE_NODE_CLASS_NAME = "jdk.graal.compiler.nodes.ValueNode"; + static final String STAMP_CLASS_NAME = "jdk.graal.compiler.core.common.type.Stamp"; + static final String NODE_CLASS_NAME = "jdk.graal.compiler.graph.Node"; + static final String NODE_INFO_CLASS_NAME = "jdk.graal.compiler.nodeinfo.NodeInfo"; + static final String NODE_INTRINSIC_CLASS_NAME = "jdk.graal.compiler.graph.Node.NodeIntrinsic"; + static final String NODE_INTRINSIC_FACTORY_CLASS_NAME = "jdk.graal.compiler.graph.Node.NodeIntrinsicFactory"; + static final String INJECTED_NODE_PARAMETER_CLASS_NAME = "jdk.graal.compiler.graph.Node.InjectedNodeParameter"; + static final String FOREIGN_CALL_DESCRIPTOR_CLASS_NAME = "jdk.graal.compiler.core.common.spi.ForeignCallDescriptor"; public NodeIntrinsicHandler(AbstractProcessor processor) { super(processor, NODE_INTRINSIC_CLASS_NAME); diff --git a/compiler/src/jdk.compiler.graal.processor/src/jdk/compiler/graal/replacements/processor/PluginGenerator.java b/compiler/src/jdk.graal.compiler.processor/src/jdk/graal/compiler/replacements/processor/PluginGenerator.java similarity index 90% rename from compiler/src/jdk.compiler.graal.processor/src/jdk/compiler/graal/replacements/processor/PluginGenerator.java rename to compiler/src/jdk.graal.compiler.processor/src/jdk/graal/compiler/replacements/processor/PluginGenerator.java index 6b923d769e44..80281ec74b1b 100644 --- a/compiler/src/jdk.compiler.graal.processor/src/jdk/compiler/graal/replacements/processor/PluginGenerator.java +++ b/compiler/src/jdk.graal.compiler.processor/src/jdk/graal/compiler/replacements/processor/PluginGenerator.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.replacements.processor; +package jdk.graal.compiler.replacements.processor; import java.io.IOException; import java.io.PrintWriter; @@ -44,7 +44,7 @@ import javax.tools.Diagnostic; import javax.tools.JavaFileObject; -import jdk.compiler.graal.processor.AbstractProcessor; +import jdk.graal.compiler.processor.AbstractProcessor; public class PluginGenerator { @@ -138,7 +138,7 @@ private static void createPluginFactory(AbstractProcessor processor, Element top } catch (IOException e) { processor.env().getMessager().printMessage(Diagnostic.Kind.ERROR, e.getMessage()); } - processor.createProviderFile(qualifiedGenClassName, "jdk.compiler.graal.nodes.graphbuilderconf.GeneratedPluginFactory", topLevelClass); + processor.createProviderFile(qualifiedGenClassName, "jdk.graal.compiler.nodes.graphbuilderconf.GeneratedPluginFactory", topLevelClass); } protected static void createImports(PrintWriter out, AbstractProcessor processor, List plugins, String importingPackage) { @@ -146,23 +146,23 @@ protected static void createImports(PrintWriter out, AbstractProcessor processor extra.add("jdk.vm.ci.meta.ResolvedJavaMethod"); extra.add("java.lang.annotation.Annotation"); - extra.add("jdk.compiler.graal.nodes.ValueNode"); - extra.add("jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext"); - extra.add("jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin"); - extra.add("jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins"); - extra.add("jdk.compiler.graal.nodes.graphbuilderconf.GeneratedPluginFactory"); - extra.add("jdk.compiler.graal.nodes.graphbuilderconf.GeneratedPluginInjectionProvider"); + extra.add("jdk.graal.compiler.nodes.ValueNode"); + extra.add("jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext"); + extra.add("jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin"); + extra.add("jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins"); + extra.add("jdk.graal.compiler.nodes.graphbuilderconf.GeneratedPluginFactory"); + extra.add("jdk.graal.compiler.nodes.graphbuilderconf.GeneratedPluginInjectionProvider"); for (GeneratedPlugin plugin : plugins) { plugin.extraImports(processor, extra); - extra.add("jdk.compiler.graal.nodes.graphbuilderconf." + plugin.pluginSuperclass()); + extra.add("jdk.graal.compiler.nodes.graphbuilderconf." + plugin.pluginSuperclass()); if (plugin.needsReplacement(processor)) { - extra.add("jdk.compiler.graal.options.ExcludeFromJacocoGeneratedReport"); - extra.add("jdk.compiler.graal.graph.NodeInputList"); + extra.add("jdk.graal.compiler.options.ExcludeFromJacocoGeneratedReport"); + extra.add("jdk.graal.compiler.graph.NodeInputList"); if (plugin.isWithExceptionReplacement(processor)) { - extra.add("jdk.compiler.graal.nodes.PluginReplacementWithExceptionNode"); + extra.add("jdk.graal.compiler.nodes.PluginReplacementWithExceptionNode"); } else { - extra.add("jdk.compiler.graal.nodes.PluginReplacementNode"); + extra.add("jdk.graal.compiler.nodes.PluginReplacementNode"); } } } diff --git a/compiler/src/jdk.compiler.graal.processor/src/jdk/compiler/graal/replacements/processor/ReplacementsAnnotationProcessor.java b/compiler/src/jdk.graal.compiler.processor/src/jdk/graal/compiler/replacements/processor/ReplacementsAnnotationProcessor.java similarity index 94% rename from compiler/src/jdk.compiler.graal.processor/src/jdk/compiler/graal/replacements/processor/ReplacementsAnnotationProcessor.java rename to compiler/src/jdk.graal.compiler.processor/src/jdk/graal/compiler/replacements/processor/ReplacementsAnnotationProcessor.java index c4f6ce34c8f2..bf5bce945224 100644 --- a/compiler/src/jdk.compiler.graal.processor/src/jdk/compiler/graal/replacements/processor/ReplacementsAnnotationProcessor.java +++ b/compiler/src/jdk.graal.compiler.processor/src/jdk/graal/compiler/replacements/processor/ReplacementsAnnotationProcessor.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.replacements.processor; +package jdk.graal.compiler.replacements.processor; import java.util.ArrayList; import java.util.HashSet; @@ -35,10 +35,10 @@ import javax.lang.model.element.TypeElement; import javax.tools.Diagnostic.Kind; -import jdk.compiler.graal.processor.AbstractProcessor; +import jdk.graal.compiler.processor.AbstractProcessor; /** - * Processor for annotation types in the {@code jdk.compiler.graal.replacements} name space. + * Processor for annotation types in the {@code jdk.graal.compiler.replacements} name space. */ public class ReplacementsAnnotationProcessor extends AbstractProcessor { diff --git a/compiler/src/jdk.compiler.graal.processor/src/jdk/compiler/graal/serviceprovider/processor/ServiceProviderProcessor.java b/compiler/src/jdk.graal.compiler.processor/src/jdk/graal/compiler/serviceprovider/processor/ServiceProviderProcessor.java similarity index 96% rename from compiler/src/jdk.compiler.graal.processor/src/jdk/compiler/graal/serviceprovider/processor/ServiceProviderProcessor.java rename to compiler/src/jdk.graal.compiler.processor/src/jdk/graal/compiler/serviceprovider/processor/ServiceProviderProcessor.java index b2efb46dd07d..19656f0c49df 100644 --- a/compiler/src/jdk.compiler.graal.processor/src/jdk/compiler/graal/serviceprovider/processor/ServiceProviderProcessor.java +++ b/compiler/src/jdk.graal.compiler.processor/src/jdk/graal/compiler/serviceprovider/processor/ServiceProviderProcessor.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.serviceprovider.processor; +package jdk.graal.compiler.serviceprovider.processor; import java.util.HashMap; import java.util.HashSet; @@ -40,7 +40,7 @@ import javax.lang.model.type.TypeMirror; import javax.tools.Diagnostic.Kind; -import jdk.compiler.graal.processor.AbstractProcessor; +import jdk.graal.compiler.processor.AbstractProcessor; /** * Processes classes annotated with {@code ServiceProvider}. For a service defined by {@code S} and @@ -48,10 +48,10 @@ * {@code META-INF/providers/P} whose contents are a single line containing the fully qualified name * of {@code S}. */ -@SupportedAnnotationTypes("jdk.compiler.graal.serviceprovider.ServiceProvider") +@SupportedAnnotationTypes("jdk.graal.compiler.serviceprovider.ServiceProvider") public class ServiceProviderProcessor extends AbstractProcessor { - private static final String SERVICE_PROVIDER_CLASS_NAME = "jdk.compiler.graal.serviceprovider.ServiceProvider"; + private static final String SERVICE_PROVIDER_CLASS_NAME = "jdk.graal.compiler.serviceprovider.ServiceProvider"; private final Set processed = new HashSet<>(); private final Map serviceProviders = new HashMap<>(); diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/api/directives/test/BlackholeDirectiveTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/api/directives/test/BlackholeDirectiveTest.java similarity index 93% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/api/directives/test/BlackholeDirectiveTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/api/directives/test/BlackholeDirectiveTest.java index 822a4fae228b..470411b99ec6 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/api/directives/test/BlackholeDirectiveTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/api/directives/test/BlackholeDirectiveTest.java @@ -22,18 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.api.directives.test; +package jdk.graal.compiler.api.directives.test; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import jdk.compiler.graal.api.directives.GraalDirectives; -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.nodes.ParameterNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.phases.OptimisticOptimizations; +import jdk.graal.compiler.api.directives.GraalDirectives; +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.nodes.ParameterNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.phases.OptimisticOptimizations; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/api/directives/test/ConstantProbablityBranchFoldingTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/api/directives/test/ConstantProbablityBranchFoldingTest.java similarity index 87% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/api/directives/test/ConstantProbablityBranchFoldingTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/api/directives/test/ConstantProbablityBranchFoldingTest.java index 103e4da2d95d..da1aecdbf248 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/api/directives/test/ConstantProbablityBranchFoldingTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/api/directives/test/ConstantProbablityBranchFoldingTest.java @@ -23,13 +23,13 @@ * questions. */ -package jdk.compiler.graal.api.directives.test; +package jdk.graal.compiler.api.directives.test; -import jdk.compiler.graal.api.directives.GraalDirectives; -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.graph.iterators.NodeIterable; -import jdk.compiler.graal.nodes.IfNode; -import jdk.compiler.graal.nodes.StructuredGraph; +import jdk.graal.compiler.api.directives.GraalDirectives; +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.graph.iterators.NodeIterable; +import jdk.graal.compiler.nodes.IfNode; +import jdk.graal.compiler.nodes.StructuredGraph; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/api/directives/test/ControlFlowAnchorDirectiveTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/api/directives/test/ControlFlowAnchorDirectiveTest.java similarity index 93% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/api/directives/test/ControlFlowAnchorDirectiveTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/api/directives/test/ControlFlowAnchorDirectiveTest.java index 4a9c50471078..de5ad0fb9102 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/api/directives/test/ControlFlowAnchorDirectiveTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/api/directives/test/ControlFlowAnchorDirectiveTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.api.directives.test; +package jdk.graal.compiler.api.directives.test; import java.lang.annotation.ElementType; import java.lang.annotation.Repeatable; @@ -33,17 +33,17 @@ import java.util.Collections; import java.util.List; -import jdk.compiler.graal.api.directives.GraalDirectives; -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.graph.iterators.NodeIterable; -import jdk.compiler.graal.nodes.IfNode; -import jdk.compiler.graal.nodes.LoopBeginNode; -import jdk.compiler.graal.nodes.ReturnNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions; -import jdk.compiler.graal.nodes.debug.ControlFlowAnchorNode; -import jdk.compiler.graal.phases.OptimisticOptimizations; +import jdk.graal.compiler.api.directives.GraalDirectives; +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.graph.iterators.NodeIterable; +import jdk.graal.compiler.nodes.IfNode; +import jdk.graal.compiler.nodes.LoopBeginNode; +import jdk.graal.compiler.nodes.ReturnNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.StructuredGraph.AllowAssumptions; +import jdk.graal.compiler.nodes.debug.ControlFlowAnchorNode; +import jdk.graal.compiler.phases.OptimisticOptimizations; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/api/directives/test/DeoptimizeDirectiveTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/api/directives/test/DeoptimizeDirectiveTest.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/api/directives/test/DeoptimizeDirectiveTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/api/directives/test/DeoptimizeDirectiveTest.java index 81b970c581c6..2ff65f92a45f 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/api/directives/test/DeoptimizeDirectiveTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/api/directives/test/DeoptimizeDirectiveTest.java @@ -22,17 +22,17 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.api.directives.test; +package jdk.graal.compiler.api.directives.test; -import jdk.compiler.graal.core.test.GraalCompilerTest; +import jdk.graal.compiler.core.test.GraalCompilerTest; import jdk.vm.ci.code.InstalledCode; import jdk.vm.ci.meta.ResolvedJavaMethod; import org.junit.Assert; import org.junit.Test; -import jdk.compiler.graal.api.directives.GraalDirectives; -import jdk.compiler.graal.phases.OptimisticOptimizations; +import jdk.graal.compiler.api.directives.GraalDirectives; +import jdk.graal.compiler.phases.OptimisticOptimizations; public class DeoptimizeDirectiveTest extends GraalCompilerTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/api/directives/test/GraalDirectiveIntrinsificationTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/api/directives/test/GraalDirectiveIntrinsificationTest.java similarity index 93% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/api/directives/test/GraalDirectiveIntrinsificationTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/api/directives/test/GraalDirectiveIntrinsificationTest.java index 81fd382e334a..babc97d693fb 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/api/directives/test/GraalDirectiveIntrinsificationTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/api/directives/test/GraalDirectiveIntrinsificationTest.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.api.directives.test; +package jdk.graal.compiler.api.directives.test; import java.util.List; -import jdk.compiler.graal.core.test.GraalCompilerTest; +import jdk.graal.compiler.core.test.GraalCompilerTest; import org.graalvm.collections.EconomicSet; -import jdk.compiler.graal.api.directives.GraalDirectives; -import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin; +import jdk.graal.compiler.api.directives.GraalDirectives; +import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/api/directives/test/IterationDirectiveTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/api/directives/test/IterationDirectiveTest.java similarity index 86% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/api/directives/test/IterationDirectiveTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/api/directives/test/IterationDirectiveTest.java index e78424b61edf..e80f89b9c9bb 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/api/directives/test/IterationDirectiveTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/api/directives/test/IterationDirectiveTest.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.api.directives.test; +package jdk.graal.compiler.api.directives.test; -import jdk.compiler.graal.api.directives.GraalDirectives; -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.graph.iterators.NodeIterable; -import jdk.compiler.graal.nodes.LoopBeginNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.cfg.ControlFlowGraph; +import jdk.graal.compiler.api.directives.GraalDirectives; +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.graph.iterators.NodeIterable; +import jdk.graal.compiler.nodes.LoopBeginNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.cfg.ControlFlowGraph; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/api/directives/test/OpaqueDirectiveTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/api/directives/test/OpaqueDirectiveTest.java similarity index 90% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/api/directives/test/OpaqueDirectiveTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/api/directives/test/OpaqueDirectiveTest.java index a0a4dd814331..18c06d2f9a18 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/api/directives/test/OpaqueDirectiveTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/api/directives/test/OpaqueDirectiveTest.java @@ -22,21 +22,21 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.api.directives.test; +package jdk.graal.compiler.api.directives.test; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import jdk.compiler.graal.api.directives.GraalDirectives; -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.nodes.ConstantNode; -import jdk.compiler.graal.nodes.ReturnNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.calc.AddNode; -import jdk.compiler.graal.nodes.calc.ConditionalNode; -import jdk.compiler.graal.phases.OptimisticOptimizations; +import jdk.graal.compiler.api.directives.GraalDirectives; +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.nodes.ConstantNode; +import jdk.graal.compiler.nodes.ReturnNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.calc.AddNode; +import jdk.graal.compiler.nodes.calc.ConditionalNode; +import jdk.graal.compiler.phases.OptimisticOptimizations; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/api/directives/test/ProbabilityDirectiveShortCircuitTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/api/directives/test/ProbabilityDirectiveShortCircuitTest.java similarity index 88% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/api/directives/test/ProbabilityDirectiveShortCircuitTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/api/directives/test/ProbabilityDirectiveShortCircuitTest.java index 0e411699dc92..245de3980b4e 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/api/directives/test/ProbabilityDirectiveShortCircuitTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/api/directives/test/ProbabilityDirectiveShortCircuitTest.java @@ -22,20 +22,20 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.api.directives.test; +package jdk.graal.compiler.api.directives.test; -import static jdk.compiler.graal.api.directives.GraalDirectives.injectBranchProbability; -import static jdk.compiler.graal.api.directives.GraalDirectives.sideEffect; -import static jdk.compiler.graal.debug.DebugOptions.DumpOnError; +import static jdk.graal.compiler.api.directives.GraalDirectives.injectBranchProbability; +import static jdk.graal.compiler.api.directives.GraalDirectives.sideEffect; +import static jdk.graal.compiler.debug.DebugOptions.DumpOnError; -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.nodes.IfNode; -import jdk.compiler.graal.nodes.ProfileData.ProfileSource; -import jdk.compiler.graal.nodes.ShortCircuitOrNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.phases.common.CanonicalizerPhase; +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.nodes.IfNode; +import jdk.graal.compiler.nodes.ProfileData.ProfileSource; +import jdk.graal.compiler.nodes.ShortCircuitOrNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.phases.common.CanonicalizerPhase; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/api/directives/test/ProbabilityDirectiveTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/api/directives/test/ProbabilityDirectiveTest.java similarity index 88% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/api/directives/test/ProbabilityDirectiveTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/api/directives/test/ProbabilityDirectiveTest.java index a8155f436882..939d37db06d6 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/api/directives/test/ProbabilityDirectiveTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/api/directives/test/ProbabilityDirectiveTest.java @@ -22,18 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.api.directives.test; +package jdk.graal.compiler.api.directives.test; -import jdk.compiler.graal.core.test.GraalCompilerTest; +import jdk.graal.compiler.core.test.GraalCompilerTest; import jdk.vm.ci.meta.ResolvedJavaMethod; -import jdk.compiler.graal.api.directives.GraalDirectives; -import jdk.compiler.graal.graph.iterators.NodeIterable; -import jdk.compiler.graal.nodes.AbstractBeginNode; -import jdk.compiler.graal.nodes.IfNode; -import jdk.compiler.graal.nodes.ReturnNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.debug.ControlFlowAnchorNode; +import jdk.graal.compiler.api.directives.GraalDirectives; +import jdk.graal.compiler.graph.iterators.NodeIterable; +import jdk.graal.compiler.nodes.AbstractBeginNode; +import jdk.graal.compiler.nodes.IfNode; +import jdk.graal.compiler.nodes.ReturnNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.debug.ControlFlowAnchorNode; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/api/directives/test/SwitchCaseProbabilityDirectiveTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/api/directives/test/SwitchCaseProbabilityDirectiveTest.java similarity index 92% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/api/directives/test/SwitchCaseProbabilityDirectiveTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/api/directives/test/SwitchCaseProbabilityDirectiveTest.java index 2e63d859ddb8..a946180e8743 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/api/directives/test/SwitchCaseProbabilityDirectiveTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/api/directives/test/SwitchCaseProbabilityDirectiveTest.java @@ -23,17 +23,17 @@ * questions. */ -package jdk.compiler.graal.api.directives.test; +package jdk.graal.compiler.api.directives.test; -import jdk.compiler.graal.api.directives.GraalDirectives; -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.debug.DebugOptions; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.graph.iterators.NodeIterable; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.extended.IntegerSwitchNode; -import jdk.compiler.graal.nodes.extended.SwitchCaseProbabilityNode; -import jdk.compiler.graal.options.OptionValues; +import jdk.graal.compiler.api.directives.GraalDirectives; +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.debug.DebugOptions; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.graph.iterators.NodeIterable; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.extended.IntegerSwitchNode; +import jdk.graal.compiler.nodes.extended.SwitchCaseProbabilityNode; +import jdk.graal.compiler.options.OptionValues; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/api/test/ExportingClassLoader.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/api/test/ExportingClassLoader.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/api/test/ExportingClassLoader.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/api/test/ExportingClassLoader.java index d45c6c9f73b2..55bf9997fdd5 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/api/test/ExportingClassLoader.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/api/test/ExportingClassLoader.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.api.test; +package jdk.graal.compiler.api.test; /** * A class loader that exports all packages in the module defining the class loader to all classes diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/api/test/Graal.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/api/test/Graal.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/api/test/Graal.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/api/test/Graal.java index 807c3cc21440..aa94e8a46aac 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/api/test/Graal.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/api/test/Graal.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.api.test; +package jdk.graal.compiler.api.test; import java.util.Formatter; -import jdk.compiler.graal.api.runtime.GraalJVMCICompiler; -import jdk.compiler.graal.api.runtime.GraalRuntime; +import jdk.graal.compiler.api.runtime.GraalJVMCICompiler; +import jdk.graal.compiler.api.runtime.GraalRuntime; import jdk.vm.ci.runtime.JVMCI; import jdk.vm.ci.runtime.JVMCICompiler; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/api/test/GraalAPITest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/api/test/GraalAPITest.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/api/test/GraalAPITest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/api/test/GraalAPITest.java index 4fa1a11afc9e..2d5bf7e2561e 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/api/test/GraalAPITest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/api/test/GraalAPITest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.api.test; +package jdk.graal.compiler.api.test; import static org.junit.Assert.assertNotNull; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/api/test/ModuleSupport.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/api/test/ModuleSupport.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/api/test/ModuleSupport.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/api/test/ModuleSupport.java index af2d0f65907b..d39c739d8b8d 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/api/test/ModuleSupport.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/api/test/ModuleSupport.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.api.test; +package jdk.graal.compiler.api.test; import java.io.IOException; import java.lang.module.ModuleDescriptor.Requires; @@ -38,7 +38,7 @@ import java.util.Optional; import java.util.Set; -import jdk.compiler.graal.debug.DebugOptions; +import jdk.graal.compiler.debug.DebugOptions; import jdk.internal.module.Modules; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/asm/aarch64/test/AArch64AddressingModeTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/asm/aarch64/test/AArch64AddressingModeTest.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/asm/aarch64/test/AArch64AddressingModeTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/asm/aarch64/test/AArch64AddressingModeTest.java index 715819b8a485..394086138a9a 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/asm/aarch64/test/AArch64AddressingModeTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/asm/aarch64/test/AArch64AddressingModeTest.java @@ -23,17 +23,17 @@ * questions. */ -package jdk.compiler.graal.asm.aarch64.test; +package jdk.graal.compiler.asm.aarch64.test; import static org.junit.Assert.assertArrayEquals; import java.util.EnumSet; -import jdk.compiler.graal.asm.aarch64.AArch64Address; -import jdk.compiler.graal.asm.aarch64.AArch64Assembler; -import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler; -import jdk.compiler.graal.core.common.NumUtil; -import jdk.compiler.graal.test.GraalTest; +import jdk.graal.compiler.asm.aarch64.AArch64Address; +import jdk.graal.compiler.asm.aarch64.AArch64Assembler; +import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler; +import jdk.graal.compiler.core.common.NumUtil; +import jdk.graal.compiler.test.GraalTest; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/asm/aarch64/test/AArch64BitCountAssemblerTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/asm/aarch64/test/AArch64BitCountAssemblerTest.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/asm/aarch64/test/AArch64BitCountAssemblerTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/asm/aarch64/test/AArch64BitCountAssemblerTest.java index 3ca4589793a0..8ff779066b03 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/asm/aarch64/test/AArch64BitCountAssemblerTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/asm/aarch64/test/AArch64BitCountAssemblerTest.java @@ -23,14 +23,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.asm.aarch64.test; +package jdk.graal.compiler.asm.aarch64.test; import static jdk.vm.ci.code.ValueUtil.asRegister; import static org.junit.Assume.assumeTrue; -import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler; -import jdk.compiler.graal.asm.test.AssemblerTest; -import jdk.compiler.graal.code.CompilationResult; +import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler; +import jdk.graal.compiler.asm.test.AssemblerTest; +import jdk.graal.compiler.code.CompilationResult; import org.junit.Before; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/asm/aarch64/test/AArch64InstructionEncodingTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/asm/aarch64/test/AArch64InstructionEncodingTest.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/asm/aarch64/test/AArch64InstructionEncodingTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/asm/aarch64/test/AArch64InstructionEncodingTest.java index 9c49ec63d10d..e4fdac72c0ee 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/asm/aarch64/test/AArch64InstructionEncodingTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/asm/aarch64/test/AArch64InstructionEncodingTest.java @@ -23,17 +23,17 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.asm.aarch64.test; +package jdk.graal.compiler.asm.aarch64.test; import static org.junit.Assume.assumeTrue; import java.nio.ByteBuffer; -import jdk.compiler.graal.asm.aarch64.AArch64ASIMDAssembler; -import jdk.compiler.graal.asm.aarch64.AArch64ASIMDAssembler.ASIMDSize; -import jdk.compiler.graal.asm.aarch64.AArch64ASIMDAssembler.ElementSize; -import jdk.compiler.graal.asm.aarch64.AArch64Address; -import jdk.compiler.graal.test.GraalTest; +import jdk.graal.compiler.asm.aarch64.AArch64ASIMDAssembler; +import jdk.graal.compiler.asm.aarch64.AArch64ASIMDAssembler.ASIMDSize; +import jdk.graal.compiler.asm.aarch64.AArch64ASIMDAssembler.ElementSize; +import jdk.graal.compiler.asm.aarch64.AArch64Address; +import jdk.graal.compiler.test.GraalTest; import org.junit.Before; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/asm/aarch64/test/AArch64LoadStoreMergingAssemblerTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/asm/aarch64/test/AArch64LoadStoreMergingAssemblerTest.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/asm/aarch64/test/AArch64LoadStoreMergingAssemblerTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/asm/aarch64/test/AArch64LoadStoreMergingAssemblerTest.java index 9ece67050b11..c63f8ea0a3b9 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/asm/aarch64/test/AArch64LoadStoreMergingAssemblerTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/asm/aarch64/test/AArch64LoadStoreMergingAssemblerTest.java @@ -23,15 +23,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.asm.aarch64.test; +package jdk.graal.compiler.asm.aarch64.test; import jdk.vm.ci.aarch64.AArch64; import jdk.vm.ci.code.Register; import jdk.vm.ci.code.TargetDescription; import jdk.vm.ci.runtime.JVMCI; -import jdk.compiler.graal.asm.aarch64.AArch64Address; -import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler; -import jdk.compiler.graal.test.GraalTest; +import jdk.graal.compiler.asm.aarch64.AArch64Address; +import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler; +import jdk.graal.compiler.test.GraalTest; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/asm/aarch64/test/AArch64MoveConstantTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/asm/aarch64/test/AArch64MoveConstantTest.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/asm/aarch64/test/AArch64MoveConstantTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/asm/aarch64/test/AArch64MoveConstantTest.java index 553af45a570d..628f19cf5365 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/asm/aarch64/test/AArch64MoveConstantTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/asm/aarch64/test/AArch64MoveConstantTest.java @@ -24,13 +24,13 @@ * questions. */ -package jdk.compiler.graal.asm.aarch64.test; +package jdk.graal.compiler.asm.aarch64.test; import static org.junit.Assert.assertArrayEquals; -import jdk.compiler.graal.asm.aarch64.AArch64Assembler; -import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler; -import jdk.compiler.graal.test.GraalTest; +import jdk.graal.compiler.asm.aarch64.AArch64Assembler; +import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler; +import jdk.graal.compiler.test.GraalTest; import org.junit.Assume; import org.junit.Before; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/asm/aarch64/test/TestProtectedAssembler.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/asm/aarch64/test/TestProtectedAssembler.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/asm/aarch64/test/TestProtectedAssembler.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/asm/aarch64/test/TestProtectedAssembler.java index 7443e53e9e42..dd6bc2dc347a 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/asm/aarch64/test/TestProtectedAssembler.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/asm/aarch64/test/TestProtectedAssembler.java @@ -23,12 +23,12 @@ * questions. */ -package jdk.compiler.graal.asm.aarch64.test; +package jdk.graal.compiler.asm.aarch64.test; -import jdk.compiler.graal.asm.AbstractAddress; -import jdk.compiler.graal.asm.Label; -import jdk.compiler.graal.asm.aarch64.AArch64ASIMDAssembler; -import jdk.compiler.graal.asm.aarch64.AArch64Assembler; +import jdk.graal.compiler.asm.AbstractAddress; +import jdk.graal.compiler.asm.Label; +import jdk.graal.compiler.asm.aarch64.AArch64ASIMDAssembler; +import jdk.graal.compiler.asm.aarch64.AArch64Assembler; import jdk.vm.ci.code.Register; import jdk.vm.ci.code.TargetDescription; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/asm/amd64/test/AMD64AssemblerUtilityTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/asm/amd64/test/AMD64AssemblerUtilityTest.java similarity index 85% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/asm/amd64/test/AMD64AssemblerUtilityTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/asm/amd64/test/AMD64AssemblerUtilityTest.java index 67429fb712c8..7c84f51621fa 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/asm/amd64/test/AMD64AssemblerUtilityTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/asm/amd64/test/AMD64AssemblerUtilityTest.java @@ -23,23 +23,23 @@ * questions. */ -package jdk.compiler.graal.asm.amd64.test; +package jdk.graal.compiler.asm.amd64.test; -import static jdk.compiler.graal.asm.amd64.AVXKind.AVXSize.DWORD; -import static jdk.compiler.graal.asm.amd64.AVXKind.AVXSize.QWORD; -import static jdk.compiler.graal.asm.amd64.AVXKind.AVXSize.XMM; -import static jdk.compiler.graal.asm.amd64.AVXKind.AVXSize.YMM; -import static jdk.compiler.graal.asm.amd64.AVXKind.AVXSize.ZMM; +import static jdk.graal.compiler.asm.amd64.AVXKind.AVXSize.DWORD; +import static jdk.graal.compiler.asm.amd64.AVXKind.AVXSize.QWORD; +import static jdk.graal.compiler.asm.amd64.AVXKind.AVXSize.XMM; +import static jdk.graal.compiler.asm.amd64.AVXKind.AVXSize.YMM; +import static jdk.graal.compiler.asm.amd64.AVXKind.AVXSize.ZMM; import java.util.EnumSet; -import jdk.compiler.graal.asm.amd64.AMD64Address; -import jdk.compiler.graal.asm.amd64.AVXKind; -import jdk.compiler.graal.asm.amd64.AVXKind.AVXSize; -import jdk.compiler.graal.core.common.LIRKind; -import jdk.compiler.graal.core.common.Stride; -import jdk.compiler.graal.lir.ConstantValue; -import jdk.compiler.graal.test.GraalTest; +import jdk.graal.compiler.asm.amd64.AMD64Address; +import jdk.graal.compiler.asm.amd64.AVXKind; +import jdk.graal.compiler.asm.amd64.AVXKind.AVXSize; +import jdk.graal.compiler.core.common.LIRKind; +import jdk.graal.compiler.core.common.Stride; +import jdk.graal.compiler.lir.ConstantValue; +import jdk.graal.compiler.test.GraalTest; import org.junit.Test; import jdk.vm.ci.amd64.AMD64; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/asm/amd64/test/BitOpsTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/asm/amd64/test/BitOpsTest.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/asm/amd64/test/BitOpsTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/asm/amd64/test/BitOpsTest.java index c6ee6392a8b5..881595e7a59e 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/asm/amd64/test/BitOpsTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/asm/amd64/test/BitOpsTest.java @@ -23,22 +23,22 @@ * questions. */ -package jdk.compiler.graal.asm.amd64.test; +package jdk.graal.compiler.asm.amd64.test; import static jdk.vm.ci.code.ValueUtil.asRegister; -import static jdk.compiler.graal.asm.amd64.AMD64Assembler.AMD64RMOp.LZCNT; -import static jdk.compiler.graal.asm.amd64.AMD64Assembler.AMD64RMOp.TZCNT; -import static jdk.compiler.graal.asm.amd64.AMD64BaseAssembler.OperandSize.DWORD; -import static jdk.compiler.graal.asm.amd64.AMD64BaseAssembler.OperandSize.QWORD; +import static jdk.graal.compiler.asm.amd64.AMD64Assembler.AMD64RMOp.LZCNT; +import static jdk.graal.compiler.asm.amd64.AMD64Assembler.AMD64RMOp.TZCNT; +import static jdk.graal.compiler.asm.amd64.AMD64BaseAssembler.OperandSize.DWORD; +import static jdk.graal.compiler.asm.amd64.AMD64BaseAssembler.OperandSize.QWORD; import static org.junit.Assume.assumeTrue; import java.lang.reflect.Field; import java.util.EnumSet; -import jdk.compiler.graal.asm.amd64.AMD64Address; -import jdk.compiler.graal.asm.amd64.AMD64Assembler; -import jdk.compiler.graal.asm.test.AssemblerTest; -import jdk.compiler.graal.code.CompilationResult; +import jdk.graal.compiler.asm.amd64.AMD64Address; +import jdk.graal.compiler.asm.amd64.AMD64Assembler; +import jdk.graal.compiler.asm.test.AssemblerTest; +import jdk.graal.compiler.code.CompilationResult; import org.junit.Before; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/asm/amd64/test/IncrementDecrementMacroTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/asm/amd64/test/IncrementDecrementMacroTest.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/asm/amd64/test/IncrementDecrementMacroTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/asm/amd64/test/IncrementDecrementMacroTest.java index 3e160558a3ff..eec82175c268 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/asm/amd64/test/IncrementDecrementMacroTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/asm/amd64/test/IncrementDecrementMacroTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.asm.amd64.test; +package jdk.graal.compiler.asm.amd64.test; import static jdk.vm.ci.code.ValueUtil.asRegister; import static org.junit.Assume.assumeTrue; @@ -39,10 +39,10 @@ import org.junit.Before; import org.junit.Test; -import jdk.compiler.graal.asm.amd64.AMD64Address; -import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler; -import jdk.compiler.graal.asm.test.AssemblerTest; -import jdk.compiler.graal.code.CompilationResult; +import jdk.graal.compiler.asm.amd64.AMD64Address; +import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler; +import jdk.graal.compiler.asm.test.AssemblerTest; +import jdk.graal.compiler.code.CompilationResult; public class IncrementDecrementMacroTest extends AssemblerTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/asm/amd64/test/IndirectCallTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/asm/amd64/test/IndirectCallTest.java similarity index 94% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/asm/amd64/test/IndirectCallTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/asm/amd64/test/IndirectCallTest.java index d0809e7b8aae..7c079bc7e733 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/asm/amd64/test/IndirectCallTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/asm/amd64/test/IndirectCallTest.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.asm.amd64.test; +package jdk.graal.compiler.asm.amd64.test; import static org.junit.Assume.assumeTrue; -import jdk.compiler.graal.asm.amd64.AMD64Assembler; -import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler; -import jdk.compiler.graal.asm.test.AssemblerTest; +import jdk.graal.compiler.asm.amd64.AMD64Assembler; +import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler; +import jdk.graal.compiler.asm.test.AssemblerTest; import org.junit.Before; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/asm/amd64/test/SimpleAssemblerTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/asm/amd64/test/SimpleAssemblerTest.java similarity index 92% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/asm/amd64/test/SimpleAssemblerTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/asm/amd64/test/SimpleAssemblerTest.java index 92d3cf177cca..feca7e175636 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/asm/amd64/test/SimpleAssemblerTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/asm/amd64/test/SimpleAssemblerTest.java @@ -22,21 +22,21 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.asm.amd64.test; +package jdk.graal.compiler.asm.amd64.test; import static org.junit.Assume.assumeTrue; import java.nio.ByteBuffer; import java.nio.ByteOrder; -import jdk.compiler.graal.asm.amd64.AMD64Assembler; -import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler; -import jdk.compiler.graal.asm.test.AssemblerTest; -import jdk.compiler.graal.code.CompilationResult; -import jdk.compiler.graal.code.DataSection; -import jdk.compiler.graal.code.DataSection.Data; -import jdk.compiler.graal.code.DataSection.RawData; -import jdk.compiler.graal.code.DataSection.SerializableData; +import jdk.graal.compiler.asm.amd64.AMD64Assembler; +import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler; +import jdk.graal.compiler.asm.test.AssemblerTest; +import jdk.graal.compiler.code.CompilationResult; +import jdk.graal.compiler.code.DataSection; +import jdk.graal.compiler.code.DataSection.Data; +import jdk.graal.compiler.code.DataSection.RawData; +import jdk.graal.compiler.code.DataSection.SerializableData; import org.junit.Before; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/asm/test/AssemblerTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/asm/test/AssemblerTest.java similarity index 87% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/asm/test/AssemblerTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/asm/test/AssemblerTest.java index 17ab59f5fa43..e42cb2e088e2 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/asm/test/AssemblerTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/asm/test/AssemblerTest.java @@ -22,27 +22,27 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.asm.test; +package jdk.graal.compiler.asm.test; -import static jdk.compiler.graal.core.common.CompilationRequestIdentifier.asCompilationRequest; +import static jdk.graal.compiler.core.common.CompilationRequestIdentifier.asCompilationRequest; import java.lang.reflect.Method; -import jdk.compiler.graal.api.test.Graal; -import jdk.compiler.graal.code.CompilationResult; -import jdk.compiler.graal.code.DisassemblerProvider; -import jdk.compiler.graal.core.common.CompilationIdentifier; -import jdk.compiler.graal.core.common.alloc.RegisterAllocationConfig; -import jdk.compiler.graal.core.gen.LIRGenerationProvider; -import jdk.compiler.graal.core.target.Backend; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.gc.ZBarrierSet; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.phases.util.Providers; -import jdk.compiler.graal.runtime.RuntimeProvider; -import jdk.compiler.graal.serviceprovider.GraalServices; -import jdk.compiler.graal.test.GraalTest; +import jdk.graal.compiler.api.test.Graal; +import jdk.graal.compiler.code.CompilationResult; +import jdk.graal.compiler.code.DisassemblerProvider; +import jdk.graal.compiler.core.common.CompilationIdentifier; +import jdk.graal.compiler.core.common.alloc.RegisterAllocationConfig; +import jdk.graal.compiler.core.gen.LIRGenerationProvider; +import jdk.graal.compiler.core.target.Backend; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.gc.ZBarrierSet; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.phases.util.Providers; +import jdk.graal.compiler.runtime.RuntimeProvider; +import jdk.graal.compiler.serviceprovider.GraalServices; +import jdk.graal.compiler.test.GraalTest; import org.junit.Assert; import org.junit.Assume; import org.junit.Before; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/aarch64/test/AArch64AddSubShiftTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/aarch64/test/AArch64AddSubShiftTest.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/aarch64/test/AArch64AddSubShiftTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/aarch64/test/AArch64AddSubShiftTest.java index 18b4e3481c04..f78fded5888c 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/aarch64/test/AArch64AddSubShiftTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/aarch64/test/AArch64AddSubShiftTest.java @@ -24,10 +24,10 @@ * questions. */ -package jdk.compiler.graal.core.aarch64.test; +package jdk.graal.compiler.core.aarch64.test; -import jdk.compiler.graal.lir.LIRInstruction; -import jdk.compiler.graal.lir.aarch64.AArch64ArithmeticOp; +import jdk.graal.compiler.lir.LIRInstruction; +import jdk.graal.compiler.lir.aarch64.AArch64ArithmeticOp; import org.junit.Test; import java.util.function.Predicate; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/aarch64/test/AArch64ArrayAddressTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/aarch64/test/AArch64ArrayAddressTest.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/aarch64/test/AArch64ArrayAddressTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/aarch64/test/AArch64ArrayAddressTest.java index c40a2182b778..1c66d20cd734 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/aarch64/test/AArch64ArrayAddressTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/aarch64/test/AArch64ArrayAddressTest.java @@ -23,13 +23,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.aarch64.test; +package jdk.graal.compiler.core.aarch64.test; -import jdk.compiler.graal.api.directives.GraalDirectives; -import jdk.compiler.graal.core.common.GraalOptions; -import jdk.compiler.graal.lir.LIRInstruction; -import jdk.compiler.graal.lir.aarch64.AArch64ArithmeticOp.ExtendedAddSubShiftOp; -import jdk.compiler.graal.options.OptionValues; +import jdk.graal.compiler.api.directives.GraalDirectives; +import jdk.graal.compiler.core.common.GraalOptions; +import jdk.graal.compiler.lir.LIRInstruction; +import jdk.graal.compiler.lir.aarch64.AArch64ArithmeticOp.ExtendedAddSubShiftOp; +import jdk.graal.compiler.options.OptionValues; import org.junit.Test; import java.util.ArrayDeque; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/aarch64/test/AArch64BitFieldTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/aarch64/test/AArch64BitFieldTest.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/aarch64/test/AArch64BitFieldTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/aarch64/test/AArch64BitFieldTest.java index 60408b41bbce..2ba1b4f118fc 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/aarch64/test/AArch64BitFieldTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/aarch64/test/AArch64BitFieldTest.java @@ -24,10 +24,10 @@ * questions. */ -package jdk.compiler.graal.core.aarch64.test; +package jdk.graal.compiler.core.aarch64.test; -import jdk.compiler.graal.lir.LIRInstruction; -import jdk.compiler.graal.lir.aarch64.AArch64BitFieldOp; +import jdk.graal.compiler.lir.LIRInstruction; +import jdk.graal.compiler.lir.aarch64.AArch64BitFieldOp; import org.junit.Test; import java.util.function.Predicate; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/aarch64/test/AArch64BitwiseLogicalNotTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/aarch64/test/AArch64BitwiseLogicalNotTest.java similarity index 94% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/aarch64/test/AArch64BitwiseLogicalNotTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/aarch64/test/AArch64BitwiseLogicalNotTest.java index 18b173bc4f40..e5022cd051b6 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/aarch64/test/AArch64BitwiseLogicalNotTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/aarch64/test/AArch64BitwiseLogicalNotTest.java @@ -24,11 +24,11 @@ * questions. */ -package jdk.compiler.graal.core.aarch64.test; +package jdk.graal.compiler.core.aarch64.test; -import jdk.compiler.graal.lir.LIRInstruction; -import jdk.compiler.graal.lir.aarch64.AArch64ArithmeticOp; -import jdk.compiler.graal.lir.aarch64.AArch64ArithmeticOp.BinaryOp; +import jdk.graal.compiler.lir.LIRInstruction; +import jdk.graal.compiler.lir.aarch64.AArch64ArithmeticOp; +import jdk.graal.compiler.lir.aarch64.AArch64ArithmeticOp.BinaryOp; import org.junit.Test; import java.util.function.Predicate; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/aarch64/test/AArch64CbzTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/aarch64/test/AArch64CbzTest.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/aarch64/test/AArch64CbzTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/aarch64/test/AArch64CbzTest.java index dbbceab63660..4a8d74d6b49c 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/aarch64/test/AArch64CbzTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/aarch64/test/AArch64CbzTest.java @@ -24,10 +24,10 @@ * questions. */ -package jdk.compiler.graal.core.aarch64.test; +package jdk.graal.compiler.core.aarch64.test; -import jdk.compiler.graal.lir.LIRInstruction; -import jdk.compiler.graal.lir.aarch64.AArch64ControlFlow; +import jdk.graal.compiler.lir.LIRInstruction; +import jdk.graal.compiler.lir.aarch64.AArch64ControlFlow; import org.junit.Test; import java.util.function.Predicate; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/aarch64/test/AArch64ConditionalSetTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/aarch64/test/AArch64ConditionalSetTest.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/aarch64/test/AArch64ConditionalSetTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/aarch64/test/AArch64ConditionalSetTest.java index 00f3d43d77ae..003aaaf11009 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/aarch64/test/AArch64ConditionalSetTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/aarch64/test/AArch64ConditionalSetTest.java @@ -24,11 +24,11 @@ * questions. */ -package jdk.compiler.graal.core.aarch64.test; +package jdk.graal.compiler.core.aarch64.test; -import jdk.compiler.graal.core.common.calc.UnsignedMath; -import jdk.compiler.graal.lir.LIRInstruction; -import jdk.compiler.graal.lir.aarch64.AArch64ControlFlow; +import jdk.graal.compiler.core.common.calc.UnsignedMath; +import jdk.graal.compiler.lir.LIRInstruction; +import jdk.graal.compiler.lir.aarch64.AArch64ControlFlow; import org.junit.Test; import java.util.function.Predicate; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/aarch64/test/AArch64ElideL2ITest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/aarch64/test/AArch64ElideL2ITest.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/aarch64/test/AArch64ElideL2ITest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/aarch64/test/AArch64ElideL2ITest.java index 06163814140a..e5857315de82 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/aarch64/test/AArch64ElideL2ITest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/aarch64/test/AArch64ElideL2ITest.java @@ -24,10 +24,10 @@ * questions. */ -package jdk.compiler.graal.core.aarch64.test; +package jdk.graal.compiler.core.aarch64.test; -import jdk.compiler.graal.lir.LIRInstruction; -import jdk.compiler.graal.lir.aarch64.AArch64ArithmeticOp.BinaryConstOp; +import jdk.graal.compiler.lir.LIRInstruction; +import jdk.graal.compiler.lir.aarch64.AArch64ArithmeticOp.BinaryConstOp; import org.junit.Test; import java.util.function.Predicate; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/aarch64/test/AArch64FloatSqrtTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/aarch64/test/AArch64FloatSqrtTest.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/aarch64/test/AArch64FloatSqrtTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/aarch64/test/AArch64FloatSqrtTest.java index 6ffaa2899e76..38937b6dc3da 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/aarch64/test/AArch64FloatSqrtTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/aarch64/test/AArch64FloatSqrtTest.java @@ -23,9 +23,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.aarch64.test; +package jdk.graal.compiler.core.aarch64.test; -import jdk.compiler.graal.lir.LIRInstruction; +import jdk.graal.compiler.lir.LIRInstruction; import org.junit.Test; import java.util.function.Predicate; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/aarch64/test/AArch64LogicShiftTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/aarch64/test/AArch64LogicShiftTest.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/aarch64/test/AArch64LogicShiftTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/aarch64/test/AArch64LogicShiftTest.java index fa2121737e60..88157ef0ab29 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/aarch64/test/AArch64LogicShiftTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/aarch64/test/AArch64LogicShiftTest.java @@ -24,10 +24,10 @@ * questions. */ -package jdk.compiler.graal.core.aarch64.test; +package jdk.graal.compiler.core.aarch64.test; -import jdk.compiler.graal.lir.LIRInstruction; -import jdk.compiler.graal.lir.aarch64.AArch64ArithmeticOp; +import jdk.graal.compiler.lir.LIRInstruction; +import jdk.graal.compiler.lir.aarch64.AArch64ArithmeticOp; import org.junit.Test; import java.util.function.Predicate; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/aarch64/test/AArch64MNegTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/aarch64/test/AArch64MNegTest.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/aarch64/test/AArch64MNegTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/aarch64/test/AArch64MNegTest.java index 2add32d52098..7169954179ae 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/aarch64/test/AArch64MNegTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/aarch64/test/AArch64MNegTest.java @@ -24,10 +24,10 @@ * questions. */ -package jdk.compiler.graal.core.aarch64.test; +package jdk.graal.compiler.core.aarch64.test; import java.util.function.Predicate; -import jdk.compiler.graal.lir.LIRInstruction; +import jdk.graal.compiler.lir.LIRInstruction; import org.junit.Test; public class AArch64MNegTest extends AArch64MatchRuleTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/aarch64/test/AArch64MatchRuleTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/aarch64/test/AArch64MatchRuleTest.java similarity index 94% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/aarch64/test/AArch64MatchRuleTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/aarch64/test/AArch64MatchRuleTest.java index 0e51254192f8..a99dc1cdbd3d 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/aarch64/test/AArch64MatchRuleTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/aarch64/test/AArch64MatchRuleTest.java @@ -24,10 +24,10 @@ * questions. */ -package jdk.compiler.graal.core.aarch64.test; +package jdk.graal.compiler.core.aarch64.test; import jdk.vm.ci.aarch64.AArch64; -import jdk.compiler.graal.core.test.MatchRuleTest; +import jdk.graal.compiler.core.test.MatchRuleTest; import org.junit.Before; import static org.junit.Assume.assumeTrue; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/aarch64/test/AArch64MembarOpTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/aarch64/test/AArch64MembarOpTest.java similarity index 89% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/aarch64/test/AArch64MembarOpTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/aarch64/test/AArch64MembarOpTest.java index 2189aadae5d9..ce555f70a9a9 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/aarch64/test/AArch64MembarOpTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/aarch64/test/AArch64MembarOpTest.java @@ -23,7 +23,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.aarch64.test; +package jdk.graal.compiler.core.aarch64.test; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assume.assumeTrue; @@ -32,16 +32,16 @@ import java.util.List; import org.graalvm.collections.Pair; -import jdk.compiler.graal.asm.aarch64.AArch64Assembler.BarrierKind; -import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler; -import jdk.compiler.graal.code.CompilationResult; -import jdk.compiler.graal.core.gen.LIRGenerationProvider; -import jdk.compiler.graal.core.test.backend.BackendTest; -import jdk.compiler.graal.lir.aarch64.AArch64Move.MembarOp; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; -import jdk.compiler.graal.lir.asm.CompilationResultBuilderFactory; -import jdk.compiler.graal.lir.gen.LIRGenerationResult; -import jdk.compiler.graal.nodes.StructuredGraph; +import jdk.graal.compiler.asm.aarch64.AArch64Assembler.BarrierKind; +import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler; +import jdk.graal.compiler.code.CompilationResult; +import jdk.graal.compiler.core.gen.LIRGenerationProvider; +import jdk.graal.compiler.core.test.backend.BackendTest; +import jdk.graal.compiler.lir.aarch64.AArch64Move.MembarOp; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.lir.asm.CompilationResultBuilderFactory; +import jdk.graal.compiler.lir.gen.LIRGenerationResult; +import jdk.graal.compiler.nodes.StructuredGraph; import org.junit.Before; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/aarch64/test/AArch64MergeExtendWithAddSubTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/aarch64/test/AArch64MergeExtendWithAddSubTest.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/aarch64/test/AArch64MergeExtendWithAddSubTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/aarch64/test/AArch64MergeExtendWithAddSubTest.java index 729220d0139c..8c7e4ddb3c39 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/aarch64/test/AArch64MergeExtendWithAddSubTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/aarch64/test/AArch64MergeExtendWithAddSubTest.java @@ -23,10 +23,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.aarch64.test; +package jdk.graal.compiler.core.aarch64.test; -import jdk.compiler.graal.lir.LIRInstruction; -import jdk.compiler.graal.lir.aarch64.AArch64ArithmeticOp; +import jdk.graal.compiler.lir.LIRInstruction; +import jdk.graal.compiler.lir.aarch64.AArch64ArithmeticOp; import org.junit.Test; import java.util.function.Predicate; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/aarch64/test/AArch64MergeNarrowWithAddSubTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/aarch64/test/AArch64MergeNarrowWithAddSubTest.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/aarch64/test/AArch64MergeNarrowWithAddSubTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/aarch64/test/AArch64MergeNarrowWithAddSubTest.java index ccffa2bc26b5..d28babea50cf 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/aarch64/test/AArch64MergeNarrowWithAddSubTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/aarch64/test/AArch64MergeNarrowWithAddSubTest.java @@ -23,10 +23,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.aarch64.test; +package jdk.graal.compiler.core.aarch64.test; -import jdk.compiler.graal.lir.LIRInstruction; -import jdk.compiler.graal.lir.aarch64.AArch64ArithmeticOp; +import jdk.graal.compiler.lir.LIRInstruction; +import jdk.graal.compiler.lir.aarch64.AArch64ArithmeticOp; import org.junit.Test; import java.util.function.Predicate; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/aarch64/test/AArch64MergeNarrowWithExtendTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/aarch64/test/AArch64MergeNarrowWithExtendTest.java similarity index 94% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/aarch64/test/AArch64MergeNarrowWithExtendTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/aarch64/test/AArch64MergeNarrowWithExtendTest.java index 764e9c4c5c3b..d651df42cd69 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/aarch64/test/AArch64MergeNarrowWithExtendTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/aarch64/test/AArch64MergeNarrowWithExtendTest.java @@ -24,10 +24,10 @@ * questions. */ -package jdk.compiler.graal.core.aarch64.test; +package jdk.graal.compiler.core.aarch64.test; -import jdk.compiler.graal.lir.LIRInstruction; -import jdk.compiler.graal.lir.aarch64.AArch64ArithmeticOp.BinaryConstOp; +import jdk.graal.compiler.lir.LIRInstruction; +import jdk.graal.compiler.lir.aarch64.AArch64ArithmeticOp.BinaryConstOp; import org.junit.Test; import java.util.function.Predicate; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/aarch64/test/AArch64MultiplyAddSubTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/aarch64/test/AArch64MultiplyAddSubTest.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/aarch64/test/AArch64MultiplyAddSubTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/aarch64/test/AArch64MultiplyAddSubTest.java index 62d88e952465..b5498d4e073e 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/aarch64/test/AArch64MultiplyAddSubTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/aarch64/test/AArch64MultiplyAddSubTest.java @@ -24,10 +24,10 @@ * questions. */ -package jdk.compiler.graal.core.aarch64.test; +package jdk.graal.compiler.core.aarch64.test; -import jdk.compiler.graal.lir.LIRInstruction; -import jdk.compiler.graal.lir.aarch64.AArch64ArithmeticOp; +import jdk.graal.compiler.lir.LIRInstruction; +import jdk.graal.compiler.lir.aarch64.AArch64ArithmeticOp; import org.junit.Test; import java.util.function.Predicate; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/aarch64/test/AArch64MultiplyLongTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/aarch64/test/AArch64MultiplyLongTest.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/aarch64/test/AArch64MultiplyLongTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/aarch64/test/AArch64MultiplyLongTest.java index 5c0eddf24f07..ff10be9785b7 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/aarch64/test/AArch64MultiplyLongTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/aarch64/test/AArch64MultiplyLongTest.java @@ -23,7 +23,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.aarch64.test; +package jdk.graal.compiler.core.aarch64.test; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/aarch64/test/AArch64NegateShiftTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/aarch64/test/AArch64NegateShiftTest.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/aarch64/test/AArch64NegateShiftTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/aarch64/test/AArch64NegateShiftTest.java index 62d3be1bcc4e..74c32113f196 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/aarch64/test/AArch64NegateShiftTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/aarch64/test/AArch64NegateShiftTest.java @@ -23,10 +23,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.aarch64.test; +package jdk.graal.compiler.core.aarch64.test; -import jdk.compiler.graal.lir.LIRInstruction; -import jdk.compiler.graal.lir.aarch64.AArch64ArithmeticOp; +import jdk.graal.compiler.lir.LIRInstruction; +import jdk.graal.compiler.lir.aarch64.AArch64ArithmeticOp; import org.junit.Test; import java.util.function.Predicate; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/aarch64/test/AArch64PairLoadStoreTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/aarch64/test/AArch64PairLoadStoreTest.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/aarch64/test/AArch64PairLoadStoreTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/aarch64/test/AArch64PairLoadStoreTest.java index 5375524e03e4..de51ff788894 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/aarch64/test/AArch64PairLoadStoreTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/aarch64/test/AArch64PairLoadStoreTest.java @@ -24,11 +24,11 @@ * questions. */ -package jdk.compiler.graal.core.aarch64.test; +package jdk.graal.compiler.core.aarch64.test; import jdk.vm.ci.aarch64.AArch64; import jdk.vm.ci.runtime.JVMCI; -import jdk.compiler.graal.core.test.GraalCompilerTest; +import jdk.graal.compiler.core.test.GraalCompilerTest; import org.junit.Before; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/aarch64/test/AArch64RotationTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/aarch64/test/AArch64RotationTest.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/aarch64/test/AArch64RotationTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/aarch64/test/AArch64RotationTest.java index 4f71b950784e..9791af1fac24 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/aarch64/test/AArch64RotationTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/aarch64/test/AArch64RotationTest.java @@ -23,9 +23,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.aarch64.test; +package jdk.graal.compiler.core.aarch64.test; -import jdk.compiler.graal.lir.LIRInstruction; +import jdk.graal.compiler.lir.LIRInstruction; import org.junit.Test; import java.util.function.Predicate; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/aarch64/test/AArch64TestBitAndBranchTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/aarch64/test/AArch64TestBitAndBranchTest.java similarity index 89% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/aarch64/test/AArch64TestBitAndBranchTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/aarch64/test/AArch64TestBitAndBranchTest.java index 3b5462bdb107..58d7e416c094 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/aarch64/test/AArch64TestBitAndBranchTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/aarch64/test/AArch64TestBitAndBranchTest.java @@ -22,28 +22,28 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.aarch64.test; +package jdk.graal.compiler.core.aarch64.test; -import jdk.compiler.graal.asm.Label; +import jdk.graal.compiler.asm.Label; import jdk.vm.ci.aarch64.AArch64; import jdk.vm.ci.code.TargetDescription; import jdk.vm.ci.meta.Value; -import jdk.compiler.graal.api.directives.GraalDirectives; -import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler; -import jdk.compiler.graal.lir.LIR; -import jdk.compiler.graal.lir.LIRInstruction; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.aarch64.AArch64ControlFlow; -import jdk.compiler.graal.lir.aarch64.AArch64LIRInstruction; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; -import jdk.compiler.graal.lir.gen.LIRGenerationResult; -import jdk.compiler.graal.lir.gen.LIRGeneratorTool; -import jdk.compiler.graal.lir.jtt.LIRTest; -import jdk.compiler.graal.lir.jtt.LIRTestSpecification; -import jdk.compiler.graal.lir.phases.LIRPhase; -import jdk.compiler.graal.lir.phases.LIRSuites; -import jdk.compiler.graal.lir.phases.PreAllocationOptimizationPhase.PreAllocationOptimizationContext; -import jdk.compiler.graal.options.OptionValues; +import jdk.graal.compiler.api.directives.GraalDirectives; +import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler; +import jdk.graal.compiler.lir.LIR; +import jdk.graal.compiler.lir.LIRInstruction; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.aarch64.AArch64ControlFlow; +import jdk.graal.compiler.lir.aarch64.AArch64LIRInstruction; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.lir.gen.LIRGenerationResult; +import jdk.graal.compiler.lir.gen.LIRGeneratorTool; +import jdk.graal.compiler.lir.jtt.LIRTest; +import jdk.graal.compiler.lir.jtt.LIRTestSpecification; +import jdk.graal.compiler.lir.phases.LIRPhase; +import jdk.graal.compiler.lir.phases.LIRSuites; +import jdk.graal.compiler.lir.phases.PreAllocationOptimizationPhase.PreAllocationOptimizationContext; +import jdk.graal.compiler.options.OptionValues; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/aarch64/test/AArch64VolatileAccessesTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/aarch64/test/AArch64VolatileAccessesTest.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/aarch64/test/AArch64VolatileAccessesTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/aarch64/test/AArch64VolatileAccessesTest.java index e1dd53725d38..dc9985b77508 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/aarch64/test/AArch64VolatileAccessesTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/aarch64/test/AArch64VolatileAccessesTest.java @@ -24,13 +24,13 @@ * questions. */ -package jdk.compiler.graal.core.aarch64.test; +package jdk.graal.compiler.core.aarch64.test; import jdk.vm.ci.aarch64.AArch64; import jdk.vm.ci.aarch64.AArch64Kind; -import jdk.compiler.graal.core.test.MatchRuleTest; -import jdk.compiler.graal.lir.LIRInstruction; -import jdk.compiler.graal.lir.aarch64.AArch64Move; +import jdk.graal.compiler.core.test.MatchRuleTest; +import jdk.graal.compiler.lir.LIRInstruction; +import jdk.graal.compiler.lir.aarch64.AArch64Move; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/amd64/test/AMD64AddressLoweringTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/amd64/test/AMD64AddressLoweringTest.java similarity index 89% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/amd64/test/AMD64AddressLoweringTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/amd64/test/AMD64AddressLoweringTest.java index dbca929af62b..1c07347b5239 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/amd64/test/AMD64AddressLoweringTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/amd64/test/AMD64AddressLoweringTest.java @@ -22,21 +22,21 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.amd64.test; +package jdk.graal.compiler.core.amd64.test; import static org.junit.Assume.assumeTrue; -import jdk.compiler.graal.core.common.Stride; -import jdk.compiler.graal.core.amd64.AMD64AddressLowering; -import jdk.compiler.graal.core.amd64.AMD64AddressNode; -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.nodes.ConstantNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.calc.AddNode; -import jdk.compiler.graal.nodes.calc.LeftShiftNode; -import jdk.compiler.graal.nodes.calc.NegateNode; -import jdk.compiler.graal.nodes.memory.address.AddressNode; +import jdk.graal.compiler.core.common.Stride; +import jdk.graal.compiler.core.amd64.AMD64AddressLowering; +import jdk.graal.compiler.core.amd64.AMD64AddressNode; +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.nodes.ConstantNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.calc.AddNode; +import jdk.graal.compiler.nodes.calc.LeftShiftNode; +import jdk.graal.compiler.nodes.calc.NegateNode; +import jdk.graal.compiler.nodes.memory.address.AddressNode; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/amd64/test/AMD64AllocatorTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/amd64/test/AMD64AllocatorTest.java similarity index 92% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/amd64/test/AMD64AllocatorTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/amd64/test/AMD64AllocatorTest.java index 4819fd70bf35..b5fa68a9140d 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/amd64/test/AMD64AllocatorTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/amd64/test/AMD64AllocatorTest.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.amd64.test; +package jdk.graal.compiler.core.amd64.test; -import static jdk.compiler.graal.core.common.GraalOptions.RegisterPressure; +import static jdk.graal.compiler.core.common.GraalOptions.RegisterPressure; import static org.junit.Assume.assumeTrue; import jdk.vm.ci.amd64.AMD64; @@ -32,7 +32,7 @@ import org.junit.Ignore; import org.junit.Test; -import jdk.compiler.graal.core.test.backend.AllocatorTest; +import jdk.graal.compiler.core.test.backend.AllocatorTest; public class AMD64AllocatorTest extends AllocatorTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/amd64/test/AMD64MatchRuleTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/amd64/test/AMD64MatchRuleTest.java similarity index 93% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/amd64/test/AMD64MatchRuleTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/amd64/test/AMD64MatchRuleTest.java index 4e91c0c4a9de..332b4f91f488 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/amd64/test/AMD64MatchRuleTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/amd64/test/AMD64MatchRuleTest.java @@ -22,21 +22,21 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.amd64.test; +package jdk.graal.compiler.core.amd64.test; import static org.junit.Assume.assumeTrue; -import jdk.compiler.graal.core.common.cfg.BasicBlock; -import jdk.compiler.graal.core.test.MatchRuleTest; -import jdk.compiler.graal.lir.LIR; -import jdk.compiler.graal.lir.LIRInstruction; -import jdk.compiler.graal.lir.amd64.AMD64Binary; -import jdk.compiler.graal.lir.amd64.AMD64BinaryConsumer.ConstOp; -import jdk.compiler.graal.lir.amd64.AMD64BinaryConsumer.MemoryConstOp; -import jdk.compiler.graal.lir.amd64.AMD64ControlFlow.CmpBranchOp; -import jdk.compiler.graal.lir.amd64.AMD64ControlFlow.CmpConstBranchOp; -import jdk.compiler.graal.lir.amd64.AMD64ControlFlow.CmpDataBranchOp; -import jdk.compiler.graal.lir.amd64.AMD64Unary; +import jdk.graal.compiler.core.common.cfg.BasicBlock; +import jdk.graal.compiler.core.test.MatchRuleTest; +import jdk.graal.compiler.lir.LIR; +import jdk.graal.compiler.lir.LIRInstruction; +import jdk.graal.compiler.lir.amd64.AMD64Binary; +import jdk.graal.compiler.lir.amd64.AMD64BinaryConsumer.ConstOp; +import jdk.graal.compiler.lir.amd64.AMD64BinaryConsumer.MemoryConstOp; +import jdk.graal.compiler.lir.amd64.AMD64ControlFlow.CmpBranchOp; +import jdk.graal.compiler.lir.amd64.AMD64ControlFlow.CmpConstBranchOp; +import jdk.graal.compiler.lir.amd64.AMD64ControlFlow.CmpDataBranchOp; +import jdk.graal.compiler.lir.amd64.AMD64Unary; import org.junit.Before; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/amd64/test/AMD64VolatileWriteMembarEliminationTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/amd64/test/AMD64VolatileWriteMembarEliminationTest.java similarity index 93% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/amd64/test/AMD64VolatileWriteMembarEliminationTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/amd64/test/AMD64VolatileWriteMembarEliminationTest.java index d172fd456d34..294c45607080 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/amd64/test/AMD64VolatileWriteMembarEliminationTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/amd64/test/AMD64VolatileWriteMembarEliminationTest.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.amd64.test; +package jdk.graal.compiler.core.amd64.test; import static org.junit.Assume.assumeTrue; -import jdk.compiler.graal.core.common.memory.MemoryOrderMode; -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.memory.WriteNode; +import jdk.graal.compiler.core.common.memory.MemoryOrderMode; +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.memory.WriteNode; import org.junit.Before; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/amd64/test/ConstantStackMoveTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/amd64/test/ConstantStackMoveTest.java similarity index 94% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/amd64/test/ConstantStackMoveTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/amd64/test/ConstantStackMoveTest.java index 5de23e5dec7c..e702bcb22625 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/amd64/test/ConstantStackMoveTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/amd64/test/ConstantStackMoveTest.java @@ -22,19 +22,19 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.amd64.test; +package jdk.graal.compiler.core.amd64.test; import static org.junit.Assume.assumeTrue; import org.junit.Before; import org.junit.Test; -import jdk.compiler.graal.core.common.LIRKind; -import jdk.compiler.graal.lir.VirtualStackSlot; -import jdk.compiler.graal.lir.framemap.FrameMapBuilder; -import jdk.compiler.graal.lir.gen.LIRGeneratorTool; -import jdk.compiler.graal.lir.jtt.LIRTest; -import jdk.compiler.graal.lir.jtt.LIRTestSpecification; +import jdk.graal.compiler.core.common.LIRKind; +import jdk.graal.compiler.lir.VirtualStackSlot; +import jdk.graal.compiler.lir.framemap.FrameMapBuilder; +import jdk.graal.compiler.lir.gen.LIRGeneratorTool; +import jdk.graal.compiler.lir.jtt.LIRTest; +import jdk.graal.compiler.lir.jtt.LIRTestSpecification; import jdk.vm.ci.amd64.AMD64; import jdk.vm.ci.meta.JavaConstant; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/amd64/test/StackStoreTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/amd64/test/StackStoreTest.java similarity index 93% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/amd64/test/StackStoreTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/amd64/test/StackStoreTest.java index 39aa85f8232a..5dd32292bf58 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/amd64/test/StackStoreTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/amd64/test/StackStoreTest.java @@ -22,19 +22,19 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.amd64.test; +package jdk.graal.compiler.core.amd64.test; import static org.junit.Assume.assumeTrue; import org.junit.Before; import org.junit.Test; -import jdk.compiler.graal.core.common.LIRKind; -import jdk.compiler.graal.lir.VirtualStackSlot; -import jdk.compiler.graal.lir.framemap.FrameMapBuilder; -import jdk.compiler.graal.lir.gen.LIRGeneratorTool; -import jdk.compiler.graal.lir.jtt.LIRTest; -import jdk.compiler.graal.lir.jtt.LIRTestSpecification; +import jdk.graal.compiler.core.common.LIRKind; +import jdk.graal.compiler.lir.VirtualStackSlot; +import jdk.graal.compiler.lir.framemap.FrameMapBuilder; +import jdk.graal.compiler.lir.gen.LIRGeneratorTool; +import jdk.graal.compiler.lir.jtt.LIRTest; +import jdk.graal.compiler.lir.jtt.LIRTestSpecification; import jdk.vm.ci.amd64.AMD64; import jdk.vm.ci.amd64.AMD64Kind; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/AbsCanonicalizationTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/AbsCanonicalizationTest.java similarity index 94% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/AbsCanonicalizationTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/AbsCanonicalizationTest.java index 1773d4a64880..a9891af2e230 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/AbsCanonicalizationTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/AbsCanonicalizationTest.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.calc.AbsNode; -import jdk.compiler.graal.nodes.calc.NegateNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.calc.AbsNode; +import jdk.graal.compiler.nodes.calc.NegateNode; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/AllocSpy.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/AllocSpy.java similarity index 99% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/AllocSpy.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/AllocSpy.java index d92ec704dd2a..be48cfe68000 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/AllocSpy.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/AllocSpy.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; import static java.lang.Boolean.parseBoolean; import static java.lang.Integer.getInteger; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ArrayCopyVirtualizationTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ArrayCopyVirtualizationTest.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ArrayCopyVirtualizationTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ArrayCopyVirtualizationTest.java index 6023ea550f01..2f72ba2bf164 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ArrayCopyVirtualizationTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ArrayCopyVirtualizationTest.java @@ -23,12 +23,12 @@ * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; import org.junit.Test; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.java.NewArrayNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.java.NewArrayNode; public class ArrayCopyVirtualizationTest extends GraalCompilerTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ArrayLengthProviderTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ArrayLengthProviderTest.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ArrayLengthProviderTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ArrayLengthProviderTest.java index ff6f56184af8..32b68c2ad08b 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ArrayLengthProviderTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ArrayLengthProviderTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; import java.util.ArrayList; import java.util.Arrays; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/BasePhaseBinaryGraphTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/BasePhaseBinaryGraphTest.java similarity index 91% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/BasePhaseBinaryGraphTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/BasePhaseBinaryGraphTest.java index 90a2b04d5a1a..e688263137d9 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/BasePhaseBinaryGraphTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/BasePhaseBinaryGraphTest.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; import static org.junit.Assert.assertEquals; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.printer.BinaryGraphPrinter; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.printer.BinaryGraphPrinter; import org.junit.Before; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/BciBlockMappingTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/BciBlockMappingTest.java similarity index 99% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/BciBlockMappingTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/BciBlockMappingTest.java index cf49dc37c671..c66f68ea652a 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/BciBlockMappingTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/BciBlockMappingTest.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; -import jdk.compiler.graal.java.BciBlockMapping; -import jdk.compiler.graal.nodes.FrameState; -import jdk.compiler.graal.nodes.SafepointNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.ValuePhiNode; +import jdk.graal.compiler.java.BciBlockMapping; +import jdk.graal.compiler.nodes.FrameState; +import jdk.graal.compiler.nodes.SafepointNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.StructuredGraph.AllowAssumptions; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.ValuePhiNode; import org.junit.Test; import java.util.Random; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/BoxingEliminationTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/BoxingEliminationTest.java similarity index 94% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/BoxingEliminationTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/BoxingEliminationTest.java index 059dc49585b8..db2adcf595e9 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/BoxingEliminationTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/BoxingEliminationTest.java @@ -22,18 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; - -import jdk.compiler.graal.loop.phases.LoopPeelingPhase; -import jdk.compiler.graal.nodes.ReturnNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.loop.DefaultLoopPolicies; -import jdk.compiler.graal.phases.common.CanonicalizerPhase; -import jdk.compiler.graal.phases.common.DeadCodeEliminationPhase; -import jdk.compiler.graal.phases.tiers.HighTierContext; -import jdk.compiler.graal.virtual.phases.ea.PartialEscapePhase; +package jdk.graal.compiler.core.test; + +import jdk.graal.compiler.loop.phases.LoopPeelingPhase; +import jdk.graal.compiler.nodes.ReturnNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.StructuredGraph.AllowAssumptions; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.loop.DefaultLoopPolicies; +import jdk.graal.compiler.phases.common.CanonicalizerPhase; +import jdk.graal.compiler.phases.common.DeadCodeEliminationPhase; +import jdk.graal.compiler.phases.tiers.HighTierContext; +import jdk.graal.compiler.virtual.phases.ea.PartialEscapePhase; import org.junit.Assert; import org.junit.Ignore; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/BoxingTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/BoxingTest.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/BoxingTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/BoxingTest.java index eff1823aea0a..2967a700ea9a 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/BoxingTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/BoxingTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ByteBufferTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ByteBufferTest.java similarity index 99% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ByteBufferTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ByteBufferTest.java index e3b6d22a294c..bba65e9bcb5c 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ByteBufferTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ByteBufferTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; import java.nio.ByteBuffer; import java.nio.ByteOrder; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/BytecodeDisassemblerTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/BytecodeDisassemblerTest.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/BytecodeDisassemblerTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/BytecodeDisassemblerTest.java index 29e24396bc1d..b99faf3e0015 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/BytecodeDisassemblerTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/BytecodeDisassemblerTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; import java.io.IOException; import java.net.URI; @@ -35,7 +35,7 @@ import java.util.List; import java.util.Random; -import jdk.compiler.graal.bytecode.BytecodeDisassembler; +import jdk.graal.compiler.bytecode.BytecodeDisassembler; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/CanonicalizedConversionTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/CanonicalizedConversionTest.java similarity index 89% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/CanonicalizedConversionTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/CanonicalizedConversionTest.java index ca331e4678f8..193de12025f7 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/CanonicalizedConversionTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/CanonicalizedConversionTest.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.nodes.IfNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.calc.AddNode; -import jdk.compiler.graal.nodes.calc.FloatEqualsNode; -import jdk.compiler.graal.nodes.calc.LeftShiftNode; -import jdk.compiler.graal.nodes.calc.ReinterpretNode; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.nodes.IfNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.calc.AddNode; +import jdk.graal.compiler.nodes.calc.FloatEqualsNode; +import jdk.graal.compiler.nodes.calc.LeftShiftNode; +import jdk.graal.compiler.nodes.calc.ReinterpretNode; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/CheckGraalInvariants.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/CheckGraalInvariants.java similarity index 91% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/CheckGraalInvariants.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/CheckGraalInvariants.java index fdcf373b4b29..d2f8f7b35b12 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/CheckGraalInvariants.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/CheckGraalInvariants.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; import java.io.File; import java.io.IOException; @@ -51,53 +51,53 @@ import java.util.zip.ZipEntry; import java.util.zip.ZipFile; -import jdk.compiler.graal.api.replacements.Snippet; -import jdk.compiler.graal.api.replacements.Snippet.ConstantParameter; -import jdk.compiler.graal.api.replacements.Snippet.NonNullParameter; -import jdk.compiler.graal.api.replacements.Snippet.VarargsParameter; -import jdk.compiler.graal.api.test.Graal; -import jdk.compiler.graal.api.test.ModuleSupport; -import jdk.compiler.graal.bytecode.BridgeMethodUtils; -import jdk.compiler.graal.core.CompilerThreadFactory; -import jdk.compiler.graal.core.common.GraalOptions; -import jdk.compiler.graal.core.common.LIRKind; -import jdk.compiler.graal.core.common.type.ArithmeticOpTable; -import jdk.compiler.graal.debug.DebugCloseable; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.debug.DebugContext.Builder; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.graph.NodeClass; -import jdk.compiler.graal.java.GraphBuilderPhase; -import jdk.compiler.graal.nodeinfo.NodeInfo; -import jdk.compiler.graal.nodes.FrameState; -import jdk.compiler.graal.nodes.PhiNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions; -import jdk.compiler.graal.nodes.graphbuilderconf.ClassInitializationPlugin; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext; -import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins; -import jdk.compiler.graal.nodes.java.LoadFieldNode; -import jdk.compiler.graal.nodes.memory.MemoryKill; -import jdk.compiler.graal.nodes.memory.MultiMemoryKill; -import jdk.compiler.graal.nodes.memory.SingleMemoryKill; -import jdk.compiler.graal.nodes.spi.CoreProviders; -import jdk.compiler.graal.options.Option; -import jdk.compiler.graal.options.OptionDescriptor; -import jdk.compiler.graal.options.OptionDescriptors; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.options.OptionsParser; -import jdk.compiler.graal.phases.OptimisticOptimizations; -import jdk.compiler.graal.phases.PhaseSuite; -import jdk.compiler.graal.phases.VerifyPhase; -import jdk.compiler.graal.phases.VerifyPhase.VerificationError; -import jdk.compiler.graal.phases.contract.VerifyNodeCosts; -import jdk.compiler.graal.phases.tiers.HighTierContext; -import jdk.compiler.graal.phases.util.Providers; -import jdk.compiler.graal.runtime.RuntimeProvider; -import jdk.compiler.graal.test.AddExports; +import jdk.graal.compiler.api.replacements.Snippet; +import jdk.graal.compiler.api.replacements.Snippet.ConstantParameter; +import jdk.graal.compiler.api.replacements.Snippet.NonNullParameter; +import jdk.graal.compiler.api.replacements.Snippet.VarargsParameter; +import jdk.graal.compiler.api.test.Graal; +import jdk.graal.compiler.api.test.ModuleSupport; +import jdk.graal.compiler.bytecode.BridgeMethodUtils; +import jdk.graal.compiler.core.CompilerThreadFactory; +import jdk.graal.compiler.core.common.GraalOptions; +import jdk.graal.compiler.core.common.LIRKind; +import jdk.graal.compiler.core.common.type.ArithmeticOpTable; +import jdk.graal.compiler.debug.DebugCloseable; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.debug.DebugContext.Builder; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.graph.NodeClass; +import jdk.graal.compiler.java.GraphBuilderPhase; +import jdk.graal.compiler.nodeinfo.NodeInfo; +import jdk.graal.compiler.nodes.FrameState; +import jdk.graal.compiler.nodes.PhiNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.StructuredGraph.AllowAssumptions; +import jdk.graal.compiler.nodes.graphbuilderconf.ClassInitializationPlugin; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext; +import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins; +import jdk.graal.compiler.nodes.java.LoadFieldNode; +import jdk.graal.compiler.nodes.memory.MemoryKill; +import jdk.graal.compiler.nodes.memory.MultiMemoryKill; +import jdk.graal.compiler.nodes.memory.SingleMemoryKill; +import jdk.graal.compiler.nodes.spi.CoreProviders; +import jdk.graal.compiler.options.Option; +import jdk.graal.compiler.options.OptionDescriptor; +import jdk.graal.compiler.options.OptionDescriptors; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.options.OptionsParser; +import jdk.graal.compiler.phases.OptimisticOptimizations; +import jdk.graal.compiler.phases.PhaseSuite; +import jdk.graal.compiler.phases.VerifyPhase; +import jdk.graal.compiler.phases.VerifyPhase.VerificationError; +import jdk.graal.compiler.phases.contract.VerifyNodeCosts; +import jdk.graal.compiler.phases.tiers.HighTierContext; +import jdk.graal.compiler.phases.util.Providers; +import jdk.graal.compiler.runtime.RuntimeProvider; +import jdk.graal.compiler.test.AddExports; import org.graalvm.word.LocationIdentity; import org.junit.Assert; import org.junit.Assume; @@ -155,7 +155,7 @@ protected boolean shouldProcess(String classpathEntry) { } if (classpathEntry.endsWith(".jar")) { String name = new File(classpathEntry).getName(); - return name.contains("graal") || name.contains("jdk.compiler.graal"); + return name.contains("graal") || name.contains("jdk.graal.compiler"); } return false; } @@ -203,7 +203,7 @@ protected void updateVerifiers(List> verifiers) { */ public boolean shouldCheckUsage(OptionDescriptor option) { Class declaringClass = option.getDeclaringClass(); - if (declaringClass.getName().equals("jdk.compiler.graal.truffle.TruffleCompilerOptions")) { + if (declaringClass.getName().equals("jdk.graal.compiler.truffle.TruffleCompilerOptions")) { /* * These options are deprecated and will be removed in GraalVM 20.2.0. The * TruffleIntrinsifyFrameAccess option has no replacement and is unused. @@ -213,7 +213,7 @@ public boolean shouldCheckUsage(OptionDescriptor option) { if (option.getOptionKey().getClass().isAnonymousClass()) { /* * Probably a derived option such as - * jdk.compiler.graal.debug.DebugOptions.PrintGraphFile. + * jdk.graal.compiler.debug.DebugOptions.PrintGraphFile. */ return false; } diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/CommonedConstantsTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/CommonedConstantsTest.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/CommonedConstantsTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/CommonedConstantsTest.java index fa138b2f3e3d..d6fef70f4fc8 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/CommonedConstantsTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/CommonedConstantsTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; import java.lang.reflect.Array; @@ -30,7 +30,7 @@ import org.junit.Test; -import jdk.compiler.graal.phases.common.AbstractInliningPhase; +import jdk.graal.compiler.phases.common.AbstractInliningPhase; /** * Tests any optimization that commons loads of non-inlineable constants. diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/CompareCanonicalizerTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/CompareCanonicalizerTest.java similarity index 93% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/CompareCanonicalizerTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/CompareCanonicalizerTest.java index cabe200e2b3d..ef2e58805348 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/CompareCanonicalizerTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/CompareCanonicalizerTest.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; - -import jdk.compiler.graal.nodes.ParameterNode; -import jdk.compiler.graal.nodes.ReturnNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.calc.ConditionalNode; -import jdk.compiler.graal.nodes.calc.IntegerTestNode; +package jdk.graal.compiler.core.test; + +import jdk.graal.compiler.nodes.ParameterNode; +import jdk.graal.compiler.nodes.ReturnNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.StructuredGraph.AllowAssumptions; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.calc.ConditionalNode; +import jdk.graal.compiler.nodes.calc.IntegerTestNode; import org.junit.Test; public class CompareCanonicalizerTest extends GraalCompilerTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/CompareCanonicalizerTest2.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/CompareCanonicalizerTest2.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/CompareCanonicalizerTest2.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/CompareCanonicalizerTest2.java index 01e33b3c670a..bc30b7b94e7b 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/CompareCanonicalizerTest2.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/CompareCanonicalizerTest2.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.StructuredGraph.AllowAssumptions; import org.junit.Test; public class CompareCanonicalizerTest2 extends GraalCompilerTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/CompareCanonicalizerTest3.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/CompareCanonicalizerTest3.java similarity index 91% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/CompareCanonicalizerTest3.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/CompareCanonicalizerTest3.java index 95540e478301..3f8559ebe114 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/CompareCanonicalizerTest3.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/CompareCanonicalizerTest3.java @@ -22,19 +22,19 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; - -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext; -import jdk.compiler.graal.nodes.graphbuilderconf.InlineInvokePlugin; -import jdk.compiler.graal.nodes.spi.CoreProviders; -import jdk.compiler.graal.phases.OptimisticOptimizations; -import jdk.compiler.graal.phases.common.CanonicalizerPhase; -import jdk.compiler.graal.phases.common.FrameStateAssignmentPhase; -import jdk.compiler.graal.phases.common.GuardLoweringPhase; -import jdk.compiler.graal.phases.tiers.MidTierContext; +package jdk.graal.compiler.core.test; + +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.StructuredGraph.AllowAssumptions; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext; +import jdk.graal.compiler.nodes.graphbuilderconf.InlineInvokePlugin; +import jdk.graal.compiler.nodes.spi.CoreProviders; +import jdk.graal.compiler.phases.OptimisticOptimizations; +import jdk.graal.compiler.phases.common.CanonicalizerPhase; +import jdk.graal.compiler.phases.common.FrameStateAssignmentPhase; +import jdk.graal.compiler.phases.common.GuardLoweringPhase; +import jdk.graal.compiler.phases.tiers.MidTierContext; import org.junit.Ignore; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/CompilationResultTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/CompilationResultTest.java similarity index 93% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/CompilationResultTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/CompilationResultTest.java index 1abe7469fa48..85f6fe07db0d 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/CompilationResultTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/CompilationResultTest.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import jdk.compiler.graal.code.CompilationResult; -import jdk.compiler.graal.code.CompilationResult.CodeComment; -import jdk.compiler.graal.code.CompilationResult.CodeMark; -import jdk.compiler.graal.code.CompilationResult.JumpTable; +import jdk.graal.compiler.code.CompilationResult; +import jdk.graal.compiler.code.CompilationResult.CodeComment; +import jdk.graal.compiler.code.CompilationResult.CodeMark; +import jdk.graal.compiler.code.CompilationResult.JumpTable; import org.junit.Test; public class CompilationResultTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/CompilationWatchDogTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/CompilationWatchDogTest.java similarity index 91% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/CompilationWatchDogTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/CompilationWatchDogTest.java index c3e2ce92161d..68309592d44e 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/CompilationWatchDogTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/CompilationWatchDogTest.java @@ -22,22 +22,22 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; -import static jdk.compiler.graal.core.CompilationWatchDog.Options.CompilationWatchDogStartDelay; -import static jdk.compiler.graal.core.CompilationWatchDog.Options.CompilationWatchDogVMExitDelay; -import static jdk.compiler.graal.core.GraalCompilerOptions.InjectedCompilationDelay; +import static jdk.graal.compiler.core.CompilationWatchDog.Options.CompilationWatchDogStartDelay; +import static jdk.graal.compiler.core.CompilationWatchDog.Options.CompilationWatchDogVMExitDelay; +import static jdk.graal.compiler.core.GraalCompilerOptions.InjectedCompilationDelay; import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; -import jdk.compiler.graal.core.CompilationWatchDog; -import jdk.compiler.graal.core.CompilationWatchDog.EventHandler; -import jdk.compiler.graal.core.common.CompilationIdentifier; -import jdk.compiler.graal.debug.TTY; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.options.OptionValues; +import jdk.graal.compiler.core.CompilationWatchDog; +import jdk.graal.compiler.core.CompilationWatchDog.EventHandler; +import jdk.graal.compiler.core.common.CompilationIdentifier; +import jdk.graal.compiler.debug.TTY; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.options.OptionValues; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConcreteSubtypeTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ConcreteSubtypeTest.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConcreteSubtypeTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ConcreteSubtypeTest.java index e1652a64454a..2d172b5b2415 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConcreteSubtypeTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ConcreteSubtypeTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConditionTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ConditionTest.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConditionTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ConditionTest.java index c8e200bfe85a..8d1ae8c47b9a 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConditionTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ConditionTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -30,9 +30,9 @@ import java.util.Random; -import jdk.compiler.graal.core.common.calc.Condition; -import jdk.compiler.graal.core.common.type.Stamp; -import jdk.compiler.graal.core.common.type.StampFactory; +import jdk.graal.compiler.core.common.calc.Condition; +import jdk.graal.compiler.core.common.type.Stamp; +import jdk.graal.compiler.core.common.type.StampFactory; import org.junit.Test; import jdk.vm.ci.meta.JavaConstant; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConditionalEliminationMulTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ConditionalEliminationMulTest.java similarity index 89% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConditionalEliminationMulTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ConditionalEliminationMulTest.java index 8b8369d53869..a1e09200505f 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConditionalEliminationMulTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ConditionalEliminationMulTest.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions; -import jdk.compiler.graal.phases.common.CanonicalizerPhase; -import jdk.compiler.graal.phases.common.ConditionalEliminationPhase; -import jdk.compiler.graal.phases.tiers.HighTierContext; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.StructuredGraph.AllowAssumptions; +import jdk.graal.compiler.phases.common.CanonicalizerPhase; +import jdk.graal.compiler.phases.common.ConditionalEliminationPhase; +import jdk.graal.compiler.phases.tiers.HighTierContext; import org.junit.Test; public class ConditionalEliminationMulTest extends GraalCompilerTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConditionalEliminationPiTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ConditionalEliminationPiTest.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConditionalEliminationPiTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ConditionalEliminationPiTest.java index bc1749c239f2..b4f4ac9c68cc 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConditionalEliminationPiTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ConditionalEliminationPiTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConditionalEliminationRegressionTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ConditionalEliminationRegressionTest.java similarity index 83% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConditionalEliminationRegressionTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ConditionalEliminationRegressionTest.java index 69cf7bc8f962..3b736e82f0b6 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConditionalEliminationRegressionTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ConditionalEliminationRegressionTest.java @@ -22,45 +22,45 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; -import static jdk.compiler.graal.core.common.type.StampFactory.objectNonNull; +import static jdk.graal.compiler.core.common.type.StampFactory.objectNonNull; import java.util.List; -import jdk.compiler.graal.api.directives.GraalDirectives; -import jdk.compiler.graal.core.common.GraalOptions; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.loop.phases.ConvertDeoptimizeToGuardPhase; -import jdk.compiler.graal.nodes.AbstractBeginNode; -import jdk.compiler.graal.nodes.DeoptimizeNode; -import jdk.compiler.graal.nodes.EndNode; -import jdk.compiler.graal.nodes.FixedGuardNode; -import jdk.compiler.graal.nodes.GuardPhiNode; -import jdk.compiler.graal.nodes.LogicNode; -import jdk.compiler.graal.nodes.MergeNode; -import jdk.compiler.graal.nodes.PiNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.calc.ConditionalNode; -import jdk.compiler.graal.nodes.calc.IsNullNode; -import jdk.compiler.graal.nodes.extended.GuardingNode; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext; -import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin.InlineOnlyInvocationPlugin; -import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins.Registration; -import jdk.compiler.graal.nodes.memory.FloatingReadNode; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.phases.OptimisticOptimizations; -import jdk.compiler.graal.phases.common.CanonicalizerPhase; -import jdk.compiler.graal.phases.common.ConditionalEliminationPhase; -import jdk.compiler.graal.phases.common.FloatingReadPhase; -import jdk.compiler.graal.phases.common.HighTierLoweringPhase; -import jdk.compiler.graal.phases.common.inlining.InliningPhase; -import jdk.compiler.graal.phases.common.inlining.policy.GreedyInliningPolicy; -import jdk.compiler.graal.phases.util.GraphOrder; +import jdk.graal.compiler.api.directives.GraalDirectives; +import jdk.graal.compiler.core.common.GraalOptions; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.loop.phases.ConvertDeoptimizeToGuardPhase; +import jdk.graal.compiler.nodes.AbstractBeginNode; +import jdk.graal.compiler.nodes.DeoptimizeNode; +import jdk.graal.compiler.nodes.EndNode; +import jdk.graal.compiler.nodes.FixedGuardNode; +import jdk.graal.compiler.nodes.GuardPhiNode; +import jdk.graal.compiler.nodes.LogicNode; +import jdk.graal.compiler.nodes.MergeNode; +import jdk.graal.compiler.nodes.PiNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.StructuredGraph.AllowAssumptions; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.calc.ConditionalNode; +import jdk.graal.compiler.nodes.calc.IsNullNode; +import jdk.graal.compiler.nodes.extended.GuardingNode; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext; +import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin.InlineOnlyInvocationPlugin; +import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins.Registration; +import jdk.graal.compiler.nodes.memory.FloatingReadNode; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.phases.OptimisticOptimizations; +import jdk.graal.compiler.phases.common.CanonicalizerPhase; +import jdk.graal.compiler.phases.common.ConditionalEliminationPhase; +import jdk.graal.compiler.phases.common.FloatingReadPhase; +import jdk.graal.compiler.phases.common.HighTierLoweringPhase; +import jdk.graal.compiler.phases.common.inlining.InliningPhase; +import jdk.graal.compiler.phases.common.inlining.policy.GreedyInliningPolicy; +import jdk.graal.compiler.phases.util.GraphOrder; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConditionalEliminationStampInversionTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ConditionalEliminationStampInversionTest.java similarity index 86% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConditionalEliminationStampInversionTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ConditionalEliminationStampInversionTest.java index f763c57e3145..1f6f1a4cff35 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConditionalEliminationStampInversionTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ConditionalEliminationStampInversionTest.java @@ -22,22 +22,22 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; -import jdk.compiler.graal.nodes.ConstantNode; -import jdk.compiler.graal.nodes.FixedGuardNode; -import jdk.compiler.graal.nodes.IfNode; -import jdk.compiler.graal.nodes.LogicNode; -import jdk.compiler.graal.nodes.NodeView; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.calc.AndNode; -import jdk.compiler.graal.nodes.calc.IntegerEqualsNode; -import jdk.compiler.graal.nodes.calc.IntegerTestNode; -import jdk.compiler.graal.nodes.calc.SignExtendNode; -import jdk.compiler.graal.nodes.util.GraphUtil; -import jdk.compiler.graal.phases.common.ConditionalEliminationPhase; -import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions; +import jdk.graal.compiler.nodes.ConstantNode; +import jdk.graal.compiler.nodes.FixedGuardNode; +import jdk.graal.compiler.nodes.IfNode; +import jdk.graal.compiler.nodes.LogicNode; +import jdk.graal.compiler.nodes.NodeView; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.calc.AndNode; +import jdk.graal.compiler.nodes.calc.IntegerEqualsNode; +import jdk.graal.compiler.nodes.calc.IntegerTestNode; +import jdk.graal.compiler.nodes.calc.SignExtendNode; +import jdk.graal.compiler.nodes.util.GraphUtil; +import jdk.graal.compiler.phases.common.ConditionalEliminationPhase; +import jdk.graal.compiler.nodes.StructuredGraph.AllowAssumptions; import org.junit.Test; import jdk.vm.ci.code.InvalidInstalledCodeException; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest1.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ConditionalEliminationTest1.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest1.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ConditionalEliminationTest1.java index ce764fa770b2..2c644f8a0784 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest1.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ConditionalEliminationTest1.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; -import jdk.compiler.graal.api.directives.GraalDirectives; -import jdk.compiler.graal.phases.common.ConditionalEliminationPhase; +import jdk.graal.compiler.api.directives.GraalDirectives; +import jdk.graal.compiler.phases.common.ConditionalEliminationPhase; import org.junit.Test; /** diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest10.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ConditionalEliminationTest10.java similarity index 86% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest10.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ConditionalEliminationTest10.java index 351d1b04d199..ceaf711b43c0 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest10.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ConditionalEliminationTest10.java @@ -22,16 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; -import jdk.compiler.graal.api.directives.GraalDirectives; -import jdk.compiler.graal.nodes.GuardNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions; -import jdk.compiler.graal.nodes.spi.CoreProviders; -import jdk.compiler.graal.phases.common.ConditionalEliminationPhase; -import jdk.compiler.graal.phases.common.LoweringPhase; -import jdk.compiler.graal.phases.common.HighTierLoweringPhase; +import jdk.graal.compiler.api.directives.GraalDirectives; +import jdk.graal.compiler.nodes.GuardNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.StructuredGraph.AllowAssumptions; +import jdk.graal.compiler.nodes.spi.CoreProviders; +import jdk.graal.compiler.phases.common.ConditionalEliminationPhase; +import jdk.graal.compiler.phases.common.LoweringPhase; +import jdk.graal.compiler.phases.common.HighTierLoweringPhase; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest11.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ConditionalEliminationTest11.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest11.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ConditionalEliminationTest11.java index d5d0ef9c0bce..c081a0c660bb 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest11.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ConditionalEliminationTest11.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; -import jdk.compiler.graal.api.directives.GraalDirectives; -import jdk.compiler.graal.phases.common.ConditionalEliminationPhase; +import jdk.graal.compiler.api.directives.GraalDirectives; +import jdk.graal.compiler.phases.common.ConditionalEliminationPhase; import org.junit.Ignore; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest12.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ConditionalEliminationTest12.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest12.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ConditionalEliminationTest12.java index 1957e3dbc80a..9508c67c73bd 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest12.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ConditionalEliminationTest12.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; -import jdk.compiler.graal.api.directives.GraalDirectives; +import jdk.graal.compiler.api.directives.GraalDirectives; import org.junit.Test; public class ConditionalEliminationTest12 extends ConditionalEliminationTestBase { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest13.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ConditionalEliminationTest13.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest13.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ConditionalEliminationTest13.java index 6ae76a31a06e..d63eb0f47822 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest13.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ConditionalEliminationTest13.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; - -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext; -import jdk.compiler.graal.nodes.graphbuilderconf.InlineInvokePlugin; -import jdk.compiler.graal.nodes.spi.CoreProviders; -import jdk.compiler.graal.phases.common.CanonicalizerPhase; +package jdk.graal.compiler.core.test; + +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext; +import jdk.graal.compiler.nodes.graphbuilderconf.InlineInvokePlugin; +import jdk.graal.compiler.nodes.spi.CoreProviders; +import jdk.graal.compiler.phases.common.CanonicalizerPhase; import org.junit.Ignore; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest14.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ConditionalEliminationTest14.java similarity index 80% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest14.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ConditionalEliminationTest14.java index be17338d0f80..7f23bdf2943f 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest14.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ConditionalEliminationTest14.java @@ -22,24 +22,24 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; -import jdk.compiler.graal.graph.iterators.NodeIterable; -import jdk.compiler.graal.nodes.ConstantNode; -import jdk.compiler.graal.nodes.FixedGuardNode; -import jdk.compiler.graal.nodes.GuardNode; -import jdk.compiler.graal.nodes.LogicNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions; -import jdk.compiler.graal.nodes.calc.IntegerBelowNode; -import jdk.compiler.graal.nodes.java.LoadIndexedNode; -import jdk.compiler.graal.nodes.memory.FloatingReadNode; -import jdk.compiler.graal.nodes.memory.ReadNode; -import jdk.compiler.graal.nodes.spi.CoreProviders; -import jdk.compiler.graal.phases.common.CanonicalizerPhase; -import jdk.compiler.graal.phases.common.FloatingReadPhase; -import jdk.compiler.graal.phases.common.HighTierLoweringPhase; -import jdk.compiler.graal.phases.common.IterativeConditionalEliminationPhase; +import jdk.graal.compiler.graph.iterators.NodeIterable; +import jdk.graal.compiler.nodes.ConstantNode; +import jdk.graal.compiler.nodes.FixedGuardNode; +import jdk.graal.compiler.nodes.GuardNode; +import jdk.graal.compiler.nodes.LogicNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.StructuredGraph.AllowAssumptions; +import jdk.graal.compiler.nodes.calc.IntegerBelowNode; +import jdk.graal.compiler.nodes.java.LoadIndexedNode; +import jdk.graal.compiler.nodes.memory.FloatingReadNode; +import jdk.graal.compiler.nodes.memory.ReadNode; +import jdk.graal.compiler.nodes.spi.CoreProviders; +import jdk.graal.compiler.phases.common.CanonicalizerPhase; +import jdk.graal.compiler.phases.common.FloatingReadPhase; +import jdk.graal.compiler.phases.common.HighTierLoweringPhase; +import jdk.graal.compiler.phases.common.IterativeConditionalEliminationPhase; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest15.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ConditionalEliminationTest15.java similarity index 82% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest15.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ConditionalEliminationTest15.java index 3fd718ab4211..30382d0af224 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest15.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ConditionalEliminationTest15.java @@ -22,19 +22,19 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions; -import jdk.compiler.graal.nodes.calc.IntegerLessThanNode; -import jdk.compiler.graal.nodes.spi.CoreProviders; -import jdk.compiler.graal.phases.common.ConditionalEliminationPhase; -import jdk.compiler.graal.phases.common.CanonicalizerPhase; -import jdk.compiler.graal.phases.common.HighTierLoweringPhase; -import jdk.compiler.graal.phases.common.IterativeConditionalEliminationPhase; -import jdk.compiler.graal.virtual.phases.ea.ReadEliminationPhase; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.StructuredGraph.AllowAssumptions; +import jdk.graal.compiler.nodes.calc.IntegerLessThanNode; +import jdk.graal.compiler.nodes.spi.CoreProviders; +import jdk.graal.compiler.phases.common.ConditionalEliminationPhase; +import jdk.graal.compiler.phases.common.CanonicalizerPhase; +import jdk.graal.compiler.phases.common.HighTierLoweringPhase; +import jdk.graal.compiler.phases.common.IterativeConditionalEliminationPhase; +import jdk.graal.compiler.virtual.phases.ea.ReadEliminationPhase; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest16.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ConditionalEliminationTest16.java similarity index 91% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest16.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ConditionalEliminationTest16.java index 5824531f8118..4e8fc1f7a058 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest16.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ConditionalEliminationTest16.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; - -import jdk.compiler.graal.api.directives.GraalDirectives; -import jdk.compiler.graal.core.common.type.StampFactory; -import jdk.compiler.graal.core.common.type.StampPair; -import jdk.compiler.graal.core.common.type.TypeReference; -import jdk.compiler.graal.nodes.ParameterNode; -import jdk.compiler.graal.nodes.PiNode; -import jdk.compiler.graal.nodes.StructuredGraph; +package jdk.graal.compiler.core.test; + +import jdk.graal.compiler.api.directives.GraalDirectives; +import jdk.graal.compiler.core.common.type.StampFactory; +import jdk.graal.compiler.core.common.type.StampPair; +import jdk.graal.compiler.core.common.type.TypeReference; +import jdk.graal.compiler.nodes.ParameterNode; +import jdk.graal.compiler.nodes.PiNode; +import jdk.graal.compiler.nodes.StructuredGraph; import org.junit.Before; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest2.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ConditionalEliminationTest2.java similarity index 92% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest2.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ConditionalEliminationTest2.java index a2a561513fe7..304bf0a3ab17 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest2.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ConditionalEliminationTest2.java @@ -22,18 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; - -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.nodes.GuardNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions; -import jdk.compiler.graal.nodes.java.InstanceOfNode; -import jdk.compiler.graal.nodes.spi.CoreProviders; -import jdk.compiler.graal.phases.common.CanonicalizerPhase; -import jdk.compiler.graal.phases.common.ConditionalEliminationPhase; -import jdk.compiler.graal.phases.common.FloatingReadPhase; -import jdk.compiler.graal.phases.common.HighTierLoweringPhase; +package jdk.graal.compiler.core.test; + +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.nodes.GuardNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.StructuredGraph.AllowAssumptions; +import jdk.graal.compiler.nodes.java.InstanceOfNode; +import jdk.graal.compiler.nodes.spi.CoreProviders; +import jdk.graal.compiler.phases.common.CanonicalizerPhase; +import jdk.graal.compiler.phases.common.ConditionalEliminationPhase; +import jdk.graal.compiler.phases.common.FloatingReadPhase; +import jdk.graal.compiler.phases.common.HighTierLoweringPhase; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest3.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ConditionalEliminationTest3.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest3.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ConditionalEliminationTest3.java index d547d12d50f0..f20d99cda227 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest3.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ConditionalEliminationTest3.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; -import jdk.compiler.graal.phases.common.ConditionalEliminationPhase; +import jdk.graal.compiler.phases.common.ConditionalEliminationPhase; import org.junit.Ignore; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest4.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ConditionalEliminationTest4.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest4.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ConditionalEliminationTest4.java index e97b0663abff..f0847f359c5d 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest4.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ConditionalEliminationTest4.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; -import jdk.compiler.graal.phases.common.ConditionalEliminationPhase; +import jdk.graal.compiler.phases.common.ConditionalEliminationPhase; import org.junit.Test; /** diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest5.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ConditionalEliminationTest5.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest5.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ConditionalEliminationTest5.java index 730d46306f57..81a4ac084fd9 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest5.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ConditionalEliminationTest5.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; -import jdk.compiler.graal.api.directives.GraalDirectives; -import jdk.compiler.graal.phases.common.ConditionalEliminationPhase; +import jdk.graal.compiler.api.directives.GraalDirectives; +import jdk.graal.compiler.phases.common.ConditionalEliminationPhase; import org.junit.Ignore; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest6.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ConditionalEliminationTest6.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest6.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ConditionalEliminationTest6.java index b7e42420315c..793ee5b09bbd 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest6.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ConditionalEliminationTest6.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; -import jdk.compiler.graal.phases.common.ConditionalEliminationPhase; +import jdk.graal.compiler.phases.common.ConditionalEliminationPhase; import org.junit.Test; /** diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest7.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ConditionalEliminationTest7.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest7.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ConditionalEliminationTest7.java index 941191961add..f9ae8a2382e5 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest7.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ConditionalEliminationTest7.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; -import jdk.compiler.graal.phases.common.ConditionalEliminationPhase; +import jdk.graal.compiler.phases.common.ConditionalEliminationPhase; import org.junit.Ignore; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest8.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ConditionalEliminationTest8.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest8.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ConditionalEliminationTest8.java index 415bcb94725e..7a16bdb825ff 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest8.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ConditionalEliminationTest8.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; -import jdk.compiler.graal.phases.common.ConditionalEliminationPhase; +import jdk.graal.compiler.phases.common.ConditionalEliminationPhase; import org.junit.Test; /** diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest9.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ConditionalEliminationTest9.java similarity index 92% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest9.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ConditionalEliminationTest9.java index c4ef20f22704..5e7c6f178b68 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest9.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ConditionalEliminationTest9.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; -import jdk.compiler.graal.phases.common.ConditionalEliminationPhase; +import jdk.graal.compiler.phases.common.ConditionalEliminationPhase; import org.junit.Test; -import jdk.compiler.graal.api.directives.GraalDirectives; +import jdk.graal.compiler.api.directives.GraalDirectives; /** * Collection of tests for {@link ConditionalEliminationPhase} including those that triggered bugs diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTestBase.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ConditionalEliminationTestBase.java similarity index 87% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTestBase.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ConditionalEliminationTestBase.java index 40b1d9a58b0e..50a4e02f1271 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTestBase.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ConditionalEliminationTestBase.java @@ -22,20 +22,20 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.loop.phases.ConvertDeoptimizeToGuardPhase; -import jdk.compiler.graal.nodes.ProxyNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions; -import jdk.compiler.graal.nodes.spi.CoreProviders; -import jdk.compiler.graal.phases.OptimisticOptimizations; -import jdk.compiler.graal.phases.common.CanonicalizerPhase; -import jdk.compiler.graal.phases.common.ConditionalEliminationPhase; -import jdk.compiler.graal.phases.common.HighTierLoweringPhase; -import jdk.compiler.graal.phases.common.IterativeConditionalEliminationPhase; -import jdk.compiler.graal.phases.schedule.SchedulePhase; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.loop.phases.ConvertDeoptimizeToGuardPhase; +import jdk.graal.compiler.nodes.ProxyNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.StructuredGraph.AllowAssumptions; +import jdk.graal.compiler.nodes.spi.CoreProviders; +import jdk.graal.compiler.phases.OptimisticOptimizations; +import jdk.graal.compiler.phases.common.CanonicalizerPhase; +import jdk.graal.compiler.phases.common.ConditionalEliminationPhase; +import jdk.graal.compiler.phases.common.HighTierLoweringPhase; +import jdk.graal.compiler.phases.common.IterativeConditionalEliminationPhase; +import jdk.graal.compiler.phases.schedule.SchedulePhase; import org.junit.Assert; /** diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConditionalNodeTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ConditionalNodeTest.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConditionalNodeTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ConditionalNodeTest.java index baf9cff9cb6a..c4f8b3999377 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConditionalNodeTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ConditionalNodeTest.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; -import jdk.compiler.graal.api.directives.GraalDirectives; -import jdk.compiler.graal.nodes.CallTargetNode.InvokeKind; -import jdk.compiler.graal.phases.OptimisticOptimizations; +import jdk.graal.compiler.api.directives.GraalDirectives; +import jdk.graal.compiler.nodes.CallTargetNode.InvokeKind; +import jdk.graal.compiler.phases.OptimisticOptimizations; import org.junit.Test; public class ConditionalNodeTest extends GraalCompilerTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConstantArrayReadFoldingTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ConstantArrayReadFoldingTest.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConstantArrayReadFoldingTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ConstantArrayReadFoldingTest.java index f89be21c6e2e..5900d585588b 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConstantArrayReadFoldingTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ConstantArrayReadFoldingTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/CopyOfVirtualizationTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/CopyOfVirtualizationTest.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/CopyOfVirtualizationTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/CopyOfVirtualizationTest.java index 3e4645ec4b37..8c12b179707c 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/CopyOfVirtualizationTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/CopyOfVirtualizationTest.java @@ -23,14 +23,14 @@ * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; import java.util.Arrays; import org.junit.Test; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.java.NewArrayNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.java.NewArrayNode; public class CopyOfVirtualizationTest extends GraalCompilerTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/CountedLoopMaxTripCountPiTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/CountedLoopMaxTripCountPiTest.java similarity index 86% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/CountedLoopMaxTripCountPiTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/CountedLoopMaxTripCountPiTest.java index a654dcd4c0e1..6865eb396a68 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/CountedLoopMaxTripCountPiTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/CountedLoopMaxTripCountPiTest.java @@ -22,23 +22,23 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; -import jdk.compiler.graal.api.directives.GraalDirectives; -import jdk.compiler.graal.core.common.GraalOptions; -import jdk.compiler.graal.core.common.type.StampFactory; -import jdk.compiler.graal.nodes.BeginNode; -import jdk.compiler.graal.nodes.NodeView; -import jdk.compiler.graal.nodes.PiNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext; -import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin; -import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins; -import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins.Registration; -import jdk.compiler.graal.nodes.loop.LoopEx; -import jdk.compiler.graal.nodes.loop.LoopsData; -import jdk.compiler.graal.options.OptionValues; +import jdk.graal.compiler.api.directives.GraalDirectives; +import jdk.graal.compiler.core.common.GraalOptions; +import jdk.graal.compiler.core.common.type.StampFactory; +import jdk.graal.compiler.nodes.BeginNode; +import jdk.graal.compiler.nodes.NodeView; +import jdk.graal.compiler.nodes.PiNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext; +import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin; +import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins; +import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins.Registration; +import jdk.graal.compiler.nodes.loop.LoopEx; +import jdk.graal.compiler.nodes.loop.LoopsData; +import jdk.graal.compiler.options.OptionValues; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/CountedLoopOverflowTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/CountedLoopOverflowTest.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/CountedLoopOverflowTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/CountedLoopOverflowTest.java index 8b1a3f8a91d3..3622ff3f2f48 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/CountedLoopOverflowTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/CountedLoopOverflowTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; import java.util.Collections; import java.util.EnumMap; @@ -30,10 +30,10 @@ import java.util.Formatter; import java.util.Map; -import jdk.compiler.graal.api.directives.GraalDirectives; -import jdk.compiler.graal.core.common.GraalOptions; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.phases.OptimisticOptimizations; +import jdk.graal.compiler.api.directives.GraalDirectives; +import jdk.graal.compiler.core.common.GraalOptions; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.phases.OptimisticOptimizations; import org.junit.Test; import jdk.vm.ci.meta.DeoptimizationReason; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/CountedLoopTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/CountedLoopTest.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/CountedLoopTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/CountedLoopTest.java index 189d12981fd8..6074e054865c 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/CountedLoopTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/CountedLoopTest.java @@ -22,31 +22,31 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; - -import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_IGNORED; -import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_IGNORED; - -import jdk.compiler.graal.api.directives.GraalDirectives; -import jdk.compiler.graal.graph.NodeClass; -import jdk.compiler.graal.nodeinfo.NodeInfo; -import jdk.compiler.graal.nodes.ConstantNode; -import jdk.compiler.graal.nodes.NodeView; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.calc.FloatingNode; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext; -import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin; -import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins; -import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins.Registration; -import jdk.compiler.graal.nodes.loop.InductionVariable; -import jdk.compiler.graal.nodes.loop.LoopEx; -import jdk.compiler.graal.nodes.loop.LoopsData; -import jdk.compiler.graal.nodes.spi.LIRLowerable; -import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool; -import jdk.compiler.graal.nodes.util.GraphUtil; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.phases.OptimisticOptimizations; +package jdk.graal.compiler.core.test; + +import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_IGNORED; +import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_IGNORED; + +import jdk.graal.compiler.api.directives.GraalDirectives; +import jdk.graal.compiler.graph.NodeClass; +import jdk.graal.compiler.nodeinfo.NodeInfo; +import jdk.graal.compiler.nodes.ConstantNode; +import jdk.graal.compiler.nodes.NodeView; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.calc.FloatingNode; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext; +import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin; +import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins; +import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins.Registration; +import jdk.graal.compiler.nodes.loop.InductionVariable; +import jdk.graal.compiler.nodes.loop.LoopEx; +import jdk.graal.compiler.nodes.loop.LoopsData; +import jdk.graal.compiler.nodes.spi.LIRLowerable; +import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool; +import jdk.graal.compiler.nodes.util.GraphUtil; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.phases.OptimisticOptimizations; import org.junit.Test; import jdk.vm.ci.code.InstalledCode; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/CountedLoopTest2.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/CountedLoopTest2.java similarity index 90% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/CountedLoopTest2.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/CountedLoopTest2.java index feee8d3b2023..e8ed7c147d7d 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/CountedLoopTest2.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/CountedLoopTest2.java @@ -22,16 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; -import jdk.compiler.graal.api.directives.GraalDirectives; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.graph.iterators.FilteredNodeIterable; -import jdk.compiler.graal.nodes.DeoptimizingNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions; -import jdk.compiler.graal.nodes.loop.LoopEx; -import jdk.compiler.graal.nodes.loop.LoopsData; +import jdk.graal.compiler.api.directives.GraalDirectives; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.graph.iterators.FilteredNodeIterable; +import jdk.graal.compiler.nodes.DeoptimizingNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.StructuredGraph.AllowAssumptions; +import jdk.graal.compiler.nodes.loop.LoopEx; +import jdk.graal.compiler.nodes.loop.LoopsData; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/CustomizedBytecodePatternTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/CustomizedBytecodePatternTest.java similarity index 99% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/CustomizedBytecodePatternTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/CustomizedBytecodePatternTest.java index da3c7d625e17..705b27b9b11b 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/CustomizedBytecodePatternTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/CustomizedBytecodePatternTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; import java.io.File; import java.io.IOException; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/DeMorganCanonicalizationTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/DeMorganCanonicalizationTest.java similarity index 91% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/DeMorganCanonicalizationTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/DeMorganCanonicalizationTest.java index 8e485f9e6a13..c5b4cf54891e 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/DeMorganCanonicalizationTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/DeMorganCanonicalizationTest.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions; -import jdk.compiler.graal.nodes.calc.AndNode; -import jdk.compiler.graal.nodes.calc.NotNode; -import jdk.compiler.graal.nodes.calc.OrNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.StructuredGraph.AllowAssumptions; +import jdk.graal.compiler.nodes.calc.AndNode; +import jdk.graal.compiler.nodes.calc.NotNode; +import jdk.graal.compiler.nodes.calc.OrNode; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/DeepUnrollingTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/DeepUnrollingTest.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/DeepUnrollingTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/DeepUnrollingTest.java index 7d297342aa4e..e56f61cfa86d 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/DeepUnrollingTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/DeepUnrollingTest.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; import java.io.IOException; import java.util.concurrent.TimeUnit; import java.util.stream.LongStream; -import jdk.compiler.graal.core.common.GraalOptions; -import jdk.compiler.graal.options.OptionValues; +import jdk.graal.compiler.core.common.GraalOptions; +import jdk.graal.compiler.options.OptionValues; import org.junit.Test; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/DegeneratedLoopsTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/DegeneratedLoopsTest.java similarity index 91% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/DegeneratedLoopsTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/DegeneratedLoopsTest.java index 3de4b886abc9..b0510d27c01e 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/DegeneratedLoopsTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/DegeneratedLoopsTest.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.debug.DebugDumpScope; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions; -import jdk.compiler.graal.phases.tiers.HighTierContext; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.debug.DebugDumpScope; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.StructuredGraph.AllowAssumptions; +import jdk.graal.compiler.phases.tiers.HighTierContext; import org.junit.Test; /** diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/DirectByteBufferTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/DirectByteBufferTest.java similarity index 99% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/DirectByteBufferTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/DirectByteBufferTest.java index 32e9130b1aa7..d0be69438f91 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/DirectByteBufferTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/DirectByteBufferTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; import java.nio.ByteBuffer; import java.nio.ByteOrder; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/DontReuseArgumentSpaceTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/DontReuseArgumentSpaceTest.java similarity index 88% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/DontReuseArgumentSpaceTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/DontReuseArgumentSpaceTest.java index 06a679d713c2..a3a6c23df6a6 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/DontReuseArgumentSpaceTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/DontReuseArgumentSpaceTest.java @@ -24,17 +24,17 @@ */ /* */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; import org.junit.Test; -import jdk.compiler.graal.code.CompilationResult; -import jdk.compiler.graal.core.phases.HighTier; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.phases.tiers.Suites; +import jdk.graal.compiler.code.CompilationResult; +import jdk.graal.compiler.core.phases.HighTier; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.StructuredGraph.AllowAssumptions; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.phases.tiers.Suites; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/DumpPathTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/DumpPathTest.java similarity index 93% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/DumpPathTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/DumpPathTest.java index 15d576a8965c..068393786c90 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/DumpPathTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/DumpPathTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; import java.io.IOException; import java.nio.file.DirectoryStream; @@ -31,11 +31,11 @@ import java.nio.file.Paths; import org.graalvm.collections.EconomicMap; -import jdk.compiler.graal.debug.DebugOptions; -import jdk.compiler.graal.debug.DebugOptions.PrintGraphTarget; -import jdk.compiler.graal.debug.TTY; -import jdk.compiler.graal.options.OptionKey; -import jdk.compiler.graal.options.OptionValues; +import jdk.graal.compiler.debug.DebugOptions; +import jdk.graal.compiler.debug.DebugOptions.PrintGraphTarget; +import jdk.graal.compiler.debug.TTY; +import jdk.graal.compiler.options.OptionKey; +import jdk.graal.compiler.options.OptionValues; import org.junit.Test; /** diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/DynamicConstantTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/DynamicConstantTest.java similarity index 99% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/DynamicConstantTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/DynamicConstantTest.java index 621bdbd541cd..a893b5382d52 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/DynamicConstantTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/DynamicConstantTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; import java.lang.invoke.MethodHandles; import java.util.Arrays; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/EarlyGVNTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/EarlyGVNTest.java similarity index 92% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/EarlyGVNTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/EarlyGVNTest.java index a472d2a84eda..55f4440e1606 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/EarlyGVNTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/EarlyGVNTest.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; -import static jdk.compiler.graal.core.test.EarlyGVNTest.NodeCount.count; -import static jdk.compiler.graal.core.test.EarlyGVNTest.NodeCount.invariantCount; +import static jdk.graal.compiler.core.test.EarlyGVNTest.NodeCount.count; +import static jdk.graal.compiler.core.test.EarlyGVNTest.NodeCount.invariantCount; import static org.junit.Assume.assumeTrue; import java.lang.annotation.ElementType; @@ -35,30 +35,30 @@ import java.util.List; import java.util.ListIterator; -import jdk.compiler.graal.api.directives.GraalDirectives; -import jdk.compiler.graal.core.common.GraalOptions; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.graph.NodeClass; -import jdk.compiler.graal.loop.phases.ConvertDeoptimizeToGuardPhase; -import jdk.compiler.graal.loop.phases.LoopFullUnrollPhase; -import jdk.compiler.graal.nodes.FixedGuardNode; -import jdk.compiler.graal.nodes.LoopBeginNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions; -import jdk.compiler.graal.nodes.java.ArrayLengthNode; -import jdk.compiler.graal.nodes.java.LoadFieldNode; -import jdk.compiler.graal.nodes.java.LoadIndexedNode; -import jdk.compiler.graal.nodes.java.StoreFieldNode; -import jdk.compiler.graal.nodes.loop.LoopEx; -import jdk.compiler.graal.nodes.loop.LoopsData; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.phases.BasePhase; -import jdk.compiler.graal.phases.PhaseSuite; -import jdk.compiler.graal.phases.common.CanonicalizerPhase; -import jdk.compiler.graal.phases.common.ConditionalEliminationPhase; -import jdk.compiler.graal.phases.common.DominatorBasedGlobalValueNumberingPhase; -import jdk.compiler.graal.phases.tiers.HighTierContext; -import jdk.compiler.graal.phases.tiers.Suites; +import jdk.graal.compiler.api.directives.GraalDirectives; +import jdk.graal.compiler.core.common.GraalOptions; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.graph.NodeClass; +import jdk.graal.compiler.loop.phases.ConvertDeoptimizeToGuardPhase; +import jdk.graal.compiler.loop.phases.LoopFullUnrollPhase; +import jdk.graal.compiler.nodes.FixedGuardNode; +import jdk.graal.compiler.nodes.LoopBeginNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.StructuredGraph.AllowAssumptions; +import jdk.graal.compiler.nodes.java.ArrayLengthNode; +import jdk.graal.compiler.nodes.java.LoadFieldNode; +import jdk.graal.compiler.nodes.java.LoadIndexedNode; +import jdk.graal.compiler.nodes.java.StoreFieldNode; +import jdk.graal.compiler.nodes.loop.LoopEx; +import jdk.graal.compiler.nodes.loop.LoopsData; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.phases.BasePhase; +import jdk.graal.compiler.phases.PhaseSuite; +import jdk.graal.compiler.phases.common.CanonicalizerPhase; +import jdk.graal.compiler.phases.common.ConditionalEliminationPhase; +import jdk.graal.compiler.phases.common.DominatorBasedGlobalValueNumberingPhase; +import jdk.graal.compiler.phases.tiers.HighTierContext; +import jdk.graal.compiler.phases.tiers.Suites; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/EnumSwitchTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/EnumSwitchTest.java similarity index 94% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/EnumSwitchTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/EnumSwitchTest.java index 008b30d087c3..eab10c187832 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/EnumSwitchTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/EnumSwitchTest.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.extended.IntegerSwitchNode; -import jdk.compiler.graal.nodes.java.LoadIndexedNode; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.phases.tiers.Suites; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.extended.IntegerSwitchNode; +import jdk.graal.compiler.nodes.java.LoadIndexedNode; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.phases.tiers.Suites; import org.junit.Assume; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/EnumValuesTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/EnumValuesTest.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/EnumValuesTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/EnumValuesTest.java index 0131873e1132..680e501e409b 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/EnumValuesTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/EnumValuesTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/FinalizableSubclassTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/FinalizableSubclassTest.java similarity index 92% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/FinalizableSubclassTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/FinalizableSubclassTest.java index af241eda6942..6108fc04be92 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/FinalizableSubclassTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/FinalizableSubclassTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -30,18 +30,18 @@ import java.lang.reflect.Constructor; import java.util.HashMap; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.java.GraphBuilderPhase; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions; -import jdk.compiler.graal.nodes.extended.LoadHubNode; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration; -import jdk.compiler.graal.nodes.java.RegisterFinalizerNode; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.phases.OptimisticOptimizations; -import jdk.compiler.graal.phases.common.CanonicalizerPhase; -import jdk.compiler.graal.phases.common.HighTierLoweringPhase; -import jdk.compiler.graal.phases.tiers.HighTierContext; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.java.GraphBuilderPhase; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.StructuredGraph.AllowAssumptions; +import jdk.graal.compiler.nodes.extended.LoadHubNode; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration; +import jdk.graal.compiler.nodes.java.RegisterFinalizerNode; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.phases.OptimisticOptimizations; +import jdk.graal.compiler.phases.common.CanonicalizerPhase; +import jdk.graal.compiler.phases.common.HighTierLoweringPhase; +import jdk.graal.compiler.phases.tiers.HighTierContext; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/FindUniqueConcreteMethodBugTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/FindUniqueConcreteMethodBugTest.java similarity index 99% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/FindUniqueConcreteMethodBugTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/FindUniqueConcreteMethodBugTest.java index 906f309aacde..2c5b5ce8dc8d 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/FindUniqueConcreteMethodBugTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/FindUniqueConcreteMethodBugTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; import jdk.vm.ci.meta.Assumptions.AssumptionResult; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/FindUniqueDefaultMethodTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/FindUniqueDefaultMethodTest.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/FindUniqueDefaultMethodTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/FindUniqueDefaultMethodTest.java index 4593f3442f48..2df6921b4e3b 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/FindUniqueDefaultMethodTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/FindUniqueDefaultMethodTest.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.nodes.ReturnNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.nodes.ReturnNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.StructuredGraph.AllowAssumptions; import org.junit.Ignore; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/FloatOptimizationTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/FloatOptimizationTest.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/FloatOptimizationTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/FloatOptimizationTest.java index fcc1fa7fede7..baa9ee9fbe24 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/FloatOptimizationTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/FloatOptimizationTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/FloatingDivTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/FloatingDivTest.java similarity index 93% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/FloatingDivTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/FloatingDivTest.java index 0c3b5126da8a..33df281161a5 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/FloatingDivTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/FloatingDivTest.java @@ -22,23 +22,23 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; import java.util.ListIterator; -import jdk.compiler.graal.api.directives.GraalDirectives; -import jdk.compiler.graal.core.common.GraalOptions; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions; -import jdk.compiler.graal.nodes.calc.FloatingIntegerDivRemNode; -import jdk.compiler.graal.nodes.calc.IntegerDivRemNode; -import jdk.compiler.graal.nodes.calc.IntegerEqualsNode; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.phases.BasePhase; -import jdk.compiler.graal.phases.PhaseSuite; -import jdk.compiler.graal.phases.common.LoweringPhase; -import jdk.compiler.graal.phases.tiers.HighTierContext; -import jdk.compiler.graal.phases.tiers.Suites; +import jdk.graal.compiler.api.directives.GraalDirectives; +import jdk.graal.compiler.core.common.GraalOptions; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.StructuredGraph.AllowAssumptions; +import jdk.graal.compiler.nodes.calc.FloatingIntegerDivRemNode; +import jdk.graal.compiler.nodes.calc.IntegerDivRemNode; +import jdk.graal.compiler.nodes.calc.IntegerEqualsNode; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.phases.BasePhase; +import jdk.graal.compiler.phases.PhaseSuite; +import jdk.graal.compiler.phases.common.LoweringPhase; +import jdk.graal.compiler.phases.tiers.HighTierContext; +import jdk.graal.compiler.phases.tiers.Suites; import org.junit.Assert; import org.junit.Ignore; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/FloatingReadTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/FloatingReadTest.java similarity index 82% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/FloatingReadTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/FloatingReadTest.java index 64b9c8f45aa0..d543f92d1c5b 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/FloatingReadTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/FloatingReadTest.java @@ -22,20 +22,20 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.debug.DebugDumpScope; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.nodes.ReturnNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions; -import jdk.compiler.graal.nodes.extended.MonitorExit; -import jdk.compiler.graal.nodes.memory.FloatingReadNode; -import jdk.compiler.graal.nodes.spi.CoreProviders; -import jdk.compiler.graal.phases.common.CanonicalizerPhase; -import jdk.compiler.graal.phases.common.FloatingReadPhase; -import jdk.compiler.graal.phases.common.HighTierLoweringPhase; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.debug.DebugDumpScope; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.nodes.ReturnNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.StructuredGraph.AllowAssumptions; +import jdk.graal.compiler.nodes.extended.MonitorExit; +import jdk.graal.compiler.nodes.memory.FloatingReadNode; +import jdk.graal.compiler.nodes.spi.CoreProviders; +import jdk.graal.compiler.phases.common.CanonicalizerPhase; +import jdk.graal.compiler.phases.common.FloatingReadPhase; +import jdk.graal.compiler.phases.common.HighTierLoweringPhase; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/FuzzTest36456.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/FuzzTest36456.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/FuzzTest36456.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/FuzzTest36456.java index 2f449c2a7a24..fce43a851605 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/FuzzTest36456.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/FuzzTest36456.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; public class FuzzTest36456 extends GraalCompilerTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/FuzzTest36457.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/FuzzTest36457.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/FuzzTest36457.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/FuzzTest36457.java index 9d2f82b96862..aa104ae977eb 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/FuzzTest36457.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/FuzzTest36457.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; public class FuzzTest36457 extends GraalCompilerTest { public static volatile char[] field2; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/GraalCompilerAssumptionsTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/GraalCompilerAssumptionsTest.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/GraalCompilerAssumptionsTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/GraalCompilerAssumptionsTest.java index bbd18e357ed8..bcec32c6097a 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/GraalCompilerAssumptionsTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/GraalCompilerAssumptionsTest.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; -import jdk.compiler.graal.code.CompilationResult; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions; +import jdk.graal.compiler.code.CompilationResult; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.StructuredGraph.AllowAssumptions; import jdk.vm.ci.code.Architecture; import jdk.vm.ci.code.InstalledCode; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/GraalCompilerTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/GraalCompilerTest.java similarity index 94% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/GraalCompilerTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/GraalCompilerTest.java index a09290e2b539..b28fb68a3d20 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/GraalCompilerTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/GraalCompilerTest.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; import static java.lang.reflect.Modifier.isStatic; import static jdk.vm.ci.runtime.JVMCICompiler.INVOCATION_ENTRY_BCI; -import static jdk.compiler.graal.nodes.ConstantNode.getConstantNodes; -import static jdk.compiler.graal.nodes.graphbuilderconf.InlineInvokePlugin.InlineInfo.DO_NOT_INLINE_NO_EXCEPTION; -import static jdk.compiler.graal.nodes.graphbuilderconf.InlineInvokePlugin.InlineInfo.DO_NOT_INLINE_WITH_EXCEPTION; +import static jdk.graal.compiler.nodes.ConstantNode.getConstantNodes; +import static jdk.graal.compiler.nodes.graphbuilderconf.InlineInvokePlugin.InlineInfo.DO_NOT_INLINE_NO_EXCEPTION; +import static jdk.graal.compiler.nodes.graphbuilderconf.InlineInvokePlugin.InlineInfo.DO_NOT_INLINE_WITH_EXCEPTION; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -57,85 +57,85 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.function.Supplier; -import jdk.compiler.graal.api.replacements.SnippetReflectionProvider; -import jdk.compiler.graal.api.test.Graal; -import jdk.compiler.graal.api.test.ModuleSupport; -import jdk.compiler.graal.code.CompilationResult; -import jdk.compiler.graal.core.CompilationPrinter; -import jdk.compiler.graal.core.GraalCompiler; -import jdk.compiler.graal.core.GraalCompiler.Request; -import jdk.compiler.graal.core.common.CompilationIdentifier; -import jdk.compiler.graal.core.common.type.StampFactory; -import jdk.compiler.graal.core.phases.fuzzing.PhasePlanSerializer; -import jdk.compiler.graal.core.target.Backend; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.debug.DebugDumpHandler; -import jdk.compiler.graal.debug.DebugHandlersFactory; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.debug.TTY; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.graph.NodeClass; -import jdk.compiler.graal.graph.NodeMap; -import jdk.compiler.graal.hotspot.HotSpotGraphBuilderPhase; -import jdk.compiler.graal.java.BytecodeParser; -import jdk.compiler.graal.java.GraphBuilderPhase; -import jdk.compiler.graal.lir.asm.CompilationResultBuilderFactory; -import jdk.compiler.graal.lir.phases.LIRSuites; -import jdk.compiler.graal.loop.phases.ConvertDeoptimizeToGuardPhase; -import jdk.compiler.graal.nodeinfo.NodeInfo; -import jdk.compiler.graal.nodeinfo.NodeSize; -import jdk.compiler.graal.nodeinfo.Verbosity; -import jdk.compiler.graal.nodes.BreakpointNode; -import jdk.compiler.graal.nodes.Cancellable; -import jdk.compiler.graal.nodes.ConstantNode; -import jdk.compiler.graal.nodes.FixedWithNextNode; -import jdk.compiler.graal.nodes.FrameState; -import jdk.compiler.graal.nodes.FullInfopointNode; -import jdk.compiler.graal.nodes.Invoke; -import jdk.compiler.graal.nodes.InvokeNode; -import jdk.compiler.graal.nodes.InvokeWithExceptionNode; -import jdk.compiler.graal.nodes.ParameterNode; -import jdk.compiler.graal.nodes.ProxyNode; -import jdk.compiler.graal.nodes.ReturnNode; -import jdk.compiler.graal.nodes.SafepointNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions; -import jdk.compiler.graal.nodes.StructuredGraph.Builder; -import jdk.compiler.graal.nodes.StructuredGraph.ScheduleResult; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.cfg.HIRBlock; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext; -import jdk.compiler.graal.nodes.graphbuilderconf.InlineInvokePlugin; -import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin; -import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins; -import jdk.compiler.graal.nodes.java.AccessFieldNode; -import jdk.compiler.graal.nodes.spi.LoweringProvider; -import jdk.compiler.graal.nodes.spi.ProfileProvider; -import jdk.compiler.graal.nodes.spi.Replacements; -import jdk.compiler.graal.nodes.virtual.VirtualObjectNode; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.phases.BasePhase; -import jdk.compiler.graal.phases.OptimisticOptimizations; -import jdk.compiler.graal.phases.OptimisticOptimizations.Optimization; -import jdk.compiler.graal.phases.PhaseSuite; -import jdk.compiler.graal.phases.Speculative; -import jdk.compiler.graal.phases.common.CanonicalizerPhase; -import jdk.compiler.graal.phases.common.inlining.InliningPhase; -import jdk.compiler.graal.phases.common.inlining.info.InlineInfo; -import jdk.compiler.graal.phases.common.inlining.policy.GreedyInliningPolicy; -import jdk.compiler.graal.phases.schedule.SchedulePhase; -import jdk.compiler.graal.phases.schedule.SchedulePhase.SchedulingStrategy; -import jdk.compiler.graal.phases.tiers.HighTierContext; -import jdk.compiler.graal.phases.tiers.LowTierContext; -import jdk.compiler.graal.phases.tiers.MidTierContext; -import jdk.compiler.graal.phases.tiers.Suites; -import jdk.compiler.graal.phases.tiers.TargetProvider; -import jdk.compiler.graal.phases.util.Providers; -import jdk.compiler.graal.printer.GraalDebugHandlersFactory; -import jdk.compiler.graal.runtime.RuntimeProvider; -import jdk.compiler.graal.test.GraalTest; +import jdk.graal.compiler.api.replacements.SnippetReflectionProvider; +import jdk.graal.compiler.api.test.Graal; +import jdk.graal.compiler.api.test.ModuleSupport; +import jdk.graal.compiler.code.CompilationResult; +import jdk.graal.compiler.core.CompilationPrinter; +import jdk.graal.compiler.core.GraalCompiler; +import jdk.graal.compiler.core.GraalCompiler.Request; +import jdk.graal.compiler.core.common.CompilationIdentifier; +import jdk.graal.compiler.core.common.type.StampFactory; +import jdk.graal.compiler.core.phases.fuzzing.PhasePlanSerializer; +import jdk.graal.compiler.core.target.Backend; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.debug.DebugDumpHandler; +import jdk.graal.compiler.debug.DebugHandlersFactory; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.debug.TTY; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.graph.NodeClass; +import jdk.graal.compiler.graph.NodeMap; +import jdk.graal.compiler.hotspot.HotSpotGraphBuilderPhase; +import jdk.graal.compiler.java.BytecodeParser; +import jdk.graal.compiler.java.GraphBuilderPhase; +import jdk.graal.compiler.lir.asm.CompilationResultBuilderFactory; +import jdk.graal.compiler.lir.phases.LIRSuites; +import jdk.graal.compiler.loop.phases.ConvertDeoptimizeToGuardPhase; +import jdk.graal.compiler.nodeinfo.NodeInfo; +import jdk.graal.compiler.nodeinfo.NodeSize; +import jdk.graal.compiler.nodeinfo.Verbosity; +import jdk.graal.compiler.nodes.BreakpointNode; +import jdk.graal.compiler.nodes.Cancellable; +import jdk.graal.compiler.nodes.ConstantNode; +import jdk.graal.compiler.nodes.FixedWithNextNode; +import jdk.graal.compiler.nodes.FrameState; +import jdk.graal.compiler.nodes.FullInfopointNode; +import jdk.graal.compiler.nodes.Invoke; +import jdk.graal.compiler.nodes.InvokeNode; +import jdk.graal.compiler.nodes.InvokeWithExceptionNode; +import jdk.graal.compiler.nodes.ParameterNode; +import jdk.graal.compiler.nodes.ProxyNode; +import jdk.graal.compiler.nodes.ReturnNode; +import jdk.graal.compiler.nodes.SafepointNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.StructuredGraph.AllowAssumptions; +import jdk.graal.compiler.nodes.StructuredGraph.Builder; +import jdk.graal.compiler.nodes.StructuredGraph.ScheduleResult; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.cfg.HIRBlock; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext; +import jdk.graal.compiler.nodes.graphbuilderconf.InlineInvokePlugin; +import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin; +import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins; +import jdk.graal.compiler.nodes.java.AccessFieldNode; +import jdk.graal.compiler.nodes.spi.LoweringProvider; +import jdk.graal.compiler.nodes.spi.ProfileProvider; +import jdk.graal.compiler.nodes.spi.Replacements; +import jdk.graal.compiler.nodes.virtual.VirtualObjectNode; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.phases.BasePhase; +import jdk.graal.compiler.phases.OptimisticOptimizations; +import jdk.graal.compiler.phases.OptimisticOptimizations.Optimization; +import jdk.graal.compiler.phases.PhaseSuite; +import jdk.graal.compiler.phases.Speculative; +import jdk.graal.compiler.phases.common.CanonicalizerPhase; +import jdk.graal.compiler.phases.common.inlining.InliningPhase; +import jdk.graal.compiler.phases.common.inlining.info.InlineInfo; +import jdk.graal.compiler.phases.common.inlining.policy.GreedyInliningPolicy; +import jdk.graal.compiler.phases.schedule.SchedulePhase; +import jdk.graal.compiler.phases.schedule.SchedulePhase.SchedulingStrategy; +import jdk.graal.compiler.phases.tiers.HighTierContext; +import jdk.graal.compiler.phases.tiers.LowTierContext; +import jdk.graal.compiler.phases.tiers.MidTierContext; +import jdk.graal.compiler.phases.tiers.Suites; +import jdk.graal.compiler.phases.tiers.TargetProvider; +import jdk.graal.compiler.phases.util.Providers; +import jdk.graal.compiler.printer.GraalDebugHandlersFactory; +import jdk.graal.compiler.runtime.RuntimeProvider; +import jdk.graal.compiler.test.GraalTest; import org.junit.After; import org.junit.Assert; import org.junit.BeforeClass; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/GraalDebugHandlersFactoryTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/GraalDebugHandlersFactoryTest.java similarity index 91% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/GraalDebugHandlersFactoryTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/GraalDebugHandlersFactoryTest.java index f04fb0804856..6ae4b18524a1 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/GraalDebugHandlersFactoryTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/GraalDebugHandlersFactoryTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; import java.io.File; import java.io.IOException; @@ -33,15 +33,15 @@ import java.nio.file.Paths; import java.util.Comparator; -import jdk.compiler.graal.debug.DebugOptions; -import jdk.compiler.graal.debug.PathUtilities; -import jdk.compiler.graal.options.OptionKey; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.test.AddExports; +import jdk.graal.compiler.debug.DebugOptions; +import jdk.graal.compiler.debug.PathUtilities; +import jdk.graal.compiler.options.OptionKey; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.test.AddExports; import org.junit.Assume; import org.junit.Test; -@AddExports("jdk.compiler.graal/jdk.compiler.graal.printer") +@AddExports("jdk.graal.compiler/jdk.graal.compiler.printer") public class GraalDebugHandlersFactoryTest extends GraalCompilerTest { @Test diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/GraphDumpingTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/GraphDumpingTest.java similarity index 85% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/GraphDumpingTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/GraphDumpingTest.java index 5d94677863c5..8d427ab475ad 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/GraphDumpingTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/GraphDumpingTest.java @@ -22,28 +22,28 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; import java.io.IOException; import java.nio.file.Paths; import java.util.Arrays; import org.graalvm.collections.EconomicMap; -import jdk.compiler.graal.core.common.memory.BarrierType; -import jdk.compiler.graal.core.common.memory.MemoryOrderMode; -import jdk.compiler.graal.debug.DebugOptions; -import jdk.compiler.graal.debug.DebugOptions.PrintGraphTarget; -import jdk.compiler.graal.graph.NodeClass; -import jdk.compiler.graal.nodeinfo.NodeCycles; -import jdk.compiler.graal.nodeinfo.NodeInfo; -import jdk.compiler.graal.nodeinfo.NodeSize; -import jdk.compiler.graal.debug.TTY; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.memory.WriteNode; -import jdk.compiler.graal.nodes.memory.address.AddressNode; -import jdk.compiler.graal.options.OptionKey; -import jdk.compiler.graal.options.OptionValues; +import jdk.graal.compiler.core.common.memory.BarrierType; +import jdk.graal.compiler.core.common.memory.MemoryOrderMode; +import jdk.graal.compiler.debug.DebugOptions; +import jdk.graal.compiler.debug.DebugOptions.PrintGraphTarget; +import jdk.graal.compiler.graph.NodeClass; +import jdk.graal.compiler.nodeinfo.NodeCycles; +import jdk.graal.compiler.nodeinfo.NodeInfo; +import jdk.graal.compiler.nodeinfo.NodeSize; +import jdk.graal.compiler.debug.TTY; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.memory.WriteNode; +import jdk.graal.compiler.nodes.memory.address.AddressNode; +import jdk.graal.compiler.options.OptionKey; +import jdk.graal.compiler.options.OptionValues; import org.graalvm.word.LocationIdentity; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/GraphEncoderTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/GraphEncoderTest.java similarity index 90% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/GraphEncoderTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/GraphEncoderTest.java index 4b9bc97a6aae..5cb893a86682 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/GraphEncoderTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/GraphEncoderTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; import java.lang.reflect.Method; import java.util.ArrayList; @@ -31,13 +31,13 @@ import java.util.Map; import org.graalvm.collections.EconomicSet; -import jdk.compiler.graal.debug.DebugOptions; -import jdk.compiler.graal.nodes.EncodedGraph; -import jdk.compiler.graal.nodes.GraphEncoder; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions; -import jdk.compiler.graal.nodes.spi.CoreProviders; -import jdk.compiler.graal.options.OptionValues; +import jdk.graal.compiler.debug.DebugOptions; +import jdk.graal.compiler.nodes.EncodedGraph; +import jdk.graal.compiler.nodes.GraphEncoder; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.StructuredGraph.AllowAssumptions; +import jdk.graal.compiler.nodes.spi.CoreProviders; +import jdk.graal.compiler.options.OptionValues; import org.junit.Test; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/GraphPrinterTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/GraphPrinterTest.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/GraphPrinterTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/GraphPrinterTest.java index 6a6e64bf5d14..190b0eaa972f 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/GraphPrinterTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/GraphPrinterTest.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; -import jdk.compiler.graal.printer.CanonicalStringGraphPrinter; +import jdk.graal.compiler.printer.CanonicalStringGraphPrinter; import org.junit.Test; import jdk.vm.ci.meta.JavaConstant; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/GraphResetDebugTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/GraphResetDebugTest.java similarity index 84% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/GraphResetDebugTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/GraphResetDebugTest.java index 8943511b16cb..a8c37b64975a 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/GraphResetDebugTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/GraphResetDebugTest.java @@ -22,16 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; import org.graalvm.collections.EconomicMap; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.debug.DebugContext.Scope; -import jdk.compiler.graal.debug.DebugOptions; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions; -import jdk.compiler.graal.options.OptionKey; -import jdk.compiler.graal.options.OptionValues; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.debug.DebugContext.Scope; +import jdk.graal.compiler.debug.DebugOptions; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.StructuredGraph.AllowAssumptions; +import jdk.graal.compiler.options.OptionKey; +import jdk.graal.compiler.options.OptionValues; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/GraphScheduleTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/GraphScheduleTest.java similarity index 89% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/GraphScheduleTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/GraphScheduleTest.java index 05dd38f9935c..177726f251d1 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/GraphScheduleTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/GraphScheduleTest.java @@ -22,16 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; import java.util.List; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.graph.NodeMap; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.StructuredGraph.ScheduleResult; -import jdk.compiler.graal.nodes.cfg.HIRBlock; -import jdk.compiler.graal.phases.schedule.SchedulePhase; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.graph.NodeMap; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.StructuredGraph.ScheduleResult; +import jdk.graal.compiler.nodes.cfg.HIRBlock; +import jdk.graal.compiler.phases.schedule.SchedulePhase; import org.junit.Assert; import jdk.vm.ci.meta.SpeculationLog; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/GraphUtilOriginalValueTests.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/GraphUtilOriginalValueTests.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/GraphUtilOriginalValueTests.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/GraphUtilOriginalValueTests.java index e29fc750588f..6e585baf54cd 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/GraphUtilOriginalValueTests.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/GraphUtilOriginalValueTests.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; import java.lang.invoke.ConstantCallSite; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; -import jdk.compiler.graal.nodes.util.GraphUtil; +import jdk.graal.compiler.nodes.util.GraphUtil; import org.junit.Assert; import org.junit.Test; import org.objectweb.asm.ClassWriter; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/GuardPrioritiesTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/GuardPrioritiesTest.java similarity index 86% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/GuardPrioritiesTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/GuardPrioritiesTest.java index eefbf8e86ec2..9ff06c106560 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/GuardPrioritiesTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/GuardPrioritiesTest.java @@ -22,32 +22,32 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; import static jdk.vm.ci.meta.DeoptimizationAction.InvalidateReprofile; import static jdk.vm.ci.meta.DeoptimizationReason.TransferToInterpreter; -import static jdk.compiler.graal.graph.test.matchers.NodeIterableCount.hasCount; -import static jdk.compiler.graal.graph.test.matchers.NodeIterableIsEmpty.isNotEmpty; +import static jdk.graal.compiler.graph.test.matchers.NodeIterableCount.hasCount; +import static jdk.graal.compiler.graph.test.matchers.NodeIterableIsEmpty.isNotEmpty; import static org.junit.Assert.assertThat; import static org.junit.Assume.assumeThat; import static org.junit.Assume.assumeTrue; import java.util.Iterator; -import jdk.compiler.graal.api.directives.GraalDirectives; -import jdk.compiler.graal.core.common.GraalOptions; -import jdk.compiler.graal.graph.iterators.NodeIterable; -import jdk.compiler.graal.loop.phases.ConvertDeoptimizeToGuardPhase; -import jdk.compiler.graal.nodes.GuardNode; -import jdk.compiler.graal.nodes.ParameterNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.calc.IntegerLowerThanNode; -import jdk.compiler.graal.nodes.calc.IsNullNode; -import jdk.compiler.graal.phases.common.CanonicalizerPhase; -import jdk.compiler.graal.phases.common.FloatingReadPhase; -import jdk.compiler.graal.phases.common.HighTierLoweringPhase; -import jdk.compiler.graal.phases.schedule.SchedulePhase; -import jdk.compiler.graal.phases.tiers.HighTierContext; +import jdk.graal.compiler.api.directives.GraalDirectives; +import jdk.graal.compiler.core.common.GraalOptions; +import jdk.graal.compiler.graph.iterators.NodeIterable; +import jdk.graal.compiler.loop.phases.ConvertDeoptimizeToGuardPhase; +import jdk.graal.compiler.nodes.GuardNode; +import jdk.graal.compiler.nodes.ParameterNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.calc.IntegerLowerThanNode; +import jdk.graal.compiler.nodes.calc.IsNullNode; +import jdk.graal.compiler.phases.common.CanonicalizerPhase; +import jdk.graal.compiler.phases.common.FloatingReadPhase; +import jdk.graal.compiler.phases.common.HighTierLoweringPhase; +import jdk.graal.compiler.phases.schedule.SchedulePhase; +import jdk.graal.compiler.phases.tiers.HighTierContext; import org.junit.Test; import jdk.vm.ci.meta.SpeculationLog; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/HashCodeTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/HashCodeTest.java similarity index 91% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/HashCodeTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/HashCodeTest.java index eb193e4afc9a..cc823e482e95 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/HashCodeTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/HashCodeTest.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; - -import jdk.compiler.graal.core.phases.HighTier; -import jdk.compiler.graal.core.phases.MidTier; -import jdk.compiler.graal.nodes.InvokeNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.phases.OptimisticOptimizations; -import jdk.compiler.graal.phases.tiers.MidTierContext; +package jdk.graal.compiler.core.test; + +import jdk.graal.compiler.core.phases.HighTier; +import jdk.graal.compiler.core.phases.MidTier; +import jdk.graal.compiler.nodes.InvokeNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.phases.OptimisticOptimizations; +import jdk.graal.compiler.phases.tiers.MidTierContext; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/IfCanonicalizerSwapTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/IfCanonicalizerSwapTest.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/IfCanonicalizerSwapTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/IfCanonicalizerSwapTest.java index 2d2033080138..ea516a9bd6b3 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/IfCanonicalizerSwapTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/IfCanonicalizerSwapTest.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; -import static jdk.compiler.graal.api.directives.GraalDirectives.injectBranchProbability; +import static jdk.graal.compiler.api.directives.GraalDirectives.injectBranchProbability; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/IfCanonicalizerTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/IfCanonicalizerTest.java similarity index 88% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/IfCanonicalizerTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/IfCanonicalizerTest.java index 713e2846113a..c93b59b0f8c3 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/IfCanonicalizerTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/IfCanonicalizerTest.java @@ -22,24 +22,24 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.nodes.ConstantNode; -import jdk.compiler.graal.nodes.FrameState; -import jdk.compiler.graal.nodes.IfNode; -import jdk.compiler.graal.nodes.ParameterNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions; -import jdk.compiler.graal.nodes.spi.CoreProviders; -import jdk.compiler.graal.phases.OptimisticOptimizations; -import jdk.compiler.graal.phases.common.CanonicalizerPhase; -import jdk.compiler.graal.phases.common.FloatingReadPhase; -import jdk.compiler.graal.phases.common.GuardLoweringPhase; -import jdk.compiler.graal.phases.common.HighTierLoweringPhase; -import jdk.compiler.graal.phases.common.MidTierLoweringPhase; -import jdk.compiler.graal.phases.tiers.MidTierContext; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.nodes.ConstantNode; +import jdk.graal.compiler.nodes.FrameState; +import jdk.graal.compiler.nodes.IfNode; +import jdk.graal.compiler.nodes.ParameterNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.StructuredGraph.AllowAssumptions; +import jdk.graal.compiler.nodes.spi.CoreProviders; +import jdk.graal.compiler.phases.OptimisticOptimizations; +import jdk.graal.compiler.phases.common.CanonicalizerPhase; +import jdk.graal.compiler.phases.common.FloatingReadPhase; +import jdk.graal.compiler.phases.common.GuardLoweringPhase; +import jdk.graal.compiler.phases.common.HighTierLoweringPhase; +import jdk.graal.compiler.phases.common.MidTierLoweringPhase; +import jdk.graal.compiler.phases.tiers.MidTierContext; import org.junit.Test; /** diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/IfReorderTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/IfReorderTest.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/IfReorderTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/IfReorderTest.java index cc5cf4d3eddf..fa67ee011ea7 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/IfReorderTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/IfReorderTest.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; -import static jdk.compiler.graal.api.directives.GraalDirectives.injectBranchProbability; +import static jdk.graal.compiler.api.directives.GraalDirectives.injectBranchProbability; import java.io.Serializable; import java.util.ArrayList; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ImplicitNullCheckTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ImplicitNullCheckTest.java similarity index 78% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ImplicitNullCheckTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ImplicitNullCheckTest.java index 67ae97c42f73..aeb94dd42df6 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ImplicitNullCheckTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ImplicitNullCheckTest.java @@ -22,22 +22,22 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; -import jdk.compiler.graal.api.directives.GraalDirectives; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.debug.DebugDumpScope; -import jdk.compiler.graal.nodes.DeoptimizeNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions; -import jdk.compiler.graal.nodes.memory.ReadNode; -import jdk.compiler.graal.nodes.spi.CoreProviders; -import jdk.compiler.graal.phases.OptimisticOptimizations; -import jdk.compiler.graal.phases.common.CanonicalizerPhase; -import jdk.compiler.graal.phases.common.FloatingReadPhase; -import jdk.compiler.graal.phases.common.GuardLoweringPhase; -import jdk.compiler.graal.phases.common.HighTierLoweringPhase; -import jdk.compiler.graal.phases.tiers.MidTierContext; +import jdk.graal.compiler.api.directives.GraalDirectives; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.debug.DebugDumpScope; +import jdk.graal.compiler.nodes.DeoptimizeNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.StructuredGraph.AllowAssumptions; +import jdk.graal.compiler.nodes.memory.ReadNode; +import jdk.graal.compiler.nodes.spi.CoreProviders; +import jdk.graal.compiler.phases.OptimisticOptimizations; +import jdk.graal.compiler.phases.common.CanonicalizerPhase; +import jdk.graal.compiler.phases.common.FloatingReadPhase; +import jdk.graal.compiler.phases.common.GuardLoweringPhase; +import jdk.graal.compiler.phases.common.HighTierLoweringPhase; +import jdk.graal.compiler.phases.tiers.MidTierContext; import org.junit.Assert; import org.junit.Ignore; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/InfopointReasonTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/InfopointReasonTest.java similarity index 86% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/InfopointReasonTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/InfopointReasonTest.java index 47f1620abe89..9add301c345e 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/InfopointReasonTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/InfopointReasonTest.java @@ -22,21 +22,21 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; -import static jdk.compiler.graal.core.GraalCompiler.compileGraph; -import static jdk.compiler.graal.core.common.GraalOptions.OptAssumptions; +import static jdk.graal.compiler.core.GraalCompiler.compileGraph; +import static jdk.graal.compiler.core.common.GraalOptions.OptAssumptions; import static org.junit.Assert.assertNotNull; -import jdk.compiler.graal.code.CompilationResult; -import jdk.compiler.graal.lir.asm.CompilationResultBuilderFactory; -import jdk.compiler.graal.nodes.FullInfopointNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration; -import jdk.compiler.graal.phases.OptimisticOptimizations; -import jdk.compiler.graal.phases.PhaseSuite; -import jdk.compiler.graal.phases.tiers.HighTierContext; +import jdk.graal.compiler.code.CompilationResult; +import jdk.graal.compiler.lir.asm.CompilationResultBuilderFactory; +import jdk.graal.compiler.nodes.FullInfopointNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.StructuredGraph.AllowAssumptions; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration; +import jdk.graal.compiler.phases.OptimisticOptimizations; +import jdk.graal.compiler.phases.PhaseSuite; +import jdk.graal.compiler.phases.tiers.HighTierContext; import org.junit.Test; import jdk.vm.ci.code.site.Call; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/InstalledCodeInvalidationTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/InstalledCodeInvalidationTest.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/InstalledCodeInvalidationTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/InstalledCodeInvalidationTest.java index 59b5f9e88011..3ce7cbed08ed 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/InstalledCodeInvalidationTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/InstalledCodeInvalidationTest.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; -import jdk.compiler.graal.api.directives.GraalDirectives; +import jdk.graal.compiler.api.directives.GraalDirectives; import org.junit.Test; import jdk.vm.ci.code.InstalledCode; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/IntegerBoxEqualsTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/IntegerBoxEqualsTest.java similarity index 94% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/IntegerBoxEqualsTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/IntegerBoxEqualsTest.java index e33be66dc8bf..5cc05ab56786 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/IntegerBoxEqualsTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/IntegerBoxEqualsTest.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; -import jdk.compiler.graal.api.directives.GraalDirectives; -import jdk.compiler.graal.nodes.IfNode; -import jdk.compiler.graal.nodes.calc.ObjectEqualsNode; +import jdk.graal.compiler.api.directives.GraalDirectives; +import jdk.graal.compiler.nodes.IfNode; +import jdk.graal.compiler.nodes.calc.ObjectEqualsNode; import org.junit.Test; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/IntegerDivPowerOf2Test.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/IntegerDivPowerOf2Test.java similarity index 90% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/IntegerDivPowerOf2Test.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/IntegerDivPowerOf2Test.java index 31bf68127d07..1b79623b1612 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/IntegerDivPowerOf2Test.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/IntegerDivPowerOf2Test.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; -import jdk.compiler.graal.api.directives.GraalDirectives; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.calc.RightShiftNode; -import jdk.compiler.graal.nodes.calc.UnsignedRightShiftNode; +import jdk.graal.compiler.api.directives.GraalDirectives; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.calc.RightShiftNode; +import jdk.graal.compiler.nodes.calc.UnsignedRightShiftNode; import org.junit.Test; public class IntegerDivPowerOf2Test extends GraalCompilerTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/IntegerDivRemCanonicalizationTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/IntegerDivRemCanonicalizationTest.java similarity index 90% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/IntegerDivRemCanonicalizationTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/IntegerDivRemCanonicalizationTest.java index ecafc8ba4eef..888868d5cec1 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/IntegerDivRemCanonicalizationTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/IntegerDivRemCanonicalizationTest.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; -import jdk.compiler.graal.core.common.GraalOptions; -import jdk.compiler.graal.core.common.type.IntegerStamp; -import jdk.compiler.graal.core.common.type.Stamp; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.calc.SignedRemNode; -import jdk.compiler.graal.options.OptionValues; +import jdk.graal.compiler.core.common.GraalOptions; +import jdk.graal.compiler.core.common.type.IntegerStamp; +import jdk.graal.compiler.core.common.type.Stamp; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.calc.SignedRemNode; +import jdk.graal.compiler.options.OptionValues; import org.junit.Test; import jdk.vm.ci.code.CodeUtil; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/IntegerDivRemConstantTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/IntegerDivRemConstantTest.java similarity index 99% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/IntegerDivRemConstantTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/IntegerDivRemConstantTest.java index f387418bcef6..c37faf5094da 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/IntegerDivRemConstantTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/IntegerDivRemConstantTest.java @@ -24,7 +24,7 @@ * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/IntegerEqualsCanonicalizerTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/IntegerEqualsCanonicalizerTest.java similarity index 91% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/IntegerEqualsCanonicalizerTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/IntegerEqualsCanonicalizerTest.java index 6afeaed4caa3..389048d05284 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/IntegerEqualsCanonicalizerTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/IntegerEqualsCanonicalizerTest.java @@ -22,30 +22,30 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; import java.util.Optional; -import jdk.compiler.graal.api.directives.GraalDirectives; -import jdk.compiler.graal.core.GraalCompiler; -import jdk.compiler.graal.nodes.ConstantNode; -import jdk.compiler.graal.nodes.FrameState; -import jdk.compiler.graal.nodes.GraphState; -import jdk.compiler.graal.nodes.LogicNode; -import jdk.compiler.graal.nodes.NodeView; -import jdk.compiler.graal.nodes.ReturnNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions; -import jdk.compiler.graal.nodes.calc.ConditionalNode; -import jdk.compiler.graal.nodes.calc.XorNode; -import jdk.compiler.graal.nodes.java.StoreFieldNode; -import jdk.compiler.graal.phases.common.CanonicalizerPhase; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.calc.IntegerEqualsNode; -import jdk.compiler.graal.phases.BasePhase; -import jdk.compiler.graal.phases.common.FinalCanonicalizerPhase; -import jdk.compiler.graal.phases.tiers.LowTierContext; -import jdk.compiler.graal.phases.tiers.Suites; +import jdk.graal.compiler.api.directives.GraalDirectives; +import jdk.graal.compiler.core.GraalCompiler; +import jdk.graal.compiler.nodes.ConstantNode; +import jdk.graal.compiler.nodes.FrameState; +import jdk.graal.compiler.nodes.GraphState; +import jdk.graal.compiler.nodes.LogicNode; +import jdk.graal.compiler.nodes.NodeView; +import jdk.graal.compiler.nodes.ReturnNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.StructuredGraph.AllowAssumptions; +import jdk.graal.compiler.nodes.calc.ConditionalNode; +import jdk.graal.compiler.nodes.calc.XorNode; +import jdk.graal.compiler.nodes.java.StoreFieldNode; +import jdk.graal.compiler.phases.common.CanonicalizerPhase; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.calc.IntegerEqualsNode; +import jdk.graal.compiler.phases.BasePhase; +import jdk.graal.compiler.phases.common.FinalCanonicalizerPhase; +import jdk.graal.compiler.phases.tiers.LowTierContext; +import jdk.graal.compiler.phases.tiers.Suites; import org.junit.Test; public class IntegerEqualsCanonicalizerTest extends GraalCompilerTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/IntegerLowerThanCommonArithmeticCorrectnessTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/IntegerLowerThanCommonArithmeticCorrectnessTest.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/IntegerLowerThanCommonArithmeticCorrectnessTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/IntegerLowerThanCommonArithmeticCorrectnessTest.java index 8d535e747a13..cb600ea93875 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/IntegerLowerThanCommonArithmeticCorrectnessTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/IntegerLowerThanCommonArithmeticCorrectnessTest.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; import java.util.ArrayList; import java.util.Collection; import java.util.List; -import jdk.compiler.graal.api.directives.GraalDirectives; -import jdk.compiler.graal.core.common.type.IntegerStamp; +import jdk.graal.compiler.api.directives.GraalDirectives; +import jdk.graal.compiler.core.common.type.IntegerStamp; 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/core/test/IntegerLowerThanCommonArithmeticOptimizationTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/IntegerLowerThanCommonArithmeticOptimizationTest.java similarity index 88% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/IntegerLowerThanCommonArithmeticOptimizationTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/IntegerLowerThanCommonArithmeticOptimizationTest.java index 9585533b2da3..efa0821e2042 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/IntegerLowerThanCommonArithmeticOptimizationTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/IntegerLowerThanCommonArithmeticOptimizationTest.java @@ -22,17 +22,17 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; -import jdk.compiler.graal.api.directives.GraalDirectives; -import jdk.compiler.graal.core.common.type.IntegerStamp; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.calc.AddNode; -import jdk.compiler.graal.nodes.calc.LeftShiftNode; -import jdk.compiler.graal.nodes.calc.SignExtendNode; -import jdk.compiler.graal.nodes.calc.ZeroExtendNode; +import jdk.graal.compiler.api.directives.GraalDirectives; +import jdk.graal.compiler.core.common.type.IntegerStamp; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.calc.AddNode; +import jdk.graal.compiler.nodes.calc.LeftShiftNode; +import jdk.graal.compiler.nodes.calc.SignExtendNode; +import jdk.graal.compiler.nodes.calc.ZeroExtendNode; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/IntegerLowerThanCommonArithmeticTestBase.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/IntegerLowerThanCommonArithmeticTestBase.java similarity index 91% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/IntegerLowerThanCommonArithmeticTestBase.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/IntegerLowerThanCommonArithmeticTestBase.java index 7c6e8188c75d..55a97674e6f8 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/IntegerLowerThanCommonArithmeticTestBase.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/IntegerLowerThanCommonArithmeticTestBase.java @@ -22,19 +22,19 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; import jdk.vm.ci.meta.DeoptimizationReason; import jdk.vm.ci.meta.JavaConstant; import jdk.vm.ci.meta.JavaType; import jdk.vm.ci.meta.ResolvedJavaMethod; -import jdk.compiler.graal.core.common.type.Stamp; -import jdk.compiler.graal.nodes.ConstantNode; -import jdk.compiler.graal.nodes.ParameterNode; -import jdk.compiler.graal.nodes.PiNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.options.OptionValues; +import jdk.graal.compiler.core.common.type.Stamp; +import jdk.graal.compiler.nodes.ConstantNode; +import jdk.graal.compiler.nodes.ParameterNode; +import jdk.graal.compiler.nodes.PiNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.options.OptionValues; import java.util.Collections; import java.util.Set; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/IntegerStampMulFoldTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/IntegerStampMulFoldTest.java similarity index 99% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/IntegerStampMulFoldTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/IntegerStampMulFoldTest.java index e4c22d524b46..f9131087bf5b 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/IntegerStampMulFoldTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/IntegerStampMulFoldTest.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; import java.util.ArrayList; import java.util.Collection; -import jdk.compiler.graal.core.common.type.IntegerStamp; +import jdk.graal.compiler.core.common.type.IntegerStamp; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/IntegerStampShiftTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/IntegerStampShiftTest.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/IntegerStampShiftTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/IntegerStampShiftTest.java index e5083d8148b2..45c61bdb162f 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/IntegerStampShiftTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/IntegerStampShiftTest.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/InterfaceMethodHandleTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/InterfaceMethodHandleTest.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/InterfaceMethodHandleTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/InterfaceMethodHandleTest.java index 0a4429bc0f66..d0ad3635a418 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/InterfaceMethodHandleTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/InterfaceMethodHandleTest.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; import java.lang.invoke.MethodType; -import jdk.compiler.graal.api.test.ExportingClassLoader; -import jdk.compiler.graal.code.CompilationResult; -import jdk.compiler.graal.debug.DebugContext; +import jdk.graal.compiler.api.test.ExportingClassLoader; +import jdk.graal.compiler.code.CompilationResult; +import jdk.graal.compiler.debug.DebugContext; import org.junit.Test; import org.objectweb.asm.ClassWriter; import org.objectweb.asm.Label; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/InvocationPluginsTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/InvocationPluginsTest.java similarity index 90% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/InvocationPluginsTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/InvocationPluginsTest.java index e37f8716fc24..9903336dc454 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/InvocationPluginsTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/InvocationPluginsTest.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext; -import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin; -import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin.Receiver; -import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins; -import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins.LateRegistration; -import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins.Registration; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext; +import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin; +import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin.Receiver; +import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins; +import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins.LateRegistration; +import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins.Registration; import org.junit.Test; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/InvokeExceptionTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/InvokeExceptionTest.java similarity index 88% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/InvokeExceptionTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/InvokeExceptionTest.java index 514ec30c7633..ee0277e25b46 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/InvokeExceptionTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/InvokeExceptionTest.java @@ -22,16 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; import java.util.HashMap; import java.util.Map; -import jdk.compiler.graal.nodes.Invoke; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions; -import jdk.compiler.graal.phases.common.DeadCodeEliminationPhase; -import jdk.compiler.graal.phases.tiers.HighTierContext; +import jdk.graal.compiler.nodes.Invoke; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.StructuredGraph.AllowAssumptions; +import jdk.graal.compiler.phases.common.DeadCodeEliminationPhase; +import jdk.graal.compiler.phases.tiers.HighTierContext; import org.junit.Test; public class InvokeExceptionTest extends GraalCompilerTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/InvokeHintsTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/InvokeHintsTest.java similarity index 89% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/InvokeHintsTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/InvokeHintsTest.java index 04ff7fc52842..6edd38323352 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/InvokeHintsTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/InvokeHintsTest.java @@ -22,16 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; import java.util.HashMap; import java.util.Map; -import jdk.compiler.graal.nodes.Invoke; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions; -import jdk.compiler.graal.phases.common.DeadCodeEliminationPhase; -import jdk.compiler.graal.phases.tiers.HighTierContext; +import jdk.graal.compiler.nodes.Invoke; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.StructuredGraph.AllowAssumptions; +import jdk.graal.compiler.phases.common.DeadCodeEliminationPhase; +import jdk.graal.compiler.phases.tiers.HighTierContext; import org.junit.Test; public class InvokeHintsTest extends GraalCompilerTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/IsArrayTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/IsArrayTest.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/IsArrayTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/IsArrayTest.java index 8cdf508975e7..1e7b6d8c7417 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/IsArrayTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/IsArrayTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; import java.io.Serializable; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/LockEliminationTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/LockEliminationTest.java similarity index 88% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/LockEliminationTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/LockEliminationTest.java index 2910cbf1301f..910f78ffb793 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/LockEliminationTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/LockEliminationTest.java @@ -22,20 +22,20 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; - -import jdk.compiler.graal.loop.phases.LoopFullUnrollPhase; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions; -import jdk.compiler.graal.nodes.java.MonitorEnterNode; -import jdk.compiler.graal.nodes.java.MonitorExitNode; -import jdk.compiler.graal.nodes.loop.DefaultLoopPolicies; -import jdk.compiler.graal.phases.common.CanonicalizerPhase; -import jdk.compiler.graal.phases.common.DeadCodeEliminationPhase; -import jdk.compiler.graal.phases.common.HighTierLoweringPhase; -import jdk.compiler.graal.phases.common.LockEliminationPhase; -import jdk.compiler.graal.phases.tiers.HighTierContext; -import jdk.compiler.graal.virtual.phases.ea.PartialEscapePhase; +package jdk.graal.compiler.core.test; + +import jdk.graal.compiler.loop.phases.LoopFullUnrollPhase; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.StructuredGraph.AllowAssumptions; +import jdk.graal.compiler.nodes.java.MonitorEnterNode; +import jdk.graal.compiler.nodes.java.MonitorExitNode; +import jdk.graal.compiler.nodes.loop.DefaultLoopPolicies; +import jdk.graal.compiler.phases.common.CanonicalizerPhase; +import jdk.graal.compiler.phases.common.DeadCodeEliminationPhase; +import jdk.graal.compiler.phases.common.HighTierLoweringPhase; +import jdk.graal.compiler.phases.common.LockEliminationPhase; +import jdk.graal.compiler.phases.tiers.HighTierContext; +import jdk.graal.compiler.virtual.phases.ea.PartialEscapePhase; import org.junit.Test; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/LongNodeChainTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/LongNodeChainTest.java similarity index 83% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/LongNodeChainTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/LongNodeChainTest.java index 9ba30e349410..683e0790613f 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/LongNodeChainTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/LongNodeChainTest.java @@ -22,20 +22,20 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; -import jdk.compiler.graal.debug.DebugContext.Builder; -import jdk.compiler.graal.nodes.ConstantNode; -import jdk.compiler.graal.nodes.ReturnNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.calc.AddNode; -import jdk.compiler.graal.nodes.extended.OpaqueNode; -import jdk.compiler.graal.nodes.extended.OpaqueValueNode; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.phases.schedule.SchedulePhase; -import jdk.compiler.graal.phases.schedule.SchedulePhase.SchedulingStrategy; -import jdk.compiler.graal.phases.tiers.HighTierContext; +import jdk.graal.compiler.debug.DebugContext.Builder; +import jdk.graal.compiler.nodes.ConstantNode; +import jdk.graal.compiler.nodes.ReturnNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.calc.AddNode; +import jdk.graal.compiler.nodes.extended.OpaqueNode; +import jdk.graal.compiler.nodes.extended.OpaqueValueNode; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.phases.schedule.SchedulePhase; +import jdk.graal.compiler.phases.schedule.SchedulePhase.SchedulingStrategy; +import jdk.graal.compiler.phases.tiers.HighTierContext; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/LoopFullUnrollTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/LoopFullUnrollTest.java similarity index 86% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/LoopFullUnrollTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/LoopFullUnrollTest.java index 99c0b3e5146a..4e44c4941404 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/LoopFullUnrollTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/LoopFullUnrollTest.java @@ -22,16 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.debug.DebugDumpScope; -import jdk.compiler.graal.loop.phases.LoopFullUnrollPhase; -import jdk.compiler.graal.nodes.LoopBeginNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions; -import jdk.compiler.graal.nodes.loop.DefaultLoopPolicies; -import jdk.compiler.graal.nodes.spi.CoreProviders; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.debug.DebugDumpScope; +import jdk.graal.compiler.loop.phases.LoopFullUnrollPhase; +import jdk.graal.compiler.nodes.LoopBeginNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.StructuredGraph.AllowAssumptions; +import jdk.graal.compiler.nodes.loop.DefaultLoopPolicies; +import jdk.graal.compiler.nodes.spi.CoreProviders; import org.junit.Test; public class LoopFullUnrollTest extends GraalCompilerTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/LoopUnswitchTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/LoopUnswitchTest.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/LoopUnswitchTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/LoopUnswitchTest.java index b5c971d4bffe..49d1f31cea19 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/LoopUnswitchTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/LoopUnswitchTest.java @@ -22,25 +22,25 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; import java.util.List; import org.graalvm.collections.EconomicMap; -import jdk.compiler.graal.api.directives.GraalDirectives; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.debug.DebugDumpScope; -import jdk.compiler.graal.loop.phases.LoopUnswitchingPhase; -import jdk.compiler.graal.nodes.ControlSplitNode; -import jdk.compiler.graal.nodes.IfNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.extended.SwitchNode; -import jdk.compiler.graal.nodes.loop.DefaultLoopPolicies; -import jdk.compiler.graal.nodes.loop.LoopEx; -import jdk.compiler.graal.nodes.loop.LoopPolicies; -import jdk.compiler.graal.phases.common.CanonicalizerPhase; +import jdk.graal.compiler.api.directives.GraalDirectives; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.debug.DebugDumpScope; +import jdk.graal.compiler.loop.phases.LoopUnswitchingPhase; +import jdk.graal.compiler.nodes.ControlSplitNode; +import jdk.graal.compiler.nodes.IfNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.StructuredGraph.AllowAssumptions; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.extended.SwitchNode; +import jdk.graal.compiler.nodes.loop.DefaultLoopPolicies; +import jdk.graal.compiler.nodes.loop.LoopEx; +import jdk.graal.compiler.nodes.loop.LoopPolicies; +import jdk.graal.compiler.phases.common.CanonicalizerPhase; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/MarkUnsafeAccessTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/MarkUnsafeAccessTest.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/MarkUnsafeAccessTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/MarkUnsafeAccessTest.java index a02133dbae4a..badf5a1a8513 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/MarkUnsafeAccessTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/MarkUnsafeAccessTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; import static java.nio.file.StandardOpenOption.READ; import static java.nio.file.StandardOpenOption.WRITE; @@ -36,10 +36,10 @@ import java.nio.file.Files; import java.nio.file.Path; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.phases.common.inlining.InliningPhase; -import jdk.compiler.graal.phases.common.inlining.policy.InlineEverythingPolicy; -import jdk.compiler.graal.phases.tiers.HighTierContext; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.phases.common.inlining.InliningPhase; +import jdk.graal.compiler.phases.common.inlining.policy.InlineEverythingPolicy; +import jdk.graal.compiler.phases.tiers.HighTierContext; import org.junit.Assert; import org.junit.Assume; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/MaskingOptimizationTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/MaskingOptimizationTest.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/MaskingOptimizationTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/MaskingOptimizationTest.java index aba374ad1020..8278e01565f9 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/MaskingOptimizationTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/MaskingOptimizationTest.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.calc.OrNode; -import jdk.compiler.graal.nodes.calc.ShiftNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.calc.OrNode; +import jdk.graal.compiler.nodes.calc.ShiftNode; import org.junit.Test; public class MaskingOptimizationTest extends GraalCompilerTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/MatchRuleTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/MatchRuleTest.java similarity index 89% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/MatchRuleTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/MatchRuleTest.java index dd1313edb973..a7cc023df30e 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/MatchRuleTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/MatchRuleTest.java @@ -22,18 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; import java.util.function.Predicate; -import jdk.compiler.graal.core.common.cfg.BasicBlock; -import jdk.compiler.graal.lir.LIR; -import jdk.compiler.graal.lir.LIRInstruction; -import jdk.compiler.graal.lir.gen.LIRGenerationResult; -import jdk.compiler.graal.lir.phases.LIRPhase; -import jdk.compiler.graal.lir.phases.LIRSuites; -import jdk.compiler.graal.lir.phases.PreAllocationOptimizationPhase.PreAllocationOptimizationContext; -import jdk.compiler.graal.options.OptionValues; +import jdk.graal.compiler.core.common.cfg.BasicBlock; +import jdk.graal.compiler.lir.LIR; +import jdk.graal.compiler.lir.LIRInstruction; +import jdk.graal.compiler.lir.gen.LIRGenerationResult; +import jdk.graal.compiler.lir.phases.LIRPhase; +import jdk.graal.compiler.lir.phases.LIRSuites; +import jdk.graal.compiler.lir.phases.PreAllocationOptimizationPhase.PreAllocationOptimizationContext; +import jdk.graal.compiler.options.OptionValues; import org.junit.Assert; import jdk.vm.ci.code.TargetDescription; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/MathCopySignStampTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/MathCopySignStampTest.java similarity index 94% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/MathCopySignStampTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/MathCopySignStampTest.java index 79a72d15f405..4235fe17f7ae 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/MathCopySignStampTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/MathCopySignStampTest.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; -import jdk.compiler.graal.core.common.type.FloatStamp; -import jdk.compiler.graal.core.common.type.Stamp; -import jdk.compiler.graal.nodes.ParameterNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.phases.PhaseSuite; -import jdk.compiler.graal.phases.tiers.HighTierContext; +import jdk.graal.compiler.core.common.type.FloatStamp; +import jdk.graal.compiler.core.common.type.Stamp; +import jdk.graal.compiler.nodes.ParameterNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.phases.PhaseSuite; +import jdk.graal.compiler.phases.tiers.HighTierContext; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/MathSignumStampTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/MathSignumStampTest.java similarity index 92% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/MathSignumStampTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/MathSignumStampTest.java index e2099d3de858..2b85c7dad2ef 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/MathSignumStampTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/MathSignumStampTest.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; -import jdk.compiler.graal.core.common.type.FloatStamp; -import jdk.compiler.graal.core.common.type.Stamp; -import jdk.compiler.graal.nodes.ParameterNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.phases.PhaseSuite; -import jdk.compiler.graal.phases.tiers.HighTierContext; +import jdk.graal.compiler.core.common.type.FloatStamp; +import jdk.graal.compiler.core.common.type.Stamp; +import jdk.graal.compiler.nodes.ParameterNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.phases.PhaseSuite; +import jdk.graal.compiler.phases.tiers.HighTierContext; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/MemoryArithmeticTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/MemoryArithmeticTest.java similarity index 99% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/MemoryArithmeticTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/MemoryArithmeticTest.java index 313aad593c77..822d06a84e8c 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/MemoryArithmeticTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/MemoryArithmeticTest.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; import jdk.vm.ci.code.InstalledCode; import jdk.vm.ci.meta.ResolvedJavaMethod; import org.junit.Test; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.options.OptionValues; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.options.OptionValues; public class MemoryArithmeticTest extends GraalCompilerTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/MemoryGraphCanonicalizeTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/MemoryGraphCanonicalizeTest.java similarity index 93% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/MemoryGraphCanonicalizeTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/MemoryGraphCanonicalizeTest.java index f2b8024d0042..3349bcefdfaf 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/MemoryGraphCanonicalizeTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/MemoryGraphCanonicalizeTest.java @@ -23,11 +23,11 @@ * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.memory.WriteNode; -import jdk.compiler.graal.phases.tiers.Suites; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.memory.WriteNode; +import jdk.graal.compiler.phases.tiers.Suites; import org.junit.Test; public class MemoryGraphCanonicalizeTest extends GraalCompilerTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/MemoryScheduleTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/MemoryScheduleTest.java similarity index 93% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/MemoryScheduleTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/MemoryScheduleTest.java index 452f5dcbe944..1a406939638f 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/MemoryScheduleTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/MemoryScheduleTest.java @@ -22,41 +22,41 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; -import static jdk.compiler.graal.core.common.GraalOptions.OptImplicitNullChecks; -import static jdk.compiler.graal.core.common.GraalOptions.OptScheduleOutOfLoops; -import static jdk.compiler.graal.graph.test.matchers.NodeIterableCount.hasCount; +import static jdk.graal.compiler.core.common.GraalOptions.OptImplicitNullChecks; +import static jdk.graal.compiler.core.common.GraalOptions.OptScheduleOutOfLoops; +import static jdk.graal.compiler.graph.test.matchers.NodeIterableCount.hasCount; import static org.hamcrest.core.IsInstanceOf.instanceOf; import static org.junit.Assert.assertThat; import java.util.ArrayList; import java.util.List; -import jdk.compiler.graal.api.directives.GraalDirectives; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.nodes.ReturnNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions; -import jdk.compiler.graal.nodes.StructuredGraph.ScheduleResult; -import jdk.compiler.graal.nodes.cfg.HIRBlock; -import jdk.compiler.graal.nodes.memory.FloatingReadNode; -import jdk.compiler.graal.nodes.memory.WriteNode; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.phases.OptimisticOptimizations; -import jdk.compiler.graal.phases.common.CanonicalizerPhase; -import jdk.compiler.graal.phases.common.FloatingReadPhase; -import jdk.compiler.graal.phases.common.GuardLoweringPhase; -import jdk.compiler.graal.phases.common.HighTierLoweringPhase; -import jdk.compiler.graal.phases.common.LowTierLoweringPhase; -import jdk.compiler.graal.phases.common.MidTierLoweringPhase; -import jdk.compiler.graal.phases.common.RemoveValueProxyPhase; -import jdk.compiler.graal.phases.schedule.SchedulePhase; -import jdk.compiler.graal.phases.schedule.SchedulePhase.SchedulingStrategy; -import jdk.compiler.graal.phases.tiers.HighTierContext; -import jdk.compiler.graal.phases.tiers.LowTierContext; -import jdk.compiler.graal.phases.tiers.MidTierContext; +import jdk.graal.compiler.api.directives.GraalDirectives; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.nodes.ReturnNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.StructuredGraph.AllowAssumptions; +import jdk.graal.compiler.nodes.StructuredGraph.ScheduleResult; +import jdk.graal.compiler.nodes.cfg.HIRBlock; +import jdk.graal.compiler.nodes.memory.FloatingReadNode; +import jdk.graal.compiler.nodes.memory.WriteNode; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.phases.OptimisticOptimizations; +import jdk.graal.compiler.phases.common.CanonicalizerPhase; +import jdk.graal.compiler.phases.common.FloatingReadPhase; +import jdk.graal.compiler.phases.common.GuardLoweringPhase; +import jdk.graal.compiler.phases.common.HighTierLoweringPhase; +import jdk.graal.compiler.phases.common.LowTierLoweringPhase; +import jdk.graal.compiler.phases.common.MidTierLoweringPhase; +import jdk.graal.compiler.phases.common.RemoveValueProxyPhase; +import jdk.graal.compiler.phases.schedule.SchedulePhase; +import jdk.graal.compiler.phases.schedule.SchedulePhase.SchedulingStrategy; +import jdk.graal.compiler.phases.tiers.HighTierContext; +import jdk.graal.compiler.phases.tiers.LowTierContext; +import jdk.graal.compiler.phases.tiers.MidTierContext; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/MergeCanonicalizerTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/MergeCanonicalizerTest.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/MergeCanonicalizerTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/MergeCanonicalizerTest.java index 71bb50dfc2a6..b57f9024adfe 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/MergeCanonicalizerTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/MergeCanonicalizerTest.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; -import jdk.compiler.graal.phases.OptimisticOptimizations; +import jdk.graal.compiler.phases.OptimisticOptimizations; import org.junit.Test; public class MergeCanonicalizerTest extends GraalCompilerTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/MethodHandleEagerResolution.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/MethodHandleEagerResolution.java similarity index 91% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/MethodHandleEagerResolution.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/MethodHandleEagerResolution.java index cafaed40ac8e..7954947885f4 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/MethodHandleEagerResolution.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/MethodHandleEagerResolution.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; @@ -30,10 +30,10 @@ import org.junit.Test; -import jdk.compiler.graal.nodes.DeoptimizeNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions; -import jdk.compiler.graal.test.AddExports; +import jdk.graal.compiler.nodes.DeoptimizeNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.StructuredGraph.AllowAssumptions; +import jdk.graal.compiler.test.AddExports; // Export needed to open String.value field to reflection by this test @AddExports("java.base/java.lang") diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/MonitorGraphTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/MonitorGraphTest.java similarity index 86% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/MonitorGraphTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/MonitorGraphTest.java index d6874fcbd95b..55266b35a5e1 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/MonitorGraphTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/MonitorGraphTest.java @@ -22,22 +22,22 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; import java.util.HashMap; import java.util.Map; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.graph.iterators.NodeIterable; -import jdk.compiler.graal.nodes.ConstantNode; -import jdk.compiler.graal.nodes.FrameState; -import jdk.compiler.graal.nodes.Invoke; -import jdk.compiler.graal.nodes.ParameterNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions; -import jdk.compiler.graal.nodes.java.MonitorExitNode; -import jdk.compiler.graal.phases.common.DeadCodeEliminationPhase; -import jdk.compiler.graal.phases.tiers.HighTierContext; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.graph.iterators.NodeIterable; +import jdk.graal.compiler.nodes.ConstantNode; +import jdk.graal.compiler.nodes.FrameState; +import jdk.graal.compiler.nodes.Invoke; +import jdk.graal.compiler.nodes.ParameterNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.StructuredGraph.AllowAssumptions; +import jdk.graal.compiler.nodes.java.MonitorExitNode; +import jdk.graal.compiler.phases.common.DeadCodeEliminationPhase; +import jdk.graal.compiler.phases.tiers.HighTierContext; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/MoveGuardsLoopTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/MoveGuardsLoopTest.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/MoveGuardsLoopTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/MoveGuardsLoopTest.java index 00b158ff03e2..3bcadff932b8 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/MoveGuardsLoopTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/MoveGuardsLoopTest.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; import java.util.EnumSet; -import jdk.compiler.graal.api.directives.GraalDirectives; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.phases.common.ConditionalEliminationPhase; +import jdk.graal.compiler.api.directives.GraalDirectives; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.phases.common.ConditionalEliminationPhase; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/MulNegateTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/MulNegateTest.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/MulNegateTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/MulNegateTest.java index cbb603cb4281..75c17868eb8f 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/MulNegateTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/MulNegateTest.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; -import jdk.compiler.graal.nodes.calc.NegateNode; +import jdk.graal.compiler.nodes.calc.NegateNode; import org.junit.Test; public class MulNegateTest extends GraalCompilerTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/NarrowingReadTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/NarrowingReadTest.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/NarrowingReadTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/NarrowingReadTest.java index 47e1d71ee498..ffae09d8bb8a 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/NarrowingReadTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/NarrowingReadTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/NegateCanonicalizationTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/NegateCanonicalizationTest.java similarity index 90% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/NegateCanonicalizationTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/NegateCanonicalizationTest.java index bce395736561..0cb26e51759d 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/NegateCanonicalizationTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/NegateCanonicalizationTest.java @@ -23,12 +23,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.calc.NegateNode; -import jdk.compiler.graal.nodes.calc.RightShiftNode; -import jdk.compiler.graal.nodes.calc.UnsignedRightShiftNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.calc.NegateNode; +import jdk.graal.compiler.nodes.calc.RightShiftNode; +import jdk.graal.compiler.nodes.calc.UnsignedRightShiftNode; import org.junit.Test; public class NegateCanonicalizationTest extends GraalCompilerTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/NestedArithmeticTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/NestedArithmeticTest.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/NestedArithmeticTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/NestedArithmeticTest.java index ef8928e89da5..a6500ef8d8a5 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/NestedArithmeticTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/NestedArithmeticTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/NestedLoopTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/NestedLoopTest.java similarity index 93% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/NestedLoopTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/NestedLoopTest.java index cd61e1ad0061..0f7f0682abd5 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/NestedLoopTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/NestedLoopTest.java @@ -22,17 +22,17 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; - -import jdk.compiler.graal.core.common.cfg.Loop; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.nodes.Invoke; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions; -import jdk.compiler.graal.nodes.cfg.HIRBlock; -import jdk.compiler.graal.nodes.cfg.ControlFlowGraph; -import jdk.compiler.graal.nodes.java.MethodCallTargetNode; +package jdk.graal.compiler.core.test; + +import jdk.graal.compiler.core.common.cfg.Loop; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.nodes.Invoke; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.StructuredGraph.AllowAssumptions; +import jdk.graal.compiler.nodes.cfg.HIRBlock; +import jdk.graal.compiler.nodes.cfg.ControlFlowGraph; +import jdk.graal.compiler.nodes.java.MethodCallTargetNode; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/NewInstanceTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/NewInstanceTest.java similarity index 92% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/NewInstanceTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/NewInstanceTest.java index 504dbd43648e..f1e4927d80ce 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/NewInstanceTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/NewInstanceTest.java @@ -22,21 +22,21 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; import java.lang.reflect.Constructor; -import jdk.compiler.graal.java.GraphBuilderPhase; -import jdk.compiler.graal.nodes.DeoptimizeNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration; -import jdk.compiler.graal.nodes.java.NewInstanceNode; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.phases.OptimisticOptimizations; +import jdk.graal.compiler.java.GraphBuilderPhase; +import jdk.graal.compiler.nodes.DeoptimizeNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.StructuredGraph.AllowAssumptions; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration; +import jdk.graal.compiler.nodes.java.NewInstanceNode; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.phases.OptimisticOptimizations; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/NodeCopyWithInputsTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/NodeCopyWithInputsTest.java similarity index 91% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/NodeCopyWithInputsTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/NodeCopyWithInputsTest.java index df8e73e4941d..c37bf915a863 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/NodeCopyWithInputsTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/NodeCopyWithInputsTest.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; import java.util.List; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.nodes.FrameState; -import jdk.compiler.graal.nodes.StructuredGraph; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.nodes.FrameState; +import jdk.graal.compiler.nodes.StructuredGraph; import org.junit.Test; public class NodeCopyWithInputsTest extends GraalCompilerTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/NodeMapGraphTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/NodeMapGraphTest.java similarity index 91% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/NodeMapGraphTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/NodeMapGraphTest.java index 6f6dc577cc40..e025368ca2b6 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/NodeMapGraphTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/NodeMapGraphTest.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; import org.graalvm.collections.MapCursor; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.graph.NodeMap; -import jdk.compiler.graal.nodes.ConstantNode; -import jdk.compiler.graal.nodes.StructuredGraph; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.graph.NodeMap; +import jdk.graal.compiler.nodes.ConstantNode; +import jdk.graal.compiler.nodes.StructuredGraph; import org.junit.Test; public class NodeMapGraphTest extends GraalCompilerTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/NodePosIteratorTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/NodePosIteratorTest.java similarity index 90% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/NodePosIteratorTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/NodePosIteratorTest.java index 7aa78c18ad67..c868c585ad33 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/NodePosIteratorTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/NodePosIteratorTest.java @@ -22,29 +22,29 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; -import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_IGNORED; -import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_IGNORED; +import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_IGNORED; +import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_IGNORED; import java.util.Iterator; -import jdk.compiler.graal.core.common.PermanentBailoutException; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.graph.NodeClass; -import jdk.compiler.graal.graph.NodeInputList; -import jdk.compiler.graal.graph.NodeSuccessorList; -import jdk.compiler.graal.graph.Position; -import jdk.compiler.graal.graph.iterators.NodeIterable; -import jdk.compiler.graal.nodeinfo.NodeInfo; -import jdk.compiler.graal.nodes.AbstractMergeNode; -import jdk.compiler.graal.nodes.ConstantNode; -import jdk.compiler.graal.nodes.EndNode; -import jdk.compiler.graal.nodes.MergeNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.calc.FloatingNode; +import jdk.graal.compiler.core.common.PermanentBailoutException; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.graph.NodeClass; +import jdk.graal.compiler.graph.NodeInputList; +import jdk.graal.compiler.graph.NodeSuccessorList; +import jdk.graal.compiler.graph.Position; +import jdk.graal.compiler.graph.iterators.NodeIterable; +import jdk.graal.compiler.nodeinfo.NodeInfo; +import jdk.graal.compiler.nodes.AbstractMergeNode; +import jdk.graal.compiler.nodes.ConstantNode; +import jdk.graal.compiler.nodes.EndNode; +import jdk.graal.compiler.nodes.MergeNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.calc.FloatingNode; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/NodePropertiesTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/NodePropertiesTest.java similarity index 94% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/NodePropertiesTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/NodePropertiesTest.java index f99abc0b3d59..b6cc9ad8f618 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/NodePropertiesTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/NodePropertiesTest.java @@ -22,22 +22,22 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; - -import jdk.compiler.graal.api.directives.GraalDirectives; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.graph.iterators.NodeIterable; -import jdk.compiler.graal.nodes.LoopBeginNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.cfg.ControlFlowGraph; -import jdk.compiler.graal.nodes.spi.Canonicalizable; -import jdk.compiler.graal.nodes.spi.CoreProviders; -import jdk.compiler.graal.nodes.spi.SimplifierTool; -import jdk.compiler.graal.phases.common.CanonicalizerPhase; -import jdk.compiler.graal.phases.common.CanonicalizerPhase.CustomSimplification; -import jdk.compiler.graal.phases.contract.NodeCostUtil; -import jdk.compiler.graal.phases.tiers.HighTierContext; +package jdk.graal.compiler.core.test; + +import jdk.graal.compiler.api.directives.GraalDirectives; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.graph.iterators.NodeIterable; +import jdk.graal.compiler.nodes.LoopBeginNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.cfg.ControlFlowGraph; +import jdk.graal.compiler.nodes.spi.Canonicalizable; +import jdk.graal.compiler.nodes.spi.CoreProviders; +import jdk.graal.compiler.nodes.spi.SimplifierTool; +import jdk.graal.compiler.phases.common.CanonicalizerPhase; +import jdk.graal.compiler.phases.common.CanonicalizerPhase.CustomSimplification; +import jdk.graal.compiler.phases.contract.NodeCostUtil; +import jdk.graal.compiler.phases.tiers.HighTierContext; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ObjectSubstitutionsTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ObjectSubstitutionsTest.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ObjectSubstitutionsTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ObjectSubstitutionsTest.java index 04c2d9aae8b6..ebcb53a4ece9 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ObjectSubstitutionsTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ObjectSubstitutionsTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/OffHeapUnsafeAccessTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/OffHeapUnsafeAccessTest.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/OffHeapUnsafeAccessTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/OffHeapUnsafeAccessTest.java index 1f7635c1b039..c44406dedc91 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/OffHeapUnsafeAccessTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/OffHeapUnsafeAccessTest.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; -import jdk.compiler.graal.nodes.NamedLocationIdentity; -import jdk.compiler.graal.nodes.memory.ReadNode; +import jdk.graal.compiler.nodes.NamedLocationIdentity; +import jdk.graal.compiler.nodes.memory.ReadNode; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/OnStackReplacementTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/OnStackReplacementTest.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/OnStackReplacementTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/OnStackReplacementTest.java index c8936eb2b453..2a55abf5b993 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/OnStackReplacementTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/OnStackReplacementTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/OptimizeExtendsTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/OptimizeExtendsTest.java similarity index 99% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/OptimizeExtendsTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/OptimizeExtendsTest.java index 5ec0bba532e2..9c0fcc891cf9 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/OptimizeExtendsTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/OptimizeExtendsTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/OptimizedBoxNodeTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/OptimizedBoxNodeTest.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/OptimizedBoxNodeTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/OptimizedBoxNodeTest.java index d4ca85189085..70a44ed3ad52 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/OptimizedBoxNodeTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/OptimizedBoxNodeTest.java @@ -22,22 +22,22 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; import java.util.ArrayList; -import jdk.compiler.graal.api.directives.GraalDirectives; -import jdk.compiler.graal.loop.phases.LoopFullUnrollPhase; -import jdk.compiler.graal.nodes.IfNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions; -import jdk.compiler.graal.nodes.extended.BoxNode; -import jdk.compiler.graal.nodes.loop.DefaultLoopPolicies; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.phases.common.BoxNodeIdentityPhase; -import jdk.compiler.graal.phases.common.BoxNodeOptimizationPhase; -import jdk.compiler.graal.phases.common.CanonicalizerPhase; -import jdk.compiler.graal.phases.util.GraphOrder; +import jdk.graal.compiler.api.directives.GraalDirectives; +import jdk.graal.compiler.loop.phases.LoopFullUnrollPhase; +import jdk.graal.compiler.nodes.IfNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.StructuredGraph.AllowAssumptions; +import jdk.graal.compiler.nodes.extended.BoxNode; +import jdk.graal.compiler.nodes.loop.DefaultLoopPolicies; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.phases.common.BoxNodeIdentityPhase; +import jdk.graal.compiler.phases.common.BoxNodeOptimizationPhase; +import jdk.graal.compiler.phases.common.CanonicalizerPhase; +import jdk.graal.compiler.phases.util.GraphOrder; import org.junit.Assert; import org.junit.Ignore; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/OptionsVerifierTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/OptionsVerifierTest.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/OptionsVerifierTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/OptionsVerifierTest.java index a52afad76303..abae403b7992 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/OptionsVerifierTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/OptionsVerifierTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; import static java.lang.String.format; @@ -35,11 +35,11 @@ import java.util.Set; import java.util.TreeSet; -import jdk.compiler.graal.options.OptionDescriptor; -import jdk.compiler.graal.options.OptionDescriptors; -import jdk.compiler.graal.options.OptionKey; -import jdk.compiler.graal.options.OptionsParser; -import jdk.compiler.graal.serviceprovider.GraalServices; +import jdk.graal.compiler.options.OptionDescriptor; +import jdk.graal.compiler.options.OptionDescriptors; +import jdk.graal.compiler.options.OptionKey; +import jdk.graal.compiler.options.OptionsParser; +import jdk.graal.compiler.serviceprovider.GraalServices; import org.junit.Test; import org.objectweb.asm.ClassReader; import org.objectweb.asm.ClassVisitor; @@ -56,7 +56,7 @@ public class OptionsVerifierTest { private static Set ALLOWLIST = new TreeSet<>(Arrays.asList(// - "jdk.compiler.graal.truffle.TruffleCompilerOptions")); + "jdk.graal.compiler.truffle.TruffleCompilerOptions")); @Test public void verifyOptions() throws IOException { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/PhiCreationTests.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/PhiCreationTests.java similarity index 93% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/PhiCreationTests.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/PhiCreationTests.java index e91f586fe8e4..328c0bd7ebfc 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/PhiCreationTests.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/PhiCreationTests.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions; -import jdk.compiler.graal.nodes.ValuePhiNode; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.StructuredGraph.AllowAssumptions; +import jdk.graal.compiler.nodes.ValuePhiNode; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ProfilingInfoTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ProfilingInfoTest.java similarity index 99% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ProfilingInfoTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ProfilingInfoTest.java index c3fecdfb7397..d45dc9d3a08c 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ProfilingInfoTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ProfilingInfoTest.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; import java.io.Serializable; -import jdk.compiler.graal.test.SubprocessUtil; +import jdk.graal.compiler.test.SubprocessUtil; import org.junit.Assert; import org.junit.Assume; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/PushNodesThroughPiTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/PushNodesThroughPiTest.java similarity index 84% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/PushNodesThroughPiTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/PushNodesThroughPiTest.java index 09a29b1df2ef..5cc0ce85e2cf 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/PushNodesThroughPiTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/PushNodesThroughPiTest.java @@ -22,21 +22,21 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; - -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.debug.DebugDumpScope; -import jdk.compiler.graal.nodes.ParameterNode; -import jdk.compiler.graal.nodes.PiNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions; -import jdk.compiler.graal.nodes.calc.IsNullNode; -import jdk.compiler.graal.nodes.memory.ReadNode; -import jdk.compiler.graal.nodes.memory.address.OffsetAddressNode; -import jdk.compiler.graal.nodes.spi.CoreProviders; -import jdk.compiler.graal.nodes.type.StampTool; -import jdk.compiler.graal.phases.common.CanonicalizerPhase; -import jdk.compiler.graal.phases.common.HighTierLoweringPhase; +package jdk.graal.compiler.core.test; + +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.debug.DebugDumpScope; +import jdk.graal.compiler.nodes.ParameterNode; +import jdk.graal.compiler.nodes.PiNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.StructuredGraph.AllowAssumptions; +import jdk.graal.compiler.nodes.calc.IsNullNode; +import jdk.graal.compiler.nodes.memory.ReadNode; +import jdk.graal.compiler.nodes.memory.address.OffsetAddressNode; +import jdk.graal.compiler.nodes.spi.CoreProviders; +import jdk.graal.compiler.nodes.type.StampTool; +import jdk.graal.compiler.phases.common.CanonicalizerPhase; +import jdk.graal.compiler.phases.common.HighTierLoweringPhase; import org.junit.Assert; import org.junit.Ignore; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/PushThroughIfTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/PushThroughIfTest.java similarity index 90% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/PushThroughIfTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/PushThroughIfTest.java index 4778f10de4d1..041a4083be44 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/PushThroughIfTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/PushThroughIfTest.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.nodes.FrameState; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions; -import jdk.compiler.graal.nodes.util.GraphUtil; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.nodes.FrameState; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.StructuredGraph.AllowAssumptions; +import jdk.graal.compiler.nodes.util.GraphUtil; import org.junit.Test; public class PushThroughIfTest extends GraalCompilerTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ReadAfterCheckCastTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ReadAfterCheckCastTest.java similarity index 86% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ReadAfterCheckCastTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ReadAfterCheckCastTest.java index 59331dfea18f..fc4865f0a6cf 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ReadAfterCheckCastTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ReadAfterCheckCastTest.java @@ -22,18 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.debug.DebugDumpScope; -import jdk.compiler.graal.nodes.ParameterNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions; -import jdk.compiler.graal.nodes.memory.FloatingReadNode; -import jdk.compiler.graal.nodes.spi.CoreProviders; -import jdk.compiler.graal.phases.common.CanonicalizerPhase; -import jdk.compiler.graal.phases.common.FloatingReadPhase; -import jdk.compiler.graal.phases.common.HighTierLoweringPhase; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.debug.DebugDumpScope; +import jdk.graal.compiler.nodes.ParameterNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.StructuredGraph.AllowAssumptions; +import jdk.graal.compiler.nodes.memory.FloatingReadNode; +import jdk.graal.compiler.nodes.spi.CoreProviders; +import jdk.graal.compiler.phases.common.CanonicalizerPhase; +import jdk.graal.compiler.phases.common.FloatingReadPhase; +import jdk.graal.compiler.phases.common.HighTierLoweringPhase; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ReadConstantFoldingTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ReadConstantFoldingTest.java similarity index 99% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ReadConstantFoldingTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ReadConstantFoldingTest.java index cdfe2dd6d58b..793693075532 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ReadConstantFoldingTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ReadConstantFoldingTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; import static jdk.internal.misc.Unsafe.ARRAY_BOOLEAN_BASE_OFFSET; import static jdk.internal.misc.Unsafe.ARRAY_BYTE_BASE_OFFSET; @@ -37,19 +37,19 @@ import java.util.ArrayList; import java.util.List; -import jdk.compiler.graal.api.replacements.SnippetReflectionProvider; -import jdk.compiler.graal.graph.iterators.NodeIterable; -import jdk.compiler.graal.nodes.ConstantNode; -import jdk.compiler.graal.nodes.ReturnNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.StructuredGraph.Builder; -import jdk.compiler.graal.nodes.extended.OpaqueNode; -import jdk.compiler.graal.nodes.extended.OpaqueValueNode; -import jdk.compiler.graal.nodes.extended.RawLoadNode; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.phases.PhaseSuite; -import jdk.compiler.graal.phases.tiers.HighTierContext; -import jdk.compiler.graal.test.AddExports; +import jdk.graal.compiler.api.replacements.SnippetReflectionProvider; +import jdk.graal.compiler.graph.iterators.NodeIterable; +import jdk.graal.compiler.nodes.ConstantNode; +import jdk.graal.compiler.nodes.ReturnNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.StructuredGraph.Builder; +import jdk.graal.compiler.nodes.extended.OpaqueNode; +import jdk.graal.compiler.nodes.extended.OpaqueValueNode; +import jdk.graal.compiler.nodes.extended.RawLoadNode; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.phases.PhaseSuite; +import jdk.graal.compiler.phases.tiers.HighTierContext; +import jdk.graal.compiler.test.AddExports; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ReadConstantFoldingTestGenerator.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ReadConstantFoldingTestGenerator.java similarity index 99% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ReadConstantFoldingTestGenerator.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ReadConstantFoldingTestGenerator.java index 8d7733d31e51..6a38a66fe507 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ReadConstantFoldingTestGenerator.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ReadConstantFoldingTestGenerator.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; import java.io.PrintStream; import java.util.EnumSet; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ReassociateAndCanonicalTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ReassociateAndCanonicalTest.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ReassociateAndCanonicalTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ReassociateAndCanonicalTest.java index f3b387b69e27..bb72579a8ee2 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ReassociateAndCanonicalTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ReassociateAndCanonicalTest.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; import java.util.Random; -import jdk.compiler.graal.graph.IterableNodeType; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions; +import jdk.graal.compiler.graph.IterableNodeType; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.StructuredGraph.AllowAssumptions; import org.junit.Test; import jdk.vm.ci.aarch64.AArch64; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ReassociationTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ReassociationTest.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ReassociationTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ReassociationTest.java index 6435a84f1423..a8291cf091d4 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ReassociationTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ReassociationTest.java @@ -23,15 +23,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; - -import jdk.compiler.graal.api.directives.GraalDirectives; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.graph.iterators.FilteredNodeIterable; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions; -import jdk.compiler.graal.nodes.calc.BinaryArithmeticNode; -import jdk.compiler.graal.phases.common.ReassociationPhase; +package jdk.graal.compiler.core.test; + +import jdk.graal.compiler.api.directives.GraalDirectives; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.graph.iterators.FilteredNodeIterable; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.StructuredGraph.AllowAssumptions; +import jdk.graal.compiler.nodes.calc.BinaryArithmeticNode; +import jdk.graal.compiler.phases.common.ReassociationPhase; import org.junit.Test; import java.util.List; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ReentrantBlockIteratorTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ReentrantBlockIteratorTest.java similarity index 93% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ReentrantBlockIteratorTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ReentrantBlockIteratorTest.java index 848b34ef5b71..eed83c4eccc5 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ReentrantBlockIteratorTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ReentrantBlockIteratorTest.java @@ -22,20 +22,20 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import jdk.compiler.graal.api.directives.GraalDirectives; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions; -import jdk.compiler.graal.nodes.cfg.HIRBlock; -import jdk.compiler.graal.nodes.cfg.ControlFlowGraph; -import jdk.compiler.graal.phases.graph.ReentrantBlockIterator; -import jdk.compiler.graal.phases.graph.ReentrantBlockIterator.BlockIteratorClosure; -import jdk.compiler.graal.phases.schedule.SchedulePhase; +import jdk.graal.compiler.api.directives.GraalDirectives; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.StructuredGraph.AllowAssumptions; +import jdk.graal.compiler.nodes.cfg.HIRBlock; +import jdk.graal.compiler.nodes.cfg.ControlFlowGraph; +import jdk.graal.compiler.phases.graph.ReentrantBlockIterator; +import jdk.graal.compiler.phases.graph.ReentrantBlockIterator.BlockIteratorClosure; +import jdk.graal.compiler.phases.schedule.SchedulePhase; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ReferenceGetLoopTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ReferenceGetLoopTest.java similarity index 91% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ReferenceGetLoopTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ReferenceGetLoopTest.java index 71077e794bbc..e5693e024361 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ReferenceGetLoopTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ReferenceGetLoopTest.java @@ -22,18 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; import java.lang.ref.Reference; import java.lang.ref.ReferenceQueue; import java.lang.ref.WeakReference; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.nodes.FieldLocationIdentity; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.loop.LoopEx; -import jdk.compiler.graal.nodes.loop.LoopsData; -import jdk.compiler.graal.nodes.memory.MemoryAccess; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.nodes.FieldLocationIdentity; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.loop.LoopEx; +import jdk.graal.compiler.nodes.loop.LoopsData; +import jdk.graal.compiler.nodes.memory.MemoryAccess; import org.graalvm.word.LocationIdentity; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ReflectionOptionDescriptors.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ReflectionOptionDescriptors.java similarity index 94% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ReflectionOptionDescriptors.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ReflectionOptionDescriptors.java index c6e768b154a4..0859f560fc43 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ReflectionOptionDescriptors.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ReflectionOptionDescriptors.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; import java.lang.annotation.RetentionPolicy; import java.lang.reflect.Field; @@ -35,12 +35,12 @@ import org.graalvm.collections.EconomicMap; import org.graalvm.collections.MapCursor; -import jdk.compiler.graal.options.Option; -import jdk.compiler.graal.options.OptionDescriptor; -import jdk.compiler.graal.options.OptionDescriptors; -import jdk.compiler.graal.options.OptionKey; -import jdk.compiler.graal.options.OptionType; -import jdk.compiler.graal.options.OptionValues; +import jdk.graal.compiler.options.Option; +import jdk.graal.compiler.options.OptionDescriptor; +import jdk.graal.compiler.options.OptionDescriptors; +import jdk.graal.compiler.options.OptionKey; +import jdk.graal.compiler.options.OptionType; +import jdk.graal.compiler.options.OptionValues; /** * An implementation of {@link OptionDescriptor} that uses reflection to create descriptors from a diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ResolveDynamicConstantTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ResolveDynamicConstantTest.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ResolveDynamicConstantTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ResolveDynamicConstantTest.java index d861bae97b31..c4faee561244 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ResolveDynamicConstantTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ResolveDynamicConstantTest.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; -import jdk.compiler.graal.serviceprovider.GraalServices; +import jdk.graal.compiler.serviceprovider.GraalServices; import org.junit.Assert; import org.junit.Assume; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ReverseBytesIntoArrayRegressionTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ReverseBytesIntoArrayRegressionTest.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ReverseBytesIntoArrayRegressionTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ReverseBytesIntoArrayRegressionTest.java index e263b3866870..7ce21a38b50f 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ReverseBytesIntoArrayRegressionTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ReverseBytesIntoArrayRegressionTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; import java.util.Formatter; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ScalarTypeSystemTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ScalarTypeSystemTest.java similarity index 94% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ScalarTypeSystemTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ScalarTypeSystemTest.java index c7a9e9b29d99..38a5018e68b4 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ScalarTypeSystemTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ScalarTypeSystemTest.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions; -import jdk.compiler.graal.nodes.spi.CoreProviders; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.StructuredGraph.AllowAssumptions; +import jdk.graal.compiler.nodes.spi.CoreProviders; import org.junit.Test; /** diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/SchedulingTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/SchedulingTest.java similarity index 80% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/SchedulingTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/SchedulingTest.java index 6ee5f6d00cc6..11b327203ad2 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/SchedulingTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/SchedulingTest.java @@ -22,23 +22,23 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; import java.util.List; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.graph.NodeMap; -import jdk.compiler.graal.nodes.FrameState; -import jdk.compiler.graal.nodes.LoopExitNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions; -import jdk.compiler.graal.nodes.StructuredGraph.ScheduleResult; -import jdk.compiler.graal.nodes.calc.AddNode; -import jdk.compiler.graal.nodes.calc.BinaryArithmeticNode; -import jdk.compiler.graal.nodes.cfg.HIRBlock; -import jdk.compiler.graal.nodes.util.GraphUtil; -import jdk.compiler.graal.phases.schedule.SchedulePhase; -import jdk.compiler.graal.phases.schedule.SchedulePhase.SchedulingStrategy; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.graph.NodeMap; +import jdk.graal.compiler.nodes.FrameState; +import jdk.graal.compiler.nodes.LoopExitNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.StructuredGraph.AllowAssumptions; +import jdk.graal.compiler.nodes.StructuredGraph.ScheduleResult; +import jdk.graal.compiler.nodes.calc.AddNode; +import jdk.graal.compiler.nodes.calc.BinaryArithmeticNode; +import jdk.graal.compiler.nodes.cfg.HIRBlock; +import jdk.graal.compiler.nodes.util.GraphUtil; +import jdk.graal.compiler.phases.schedule.SchedulePhase; +import jdk.graal.compiler.phases.schedule.SchedulePhase.SchedulingStrategy; import org.junit.Test; public class SchedulingTest extends GraphScheduleTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/SchedulingTest2.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/SchedulingTest2.java similarity index 79% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/SchedulingTest2.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/SchedulingTest2.java index 650f1d95eaca..7db7afe7b6ec 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/SchedulingTest2.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/SchedulingTest2.java @@ -22,34 +22,34 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; import java.util.List; -import jdk.compiler.graal.core.common.cfg.BlockMap; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.graph.NodeMap; -import jdk.compiler.graal.nodes.BeginNode; -import jdk.compiler.graal.nodes.DeoptimizingNode.DeoptDuring; -import jdk.compiler.graal.nodes.FrameState; -import jdk.compiler.graal.nodes.ReturnNode; -import jdk.compiler.graal.nodes.StateSplit; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions; -import jdk.compiler.graal.nodes.StructuredGraph.ScheduleResult; -import jdk.compiler.graal.nodes.calc.AddNode; -import jdk.compiler.graal.nodes.calc.BinaryArithmeticNode; -import jdk.compiler.graal.nodes.cfg.HIRBlock; -import jdk.compiler.graal.nodes.spi.CoreProviders; -import jdk.compiler.graal.phases.OptimisticOptimizations; -import jdk.compiler.graal.phases.common.FrameStateAssignmentPhase; -import jdk.compiler.graal.phases.common.GuardLoweringPhase; -import jdk.compiler.graal.phases.common.HighTierLoweringPhase; -import jdk.compiler.graal.phases.common.MidTierLoweringPhase; -import jdk.compiler.graal.phases.schedule.SchedulePhase; -import jdk.compiler.graal.phases.schedule.SchedulePhase.SchedulingStrategy; -import jdk.compiler.graal.phases.tiers.MidTierContext; +import jdk.graal.compiler.core.common.cfg.BlockMap; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.graph.NodeMap; +import jdk.graal.compiler.nodes.BeginNode; +import jdk.graal.compiler.nodes.DeoptimizingNode.DeoptDuring; +import jdk.graal.compiler.nodes.FrameState; +import jdk.graal.compiler.nodes.ReturnNode; +import jdk.graal.compiler.nodes.StateSplit; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.StructuredGraph.AllowAssumptions; +import jdk.graal.compiler.nodes.StructuredGraph.ScheduleResult; +import jdk.graal.compiler.nodes.calc.AddNode; +import jdk.graal.compiler.nodes.calc.BinaryArithmeticNode; +import jdk.graal.compiler.nodes.cfg.HIRBlock; +import jdk.graal.compiler.nodes.spi.CoreProviders; +import jdk.graal.compiler.phases.OptimisticOptimizations; +import jdk.graal.compiler.phases.common.FrameStateAssignmentPhase; +import jdk.graal.compiler.phases.common.GuardLoweringPhase; +import jdk.graal.compiler.phases.common.HighTierLoweringPhase; +import jdk.graal.compiler.phases.common.MidTierLoweringPhase; +import jdk.graal.compiler.phases.schedule.SchedulePhase; +import jdk.graal.compiler.phases.schedule.SchedulePhase.SchedulingStrategy; +import jdk.graal.compiler.phases.tiers.MidTierContext; import org.junit.Test; public class SchedulingTest2 extends GraphScheduleTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ShortCircuitNodeTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ShortCircuitNodeTest.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ShortCircuitNodeTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ShortCircuitNodeTest.java index 610d019b98f2..f638fdb52eb1 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ShortCircuitNodeTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ShortCircuitNodeTest.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; -import jdk.compiler.graal.core.test.ea.EATestBase; +import jdk.graal.compiler.core.test.ea.EATestBase; import org.junit.Test; public class ShortCircuitNodeTest extends GraalCompilerTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/SimpleCFGTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/SimpleCFGTest.java similarity index 84% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/SimpleCFGTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/SimpleCFGTest.java index 7b3f52eb123e..0e1261a5e3c8 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/SimpleCFGTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/SimpleCFGTest.java @@ -22,37 +22,37 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; - -import jdk.compiler.graal.api.directives.GraalDirectives; -import jdk.compiler.graal.core.common.PermanentBailoutException; -import jdk.compiler.graal.core.common.type.StampFactory; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.debug.DebugContext.Builder; -import jdk.compiler.graal.graph.NodeClass; -import jdk.compiler.graal.nodeinfo.InputType; -import jdk.compiler.graal.nodeinfo.NodeCycles; -import jdk.compiler.graal.nodeinfo.NodeInfo; -import jdk.compiler.graal.nodeinfo.NodeSize; -import jdk.compiler.graal.nodes.AbstractBeginNode; -import jdk.compiler.graal.nodes.AbstractMergeNode; -import jdk.compiler.graal.nodes.BeginNode; -import jdk.compiler.graal.nodes.ControlSplitNode; -import jdk.compiler.graal.nodes.EndNode; -import jdk.compiler.graal.nodes.FixedNode; -import jdk.compiler.graal.nodes.IfNode; -import jdk.compiler.graal.nodes.LoopExitNode; -import jdk.compiler.graal.nodes.MergeNode; -import jdk.compiler.graal.nodes.ProfileData.BranchProbabilityData; -import jdk.compiler.graal.nodes.ReturnNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions; -import jdk.compiler.graal.nodes.cfg.HIRBlock; -import jdk.compiler.graal.nodes.cfg.ControlFlowGraph; -import jdk.compiler.graal.nodes.debug.ControlFlowAnchored; -import jdk.compiler.graal.nodes.extended.BranchProbabilityNode; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.printer.GraalDebugHandlersFactory; +package jdk.graal.compiler.core.test; + +import jdk.graal.compiler.api.directives.GraalDirectives; +import jdk.graal.compiler.core.common.PermanentBailoutException; +import jdk.graal.compiler.core.common.type.StampFactory; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.debug.DebugContext.Builder; +import jdk.graal.compiler.graph.NodeClass; +import jdk.graal.compiler.nodeinfo.InputType; +import jdk.graal.compiler.nodeinfo.NodeCycles; +import jdk.graal.compiler.nodeinfo.NodeInfo; +import jdk.graal.compiler.nodeinfo.NodeSize; +import jdk.graal.compiler.nodes.AbstractBeginNode; +import jdk.graal.compiler.nodes.AbstractMergeNode; +import jdk.graal.compiler.nodes.BeginNode; +import jdk.graal.compiler.nodes.ControlSplitNode; +import jdk.graal.compiler.nodes.EndNode; +import jdk.graal.compiler.nodes.FixedNode; +import jdk.graal.compiler.nodes.IfNode; +import jdk.graal.compiler.nodes.LoopExitNode; +import jdk.graal.compiler.nodes.MergeNode; +import jdk.graal.compiler.nodes.ProfileData.BranchProbabilityData; +import jdk.graal.compiler.nodes.ReturnNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.StructuredGraph.AllowAssumptions; +import jdk.graal.compiler.nodes.cfg.HIRBlock; +import jdk.graal.compiler.nodes.cfg.ControlFlowGraph; +import jdk.graal.compiler.nodes.debug.ControlFlowAnchored; +import jdk.graal.compiler.nodes.extended.BranchProbabilityNode; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.printer.GraalDebugHandlersFactory; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/SingleImplementorInterfaceTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/SingleImplementorInterfaceTest.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/SingleImplementorInterfaceTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/SingleImplementorInterfaceTest.java index ae85dfcc1069..05fac71b57f4 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/SingleImplementorInterfaceTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/SingleImplementorInterfaceTest.java @@ -23,14 +23,14 @@ * questions. */ -package jdk.compiler.graal.core.test; - -import jdk.compiler.graal.nodes.CallTargetNode; -import jdk.compiler.graal.nodes.InvokeNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.java.InstanceOfNode; -import jdk.compiler.graal.phases.OptimisticOptimizations; -import jdk.compiler.graal.phases.tiers.HighTierContext; +package jdk.graal.compiler.core.test; + +import jdk.graal.compiler.nodes.CallTargetNode; +import jdk.graal.compiler.nodes.InvokeNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.java.InstanceOfNode; +import jdk.graal.compiler.phases.OptimisticOptimizations; +import jdk.graal.compiler.phases.tiers.HighTierContext; import org.junit.Test; import jdk.vm.ci.meta.ResolvedJavaType; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/SingleRunSubphaseTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/SingleRunSubphaseTest.java similarity index 87% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/SingleRunSubphaseTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/SingleRunSubphaseTest.java index d62cece0ce95..76274dfb176a 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/SingleRunSubphaseTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/SingleRunSubphaseTest.java @@ -22,19 +22,19 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; -import static jdk.compiler.graal.debug.DebugOptions.DumpOnError; +import static jdk.graal.compiler.debug.DebugOptions.DumpOnError; import java.util.Optional; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.debug.TTY; -import jdk.compiler.graal.nodes.GraphState; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.spi.CoreProviders; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.phases.SingleRunSubphase; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.debug.TTY; +import jdk.graal.compiler.nodes.GraphState; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.spi.CoreProviders; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.phases.SingleRunSubphase; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/SpectreFenceTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/SpectreFenceTest.java similarity index 90% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/SpectreFenceTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/SpectreFenceTest.java index 04cf472a980c..487b77bba92a 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/SpectreFenceTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/SpectreFenceTest.java @@ -23,23 +23,23 @@ * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; -import static jdk.compiler.graal.core.common.SpectrePHTMitigations.AllTargets; -import static jdk.compiler.graal.core.common.SpectrePHTMitigations.GuardTargets; -import static jdk.compiler.graal.core.common.SpectrePHTMitigations.Options.SpectrePHTBarriers; -import static jdk.compiler.graal.core.common.SpectrePHTMitigations.Options.SpeculativeExecutionBarriers; +import static jdk.graal.compiler.core.common.SpectrePHTMitigations.AllTargets; +import static jdk.graal.compiler.core.common.SpectrePHTMitigations.GuardTargets; +import static jdk.graal.compiler.core.common.SpectrePHTMitigations.Options.SpectrePHTBarriers; +import static jdk.graal.compiler.core.common.SpectrePHTMitigations.Options.SpeculativeExecutionBarriers; import static org.junit.Assume.assumeTrue; import org.graalvm.collections.EconomicMap; -import jdk.compiler.graal.api.directives.GraalDirectives; -import jdk.compiler.graal.api.test.Graal; -import jdk.compiler.graal.core.common.SpectrePHTMitigations; -import jdk.compiler.graal.nodes.AbstractBeginNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.options.OptionKey; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.runtime.RuntimeProvider; +import jdk.graal.compiler.api.directives.GraalDirectives; +import jdk.graal.compiler.api.test.Graal; +import jdk.graal.compiler.core.common.SpectrePHTMitigations; +import jdk.graal.compiler.nodes.AbstractBeginNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.options.OptionKey; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.runtime.RuntimeProvider; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/SpeculativeGuardMovementTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/SpeculativeGuardMovementTest.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/SpeculativeGuardMovementTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/SpeculativeGuardMovementTest.java index 1519e5be5a78..41fac49a42b7 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/SpeculativeGuardMovementTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/SpeculativeGuardMovementTest.java @@ -22,21 +22,21 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; import java.util.List; -import jdk.compiler.graal.api.directives.GraalDirectives; -import jdk.compiler.graal.core.common.GraalOptions; -import jdk.compiler.graal.core.common.cfg.Loop; -import jdk.compiler.graal.nodes.DeoptimizeNode; -import jdk.compiler.graal.nodes.FixedGuardNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions; -import jdk.compiler.graal.nodes.cfg.ControlFlowGraph; -import jdk.compiler.graal.nodes.cfg.HIRBlock; -import jdk.compiler.graal.nodes.java.InstanceOfNode; -import jdk.compiler.graal.options.OptionValues; +import jdk.graal.compiler.api.directives.GraalDirectives; +import jdk.graal.compiler.core.common.GraalOptions; +import jdk.graal.compiler.core.common.cfg.Loop; +import jdk.graal.compiler.nodes.DeoptimizeNode; +import jdk.graal.compiler.nodes.FixedGuardNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.StructuredGraph.AllowAssumptions; +import jdk.graal.compiler.nodes.cfg.ControlFlowGraph; +import jdk.graal.compiler.nodes.cfg.HIRBlock; +import jdk.graal.compiler.nodes.java.InstanceOfNode; +import jdk.graal.compiler.options.OptionValues; import org.junit.Test; import jdk.vm.ci.code.InstalledCode; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/SpeculativeGuardMovementTrivialDeoptTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/SpeculativeGuardMovementTrivialDeoptTest.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/SpeculativeGuardMovementTrivialDeoptTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/SpeculativeGuardMovementTrivialDeoptTest.java index f616020bb411..98d52b4cd162 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/SpeculativeGuardMovementTrivialDeoptTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/SpeculativeGuardMovementTrivialDeoptTest.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; import java.util.EnumSet; -import jdk.compiler.graal.api.directives.GraalDirectives; +import jdk.graal.compiler.api.directives.GraalDirectives; import org.junit.Test; import jdk.vm.ci.meta.DeoptimizationReason; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/StableArrayReadFoldingTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/StableArrayReadFoldingTest.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/StableArrayReadFoldingTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/StableArrayReadFoldingTest.java index 096db6058612..fcf087392782 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/StableArrayReadFoldingTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/StableArrayReadFoldingTest.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; import java.util.stream.IntStream; -import jdk.compiler.graal.core.common.CompilationIdentifier; -import jdk.compiler.graal.nodes.ConstantNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.options.OptionValues; +import jdk.graal.compiler.core.common.CompilationIdentifier; +import jdk.graal.compiler.nodes.ConstantNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.options.OptionValues; import org.junit.Test; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/StampCanonicalizerTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/StampCanonicalizerTest.java similarity index 92% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/StampCanonicalizerTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/StampCanonicalizerTest.java index 24c70da73541..f7b089bedc9a 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/StampCanonicalizerTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/StampCanonicalizerTest.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; -import jdk.compiler.graal.core.common.type.IntegerStamp; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions; -import jdk.compiler.graal.phases.common.DeadCodeEliminationPhase; +import jdk.graal.compiler.core.common.type.IntegerStamp; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.StructuredGraph.AllowAssumptions; +import jdk.graal.compiler.phases.common.DeadCodeEliminationPhase; import org.junit.Test; /** diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/StampMemoryAccessTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/StampMemoryAccessTest.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/StampMemoryAccessTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/StampMemoryAccessTest.java index c6a53072d2b1..affb36f3c9f4 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/StampMemoryAccessTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/StampMemoryAccessTest.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; import java.lang.reflect.Field; -import jdk.compiler.graal.core.common.type.Stamp; -import jdk.compiler.graal.core.common.type.StampFactory; +import jdk.graal.compiler.core.common.type.Stamp; +import jdk.graal.compiler.core.common.type.StampFactory; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/StaticInterfaceFieldTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/StaticInterfaceFieldTest.java similarity index 78% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/StaticInterfaceFieldTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/StaticInterfaceFieldTest.java index 7d1f662eb664..e14176f98fd6 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/StaticInterfaceFieldTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/StaticInterfaceFieldTest.java @@ -22,27 +22,27 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; import java.lang.reflect.Method; -import jdk.compiler.graal.api.test.Graal; -import jdk.compiler.graal.debug.DebugCloseable; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.debug.DebugContext.Builder; -import jdk.compiler.graal.java.GraphBuilderPhase; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins; -import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.phases.OptimisticOptimizations; -import jdk.compiler.graal.phases.PhaseSuite; -import jdk.compiler.graal.phases.VerifyPhase; -import jdk.compiler.graal.phases.tiers.HighTierContext; -import jdk.compiler.graal.phases.util.Providers; -import jdk.compiler.graal.runtime.RuntimeProvider; -import jdk.compiler.graal.test.GraalTest; +import jdk.graal.compiler.api.test.Graal; +import jdk.graal.compiler.debug.DebugCloseable; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.debug.DebugContext.Builder; +import jdk.graal.compiler.java.GraphBuilderPhase; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins; +import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.phases.OptimisticOptimizations; +import jdk.graal.compiler.phases.PhaseSuite; +import jdk.graal.compiler.phases.VerifyPhase; +import jdk.graal.compiler.phases.tiers.HighTierContext; +import jdk.graal.compiler.phases.util.Providers; +import jdk.graal.compiler.runtime.RuntimeProvider; +import jdk.graal.compiler.test.GraalTest; import org.junit.Assume; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/StraighteningTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/StraighteningTest.java similarity index 93% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/StraighteningTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/StraighteningTest.java index 6a558abb680a..3b34238e1ac0 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/StraighteningTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/StraighteningTest.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.StructuredGraph.AllowAssumptions; import org.junit.Test; public class StraighteningTest extends GraalCompilerTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/SubWordArrayStoreTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/SubWordArrayStoreTest.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/SubWordArrayStoreTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/SubWordArrayStoreTest.java index 4adf301b2d18..b40b77a66493 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/SubWordArrayStoreTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/SubWordArrayStoreTest.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; import java.util.ArrayList; import java.util.List; -import jdk.compiler.graal.debug.GraalError; +import jdk.graal.compiler.debug.GraalError; 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/core/test/SubWordFieldStoreTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/SubWordFieldStoreTest.java similarity index 99% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/SubWordFieldStoreTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/SubWordFieldStoreTest.java index 216c62fc4180..380b89bdf024 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/SubWordFieldStoreTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/SubWordFieldStoreTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; import java.util.ArrayList; import java.util.List; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/SubWordInputTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/SubWordInputTest.java similarity index 99% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/SubWordInputTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/SubWordInputTest.java index aee277fea74f..ba1b31f357d7 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/SubWordInputTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/SubWordInputTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; import java.util.ArrayList; import java.util.Collections; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/SubWordInputTest2.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/SubWordInputTest2.java similarity index 99% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/SubWordInputTest2.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/SubWordInputTest2.java index e6f1da506420..76b6a15c3916 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/SubWordInputTest2.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/SubWordInputTest2.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; import java.util.ArrayList; import java.util.Collections; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/SubWordReturnTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/SubWordReturnTest.java similarity index 99% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/SubWordReturnTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/SubWordReturnTest.java index a5fca7b07a47..9b56bddecefa 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/SubWordReturnTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/SubWordReturnTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; import java.util.ArrayList; import java.util.List; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/SubWordTestUtil.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/SubWordTestUtil.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/SubWordTestUtil.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/SubWordTestUtil.java index c1013f9b4ff5..e3da3fefa1cd 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/SubWordTestUtil.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/SubWordTestUtil.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.test.GraalTest; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.test.GraalTest; import org.objectweb.asm.Label; import org.objectweb.asm.MethodVisitor; import org.objectweb.asm.Opcodes; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/SubprocessTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/SubprocessTest.java similarity index 94% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/SubprocessTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/SubprocessTest.java index 50e65f3e24c8..4b7033daba0f 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/SubprocessTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/SubprocessTest.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; -import static jdk.compiler.graal.test.SubprocessUtil.getVMCommandLine; -import static jdk.compiler.graal.test.SubprocessUtil.java; -import static jdk.compiler.graal.test.SubprocessUtil.withoutDebuggerArguments; +import static jdk.graal.compiler.test.SubprocessUtil.getVMCommandLine; +import static jdk.graal.compiler.test.SubprocessUtil.java; +import static jdk.graal.compiler.test.SubprocessUtil.withoutDebuggerArguments; import java.io.IOException; import java.util.ArrayList; @@ -34,8 +34,8 @@ import java.util.List; import java.util.function.Predicate; -import jdk.compiler.graal.test.SubprocessUtil; -import jdk.compiler.graal.test.SubprocessUtil.Subprocess; +import jdk.graal.compiler.test.SubprocessUtil; +import jdk.graal.compiler.test.SubprocessUtil.Subprocess; public abstract class SubprocessTest extends GraalCompilerTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/SwitchCanonicalizerTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/SwitchCanonicalizerTest.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/SwitchCanonicalizerTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/SwitchCanonicalizerTest.java index ecd73969395d..fa66b301bd7b 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/SwitchCanonicalizerTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/SwitchCanonicalizerTest.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.extended.IntegerSwitchNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.extended.IntegerSwitchNode; import org.junit.Test; public class SwitchCanonicalizerTest extends GraalCompilerTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/SwitchDyingLoopTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/SwitchDyingLoopTest.java similarity index 86% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/SwitchDyingLoopTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/SwitchDyingLoopTest.java index 1b5a5735eff3..0810f9e39a21 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/SwitchDyingLoopTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/SwitchDyingLoopTest.java @@ -22,20 +22,20 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; -import static jdk.compiler.graal.graph.test.matchers.NodeIterableCount.hasCount; -import static jdk.compiler.graal.graph.test.matchers.NodeIterableIsEmpty.isEmpty; +import static jdk.graal.compiler.graph.test.matchers.NodeIterableCount.hasCount; +import static jdk.graal.compiler.graph.test.matchers.NodeIterableIsEmpty.isEmpty; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertThat; -import jdk.compiler.graal.core.common.type.StampFactory; -import jdk.compiler.graal.nodes.LoopBeginNode; -import jdk.compiler.graal.nodes.ParameterNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.extended.IntegerSwitchNode; -import jdk.compiler.graal.phases.common.CanonicalizerPhase; -import jdk.compiler.graal.phases.tiers.HighTierContext; +import jdk.graal.compiler.core.common.type.StampFactory; +import jdk.graal.compiler.nodes.LoopBeginNode; +import jdk.graal.compiler.nodes.ParameterNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.extended.IntegerSwitchNode; +import jdk.graal.compiler.phases.common.CanonicalizerPhase; +import jdk.graal.compiler.phases.tiers.HighTierContext; import org.junit.Test; import jdk.vm.ci.meta.JavaKind; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/SwitchFoldingTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/SwitchFoldingTest.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/SwitchFoldingTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/SwitchFoldingTest.java index 49af5d114119..61a4bbaee2a7 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/SwitchFoldingTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/SwitchFoldingTest.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; import static org.objectweb.asm.Opcodes.ACC_PUBLIC; import static org.objectweb.asm.Opcodes.ACC_STATIC; @@ -38,18 +38,18 @@ import static org.objectweb.asm.Opcodes.INVOKESTATIC; import static org.objectweb.asm.Opcodes.IRETURN; -import jdk.compiler.graal.api.directives.GraalDirectives; -import jdk.compiler.graal.api.test.ExportingClassLoader; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.graph.iterators.NodeIterable; -import jdk.compiler.graal.loop.phases.ConvertDeoptimizeToGuardPhase; -import jdk.compiler.graal.nodes.BeginNode; -import jdk.compiler.graal.nodes.ConstantNode; -import jdk.compiler.graal.nodes.FixedNode; -import jdk.compiler.graal.nodes.IfNode; -import jdk.compiler.graal.nodes.ReturnNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.extended.IntegerSwitchNode; +import jdk.graal.compiler.api.directives.GraalDirectives; +import jdk.graal.compiler.api.test.ExportingClassLoader; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.graph.iterators.NodeIterable; +import jdk.graal.compiler.loop.phases.ConvertDeoptimizeToGuardPhase; +import jdk.graal.compiler.nodes.BeginNode; +import jdk.graal.compiler.nodes.ConstantNode; +import jdk.graal.compiler.nodes.FixedNode; +import jdk.graal.compiler.nodes.IfNode; +import jdk.graal.compiler.nodes.ReturnNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.extended.IntegerSwitchNode; import org.junit.Assert; import org.junit.Test; import org.objectweb.asm.ClassWriter; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/SwitchTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/SwitchTest.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/SwitchTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/SwitchTest.java index 2706738f8813..6083aecc94db 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/SwitchTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/SwitchTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; import jdk.vm.ci.meta.ResolvedJavaMethod; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/TestAutoboxConf.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/TestAutoboxConf.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/TestAutoboxConf.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/TestAutoboxConf.java index b34a11f4d948..a21b6d1b9423 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/TestAutoboxConf.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/TestAutoboxConf.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; import java.lang.reflect.Field; import java.util.ArrayList; -import jdk.compiler.graal.phases.common.BoxNodeOptimizationPhase; +import jdk.graal.compiler.phases.common.BoxNodeOptimizationPhase; /** * Independent test program to test if the {@link BoxNodeOptimizationPhase} respects the caching diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/TestBasePhase.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/TestBasePhase.java similarity index 92% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/TestBasePhase.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/TestBasePhase.java index 9380864e35b2..be4910b70cf5 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/TestBasePhase.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/TestBasePhase.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; import java.util.Optional; -import jdk.compiler.graal.nodes.GraphState; -import jdk.compiler.graal.phases.BasePhase; +import jdk.graal.compiler.nodes.GraphState; +import jdk.graal.compiler.phases.BasePhase; /** * Base class for {@link BasePhase}s used in tests. The diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/TestPhase.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/TestPhase.java similarity index 90% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/TestPhase.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/TestPhase.java index 70c37ddcfb36..b1e36b1a162b 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/TestPhase.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/TestPhase.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; import java.util.Optional; -import jdk.compiler.graal.nodes.GraphState; -import jdk.compiler.graal.phases.BasePhase; -import jdk.compiler.graal.phases.Phase; +import jdk.graal.compiler.nodes.GraphState; +import jdk.graal.compiler.phases.BasePhase; +import jdk.graal.compiler.phases.Phase; /** * Base class for {@link Phase}s used in tests. The {@link BasePhase#notApplicableTo(GraphState)} diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/TrivialInliningExplosionTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/TrivialInliningExplosionTest.java similarity index 90% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/TrivialInliningExplosionTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/TrivialInliningExplosionTest.java index 3f1b54249dae..14f4b2ccc16c 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/TrivialInliningExplosionTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/TrivialInliningExplosionTest.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; -import jdk.compiler.graal.core.common.CompilationIdentifier; -import jdk.compiler.graal.core.common.GraalOptions; -import jdk.compiler.graal.java.BytecodeParserOptions; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.options.OptionValues; +import jdk.graal.compiler.core.common.CompilationIdentifier; +import jdk.graal.compiler.core.common.GraalOptions; +import jdk.graal.compiler.java.BytecodeParserOptions; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.options.OptionValues; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/TwoSlotMarkerClearingTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/TwoSlotMarkerClearingTest.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/TwoSlotMarkerClearingTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/TwoSlotMarkerClearingTest.java index 1e445e58880d..b21aa2c8613b 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/TwoSlotMarkerClearingTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/TwoSlotMarkerClearingTest.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; import org.junit.Test; import org.objectweb.asm.ClassWriter; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/TypeSystemTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/TypeSystemTest.java similarity index 91% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/TypeSystemTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/TypeSystemTest.java index e2f5a8f5e549..13fba3f3b5dd 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/TypeSystemTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/TypeSystemTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; import java.io.BufferedInputStream; import java.io.ByteArrayInputStream; @@ -30,19 +30,19 @@ import java.io.IOException; import java.io.InputStream; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.debug.TTY; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.nodeinfo.Verbosity; -import jdk.compiler.graal.nodes.AbstractMergeNode; -import jdk.compiler.graal.nodes.PhiNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions; -import jdk.compiler.graal.nodes.StructuredGraph.ScheduleResult; -import jdk.compiler.graal.nodes.cfg.HIRBlock; -import jdk.compiler.graal.nodes.java.InstanceOfNode; -import jdk.compiler.graal.phases.common.ConditionalEliminationPhase; -import jdk.compiler.graal.phases.schedule.SchedulePhase; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.debug.TTY; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.nodeinfo.Verbosity; +import jdk.graal.compiler.nodes.AbstractMergeNode; +import jdk.graal.compiler.nodes.PhiNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.StructuredGraph.AllowAssumptions; +import jdk.graal.compiler.nodes.StructuredGraph.ScheduleResult; +import jdk.graal.compiler.nodes.cfg.HIRBlock; +import jdk.graal.compiler.nodes.java.InstanceOfNode; +import jdk.graal.compiler.phases.common.ConditionalEliminationPhase; +import jdk.graal.compiler.phases.schedule.SchedulePhase; import org.junit.Assert; import org.junit.Ignore; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/TypeWriterTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/TypeWriterTest.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/TypeWriterTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/TypeWriterTest.java index 55f19daed6f9..4de85f11f0b7 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/TypeWriterTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/TypeWriterTest.java @@ -22,16 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; import org.junit.Assert; import org.junit.Test; -import jdk.compiler.graal.core.common.util.TypeConversion; -import jdk.compiler.graal.core.common.util.TypeReader; -import jdk.compiler.graal.core.common.util.TypeWriter; -import jdk.compiler.graal.core.common.util.UnsafeArrayTypeReader; -import jdk.compiler.graal.core.common.util.UnsafeArrayTypeWriter; +import jdk.graal.compiler.core.common.util.TypeConversion; +import jdk.graal.compiler.core.common.util.TypeReader; +import jdk.graal.compiler.core.common.util.TypeWriter; +import jdk.graal.compiler.core.common.util.UnsafeArrayTypeReader; +import jdk.graal.compiler.core.common.util.UnsafeArrayTypeWriter; public class TypeWriterTest extends GraalCompilerTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/UnbalancedLockingTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/UnbalancedLockingTest.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/UnbalancedLockingTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/UnbalancedLockingTest.java index 1e99b1164d05..45639c00fa81 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/UnbalancedLockingTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/UnbalancedLockingTest.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; import java.lang.reflect.InvocationTargetException; -import jdk.compiler.graal.core.common.GraalOptions; -import jdk.compiler.graal.java.BciBlockMapping; -import jdk.compiler.graal.java.BytecodeParserOptions; -import jdk.compiler.graal.options.OptionValues; +import jdk.graal.compiler.core.common.GraalOptions; +import jdk.graal.compiler.java.BciBlockMapping; +import jdk.graal.compiler.java.BytecodeParserOptions; +import jdk.graal.compiler.options.OptionValues; import org.junit.Ignore; import org.junit.Test; import org.objectweb.asm.ClassWriter; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/UnbalancedMonitorsTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/UnbalancedMonitorsTest.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/UnbalancedMonitorsTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/UnbalancedMonitorsTest.java index a7934c3bba68..6c4ae7dc6426 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/UnbalancedMonitorsTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/UnbalancedMonitorsTest.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; -import jdk.compiler.graal.java.GraphBuilderPhase; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins; -import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.phases.OptimisticOptimizations; +import jdk.graal.compiler.java.GraphBuilderPhase; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins; +import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.phases.OptimisticOptimizations; import org.junit.Test; import org.objectweb.asm.ClassWriter; import org.objectweb.asm.Label; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/UncheckedInterfaceProviderTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/UncheckedInterfaceProviderTest.java similarity index 89% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/UncheckedInterfaceProviderTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/UncheckedInterfaceProviderTest.java index 3bb85a2fbc61..305000b209d3 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/UncheckedInterfaceProviderTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/UncheckedInterfaceProviderTest.java @@ -22,22 +22,22 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.CoreMatchers.is; import jdk.vm.ci.meta.ResolvedJavaType; -import jdk.compiler.graal.api.directives.GraalDirectives; -import jdk.compiler.graal.core.common.type.Stamp; -import jdk.compiler.graal.nodeinfo.Verbosity; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.debug.BlackholeNode; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext; -import jdk.compiler.graal.nodes.graphbuilderconf.InlineInvokePlugin; -import jdk.compiler.graal.nodes.spi.UncheckedInterfaceProvider; -import jdk.compiler.graal.nodes.type.StampTool; +import jdk.graal.compiler.api.directives.GraalDirectives; +import jdk.graal.compiler.core.common.type.Stamp; +import jdk.graal.compiler.nodeinfo.Verbosity; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.debug.BlackholeNode; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext; +import jdk.graal.compiler.nodes.graphbuilderconf.InlineInvokePlugin; +import jdk.graal.compiler.nodes.spi.UncheckedInterfaceProvider; +import jdk.graal.compiler.nodes.type.StampTool; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/UnsafeCopyMemoryTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/UnsafeCopyMemoryTest.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/UnsafeCopyMemoryTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/UnsafeCopyMemoryTest.java index d400503b6c78..a178bf2d4c04 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/UnsafeCopyMemoryTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/UnsafeCopyMemoryTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/UnsafeGetStableArrayElement.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/UnsafeGetStableArrayElement.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/UnsafeGetStableArrayElement.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/UnsafeGetStableArrayElement.java index cb23b06ca12a..6e8368ea3e5f 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/UnsafeGetStableArrayElement.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/UnsafeGetStableArrayElement.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; import static jdk.internal.misc.Unsafe.ARRAY_BOOLEAN_BASE_OFFSET; import static jdk.internal.misc.Unsafe.ARRAY_BYTE_BASE_OFFSET; @@ -41,14 +41,14 @@ import java.util.stream.Collectors; import java.util.stream.StreamSupport; -import jdk.compiler.graal.api.replacements.SnippetReflectionProvider; -import jdk.compiler.graal.nodes.ConstantNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions; -import jdk.compiler.graal.nodes.StructuredGraph.Builder; -import jdk.compiler.graal.phases.PhaseSuite; -import jdk.compiler.graal.phases.tiers.HighTierContext; -import jdk.compiler.graal.test.AddExports; +import jdk.graal.compiler.api.replacements.SnippetReflectionProvider; +import jdk.graal.compiler.nodes.ConstantNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.StructuredGraph.AllowAssumptions; +import jdk.graal.compiler.nodes.StructuredGraph.Builder; +import jdk.graal.compiler.phases.PhaseSuite; +import jdk.graal.compiler.phases.tiers.HighTierContext; +import jdk.graal.compiler.test.AddExports; import org.junit.Assert; import jdk.internal.misc.Unsafe; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/UnsafeReadEliminationTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/UnsafeReadEliminationTest.java similarity index 94% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/UnsafeReadEliminationTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/UnsafeReadEliminationTest.java index cd75873a9c6b..f928d2952cea 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/UnsafeReadEliminationTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/UnsafeReadEliminationTest.java @@ -22,22 +22,22 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; - -import static jdk.compiler.graal.api.directives.GraalDirectives.opaque; - -import jdk.compiler.graal.api.directives.GraalDirectives; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions; -import jdk.compiler.graal.nodes.extended.UnsafeAccessNode; -import jdk.compiler.graal.nodes.memory.ReadNode; -import jdk.compiler.graal.nodes.memory.WriteNode; -import jdk.compiler.graal.nodes.spi.CoreProviders; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.phases.common.CanonicalizerPhase; -import jdk.compiler.graal.phases.common.HighTierLoweringPhase; -import jdk.compiler.graal.virtual.phases.ea.PartialEscapePhase; -import jdk.compiler.graal.virtual.phases.ea.ReadEliminationPhase; +package jdk.graal.compiler.core.test; + +import static jdk.graal.compiler.api.directives.GraalDirectives.opaque; + +import jdk.graal.compiler.api.directives.GraalDirectives; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.StructuredGraph.AllowAssumptions; +import jdk.graal.compiler.nodes.extended.UnsafeAccessNode; +import jdk.graal.compiler.nodes.memory.ReadNode; +import jdk.graal.compiler.nodes.memory.WriteNode; +import jdk.graal.compiler.nodes.spi.CoreProviders; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.phases.common.CanonicalizerPhase; +import jdk.graal.compiler.phases.common.HighTierLoweringPhase; +import jdk.graal.compiler.virtual.phases.ea.PartialEscapePhase; +import jdk.graal.compiler.virtual.phases.ea.ReadEliminationPhase; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/UnsafeVirtualizationTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/UnsafeVirtualizationTest.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/UnsafeVirtualizationTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/UnsafeVirtualizationTest.java index 4a56bd137736..1727af0556fe 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/UnsafeVirtualizationTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/UnsafeVirtualizationTest.java @@ -22,22 +22,22 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; import java.util.Arrays; -import jdk.compiler.graal.api.directives.GraalDirectives; -import jdk.compiler.graal.core.test.ea.EATestBase; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions; -import jdk.compiler.graal.nodes.extended.RawLoadNode; -import jdk.compiler.graal.nodes.extended.RawStoreNode; -import jdk.compiler.graal.nodes.spi.CoreProviders; -import jdk.compiler.graal.nodes.virtual.VirtualArrayNode; -import jdk.compiler.graal.nodes.virtual.VirtualObjectNode; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.phases.common.CanonicalizerPhase; -import jdk.compiler.graal.virtual.phases.ea.PartialEscapePhase; +import jdk.graal.compiler.api.directives.GraalDirectives; +import jdk.graal.compiler.core.test.ea.EATestBase; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.StructuredGraph.AllowAssumptions; +import jdk.graal.compiler.nodes.extended.RawLoadNode; +import jdk.graal.compiler.nodes.extended.RawStoreNode; +import jdk.graal.compiler.nodes.spi.CoreProviders; +import jdk.graal.compiler.nodes.virtual.VirtualArrayNode; +import jdk.graal.compiler.nodes.virtual.VirtualObjectNode; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.phases.common.CanonicalizerPhase; +import jdk.graal.compiler.virtual.phases.ea.PartialEscapePhase; import org.junit.Assume; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/UnschedulableGraphTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/UnschedulableGraphTest.java similarity index 86% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/UnschedulableGraphTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/UnschedulableGraphTest.java index 766ac060e8aa..38296f6e5c15 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/UnschedulableGraphTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/UnschedulableGraphTest.java @@ -22,26 +22,26 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; -import static jdk.compiler.graal.debug.DebugOptions.DumpOnError; +import static jdk.graal.compiler.debug.DebugOptions.DumpOnError; import java.util.List; -import jdk.compiler.graal.api.directives.GraalDirectives; -import jdk.compiler.graal.core.common.cfg.BlockMap; -import jdk.compiler.graal.debug.DebugCloseable; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.debug.TTY; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.graph.NodeMap; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.StructuredGraph.ScheduleResult; -import jdk.compiler.graal.nodes.calc.NegateNode; -import jdk.compiler.graal.nodes.cfg.HIRBlock; -import jdk.compiler.graal.nodes.extended.OpaqueNode; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.phases.OptimisticOptimizations; +import jdk.graal.compiler.api.directives.GraalDirectives; +import jdk.graal.compiler.core.common.cfg.BlockMap; +import jdk.graal.compiler.debug.DebugCloseable; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.debug.TTY; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.graph.NodeMap; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.StructuredGraph.ScheduleResult; +import jdk.graal.compiler.nodes.calc.NegateNode; +import jdk.graal.compiler.nodes.cfg.HIRBlock; +import jdk.graal.compiler.nodes.extended.OpaqueNode; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.phases.OptimisticOptimizations; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/UnsignedLongTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/UnsignedLongTest.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/UnsignedLongTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/UnsignedLongTest.java index 1e6877ee152e..825ac6a88265 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/UnsignedLongTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/UnsignedLongTest.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; -import jdk.compiler.graal.core.common.util.UnsignedLong; +import jdk.graal.compiler.core.common.util.UnsignedLong; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/UnusedArray.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/UnusedArray.java similarity index 89% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/UnusedArray.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/UnusedArray.java index 3e0e53990c22..de48457318fc 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/UnusedArray.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/UnusedArray.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; -import static jdk.compiler.graal.graph.test.matchers.NodeIterableIsEmpty.isEmpty; +import static jdk.graal.compiler.graph.test.matchers.NodeIterableIsEmpty.isEmpty; import static org.junit.Assert.assertThat; -import jdk.compiler.graal.graph.iterators.NodeIterable; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.java.NewArrayNode; +import jdk.graal.compiler.graph.iterators.NodeIterable; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.java.NewArrayNode; import org.junit.Test; public class UnusedArray extends GraalCompilerTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyArchUsageInPlugins.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/VerifyArchUsageInPlugins.java similarity index 89% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyArchUsageInPlugins.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/VerifyArchUsageInPlugins.java index 932d2add6514..2f9e393ba73d 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyArchUsageInPlugins.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/VerifyArchUsageInPlugins.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin; -import jdk.compiler.graal.nodes.java.MethodCallTargetNode; -import jdk.compiler.graal.nodes.spi.CoreProviders; -import jdk.compiler.graal.phases.VerifyPhase; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin; +import jdk.graal.compiler.nodes.java.MethodCallTargetNode; +import jdk.graal.compiler.nodes.spi.CoreProviders; +import jdk.graal.compiler.phases.VerifyPhase; import jdk.vm.ci.code.Architecture; import jdk.vm.ci.meta.MetaAccessProvider; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyBailoutUsage.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/VerifyBailoutUsage.java similarity index 90% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyBailoutUsage.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/VerifyBailoutUsage.java index 101e0efec77d..d03b807473f0 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyBailoutUsage.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/VerifyBailoutUsage.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; -import jdk.compiler.graal.core.common.PermanentBailoutException; -import jdk.compiler.graal.core.common.RetryableBailoutException; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.java.MethodCallTargetNode; -import jdk.compiler.graal.nodes.spi.CoreProviders; -import jdk.compiler.graal.phases.VerifyPhase; +import jdk.graal.compiler.core.common.PermanentBailoutException; +import jdk.graal.compiler.core.common.RetryableBailoutException; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.java.MethodCallTargetNode; +import jdk.graal.compiler.nodes.spi.CoreProviders; +import jdk.graal.compiler.phases.VerifyPhase; import jdk.vm.ci.code.BailoutException; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyBailoutUsageTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/VerifyBailoutUsageTest.java similarity index 82% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyBailoutUsageTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/VerifyBailoutUsageTest.java index 40a6bf864784..0266a63455f3 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyBailoutUsageTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/VerifyBailoutUsageTest.java @@ -22,30 +22,30 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; import java.lang.reflect.Method; import java.lang.reflect.Modifier; -import jdk.compiler.graal.api.test.Graal; -import jdk.compiler.graal.core.common.PermanentBailoutException; -import jdk.compiler.graal.core.common.RetryableBailoutException; -import jdk.compiler.graal.debug.DebugCloseable; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.debug.DebugContext.Builder; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.java.GraphBuilderPhase; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins; -import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.phases.OptimisticOptimizations; -import jdk.compiler.graal.phases.PhaseSuite; -import jdk.compiler.graal.phases.VerifyPhase.VerificationError; -import jdk.compiler.graal.phases.tiers.HighTierContext; -import jdk.compiler.graal.phases.util.Providers; -import jdk.compiler.graal.runtime.RuntimeProvider; +import jdk.graal.compiler.api.test.Graal; +import jdk.graal.compiler.core.common.PermanentBailoutException; +import jdk.graal.compiler.core.common.RetryableBailoutException; +import jdk.graal.compiler.debug.DebugCloseable; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.debug.DebugContext.Builder; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.java.GraphBuilderPhase; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins; +import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.phases.OptimisticOptimizations; +import jdk.graal.compiler.phases.PhaseSuite; +import jdk.graal.compiler.phases.VerifyPhase.VerificationError; +import jdk.graal.compiler.phases.tiers.HighTierContext; +import jdk.graal.compiler.phases.util.Providers; +import jdk.graal.compiler.runtime.RuntimeProvider; import org.junit.Test; import jdk.vm.ci.code.BailoutException; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyDebugUsage.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/VerifyDebugUsage.java similarity index 91% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyDebugUsage.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/VerifyDebugUsage.java index 16a5faec6a4f..abee8580eabc 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyDebugUsage.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/VerifyDebugUsage.java @@ -22,37 +22,37 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; -import static jdk.compiler.graal.debug.DebugContext.BASIC_LEVEL; +import static jdk.graal.compiler.debug.DebugContext.BASIC_LEVEL; import java.util.Arrays; import java.util.HashSet; import java.util.List; import java.util.Set; -import jdk.compiler.graal.core.GraalCompiler; -import jdk.compiler.graal.core.common.type.ObjectStamp; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.graph.Graph; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.hotspot.SymbolicSnippetEncoder; -import jdk.compiler.graal.nodes.NodeView; -import jdk.compiler.graal.nodes.OptimizationLogImpl; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.java.MethodCallTargetNode; -import jdk.compiler.graal.nodes.spi.CoreProviders; - -import jdk.compiler.graal.phases.BasePhase; -import jdk.compiler.graal.phases.VerifyPhase; -import jdk.compiler.graal.replacements.ReplacementsImpl; -import jdk.compiler.graal.replacements.SnippetTemplate; -import jdk.compiler.graal.test.GraalTest.MethodSource; -import jdk.compiler.graal.truffle.PerformanceInformationHandler; -import jdk.compiler.graal.truffle.TruffleCompilerImpl; -import jdk.compiler.graal.truffle.phases.inlining.CallTree; +import jdk.graal.compiler.core.GraalCompiler; +import jdk.graal.compiler.core.common.type.ObjectStamp; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.graph.Graph; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.hotspot.SymbolicSnippetEncoder; +import jdk.graal.compiler.nodes.NodeView; +import jdk.graal.compiler.nodes.OptimizationLogImpl; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.java.MethodCallTargetNode; +import jdk.graal.compiler.nodes.spi.CoreProviders; + +import jdk.graal.compiler.phases.BasePhase; +import jdk.graal.compiler.phases.VerifyPhase; +import jdk.graal.compiler.replacements.ReplacementsImpl; +import jdk.graal.compiler.replacements.SnippetTemplate; +import jdk.graal.compiler.test.GraalTest.MethodSource; +import jdk.graal.compiler.truffle.PerformanceInformationHandler; +import jdk.graal.compiler.truffle.TruffleCompilerImpl; +import jdk.graal.compiler.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/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyDebugUsageTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/VerifyDebugUsageTest.java similarity index 91% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyDebugUsageTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/VerifyDebugUsageTest.java index eae79156ad6a..dff21b01441b 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyDebugUsageTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/VerifyDebugUsageTest.java @@ -22,32 +22,32 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; -import static jdk.compiler.graal.core.test.GraalCompilerTest.getInitialOptions; +import static jdk.graal.compiler.core.test.GraalCompilerTest.getInitialOptions; import java.lang.reflect.Method; import java.lang.reflect.Modifier; -import jdk.compiler.graal.api.test.Graal; -import jdk.compiler.graal.debug.DebugCloseable; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.debug.DebugContext.Builder; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.debug.Indent; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.java.GraphBuilderPhase; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins; -import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.phases.OptimisticOptimizations; -import jdk.compiler.graal.phases.PhaseSuite; -import jdk.compiler.graal.phases.VerifyPhase.VerificationError; -import jdk.compiler.graal.phases.tiers.HighTierContext; -import jdk.compiler.graal.phases.util.Providers; -import jdk.compiler.graal.runtime.RuntimeProvider; +import jdk.graal.compiler.api.test.Graal; +import jdk.graal.compiler.debug.DebugCloseable; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.debug.DebugContext.Builder; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.debug.Indent; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.java.GraphBuilderPhase; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins; +import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.phases.OptimisticOptimizations; +import jdk.graal.compiler.phases.PhaseSuite; +import jdk.graal.compiler.phases.VerifyPhase.VerificationError; +import jdk.graal.compiler.phases.tiers.HighTierContext; +import jdk.graal.compiler.phases.util.Providers; +import jdk.graal.compiler.runtime.RuntimeProvider; import org.junit.Test; import jdk.vm.ci.meta.MetaAccessProvider; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyEndlessLoops.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/VerifyEndlessLoops.java similarity index 87% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyEndlessLoops.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/VerifyEndlessLoops.java index 94f9217dd83f..9ff08a7df296 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyEndlessLoops.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/VerifyEndlessLoops.java @@ -22,25 +22,25 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; import java.util.ArrayList; import java.util.List; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.nodes.LoopBeginNode; -import jdk.compiler.graal.nodes.LoopEndNode; -import jdk.compiler.graal.nodes.LoopExitNode; -import jdk.compiler.graal.nodes.PhiNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.StructuredGraph.ScheduleResult; -import jdk.compiler.graal.nodes.cfg.HIRBlock; -import jdk.compiler.graal.nodes.loop.LoopEx; -import jdk.compiler.graal.nodes.loop.LoopsData; -import jdk.compiler.graal.nodes.memory.MemoryKill; -import jdk.compiler.graal.nodes.spi.CoreProviders; -import jdk.compiler.graal.phases.VerifyPhase; -import jdk.compiler.graal.phases.schedule.SchedulePhase; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.nodes.LoopBeginNode; +import jdk.graal.compiler.nodes.LoopEndNode; +import jdk.graal.compiler.nodes.LoopExitNode; +import jdk.graal.compiler.nodes.PhiNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.StructuredGraph.ScheduleResult; +import jdk.graal.compiler.nodes.cfg.HIRBlock; +import jdk.graal.compiler.nodes.loop.LoopEx; +import jdk.graal.compiler.nodes.loop.LoopsData; +import jdk.graal.compiler.nodes.memory.MemoryKill; +import jdk.graal.compiler.nodes.spi.CoreProviders; +import jdk.graal.compiler.phases.VerifyPhase; +import jdk.graal.compiler.phases.schedule.SchedulePhase; /** * Verify that no loop in Graal contains endless paths - endless paths are paths from a loop end diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyFoldableMethods.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/VerifyFoldableMethods.java similarity index 89% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyFoldableMethods.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/VerifyFoldableMethods.java index 135164c4d7f4..475e3c9f6380 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyFoldableMethods.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/VerifyFoldableMethods.java @@ -22,18 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.stream.Collectors; -import jdk.compiler.graal.api.replacements.Fold; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.graphbuilderconf.GeneratedInvocationPlugin; -import jdk.compiler.graal.nodes.java.MethodCallTargetNode; -import jdk.compiler.graal.nodes.spi.CoreProviders; -import jdk.compiler.graal.phases.VerifyPhase; +import jdk.graal.compiler.api.replacements.Fold; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.graphbuilderconf.GeneratedInvocationPlugin; +import jdk.graal.compiler.nodes.java.MethodCallTargetNode; +import jdk.graal.compiler.nodes.spi.CoreProviders; +import jdk.graal.compiler.phases.VerifyPhase; import jdk.vm.ci.meta.ResolvedJavaMethod; import jdk.vm.ci.meta.ResolvedJavaType; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyGetOptionsUsage.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/VerifyGetOptionsUsage.java similarity index 91% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyGetOptionsUsage.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/VerifyGetOptionsUsage.java index 583ea119fa65..0df28f1cffd0 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyGetOptionsUsage.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/VerifyGetOptionsUsage.java @@ -22,17 +22,17 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; import java.lang.reflect.MalformedParametersException; import java.lang.reflect.Method; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.java.MethodCallTargetNode; -import jdk.compiler.graal.nodes.spi.CanonicalizerTool; -import jdk.compiler.graal.nodes.spi.CoreProviders; -import jdk.compiler.graal.phases.VerifyPhase; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.java.MethodCallTargetNode; +import jdk.graal.compiler.nodes.spi.CanonicalizerTool; +import jdk.graal.compiler.nodes.spi.CoreProviders; +import jdk.graal.compiler.phases.VerifyPhase; import jdk.vm.ci.meta.MetaAccessProvider; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyGraphUniqueUsages.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/VerifyGraphUniqueUsages.java similarity index 89% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyGraphUniqueUsages.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/VerifyGraphUniqueUsages.java index f45189c1a846..05cf25fb28b7 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyGraphUniqueUsages.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/VerifyGraphUniqueUsages.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.graph.Graph; -import jdk.compiler.graal.nodes.Invoke; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.java.MethodCallTargetNode; -import jdk.compiler.graal.nodes.spi.CoreProviders; -import jdk.compiler.graal.phases.VerifyPhase; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.graph.Graph; +import jdk.graal.compiler.nodes.Invoke; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.java.MethodCallTargetNode; +import jdk.graal.compiler.nodes.spi.CoreProviders; +import jdk.graal.compiler.phases.VerifyPhase; import jdk.vm.ci.meta.MetaAccessProvider; import jdk.vm.ci.meta.ResolvedJavaMethod; import jdk.vm.ci.meta.ResolvedJavaType; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyInstanceOfUsage.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/VerifyInstanceOfUsage.java similarity index 90% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyInstanceOfUsage.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/VerifyInstanceOfUsage.java index 6504e86f1287..3c3ee6381f70 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyInstanceOfUsage.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/VerifyInstanceOfUsage.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; -import jdk.compiler.graal.lir.StandardOp.LoadConstantOp; -import jdk.compiler.graal.lir.StandardOp.MoveOp; -import jdk.compiler.graal.lir.StandardOp.ValueMoveOp; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.java.InstanceOfNode; -import jdk.compiler.graal.nodes.spi.CoreProviders; -import jdk.compiler.graal.phases.VerifyPhase; +import jdk.graal.compiler.lir.StandardOp.LoadConstantOp; +import jdk.graal.compiler.lir.StandardOp.MoveOp; +import jdk.graal.compiler.lir.StandardOp.ValueMoveOp; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.java.InstanceOfNode; +import jdk.graal.compiler.nodes.spi.CoreProviders; +import jdk.graal.compiler.phases.VerifyPhase; import jdk.vm.ci.meta.MetaAccessProvider; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyIterableNodeType.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/VerifyIterableNodeType.java similarity index 86% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyIterableNodeType.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/VerifyIterableNodeType.java index 7e92f1a5f4de..5af9f0944037 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyIterableNodeType.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/VerifyIterableNodeType.java @@ -22,22 +22,22 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; -import jdk.compiler.graal.graph.NodeClass; -import jdk.compiler.graal.graph.Graph; -import jdk.compiler.graal.graph.IterableNodeType; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.graph.iterators.NodeIterable; -import jdk.compiler.graal.nodes.CallTargetNode; -import jdk.compiler.graal.nodes.ConstantNode; -import jdk.compiler.graal.nodes.Invoke; -import jdk.compiler.graal.nodes.NodeView; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.java.MethodCallTargetNode; -import jdk.compiler.graal.nodes.spi.CoreProviders; -import jdk.compiler.graal.phases.VerifyPhase; +import jdk.graal.compiler.graph.NodeClass; +import jdk.graal.compiler.graph.Graph; +import jdk.graal.compiler.graph.IterableNodeType; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.graph.iterators.NodeIterable; +import jdk.graal.compiler.nodes.CallTargetNode; +import jdk.graal.compiler.nodes.ConstantNode; +import jdk.graal.compiler.nodes.Invoke; +import jdk.graal.compiler.nodes.NodeView; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.java.MethodCallTargetNode; +import jdk.graal.compiler.nodes.spi.CoreProviders; +import jdk.graal.compiler.phases.VerifyPhase; import jdk.vm.ci.meta.MetaAccessProvider; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyMemoryKillCheck.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/VerifyMemoryKillCheck.java similarity index 89% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyMemoryKillCheck.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/VerifyMemoryKillCheck.java index 835b09b00e53..0227a7f98bdc 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyMemoryKillCheck.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/VerifyMemoryKillCheck.java @@ -22,18 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.nodes.FixedGuardNode; -import jdk.compiler.graal.nodes.GuardNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.java.InstanceOfNode; -import jdk.compiler.graal.nodes.memory.MemoryKill; -import jdk.compiler.graal.nodes.memory.MultiMemoryKill; -import jdk.compiler.graal.nodes.memory.SingleMemoryKill; -import jdk.compiler.graal.nodes.spi.CoreProviders; -import jdk.compiler.graal.phases.VerifyPhase; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.nodes.FixedGuardNode; +import jdk.graal.compiler.nodes.GuardNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.java.InstanceOfNode; +import jdk.graal.compiler.nodes.memory.MemoryKill; +import jdk.graal.compiler.nodes.memory.MultiMemoryKill; +import jdk.graal.compiler.nodes.memory.SingleMemoryKill; +import jdk.graal.compiler.nodes.spi.CoreProviders; +import jdk.graal.compiler.phases.VerifyPhase; import jdk.vm.ci.meta.DeoptimizationReason; import jdk.vm.ci.meta.MetaAccessProvider; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyPluginFrameState.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/VerifyPluginFrameState.java similarity index 88% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyPluginFrameState.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/VerifyPluginFrameState.java index 6b2d555e98ea..e34196d5c8f5 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyPluginFrameState.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/VerifyPluginFrameState.java @@ -22,25 +22,25 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; import java.util.HashSet; import java.util.Set; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.java.FrameStateBuilder; -import jdk.compiler.graal.nodes.Invoke; -import jdk.compiler.graal.nodes.NodeView; -import jdk.compiler.graal.nodes.StateSplit; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext; -import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin; -import jdk.compiler.graal.nodes.java.MethodCallTargetNode; -import jdk.compiler.graal.nodes.spi.CoreProviders; -import jdk.compiler.graal.nodes.spi.Proxy; -import jdk.compiler.graal.phases.VerifyPhase; -import jdk.compiler.graal.replacements.InvocationPluginHelper; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.java.FrameStateBuilder; +import jdk.graal.compiler.nodes.Invoke; +import jdk.graal.compiler.nodes.NodeView; +import jdk.graal.compiler.nodes.StateSplit; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext; +import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin; +import jdk.graal.compiler.nodes.java.MethodCallTargetNode; +import jdk.graal.compiler.nodes.spi.CoreProviders; +import jdk.graal.compiler.nodes.spi.Proxy; +import jdk.graal.compiler.phases.VerifyPhase; +import jdk.graal.compiler.replacements.InvocationPluginHelper; import jdk.vm.ci.meta.MetaAccessProvider; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyProfileMethodUsage.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/VerifyProfileMethodUsage.java similarity index 88% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyProfileMethodUsage.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/VerifyProfileMethodUsage.java index 56dd44ebd709..aa6f9e08f148 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyProfileMethodUsage.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/VerifyProfileMethodUsage.java @@ -22,19 +22,19 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; import java.lang.reflect.Method; import org.graalvm.collections.EconomicSet; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.java.MethodCallTargetNode; -import jdk.compiler.graal.nodes.spi.CoreProviders; -import jdk.compiler.graal.nodes.spi.ProfileProvider; -import jdk.compiler.graal.nodes.spi.ResolvedJavaMethodProfileProvider; -import jdk.compiler.graal.nodes.spi.StableProfileProvider; -import jdk.compiler.graal.phases.VerifyPhase; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.java.MethodCallTargetNode; +import jdk.graal.compiler.nodes.spi.CoreProviders; +import jdk.graal.compiler.nodes.spi.ProfileProvider; +import jdk.graal.compiler.nodes.spi.ResolvedJavaMethodProfileProvider; +import jdk.graal.compiler.nodes.spi.StableProfileProvider; +import jdk.graal.compiler.phases.VerifyPhase; import jdk.vm.ci.meta.ResolvedJavaMethod; import jdk.vm.ci.meta.ResolvedJavaType; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifySharedConstantEmptyArray.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/VerifySharedConstantEmptyArray.java similarity index 91% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifySharedConstantEmptyArray.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/VerifySharedConstantEmptyArray.java index b0f267b45c56..d66304b8dcc9 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifySharedConstantEmptyArray.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/VerifySharedConstantEmptyArray.java @@ -22,19 +22,19 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; import java.util.Set; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.graph.NodeInputList; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.java.MethodCallTargetNode; -import jdk.compiler.graal.nodes.java.NewArrayNode; -import jdk.compiler.graal.nodes.java.StoreFieldNode; -import jdk.compiler.graal.nodes.spi.CoreProviders; -import jdk.compiler.graal.nodes.util.GraphUtil; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.graph.NodeInputList; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.java.MethodCallTargetNode; +import jdk.graal.compiler.nodes.java.NewArrayNode; +import jdk.graal.compiler.nodes.java.StoreFieldNode; +import jdk.graal.compiler.nodes.spi.CoreProviders; +import jdk.graal.compiler.nodes.util.GraphUtil; import jdk.vm.ci.meta.ResolvedJavaField; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifySnippetProbabilities.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/VerifySnippetProbabilities.java similarity index 88% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifySnippetProbabilities.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/VerifySnippetProbabilities.java index 646295bd84ed..22c5d8b36d23 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifySnippetProbabilities.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/VerifySnippetProbabilities.java @@ -22,32 +22,32 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; import java.lang.annotation.Annotation; import org.graalvm.collections.EconomicSet; -import jdk.compiler.graal.api.directives.GraalDirectives; -import jdk.compiler.graal.api.replacements.Fold; -import jdk.compiler.graal.api.replacements.Snippet; -import jdk.compiler.graal.api.replacements.Snippet.ConstantParameter; -import jdk.compiler.graal.api.replacements.Snippet.NonNullParameter; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.nodes.CallTargetNode; -import jdk.compiler.graal.nodes.FixedNode; -import jdk.compiler.graal.nodes.IfNode; -import jdk.compiler.graal.nodes.Invoke; -import jdk.compiler.graal.nodes.LogicNode; -import jdk.compiler.graal.nodes.LoopExitNode; -import jdk.compiler.graal.nodes.ParameterNode; -import jdk.compiler.graal.nodes.ProfileData.BranchProbabilityData; -import jdk.compiler.graal.nodes.ProfileData.ProfileSource; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.extended.BranchProbabilityNode; -import jdk.compiler.graal.nodes.spi.CoreProviders; -import jdk.compiler.graal.nodes.util.GraphUtil; -import jdk.compiler.graal.phases.VerifyPhase; +import jdk.graal.compiler.api.directives.GraalDirectives; +import jdk.graal.compiler.api.replacements.Fold; +import jdk.graal.compiler.api.replacements.Snippet; +import jdk.graal.compiler.api.replacements.Snippet.ConstantParameter; +import jdk.graal.compiler.api.replacements.Snippet.NonNullParameter; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.nodes.CallTargetNode; +import jdk.graal.compiler.nodes.FixedNode; +import jdk.graal.compiler.nodes.IfNode; +import jdk.graal.compiler.nodes.Invoke; +import jdk.graal.compiler.nodes.LogicNode; +import jdk.graal.compiler.nodes.LoopExitNode; +import jdk.graal.compiler.nodes.ParameterNode; +import jdk.graal.compiler.nodes.ProfileData.BranchProbabilityData; +import jdk.graal.compiler.nodes.ProfileData.ProfileSource; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.extended.BranchProbabilityNode; +import jdk.graal.compiler.nodes.spi.CoreProviders; +import jdk.graal.compiler.nodes.util.GraphUtil; +import jdk.graal.compiler.phases.VerifyPhase; import jdk.vm.ci.meta.ResolvedJavaMethod; import jdk.vm.ci.meta.ResolvedJavaType; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyStatelessPhases.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/VerifyStatelessPhases.java similarity index 91% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyStatelessPhases.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/VerifyStatelessPhases.java index c1f40e401b31..36174390c566 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyStatelessPhases.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/VerifyStatelessPhases.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; import static java.lang.reflect.Modifier.isFinal; import static java.lang.reflect.Modifier.isPrivate; @@ -31,12 +31,12 @@ import java.lang.reflect.Field; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.spi.CoreProviders; -import jdk.compiler.graal.phases.BasePhase; -import jdk.compiler.graal.phases.PhaseSuite; -import jdk.compiler.graal.phases.SingleRunSubphase; -import jdk.compiler.graal.phases.VerifyPhase; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.spi.CoreProviders; +import jdk.graal.compiler.phases.BasePhase; +import jdk.graal.compiler.phases.PhaseSuite; +import jdk.graal.compiler.phases.SingleRunSubphase; +import jdk.graal.compiler.phases.VerifyPhase; import jdk.vm.ci.meta.MetaAccessProvider; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyStringFormatterUsage.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/VerifyStringFormatterUsage.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyStringFormatterUsage.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/VerifyStringFormatterUsage.java index 8be921aa99fb..3fbd40fe150e 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyStringFormatterUsage.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/VerifyStringFormatterUsage.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; import java.util.ArrayList; import java.util.Arrays; @@ -30,23 +30,23 @@ import java.util.List; import org.graalvm.collections.EconomicMap; -import jdk.compiler.graal.api.replacements.SnippetReflectionProvider; -import jdk.compiler.graal.api.test.Graal; -import jdk.compiler.graal.core.common.type.PrimitiveStamp; -import jdk.compiler.graal.core.common.type.Stamp; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.graph.NodeInputList; -import jdk.compiler.graal.nodes.CallTargetNode; -import jdk.compiler.graal.nodes.FrameState; -import jdk.compiler.graal.nodes.Invoke; -import jdk.compiler.graal.nodes.NodeView; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.java.MethodCallTargetNode; -import jdk.compiler.graal.nodes.java.NewArrayNode; -import jdk.compiler.graal.nodes.java.StoreIndexedNode; -import jdk.compiler.graal.nodes.spi.CoreProviders; -import jdk.compiler.graal.phases.VerifyPhase; +import jdk.graal.compiler.api.replacements.SnippetReflectionProvider; +import jdk.graal.compiler.api.test.Graal; +import jdk.graal.compiler.core.common.type.PrimitiveStamp; +import jdk.graal.compiler.core.common.type.Stamp; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.graph.NodeInputList; +import jdk.graal.compiler.nodes.CallTargetNode; +import jdk.graal.compiler.nodes.FrameState; +import jdk.graal.compiler.nodes.Invoke; +import jdk.graal.compiler.nodes.NodeView; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.java.MethodCallTargetNode; +import jdk.graal.compiler.nodes.java.NewArrayNode; +import jdk.graal.compiler.nodes.java.StoreIndexedNode; +import jdk.graal.compiler.nodes.spi.CoreProviders; +import jdk.graal.compiler.phases.VerifyPhase; import jdk.vm.ci.meta.JavaKind; import jdk.vm.ci.meta.MetaAccessProvider; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifySystemPropertyUsage.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/VerifySystemPropertyUsage.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifySystemPropertyUsage.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/VerifySystemPropertyUsage.java index 98a8ca9646c1..70b616ef4a4f 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifySystemPropertyUsage.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/VerifySystemPropertyUsage.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; import java.util.regex.Matcher; import java.util.regex.Pattern; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.java.MethodCallTargetNode; -import jdk.compiler.graal.nodes.spi.CoreProviders; -import jdk.compiler.graal.phases.VerifyPhase; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.java.MethodCallTargetNode; +import jdk.graal.compiler.nodes.spi.CoreProviders; +import jdk.graal.compiler.phases.VerifyPhase; import jdk.vm.ci.meta.MetaAccessProvider; import jdk.vm.ci.meta.ResolvedJavaMethod; @@ -84,7 +84,7 @@ protected void verify(StructuredGraph graph, CoreProviders context) { // This JVMCI version still has some calls that need to be removed return; } - } else if (holderQualified.equals("jdk.compiler.graal.hotspot.JVMCIVersionCheck") && caller.getName().equals("main")) { + } else if (holderQualified.equals("jdk.graal.compiler.hotspot.JVMCIVersionCheck") && caller.getName().equals("main")) { // The main method in JVMCIVersionCheck is only called from the shell return; } else if (packageName.startsWith("com.oracle.truffle") || packageName.startsWith("org.graalvm.polyglot") || diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyUnsafeAccess.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/VerifyUnsafeAccess.java similarity index 92% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyUnsafeAccess.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/VerifyUnsafeAccess.java index 7f639f878698..d1fba0c0d309 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyUnsafeAccess.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/VerifyUnsafeAccess.java @@ -22,20 +22,20 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; import static java.lang.reflect.Modifier.isProtected; import static java.lang.reflect.Modifier.isPublic; import java.lang.reflect.Field; -import jdk.compiler.graal.core.common.type.TypeReference; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.java.InstanceOfNode; -import jdk.compiler.graal.nodes.java.MethodCallTargetNode; -import jdk.compiler.graal.nodes.spi.CoreProviders; -import jdk.compiler.graal.phases.VerifyPhase; -import jdk.compiler.graal.serviceprovider.GraalUnsafeAccess; +import jdk.graal.compiler.core.common.type.TypeReference; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.java.InstanceOfNode; +import jdk.graal.compiler.nodes.java.MethodCallTargetNode; +import jdk.graal.compiler.nodes.spi.CoreProviders; +import jdk.graal.compiler.phases.VerifyPhase; +import jdk.graal.compiler.serviceprovider.GraalUnsafeAccess; import jdk.vm.ci.meta.MetaAccessProvider; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyUpdateUsages.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/VerifyUpdateUsages.java similarity index 91% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyUpdateUsages.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/VerifyUpdateUsages.java index bc73463bdc8a..79fba4ba2c4d 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyUpdateUsages.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/VerifyUpdateUsages.java @@ -22,21 +22,21 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; import java.util.List; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.graph.Node.Input; -import jdk.compiler.graal.graph.Node.OptionalInput; -import jdk.compiler.graal.graph.NodeInputList; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.java.LoadFieldNode; -import jdk.compiler.graal.nodes.java.MethodCallTargetNode; -import jdk.compiler.graal.nodes.java.StoreFieldNode; -import jdk.compiler.graal.nodes.spi.CoreProviders; -import jdk.compiler.graal.phases.VerifyPhase; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.graph.Node.Input; +import jdk.graal.compiler.graph.Node.OptionalInput; +import jdk.graal.compiler.graph.NodeInputList; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.java.LoadFieldNode; +import jdk.graal.compiler.nodes.java.MethodCallTargetNode; +import jdk.graal.compiler.nodes.java.StoreFieldNode; +import jdk.graal.compiler.nodes.spi.CoreProviders; +import jdk.graal.compiler.phases.VerifyPhase; import jdk.vm.ci.meta.ResolvedJavaField; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyUsageWithEquals.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/VerifyUsageWithEquals.java similarity index 90% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyUsageWithEquals.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/VerifyUsageWithEquals.java index e4f3a9fae6eb..51a97164e9fb 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyUsageWithEquals.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/VerifyUsageWithEquals.java @@ -22,20 +22,20 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; - -import jdk.compiler.graal.core.common.type.ObjectStamp; -import jdk.compiler.graal.nodes.Invoke; -import jdk.compiler.graal.nodes.NodeView; -import jdk.compiler.graal.nodes.ParameterNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.calc.ObjectEqualsNode; -import jdk.compiler.graal.nodes.java.LoadFieldNode; -import jdk.compiler.graal.nodes.spi.CoreProviders; -import jdk.compiler.graal.nodes.spi.UncheckedInterfaceProvider; -import jdk.compiler.graal.nodes.type.StampTool; -import jdk.compiler.graal.phases.VerifyPhase; +package jdk.graal.compiler.core.test; + +import jdk.graal.compiler.core.common.type.ObjectStamp; +import jdk.graal.compiler.nodes.Invoke; +import jdk.graal.compiler.nodes.NodeView; +import jdk.graal.compiler.nodes.ParameterNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.calc.ObjectEqualsNode; +import jdk.graal.compiler.nodes.java.LoadFieldNode; +import jdk.graal.compiler.nodes.spi.CoreProviders; +import jdk.graal.compiler.nodes.spi.UncheckedInterfaceProvider; +import jdk.graal.compiler.nodes.type.StampTool; +import jdk.graal.compiler.phases.VerifyPhase; import jdk.vm.ci.meta.JavaField; import jdk.vm.ci.meta.JavaKind; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyVariableCasts.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/VerifyVariableCasts.java similarity index 87% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyVariableCasts.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/VerifyVariableCasts.java index 658dd2779d2c..e7f721e6899f 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyVariableCasts.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/VerifyVariableCasts.java @@ -22,18 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; -import jdk.compiler.graal.core.common.type.AbstractObjectStamp; -import jdk.compiler.graal.core.common.type.Stamp; -import jdk.compiler.graal.core.common.type.TypeReference; -import jdk.compiler.graal.lir.LIRValueUtil; -import jdk.compiler.graal.lir.Variable; -import jdk.compiler.graal.nodes.PiNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.java.InstanceOfNode; -import jdk.compiler.graal.nodes.spi.CoreProviders; -import jdk.compiler.graal.phases.VerifyPhase; +import jdk.graal.compiler.core.common.type.AbstractObjectStamp; +import jdk.graal.compiler.core.common.type.Stamp; +import jdk.graal.compiler.core.common.type.TypeReference; +import jdk.graal.compiler.lir.LIRValueUtil; +import jdk.graal.compiler.lir.Variable; +import jdk.graal.compiler.nodes.PiNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.java.InstanceOfNode; +import jdk.graal.compiler.nodes.spi.CoreProviders; +import jdk.graal.compiler.phases.VerifyPhase; import jdk.vm.ci.meta.MetaAccessProvider; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyVirtualizableTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/VerifyVirtualizableTest.java similarity index 87% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyVirtualizableTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/VerifyVirtualizableTest.java index 6baa1b90a1df..46b480724f0b 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyVirtualizableTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/VerifyVirtualizableTest.java @@ -22,39 +22,39 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; -import static jdk.compiler.graal.core.test.GraalCompilerTest.getInitialOptions; -import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_IGNORED; -import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_IGNORED; +import static jdk.graal.compiler.core.test.GraalCompilerTest.getInitialOptions; +import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_IGNORED; +import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_IGNORED; import java.lang.reflect.Method; import java.lang.reflect.Modifier; -import jdk.compiler.graal.api.test.Graal; -import jdk.compiler.graal.core.common.type.StampFactory; -import jdk.compiler.graal.debug.DebugCloseable; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.debug.DebugContext.Builder; -import jdk.compiler.graal.graph.NodeClass; -import jdk.compiler.graal.java.GraphBuilderPhase; -import jdk.compiler.graal.nodeinfo.NodeInfo; -import jdk.compiler.graal.nodes.ConstantNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins; -import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins; -import jdk.compiler.graal.nodes.java.ArrayLengthNode; -import jdk.compiler.graal.nodes.spi.Virtualizable; -import jdk.compiler.graal.nodes.spi.VirtualizerTool; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.phases.OptimisticOptimizations; -import jdk.compiler.graal.phases.PhaseSuite; -import jdk.compiler.graal.phases.VerifyPhase.VerificationError; -import jdk.compiler.graal.phases.tiers.HighTierContext; -import jdk.compiler.graal.phases.util.Providers; -import jdk.compiler.graal.runtime.RuntimeProvider; +import jdk.graal.compiler.api.test.Graal; +import jdk.graal.compiler.core.common.type.StampFactory; +import jdk.graal.compiler.debug.DebugCloseable; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.debug.DebugContext.Builder; +import jdk.graal.compiler.graph.NodeClass; +import jdk.graal.compiler.java.GraphBuilderPhase; +import jdk.graal.compiler.nodeinfo.NodeInfo; +import jdk.graal.compiler.nodes.ConstantNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins; +import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins; +import jdk.graal.compiler.nodes.java.ArrayLengthNode; +import jdk.graal.compiler.nodes.spi.Virtualizable; +import jdk.graal.compiler.nodes.spi.VirtualizerTool; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.phases.OptimisticOptimizations; +import jdk.graal.compiler.phases.PhaseSuite; +import jdk.graal.compiler.phases.VerifyPhase.VerificationError; +import jdk.graal.compiler.phases.tiers.HighTierContext; +import jdk.graal.compiler.phases.util.Providers; +import jdk.graal.compiler.runtime.RuntimeProvider; import org.junit.Test; import jdk.vm.ci.meta.MetaAccessProvider; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyVirtualizableUsage.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/VerifyVirtualizableUsage.java similarity index 86% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyVirtualizableUsage.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/VerifyVirtualizableUsage.java index f887696f78fd..2b6e5f121b5b 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyVirtualizableUsage.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/VerifyVirtualizableUsage.java @@ -22,22 +22,22 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; -import jdk.compiler.graal.core.common.type.ObjectStamp; -import jdk.compiler.graal.core.common.type.Stamp; -import jdk.compiler.graal.graph.Graph; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.graph.NodeInputList; -import jdk.compiler.graal.nodes.spi.VirtualizerTool; -import jdk.compiler.graal.nodes.ConstantNode; -import jdk.compiler.graal.nodes.NodeView; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.java.MethodCallTargetNode; -import jdk.compiler.graal.nodes.spi.CoreProviders; -import jdk.compiler.graal.nodes.spi.Virtualizable; -import jdk.compiler.graal.phases.VerifyPhase; +import jdk.graal.compiler.core.common.type.ObjectStamp; +import jdk.graal.compiler.core.common.type.Stamp; +import jdk.graal.compiler.graph.Graph; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.graph.NodeInputList; +import jdk.graal.compiler.nodes.spi.VirtualizerTool; +import jdk.graal.compiler.nodes.ConstantNode; +import jdk.graal.compiler.nodes.NodeView; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.java.MethodCallTargetNode; +import jdk.graal.compiler.nodes.spi.CoreProviders; +import jdk.graal.compiler.nodes.spi.Virtualizable; +import jdk.graal.compiler.phases.VerifyPhase; import jdk.vm.ci.meta.ResolvedJavaMethod; import jdk.vm.ci.meta.ResolvedJavaType; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VolatileAccessReadEliminationTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/VolatileAccessReadEliminationTest.java similarity index 93% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VolatileAccessReadEliminationTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/VolatileAccessReadEliminationTest.java index 6746d936f7d2..14e43f171334 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VolatileAccessReadEliminationTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/VolatileAccessReadEliminationTest.java @@ -24,14 +24,14 @@ * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; import jdk.vm.ci.meta.ResolvedJavaMethod; -import jdk.compiler.graal.core.common.type.IntegerStamp; -import jdk.compiler.graal.core.common.type.Stamp; -import jdk.compiler.graal.nodes.NodeView; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.memory.ReadNode; +import jdk.graal.compiler.core.common.type.IntegerStamp; +import jdk.graal.compiler.core.common.type.Stamp; +import jdk.graal.compiler.nodes.NodeView; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.memory.ReadNode; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VolatileReadEliminateWrongMemoryStateTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/VolatileReadEliminateWrongMemoryStateTest.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VolatileReadEliminateWrongMemoryStateTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/VolatileReadEliminateWrongMemoryStateTest.java index 9d613ed28beb..b51fe57cd028 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VolatileReadEliminateWrongMemoryStateTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/VolatileReadEliminateWrongMemoryStateTest.java @@ -23,7 +23,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ZeroSignExtendTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ZeroSignExtendTest.java similarity index 99% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ZeroSignExtendTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ZeroSignExtendTest.java index 787f8e7a74be..3fb1468128f0 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ZeroSignExtendTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ZeroSignExtendTest.java @@ -23,7 +23,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test; +package jdk.graal.compiler.core.test; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/backend/AllocatorTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/backend/AllocatorTest.java similarity index 88% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/backend/AllocatorTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/backend/AllocatorTest.java index b3ee99bb5ee0..b9c5520d9972 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/backend/AllocatorTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/backend/AllocatorTest.java @@ -22,21 +22,21 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test.backend; +package jdk.graal.compiler.core.test.backend; -import static jdk.compiler.graal.core.common.cfg.AbstractControlFlowGraph.INVALID_BLOCK_ID; +import static jdk.graal.compiler.core.common.cfg.AbstractControlFlowGraph.INVALID_BLOCK_ID; import java.util.HashSet; -import jdk.compiler.graal.core.common.cfg.BasicBlock; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.lir.LIR; -import jdk.compiler.graal.lir.LIRInstruction; -import jdk.compiler.graal.lir.LIRValueUtil; -import jdk.compiler.graal.lir.StandardOp.ValueMoveOp; -import jdk.compiler.graal.lir.ValueProcedure; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions; +import jdk.graal.compiler.core.common.cfg.BasicBlock; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.lir.LIR; +import jdk.graal.compiler.lir.LIRInstruction; +import jdk.graal.compiler.lir.LIRValueUtil; +import jdk.graal.compiler.lir.StandardOp.ValueMoveOp; +import jdk.graal.compiler.lir.ValueProcedure; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.StructuredGraph.AllowAssumptions; import org.junit.Assert; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/backend/BackendTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/backend/BackendTest.java similarity index 85% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/backend/BackendTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/backend/BackendTest.java index 787ffc2fd56a..9783ec309e46 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/backend/BackendTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/backend/BackendTest.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test.backend; - -import jdk.compiler.graal.core.GraalCompiler; -import jdk.compiler.graal.core.gen.LIRCompilerBackend; -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.lir.gen.LIRGenerationResult; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.phases.OptimisticOptimizations; +package jdk.graal.compiler.core.test.backend; + +import jdk.graal.compiler.core.GraalCompiler; +import jdk.graal.compiler.core.gen.LIRCompilerBackend; +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.lir.gen.LIRGenerationResult; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.phases.OptimisticOptimizations; import jdk.vm.ci.code.Architecture; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/deopt/CompiledMethodTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/deopt/CompiledMethodTest.java similarity index 91% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/deopt/CompiledMethodTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/deopt/CompiledMethodTest.java index 9fd4c5876e51..475d0da336ba 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/deopt/CompiledMethodTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/deopt/CompiledMethodTest.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test.deopt; +package jdk.graal.compiler.core.test.deopt; -import jdk.compiler.graal.api.directives.GraalDirectives; -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.nodes.ConstantNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions; -import jdk.compiler.graal.phases.common.DeadCodeEliminationPhase; +import jdk.graal.compiler.api.directives.GraalDirectives; +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.nodes.ConstantNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.StructuredGraph.AllowAssumptions; +import jdk.graal.compiler.phases.common.DeadCodeEliminationPhase; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/deopt/MonitorDeoptTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/deopt/MonitorDeoptTest.java similarity index 94% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/deopt/MonitorDeoptTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/deopt/MonitorDeoptTest.java index 909a17c30ae9..ae706b6fce05 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/deopt/MonitorDeoptTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/deopt/MonitorDeoptTest.java @@ -24,7 +24,7 @@ */ /* */ -package jdk.compiler.graal.core.test.deopt; +package jdk.graal.compiler.core.test.deopt; import jdk.vm.ci.code.InstalledCode; import jdk.vm.ci.meta.ResolvedJavaMethod; @@ -32,14 +32,14 @@ import org.junit.Assert; import org.junit.Test; -import jdk.compiler.graal.code.CompilationResult; -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.nodes.AbstractEndNode; -import jdk.compiler.graal.nodes.FixedNode; -import jdk.compiler.graal.nodes.FixedWithNextNode; -import jdk.compiler.graal.nodes.LoopBeginNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions; +import jdk.graal.compiler.code.CompilationResult; +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.nodes.AbstractEndNode; +import jdk.graal.compiler.nodes.FixedNode; +import jdk.graal.compiler.nodes.FixedWithNextNode; +import jdk.graal.compiler.nodes.LoopBeginNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.StructuredGraph.AllowAssumptions; public final class MonitorDeoptTest extends GraalCompilerTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/deopt/RethrowDeoptMaterializeTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/deopt/RethrowDeoptMaterializeTest.java similarity index 92% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/deopt/RethrowDeoptMaterializeTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/deopt/RethrowDeoptMaterializeTest.java index 77f034e8bbdb..3feaa51e567d 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/deopt/RethrowDeoptMaterializeTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/deopt/RethrowDeoptMaterializeTest.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.core.test.deopt; +package jdk.graal.compiler.core.test.deopt; -import jdk.compiler.graal.api.directives.GraalDirectives; -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.nodes.FrameState; +import jdk.graal.compiler.api.directives.GraalDirectives; +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.nodes.FrameState; import org.junit.Test; public final class RethrowDeoptMaterializeTest extends GraalCompilerTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/deopt/RethrowExceptionLoopTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/deopt/RethrowExceptionLoopTest.java similarity index 83% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/deopt/RethrowExceptionLoopTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/deopt/RethrowExceptionLoopTest.java index 86dfdfde03a1..df9637e2a48f 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/deopt/RethrowExceptionLoopTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/deopt/RethrowExceptionLoopTest.java @@ -24,19 +24,19 @@ */ /* */ -package jdk.compiler.graal.core.test.deopt; +package jdk.graal.compiler.core.test.deopt; -import static jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration.BytecodeExceptionMode.CheckAll; +import static jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.BytecodeExceptionMode.CheckAll; -import jdk.compiler.graal.api.directives.GraalDirectives; -import jdk.compiler.graal.core.phases.HighTier; -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext; -import jdk.compiler.graal.nodes.graphbuilderconf.InlineInvokePlugin; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.phases.tiers.Suites; +import jdk.graal.compiler.api.directives.GraalDirectives; +import jdk.graal.compiler.core.phases.HighTier; +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext; +import jdk.graal.compiler.nodes.graphbuilderconf.InlineInvokePlugin; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.phases.tiers.Suites; import org.junit.Test; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/deopt/SafepointRethrowDeoptTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/deopt/SafepointRethrowDeoptTest.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/deopt/SafepointRethrowDeoptTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/deopt/SafepointRethrowDeoptTest.java index e3adec09c41f..6e832b4bb4ae 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/deopt/SafepointRethrowDeoptTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/deopt/SafepointRethrowDeoptTest.java @@ -24,7 +24,7 @@ */ /* */ -package jdk.compiler.graal.core.test.deopt; +package jdk.graal.compiler.core.test.deopt; import java.util.concurrent.CountDownLatch; @@ -32,8 +32,8 @@ import org.junit.Assume; import org.junit.Test; -import jdk.compiler.graal.core.common.GraalOptions; -import jdk.compiler.graal.core.test.GraalCompilerTest; +import jdk.graal.compiler.core.common.GraalOptions; +import jdk.graal.compiler.core.test.GraalCompilerTest; import jdk.vm.ci.code.InstalledCode; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/deopt/SynchronizedMethodDeoptimizationTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/deopt/SynchronizedMethodDeoptimizationTest.java similarity index 91% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/deopt/SynchronizedMethodDeoptimizationTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/deopt/SynchronizedMethodDeoptimizationTest.java index 388aea6f0275..f8a0361fc64a 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/deopt/SynchronizedMethodDeoptimizationTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/deopt/SynchronizedMethodDeoptimizationTest.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test.deopt; +package jdk.graal.compiler.core.test.deopt; -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.core.test.ea.EATestBase.TestClassObject; +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.core.test.ea.EATestBase.TestClassObject; import org.junit.Test; /** diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ea/AtomicVirtualizationTests.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ea/AtomicVirtualizationTests.java similarity index 99% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ea/AtomicVirtualizationTests.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ea/AtomicVirtualizationTests.java index 94092c43f84e..5ee11ee6d19b 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ea/AtomicVirtualizationTests.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ea/AtomicVirtualizationTests.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test.ea; +package jdk.graal.compiler.core.test.ea; import java.util.Objects; import java.util.concurrent.atomic.AtomicReference; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ea/CountUppercaseParallelTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ea/CountUppercaseParallelTest.java similarity index 94% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ea/CountUppercaseParallelTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ea/CountUppercaseParallelTest.java index 8cf53803acec..8b8bd6e1327a 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ea/CountUppercaseParallelTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ea/CountUppercaseParallelTest.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test.ea; +package jdk.graal.compiler.core.test.ea; -import jdk.compiler.graal.core.test.GraalCompilerTest; +import jdk.graal.compiler.core.test.GraalCompilerTest; import org.junit.Test; public class CountUppercaseParallelTest extends GraalCompilerTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ea/EAMergingTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ea/EAMergingTest.java similarity index 92% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ea/EAMergingTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ea/EAMergingTest.java index bffa9a728150..71092d878d82 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ea/EAMergingTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ea/EAMergingTest.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test.ea; +package jdk.graal.compiler.core.test.ea; import org.junit.Test; -import jdk.compiler.graal.nodes.ParameterNode; -import jdk.compiler.graal.nodes.PhiNode; -import jdk.compiler.graal.nodes.ValuePhiNode; +import jdk.graal.compiler.nodes.ParameterNode; +import jdk.graal.compiler.nodes.PhiNode; +import jdk.graal.compiler.nodes.ValuePhiNode; public class EAMergingTest extends EATestBase { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ea/EATestBase.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ea/EATestBase.java similarity index 90% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ea/EATestBase.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ea/EATestBase.java index ab9b09ece0d4..8220e4a7c4e0 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ea/EATestBase.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ea/EATestBase.java @@ -22,25 +22,25 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test.ea; +package jdk.graal.compiler.core.test.ea; -import static jdk.compiler.graal.graph.iterators.NodePredicates.isA; +import static jdk.graal.compiler.graph.iterators.NodePredicates.isA; import java.util.List; -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.nodes.ReturnNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions; -import jdk.compiler.graal.nodes.java.NewArrayNode; -import jdk.compiler.graal.nodes.java.NewInstanceNode; -import jdk.compiler.graal.nodes.virtual.AllocatedObjectNode; -import jdk.compiler.graal.nodes.virtual.CommitAllocationNode; -import jdk.compiler.graal.nodes.virtual.VirtualObjectNode; -import jdk.compiler.graal.phases.common.DeadCodeEliminationPhase; -import jdk.compiler.graal.phases.tiers.HighTierContext; -import jdk.compiler.graal.virtual.phases.ea.PartialEscapePhase; +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.nodes.ReturnNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.StructuredGraph.AllowAssumptions; +import jdk.graal.compiler.nodes.java.NewArrayNode; +import jdk.graal.compiler.nodes.java.NewInstanceNode; +import jdk.graal.compiler.nodes.virtual.AllocatedObjectNode; +import jdk.graal.compiler.nodes.virtual.CommitAllocationNode; +import jdk.graal.compiler.nodes.virtual.VirtualObjectNode; +import jdk.graal.compiler.phases.common.DeadCodeEliminationPhase; +import jdk.graal.compiler.phases.tiers.HighTierContext; +import jdk.graal.compiler.virtual.phases.ea.PartialEscapePhase; import org.junit.Assert; import jdk.vm.ci.meta.JavaConstant; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ea/EscapeAnalysisTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ea/EscapeAnalysisTest.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ea/EscapeAnalysisTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ea/EscapeAnalysisTest.java index 99a4ae6f7965..f9db9ba57654 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ea/EscapeAnalysisTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ea/EscapeAnalysisTest.java @@ -22,26 +22,26 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test.ea; +package jdk.graal.compiler.core.test.ea; import java.util.List; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.graph.iterators.NodeIterable; -import jdk.compiler.graal.loop.phases.LoopFullUnrollPhase; -import jdk.compiler.graal.loop.phases.LoopPeelingPhase; -import jdk.compiler.graal.nodes.ConstantNode; -import jdk.compiler.graal.nodes.ReturnNode; -import jdk.compiler.graal.nodes.extended.BoxNode; -import jdk.compiler.graal.nodes.extended.ValueAnchorNode; -import jdk.compiler.graal.nodes.java.LoadFieldNode; -import jdk.compiler.graal.nodes.loop.DefaultLoopPolicies; -import jdk.compiler.graal.nodes.virtual.AllocatedObjectNode; -import jdk.compiler.graal.nodes.virtual.CommitAllocationNode; -import jdk.compiler.graal.phases.schedule.SchedulePhase; -import jdk.compiler.graal.test.SubprocessUtil; -import jdk.compiler.graal.virtual.phases.ea.PartialEscapePhase; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.graph.iterators.NodeIterable; +import jdk.graal.compiler.loop.phases.LoopFullUnrollPhase; +import jdk.graal.compiler.loop.phases.LoopPeelingPhase; +import jdk.graal.compiler.nodes.ConstantNode; +import jdk.graal.compiler.nodes.ReturnNode; +import jdk.graal.compiler.nodes.extended.BoxNode; +import jdk.graal.compiler.nodes.extended.ValueAnchorNode; +import jdk.graal.compiler.nodes.java.LoadFieldNode; +import jdk.graal.compiler.nodes.loop.DefaultLoopPolicies; +import jdk.graal.compiler.nodes.virtual.AllocatedObjectNode; +import jdk.graal.compiler.nodes.virtual.CommitAllocationNode; +import jdk.graal.compiler.phases.schedule.SchedulePhase; +import jdk.graal.compiler.test.SubprocessUtil; +import jdk.graal.compiler.virtual.phases.ea.PartialEscapePhase; import org.junit.Assert; import org.junit.Assume; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ea/ExpandLogicTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ea/ExpandLogicTest.java similarity index 92% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ea/ExpandLogicTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ea/ExpandLogicTest.java index 5ee18a777e39..8949b513ee16 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ea/ExpandLogicTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ea/ExpandLogicTest.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test.ea; +package jdk.graal.compiler.core.test.ea; -import jdk.compiler.graal.api.directives.GraalDirectives; -import jdk.compiler.graal.core.test.GraalCompilerTest; +import jdk.graal.compiler.api.directives.GraalDirectives; +import jdk.graal.compiler.core.test.GraalCompilerTest; import org.junit.Test; public class ExpandLogicTest extends GraalCompilerTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ea/NestedBoxingTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ea/NestedBoxingTest.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ea/NestedBoxingTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ea/NestedBoxingTest.java index 5d94f90007b0..c6e4270e7f4b 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ea/NestedBoxingTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ea/NestedBoxingTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test.ea; +package jdk.graal.compiler.core.test.ea; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ea/PEAAssertionsTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ea/PEAAssertionsTest.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ea/PEAAssertionsTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ea/PEAAssertionsTest.java index e90271e8fe14..57d7126304b9 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ea/PEAAssertionsTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ea/PEAAssertionsTest.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test.ea; +package jdk.graal.compiler.core.test.ea; -import jdk.compiler.graal.api.directives.GraalDirectives; -import jdk.compiler.graal.code.SourceStackTraceBailoutException; -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.phases.OptimisticOptimizations; +import jdk.graal.compiler.api.directives.GraalDirectives; +import jdk.graal.compiler.code.SourceStackTraceBailoutException; +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.phases.OptimisticOptimizations; import org.junit.Test; public class PEAAssertionsTest extends GraalCompilerTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ea/PEAReadEliminationTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ea/PEAReadEliminationTest.java similarity index 93% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ea/PEAReadEliminationTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ea/PEAReadEliminationTest.java index e200375bf828..e50b4e69cae9 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ea/PEAReadEliminationTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ea/PEAReadEliminationTest.java @@ -22,16 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test.ea; - -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions; -import jdk.compiler.graal.nodes.extended.RawLoadNode; -import jdk.compiler.graal.nodes.java.LoadIndexedNode; -import jdk.compiler.graal.nodes.java.StoreIndexedNode; -import jdk.compiler.graal.phases.tiers.HighTierContext; -import jdk.compiler.graal.virtual.phases.ea.PartialEscapePhase; +package jdk.graal.compiler.core.test.ea; + +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.StructuredGraph.AllowAssumptions; +import jdk.graal.compiler.nodes.extended.RawLoadNode; +import jdk.graal.compiler.nodes.java.LoadIndexedNode; +import jdk.graal.compiler.nodes.java.StoreIndexedNode; +import jdk.graal.compiler.phases.tiers.HighTierContext; +import jdk.graal.compiler.virtual.phases.ea.PartialEscapePhase; import org.junit.Test; import sun.misc.Unsafe; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ea/PartialEscapeAnalysisIterationTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ea/PartialEscapeAnalysisIterationTest.java similarity index 94% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ea/PartialEscapeAnalysisIterationTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ea/PartialEscapeAnalysisIterationTest.java index 73762c7422f7..95630c0649bf 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ea/PartialEscapeAnalysisIterationTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ea/PartialEscapeAnalysisIterationTest.java @@ -22,16 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test.ea; +package jdk.graal.compiler.core.test.ea; import java.lang.ref.WeakReference; import java.util.List; -import jdk.compiler.graal.nodes.extended.BoxNode; -import jdk.compiler.graal.nodes.extended.UnboxNode; -import jdk.compiler.graal.nodes.java.StoreFieldNode; -import jdk.compiler.graal.nodes.virtual.CommitAllocationNode; -import jdk.compiler.graal.virtual.phases.ea.PartialEscapePhase; +import jdk.graal.compiler.nodes.extended.BoxNode; +import jdk.graal.compiler.nodes.extended.UnboxNode; +import jdk.graal.compiler.nodes.java.StoreFieldNode; +import jdk.graal.compiler.nodes.virtual.CommitAllocationNode; +import jdk.graal.compiler.virtual.phases.ea.PartialEscapePhase; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ea/PartialEscapeAnalysisTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ea/PartialEscapeAnalysisTest.java similarity index 93% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ea/PartialEscapeAnalysisTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ea/PartialEscapeAnalysisTest.java index 420868fd23df..f8865ac07fb1 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ea/PartialEscapeAnalysisTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ea/PartialEscapeAnalysisTest.java @@ -22,26 +22,26 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test.ea; +package jdk.graal.compiler.core.test.ea; import java.lang.ref.SoftReference; import java.lang.reflect.Array; import java.util.ArrayList; -import jdk.compiler.graal.api.directives.GraalDirectives; -import jdk.compiler.graal.core.test.TypeSystemTest; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.nodes.ReturnNode; -import jdk.compiler.graal.nodes.cfg.ControlFlowGraph; -import jdk.compiler.graal.nodes.extended.BoxNode; -import jdk.compiler.graal.nodes.extended.UnboxNode; -import jdk.compiler.graal.nodes.java.LoadFieldNode; -import jdk.compiler.graal.nodes.java.LoadIndexedNode; -import jdk.compiler.graal.nodes.java.NewArrayNode; -import jdk.compiler.graal.nodes.java.NewInstanceNode; -import jdk.compiler.graal.nodes.java.StoreFieldNode; -import jdk.compiler.graal.nodes.virtual.CommitAllocationNode; -import jdk.compiler.graal.phases.common.DeadCodeEliminationPhase; +import jdk.graal.compiler.api.directives.GraalDirectives; +import jdk.graal.compiler.core.test.TypeSystemTest; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.nodes.ReturnNode; +import jdk.graal.compiler.nodes.cfg.ControlFlowGraph; +import jdk.graal.compiler.nodes.extended.BoxNode; +import jdk.graal.compiler.nodes.extended.UnboxNode; +import jdk.graal.compiler.nodes.java.LoadFieldNode; +import jdk.graal.compiler.nodes.java.LoadIndexedNode; +import jdk.graal.compiler.nodes.java.NewArrayNode; +import jdk.graal.compiler.nodes.java.NewInstanceNode; +import jdk.graal.compiler.nodes.java.StoreFieldNode; +import jdk.graal.compiler.nodes.virtual.CommitAllocationNode; +import jdk.graal.compiler.phases.common.DeadCodeEliminationPhase; import org.junit.Assert; import org.junit.Ignore; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ea/PartialEscapeAnalysisTreesTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ea/PartialEscapeAnalysisTreesTest.java similarity index 93% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ea/PartialEscapeAnalysisTreesTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ea/PartialEscapeAnalysisTreesTest.java index 2868f1e7ad7b..89850830509f 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ea/PartialEscapeAnalysisTreesTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ea/PartialEscapeAnalysisTreesTest.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test.ea; +package jdk.graal.compiler.core.test.ea; import java.util.HashSet; -import jdk.compiler.graal.api.directives.GraalDirectives; -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.nodes.debug.BlackholeNode; -import jdk.compiler.graal.phases.common.DeadCodeEliminationPhase; +import jdk.graal.compiler.api.directives.GraalDirectives; +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.nodes.debug.BlackholeNode; +import jdk.graal.compiler.phases.common.DeadCodeEliminationPhase; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ea/PartialEscapeOptimizationLogTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ea/PartialEscapeOptimizationLogTest.java similarity index 94% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ea/PartialEscapeOptimizationLogTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ea/PartialEscapeOptimizationLogTest.java index e72f3fcd9b9a..a39abcf99c82 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ea/PartialEscapeOptimizationLogTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ea/PartialEscapeOptimizationLogTest.java @@ -22,17 +22,17 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test.ea; +package jdk.graal.compiler.core.test.ea; import org.graalvm.collections.EconomicMap; import org.graalvm.collections.EconomicSet; -import jdk.compiler.graal.core.test.TypeSystemTest; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.debug.DebugDumpHandler; -import jdk.compiler.graal.debug.DebugOptions; -import jdk.compiler.graal.nodes.OptimizationLogImpl; -import jdk.compiler.graal.options.OptionKey; -import jdk.compiler.graal.options.OptionValues; +import jdk.graal.compiler.core.test.TypeSystemTest; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.debug.DebugDumpHandler; +import jdk.graal.compiler.debug.DebugOptions; +import jdk.graal.compiler.nodes.OptimizationLogImpl; +import jdk.graal.compiler.options.OptionKey; +import jdk.graal.compiler.options.OptionValues; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ea/PartialEscapeUnsafeStoreTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ea/PartialEscapeUnsafeStoreTest.java similarity index 99% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ea/PartialEscapeUnsafeStoreTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ea/PartialEscapeUnsafeStoreTest.java index 9fc4f5d6bcb5..788b48e9a70f 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ea/PartialEscapeUnsafeStoreTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ea/PartialEscapeUnsafeStoreTest.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test.ea; +package jdk.graal.compiler.core.test.ea; -import jdk.compiler.graal.core.test.GraalCompilerTest; +import jdk.graal.compiler.core.test.GraalCompilerTest; import org.junit.Test; /** diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ea/PartialEscapeWithExceptionTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ea/PartialEscapeWithExceptionTest.java similarity index 87% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ea/PartialEscapeWithExceptionTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ea/PartialEscapeWithExceptionTest.java index 98c0f702764d..e49271fa3fd0 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ea/PartialEscapeWithExceptionTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ea/PartialEscapeWithExceptionTest.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test.ea; +package jdk.graal.compiler.core.test.ea; -import jdk.compiler.graal.api.directives.GraalDirectives; -import jdk.compiler.graal.core.common.GraalOptions; -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.options.OptionValues; +import jdk.graal.compiler.api.directives.GraalDirectives; +import jdk.graal.compiler.core.common.GraalOptions; +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.options.OptionValues; import org.junit.Test; public class PartialEscapeWithExceptionTest extends GraalCompilerTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ea/PoorMansEATest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ea/PoorMansEATest.java similarity index 81% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ea/PoorMansEATest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ea/PoorMansEATest.java index d155fd738e47..4dcfa457f441 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ea/PoorMansEATest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ea/PoorMansEATest.java @@ -22,19 +22,19 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test.ea; +package jdk.graal.compiler.core.test.ea; -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.debug.DebugDumpScope; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.nodes.FrameState; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions; -import jdk.compiler.graal.nodes.java.NewInstanceNode; -import jdk.compiler.graal.nodes.spi.CoreProviders; -import jdk.compiler.graal.phases.common.HighTierLoweringPhase; -import jdk.compiler.graal.phases.tiers.HighTierContext; +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.debug.DebugDumpScope; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.nodes.FrameState; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.StructuredGraph.AllowAssumptions; +import jdk.graal.compiler.nodes.java.NewInstanceNode; +import jdk.graal.compiler.nodes.spi.CoreProviders; +import jdk.graal.compiler.phases.common.HighTierLoweringPhase; +import jdk.graal.compiler.phases.tiers.HighTierContext; import org.junit.Test; public class PoorMansEATest extends GraalCompilerTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ea/ReadEliminationTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ea/ReadEliminationTest.java similarity index 91% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ea/ReadEliminationTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ea/ReadEliminationTest.java index 094fee83e010..a21b157d8e0b 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ea/ReadEliminationTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ea/ReadEliminationTest.java @@ -22,24 +22,24 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test.ea; - -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.nodes.IfNode; -import jdk.compiler.graal.nodes.LogicConstantNode; -import jdk.compiler.graal.nodes.ProxyNode; -import jdk.compiler.graal.nodes.ReturnNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.ValuePhiNode; -import jdk.compiler.graal.nodes.java.LoadFieldNode; -import jdk.compiler.graal.nodes.java.StoreFieldNode; -import jdk.compiler.graal.nodes.memory.ReadNode; -import jdk.compiler.graal.phases.common.HighTierLoweringPhase; -import jdk.compiler.graal.phases.tiers.HighTierContext; -import jdk.compiler.graal.virtual.phases.ea.ReadEliminationPhase; +package jdk.graal.compiler.core.test.ea; + +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.nodes.IfNode; +import jdk.graal.compiler.nodes.LogicConstantNode; +import jdk.graal.compiler.nodes.ProxyNode; +import jdk.graal.compiler.nodes.ReturnNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.StructuredGraph.AllowAssumptions; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.ValuePhiNode; +import jdk.graal.compiler.nodes.java.LoadFieldNode; +import jdk.graal.compiler.nodes.java.StoreFieldNode; +import jdk.graal.compiler.nodes.memory.ReadNode; +import jdk.graal.compiler.phases.common.HighTierLoweringPhase; +import jdk.graal.compiler.phases.tiers.HighTierContext; +import jdk.graal.compiler.virtual.phases.ea.ReadEliminationPhase; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ea/TrufflePEATest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ea/TrufflePEATest.java similarity index 91% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ea/TrufflePEATest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ea/TrufflePEATest.java index 77fc57271b74..b7879645cb56 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ea/TrufflePEATest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ea/TrufflePEATest.java @@ -22,18 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test.ea; +package jdk.graal.compiler.core.test.ea; import java.lang.reflect.Field; -import jdk.compiler.graal.core.common.GraalOptions; -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.extended.RawLoadNode; -import jdk.compiler.graal.nodes.extended.RawStoreNode; -import jdk.compiler.graal.nodes.virtual.CommitAllocationNode; -import jdk.compiler.graal.phases.tiers.HighTierContext; -import jdk.compiler.graal.virtual.phases.ea.PartialEscapePhase; +import jdk.graal.compiler.core.common.GraalOptions; +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.extended.RawLoadNode; +import jdk.graal.compiler.nodes.extended.RawStoreNode; +import jdk.graal.compiler.nodes.virtual.CommitAllocationNode; +import jdk.graal.compiler.phases.tiers.HighTierContext; +import jdk.graal.compiler.virtual.phases.ea.PartialEscapePhase; import org.junit.Test; import sun.misc.Unsafe; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ea/UnsafeCompareAndSwapVirtualizationTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ea/UnsafeCompareAndSwapVirtualizationTest.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ea/UnsafeCompareAndSwapVirtualizationTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ea/UnsafeCompareAndSwapVirtualizationTest.java index 4009ab54f9ec..35d45a6b4edc 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ea/UnsafeCompareAndSwapVirtualizationTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ea/UnsafeCompareAndSwapVirtualizationTest.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test.ea; +package jdk.graal.compiler.core.test.ea; import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.atomic.AtomicReferenceArray; -import jdk.compiler.graal.nodes.java.LogicCompareAndSwapNode; +import jdk.graal.compiler.nodes.java.LogicCompareAndSwapNode; import org.junit.Test; import jdk.vm.ci.meta.JavaConstant; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ea/UnsafeEATest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ea/UnsafeEATest.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ea/UnsafeEATest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ea/UnsafeEATest.java index 53a60482b4ad..243edeb9b33c 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ea/UnsafeEATest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/ea/UnsafeEATest.java @@ -22,21 +22,21 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test.ea; +package jdk.graal.compiler.core.test.ea; import java.nio.ByteBuffer; -import jdk.compiler.graal.api.directives.GraalDirectives; -import jdk.compiler.graal.graph.Graph; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.nodes.NamedLocationIdentity; -import jdk.compiler.graal.nodes.PhiNode; -import jdk.compiler.graal.nodes.ValuePhiNode; -import jdk.compiler.graal.nodes.calc.UnpackEndianHalfNode; -import jdk.compiler.graal.nodes.extended.RawLoadNode; -import jdk.compiler.graal.nodes.extended.RawStoreNode; -import jdk.compiler.graal.nodes.extended.UnsafeAccessNode; -import jdk.compiler.graal.nodes.java.LoadFieldNode; +import jdk.graal.compiler.api.directives.GraalDirectives; +import jdk.graal.compiler.graph.Graph; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.nodes.NamedLocationIdentity; +import jdk.graal.compiler.nodes.PhiNode; +import jdk.graal.compiler.nodes.ValuePhiNode; +import jdk.graal.compiler.nodes.calc.UnpackEndianHalfNode; +import jdk.graal.compiler.nodes.extended.RawLoadNode; +import jdk.graal.compiler.nodes.extended.RawStoreNode; +import jdk.graal.compiler.nodes.extended.UnsafeAccessNode; +import jdk.graal.compiler.nodes.java.LoadFieldNode; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/inlining/InliningTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/inlining/InliningTest.java similarity index 92% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/inlining/InliningTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/inlining/InliningTest.java index 9c7cae9cb859..ebf549a502bf 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/inlining/InliningTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/inlining/InliningTest.java @@ -22,26 +22,26 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test.inlining; +package jdk.graal.compiler.core.test.inlining; import java.util.regex.Pattern; -import jdk.compiler.graal.core.common.GraalOptions; -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.debug.DebugDumpScope; -import jdk.compiler.graal.debug.TTY; -import jdk.compiler.graal.nodes.FullInfopointNode; -import jdk.compiler.graal.nodes.Invoke; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions; -import jdk.compiler.graal.nodes.StructuredGraph.Builder; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.phases.OptimisticOptimizations; -import jdk.compiler.graal.phases.PhaseSuite; -import jdk.compiler.graal.phases.common.DeadCodeEliminationPhase; -import jdk.compiler.graal.phases.tiers.HighTierContext; +import jdk.graal.compiler.core.common.GraalOptions; +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.debug.DebugDumpScope; +import jdk.graal.compiler.debug.TTY; +import jdk.graal.compiler.nodes.FullInfopointNode; +import jdk.graal.compiler.nodes.Invoke; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.StructuredGraph.AllowAssumptions; +import jdk.graal.compiler.nodes.StructuredGraph.Builder; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.phases.OptimisticOptimizations; +import jdk.graal.compiler.phases.PhaseSuite; +import jdk.graal.compiler.phases.common.DeadCodeEliminationPhase; +import jdk.graal.compiler.phases.tiers.HighTierContext; import org.junit.Assert; import org.junit.Ignore; import org.junit.Test; @@ -224,11 +224,11 @@ public void testTracing() { graph = getGraph("traceInliningTest", options, false); } String inliningTree = graph.getInliningLog().formatAsTree(false); - String expectedRegex = "compilation of jdk.compiler.graal.core.test.inlining.InliningTest.traceInliningTest.*: \\R" + - " at .*jdk.compiler.graal.core.test.inlining.InliningTest.traceInliningTest.*: jdk.compiler.graal.core.test.inlining.InliningTest.callTrivial.*: yes, inline method\\R" + - " at .*jdk.compiler.graal.core.test.inlining.InliningTest.callTrivial.*: .*\\R" + - " .* jdk.compiler.graal.core.test.inlining.InliningTest.callNonTrivial.*: .*(.*\\R)*" + - " .* jdk.compiler.graal.core.test.inlining.InliningTest.callNonTrivial.*: .*(.*\\R)*"; + String expectedRegex = "compilation of jdk.graal.compiler.core.test.inlining.InliningTest.traceInliningTest.*: \\R" + + " at .*jdk.graal.compiler.core.test.inlining.InliningTest.traceInliningTest.*: jdk.graal.compiler.core.test.inlining.InliningTest.callTrivial.*: yes, inline method\\R" + + " at .*jdk.graal.compiler.core.test.inlining.InliningTest.callTrivial.*: .*\\R" + + " .* jdk.graal.compiler.core.test.inlining.InliningTest.callNonTrivial.*: .*(.*\\R)*" + + " .* jdk.graal.compiler.core.test.inlining.InliningTest.callNonTrivial.*: .*(.*\\R)*"; Pattern expectedPattern = Pattern.compile(expectedRegex, Pattern.MULTILINE); Assert.assertTrue("Got: " + inliningTree, expectedPattern.matcher(inliningTree).matches()); } diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/inlining/NestedLoopEffectsPhaseComplexityTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/inlining/NestedLoopEffectsPhaseComplexityTest.java similarity index 85% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/inlining/NestedLoopEffectsPhaseComplexityTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/inlining/NestedLoopEffectsPhaseComplexityTest.java index 7a089212401b..ccd4976e5683 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/inlining/NestedLoopEffectsPhaseComplexityTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/inlining/NestedLoopEffectsPhaseComplexityTest.java @@ -22,30 +22,30 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test.inlining; +package jdk.graal.compiler.core.test.inlining; -import static jdk.compiler.graal.phases.common.DeadCodeEliminationPhase.Optionality.Optional; +import static jdk.graal.compiler.phases.common.DeadCodeEliminationPhase.Optionality.Optional; import org.graalvm.collections.EconomicSet; -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.debug.TTY; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.nodes.Invoke; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions; -import jdk.compiler.graal.nodes.java.MethodCallTargetNode; -import jdk.compiler.graal.nodes.spi.CoreProviders; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.phases.BasePhase; -import jdk.compiler.graal.phases.OptimisticOptimizations; -import jdk.compiler.graal.phases.PhaseSuite; -import jdk.compiler.graal.phases.common.CanonicalizerPhase; -import jdk.compiler.graal.phases.common.DeadCodeEliminationPhase; -import jdk.compiler.graal.phases.common.inlining.InliningUtil; -import jdk.compiler.graal.phases.tiers.HighTierContext; -import jdk.compiler.graal.virtual.phases.ea.ReadEliminationPhase; -import jdk.compiler.graal.virtual.phases.ea.PartialEscapePhase; +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.debug.TTY; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.nodes.Invoke; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.StructuredGraph.AllowAssumptions; +import jdk.graal.compiler.nodes.java.MethodCallTargetNode; +import jdk.graal.compiler.nodes.spi.CoreProviders; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.phases.BasePhase; +import jdk.graal.compiler.phases.OptimisticOptimizations; +import jdk.graal.compiler.phases.PhaseSuite; +import jdk.graal.compiler.phases.common.CanonicalizerPhase; +import jdk.graal.compiler.phases.common.DeadCodeEliminationPhase; +import jdk.graal.compiler.phases.common.inlining.InliningUtil; +import jdk.graal.compiler.phases.tiers.HighTierContext; +import jdk.graal.compiler.virtual.phases.ea.ReadEliminationPhase; +import jdk.graal.compiler.virtual.phases.ea.PartialEscapePhase; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TestRule; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/inlining/NestedLoopEffectsPhaseComplexityTest2.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/inlining/NestedLoopEffectsPhaseComplexityTest2.java similarity index 92% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/inlining/NestedLoopEffectsPhaseComplexityTest2.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/inlining/NestedLoopEffectsPhaseComplexityTest2.java index b24c0a9afbf7..d798a379a5e7 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/inlining/NestedLoopEffectsPhaseComplexityTest2.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/inlining/NestedLoopEffectsPhaseComplexityTest2.java @@ -22,35 +22,35 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test.inlining; +package jdk.graal.compiler.core.test.inlining; -import static jdk.compiler.graal.debug.DebugOptions.DumpOnError; -import static jdk.compiler.graal.phases.common.DeadCodeEliminationPhase.Optionality.Optional; +import static jdk.graal.compiler.debug.DebugOptions.DumpOnError; +import static jdk.graal.compiler.phases.common.DeadCodeEliminationPhase.Optionality.Optional; import org.graalvm.collections.EconomicSet; -import jdk.compiler.graal.api.directives.GraalDirectives; -import jdk.compiler.graal.core.common.GraalOptions; -import jdk.compiler.graal.core.common.RetryableBailoutException; -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.debug.TTY; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.nodes.Invoke; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions; -import jdk.compiler.graal.nodes.java.MethodCallTargetNode; -import jdk.compiler.graal.nodes.java.NewInstanceNode; -import jdk.compiler.graal.nodes.spi.CoreProviders; -import jdk.compiler.graal.nodes.virtual.CommitAllocationNode; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.phases.BasePhase; -import jdk.compiler.graal.phases.OptimisticOptimizations; -import jdk.compiler.graal.phases.PhaseSuite; -import jdk.compiler.graal.phases.common.CanonicalizerPhase; -import jdk.compiler.graal.phases.common.DeadCodeEliminationPhase; -import jdk.compiler.graal.phases.common.inlining.InliningUtil; -import jdk.compiler.graal.phases.tiers.HighTierContext; -import jdk.compiler.graal.virtual.phases.ea.PartialEscapePhase; +import jdk.graal.compiler.api.directives.GraalDirectives; +import jdk.graal.compiler.core.common.GraalOptions; +import jdk.graal.compiler.core.common.RetryableBailoutException; +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.debug.TTY; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.nodes.Invoke; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.StructuredGraph.AllowAssumptions; +import jdk.graal.compiler.nodes.java.MethodCallTargetNode; +import jdk.graal.compiler.nodes.java.NewInstanceNode; +import jdk.graal.compiler.nodes.spi.CoreProviders; +import jdk.graal.compiler.nodes.virtual.CommitAllocationNode; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.phases.BasePhase; +import jdk.graal.compiler.phases.OptimisticOptimizations; +import jdk.graal.compiler.phases.PhaseSuite; +import jdk.graal.compiler.phases.common.CanonicalizerPhase; +import jdk.graal.compiler.phases.common.DeadCodeEliminationPhase; +import jdk.graal.compiler.phases.common.inlining.InliningUtil; +import jdk.graal.compiler.phases.tiers.HighTierContext; +import jdk.graal.compiler.virtual.phases.ea.PartialEscapePhase; import org.junit.Assert; import org.junit.Rule; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/jfr/TestGetEventWriter.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/jfr/TestGetEventWriter.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/jfr/TestGetEventWriter.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/jfr/TestGetEventWriter.java index 501f9f237b8a..27cca77802f2 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/jfr/TestGetEventWriter.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/jfr/TestGetEventWriter.java @@ -22,18 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test.jfr; +package jdk.graal.compiler.core.test.jfr; import java.io.IOException; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; -import jdk.compiler.graal.core.common.PermanentBailoutException; -import jdk.compiler.graal.core.test.SubprocessTest; -import jdk.compiler.graal.serviceprovider.GraalServices; -import jdk.compiler.graal.serviceprovider.JavaVersionUtil; -import jdk.compiler.graal.test.AddExports; -import jdk.compiler.graal.test.SubprocessUtil; +import jdk.graal.compiler.core.common.PermanentBailoutException; +import jdk.graal.compiler.core.test.SubprocessTest; +import jdk.graal.compiler.serviceprovider.GraalServices; +import jdk.graal.compiler.serviceprovider.JavaVersionUtil; +import jdk.graal.compiler.test.AddExports; +import jdk.graal.compiler.test.SubprocessUtil; import org.junit.Assert; import org.junit.Assume; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/tutorial/GraalTutorial.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/tutorial/GraalTutorial.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/tutorial/GraalTutorial.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/tutorial/GraalTutorial.java index c82209b8d811..0589873448dd 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/tutorial/GraalTutorial.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/tutorial/GraalTutorial.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test.tutorial; +package jdk.graal.compiler.core.test.tutorial; import java.lang.reflect.Method; import java.util.regex.Pattern; -import jdk.compiler.graal.bytecode.BytecodeDisassembler; +import jdk.graal.compiler.bytecode.BytecodeDisassembler; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/tutorial/InvokeGraal.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/tutorial/InvokeGraal.java similarity index 85% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/tutorial/InvokeGraal.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/tutorial/InvokeGraal.java index abb6c3238ee4..038ac331b898 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/tutorial/InvokeGraal.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/tutorial/InvokeGraal.java @@ -22,32 +22,32 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test.tutorial; +package jdk.graal.compiler.core.test.tutorial; -import static jdk.compiler.graal.core.common.CompilationRequestIdentifier.asCompilationRequest; -import static jdk.compiler.graal.core.test.GraalCompilerTest.getInitialOptions; +import static jdk.graal.compiler.core.common.CompilationRequestIdentifier.asCompilationRequest; +import static jdk.graal.compiler.core.test.GraalCompilerTest.getInitialOptions; import java.lang.reflect.Method; -import jdk.compiler.graal.api.test.Graal; -import jdk.compiler.graal.code.CompilationResult; -import jdk.compiler.graal.core.GraalCompiler; -import jdk.compiler.graal.core.common.CompilationIdentifier; -import jdk.compiler.graal.core.target.Backend; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.debug.DebugContext.Builder; -import jdk.compiler.graal.debug.DebugDumpScope; -import jdk.compiler.graal.lir.asm.CompilationResultBuilderFactory; -import jdk.compiler.graal.lir.phases.LIRSuites; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.phases.OptimisticOptimizations; -import jdk.compiler.graal.phases.PhaseSuite; -import jdk.compiler.graal.phases.tiers.HighTierContext; -import jdk.compiler.graal.phases.tiers.Suites; -import jdk.compiler.graal.phases.util.Providers; -import jdk.compiler.graal.runtime.RuntimeProvider; +import jdk.graal.compiler.api.test.Graal; +import jdk.graal.compiler.code.CompilationResult; +import jdk.graal.compiler.core.GraalCompiler; +import jdk.graal.compiler.core.common.CompilationIdentifier; +import jdk.graal.compiler.core.target.Backend; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.debug.DebugContext.Builder; +import jdk.graal.compiler.debug.DebugDumpScope; +import jdk.graal.compiler.lir.asm.CompilationResultBuilderFactory; +import jdk.graal.compiler.lir.phases.LIRSuites; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.StructuredGraph.AllowAssumptions; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.phases.OptimisticOptimizations; +import jdk.graal.compiler.phases.PhaseSuite; +import jdk.graal.compiler.phases.tiers.HighTierContext; +import jdk.graal.compiler.phases.tiers.Suites; +import jdk.graal.compiler.phases.util.Providers; +import jdk.graal.compiler.runtime.RuntimeProvider; import jdk.vm.ci.code.CodeCacheProvider; import jdk.vm.ci.code.InstalledCode; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/tutorial/StaticAnalysis.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/tutorial/StaticAnalysis.java similarity index 93% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/tutorial/StaticAnalysis.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/tutorial/StaticAnalysis.java index 6ca1ab56c09b..14fbcc81c45a 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/tutorial/StaticAnalysis.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/tutorial/StaticAnalysis.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test.tutorial; +package jdk.graal.compiler.core.test.tutorial; -import static jdk.compiler.graal.core.test.GraalCompilerTest.getInitialOptions; +import static jdk.graal.compiler.core.test.GraalCompilerTest.getInitialOptions; import java.util.ArrayDeque; import java.util.Collections; @@ -34,35 +34,35 @@ import java.util.Map; import java.util.Set; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.debug.DebugContext.Builder; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.graph.NodeMap; -import jdk.compiler.graal.java.GraphBuilderPhase; -import jdk.compiler.graal.nodes.CallTargetNode.InvokeKind; -import jdk.compiler.graal.nodes.ConstantNode; -import jdk.compiler.graal.nodes.FixedNode; -import jdk.compiler.graal.nodes.Invoke; -import jdk.compiler.graal.nodes.ParameterNode; -import jdk.compiler.graal.nodes.ReturnNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.ValuePhiNode; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration.BytecodeExceptionMode; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins; -import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins; -import jdk.compiler.graal.nodes.java.LoadFieldNode; -import jdk.compiler.graal.nodes.java.MethodCallTargetNode; -import jdk.compiler.graal.nodes.java.NewArrayNode; -import jdk.compiler.graal.nodes.java.NewInstanceNode; -import jdk.compiler.graal.nodes.java.StoreFieldNode; -import jdk.compiler.graal.nodes.spi.CoreProviders; -import jdk.compiler.graal.nodes.util.GraphUtil; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.phases.OptimisticOptimizations; -import jdk.compiler.graal.phases.graph.StatelessPostOrderNodeIterator; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.debug.DebugContext.Builder; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.graph.NodeMap; +import jdk.graal.compiler.java.GraphBuilderPhase; +import jdk.graal.compiler.nodes.CallTargetNode.InvokeKind; +import jdk.graal.compiler.nodes.ConstantNode; +import jdk.graal.compiler.nodes.FixedNode; +import jdk.graal.compiler.nodes.Invoke; +import jdk.graal.compiler.nodes.ParameterNode; +import jdk.graal.compiler.nodes.ReturnNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.ValuePhiNode; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.BytecodeExceptionMode; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins; +import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins; +import jdk.graal.compiler.nodes.java.LoadFieldNode; +import jdk.graal.compiler.nodes.java.MethodCallTargetNode; +import jdk.graal.compiler.nodes.java.NewArrayNode; +import jdk.graal.compiler.nodes.java.NewInstanceNode; +import jdk.graal.compiler.nodes.java.StoreFieldNode; +import jdk.graal.compiler.nodes.spi.CoreProviders; +import jdk.graal.compiler.nodes.util.GraphUtil; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.phases.OptimisticOptimizations; +import jdk.graal.compiler.phases.graph.StatelessPostOrderNodeIterator; import jdk.vm.ci.meta.JavaConstant; import jdk.vm.ci.meta.JavaKind; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/tutorial/StaticAnalysisTests.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/tutorial/StaticAnalysisTests.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/tutorial/StaticAnalysisTests.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/tutorial/StaticAnalysisTests.java index ebb8678019c9..8e4576efaa4e 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/tutorial/StaticAnalysisTests.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/tutorial/StaticAnalysisTests.java @@ -22,17 +22,17 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.test.tutorial; +package jdk.graal.compiler.core.test.tutorial; import java.lang.reflect.Field; import java.lang.reflect.Method; import java.util.Arrays; import java.util.Collection; -import jdk.compiler.graal.api.test.Graal; -import jdk.compiler.graal.core.target.Backend; -import jdk.compiler.graal.nodes.spi.CoreProviders; -import jdk.compiler.graal.runtime.RuntimeProvider; +import jdk.graal.compiler.api.test.Graal; +import jdk.graal.compiler.core.target.Backend; +import jdk.graal.compiler.nodes.spi.CoreProviders; +import jdk.graal.compiler.runtime.RuntimeProvider; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/debug/test/CSVUtilTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/debug/test/CSVUtilTest.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/debug/test/CSVUtilTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/debug/test/CSVUtilTest.java index 61a7948d67f1..57135f61bc7b 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/debug/test/CSVUtilTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/debug/test/CSVUtilTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.debug.test; +package jdk.graal.compiler.debug.test; import static org.junit.Assert.assertEquals; @@ -32,8 +32,8 @@ import java.util.Arrays; import java.util.Collection; -import jdk.compiler.graal.debug.CSVUtil; -import jdk.compiler.graal.debug.LogStream; +import jdk.graal.compiler.debug.CSVUtil; +import jdk.graal.compiler.debug.LogStream; import org.junit.Assert; import org.junit.Test; import org.junit.experimental.runners.Enclosed; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/debug/test/CompilationAlarmTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/debug/test/CompilationAlarmTest.java similarity index 89% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/debug/test/CompilationAlarmTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/debug/test/CompilationAlarmTest.java index 52c824ab22dc..bc125bee4e97 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/debug/test/CompilationAlarmTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/debug/test/CompilationAlarmTest.java @@ -22,27 +22,27 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.debug.test; +package jdk.graal.compiler.debug.test; import java.util.Optional; -import jdk.compiler.graal.api.directives.GraalDirectives; -import jdk.compiler.graal.code.CompilationResult; -import jdk.compiler.graal.core.GraalCompiler; -import jdk.compiler.graal.core.GraalCompiler.Request; -import jdk.compiler.graal.core.common.CompilationIdentifier; -import jdk.compiler.graal.core.common.util.CompilationAlarm; -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.debug.TTY; -import jdk.compiler.graal.lir.asm.CompilationResultBuilderFactory; -import jdk.compiler.graal.nodes.GraphState; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.phases.BasePhase; -import jdk.compiler.graal.phases.tiers.LowTierContext; -import jdk.compiler.graal.phases.tiers.Suites; +import jdk.graal.compiler.api.directives.GraalDirectives; +import jdk.graal.compiler.code.CompilationResult; +import jdk.graal.compiler.core.GraalCompiler; +import jdk.graal.compiler.core.GraalCompiler.Request; +import jdk.graal.compiler.core.common.CompilationIdentifier; +import jdk.graal.compiler.core.common.util.CompilationAlarm; +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.debug.TTY; +import jdk.graal.compiler.lir.asm.CompilationResultBuilderFactory; +import jdk.graal.compiler.nodes.GraphState; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.StructuredGraph.AllowAssumptions; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.phases.BasePhase; +import jdk.graal.compiler.phases.tiers.LowTierContext; +import jdk.graal.compiler.phases.tiers.Suites; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/debug/test/DebugContextTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/debug/test/DebugContextTest.java similarity index 94% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/debug/test/DebugContextTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/debug/test/DebugContextTest.java index 2ba1a60f8449..0d4fa3e2c01d 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/debug/test/DebugContextTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/debug/test/DebugContextTest.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.debug.test; +package jdk.graal.compiler.debug.test; -import static jdk.compiler.graal.debug.DebugContext.NO_DESCRIPTION; -import static jdk.compiler.graal.debug.DebugContext.NO_GLOBAL_METRIC_VALUES; +import static jdk.graal.compiler.debug.DebugContext.NO_DESCRIPTION; +import static jdk.graal.compiler.debug.DebugContext.NO_GLOBAL_METRIC_VALUES; import java.io.BufferedReader; import java.io.ByteArrayOutputStream; @@ -38,21 +38,21 @@ import java.util.stream.Collectors; import org.graalvm.collections.EconomicMap; -import jdk.compiler.graal.debug.Assertions; -import jdk.compiler.graal.debug.CounterKey; -import jdk.compiler.graal.debug.DebugCloseable; -import jdk.compiler.graal.debug.DebugConfig; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.debug.DebugContext.Builder; -import jdk.compiler.graal.debug.DebugContext.Scope; -import jdk.compiler.graal.debug.DebugDumpHandler; -import jdk.compiler.graal.debug.DebugHandler; -import jdk.compiler.graal.debug.DebugHandlersFactory; -import jdk.compiler.graal.debug.DebugOptions; -import jdk.compiler.graal.debug.DebugVerifyHandler; -import jdk.compiler.graal.options.OptionKey; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.serviceprovider.GraalServices; +import jdk.graal.compiler.debug.Assertions; +import jdk.graal.compiler.debug.CounterKey; +import jdk.graal.compiler.debug.DebugCloseable; +import jdk.graal.compiler.debug.DebugConfig; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.debug.DebugContext.Builder; +import jdk.graal.compiler.debug.DebugContext.Scope; +import jdk.graal.compiler.debug.DebugDumpHandler; +import jdk.graal.compiler.debug.DebugHandler; +import jdk.graal.compiler.debug.DebugHandlersFactory; +import jdk.graal.compiler.debug.DebugOptions; +import jdk.graal.compiler.debug.DebugVerifyHandler; +import jdk.graal.compiler.options.OptionKey; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.serviceprovider.GraalServices; import org.junit.Assert; import org.junit.Assume; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/debug/test/DebugContextTest.testLogging.input b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/debug/test/DebugContextTest.testLogging.input similarity index 100% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/debug/test/DebugContextTest.testLogging.input rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/debug/test/DebugContextTest.testLogging.input diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/debug/test/GraalErrorTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/debug/test/GraalErrorTest.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/debug/test/GraalErrorTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/debug/test/GraalErrorTest.java index c88f5d94192c..3620fe94cbaf 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/debug/test/GraalErrorTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/debug/test/GraalErrorTest.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.debug.test; +package jdk.graal.compiler.debug.test; -import jdk.compiler.graal.debug.GraalError; +import jdk.graal.compiler.debug.GraalError; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/debug/test/LogStreamTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/debug/test/LogStreamTest.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/debug/test/LogStreamTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/debug/test/LogStreamTest.java index f147f953c06f..5e1c053ed810 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/debug/test/LogStreamTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/debug/test/LogStreamTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.debug.test; +package jdk.graal.compiler.debug.test; import static org.junit.Assert.assertEquals; @@ -30,7 +30,7 @@ import java.io.PrintStream; import java.nio.charset.StandardCharsets; -import jdk.compiler.graal.debug.LogStream; +import jdk.graal.compiler.debug.LogStream; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/debug/test/TTYTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/debug/test/TTYTest.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/debug/test/TTYTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/debug/test/TTYTest.java index 8e6bd523b937..cbb9dd2c3a25 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/debug/test/TTYTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/debug/test/TTYTest.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.debug.test; +package jdk.graal.compiler.debug.test; -import jdk.compiler.graal.debug.TTY; +import jdk.graal.compiler.debug.TTY; import org.junit.Test; public class TTYTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/debug/test/TimerKeyTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/debug/test/TimerKeyTest.java similarity index 89% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/debug/test/TimerKeyTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/debug/test/TimerKeyTest.java index 6fac9af998c0..4c126a7deaaa 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/debug/test/TimerKeyTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/debug/test/TimerKeyTest.java @@ -22,20 +22,20 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.debug.test; +package jdk.graal.compiler.debug.test; -import static jdk.compiler.graal.debug.DebugContext.NO_CONFIG_CUSTOMIZERS; +import static jdk.graal.compiler.debug.DebugContext.NO_CONFIG_CUSTOMIZERS; import static org.junit.Assert.assertEquals; import org.graalvm.collections.EconomicMap; -import jdk.compiler.graal.debug.DebugCloseable; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.debug.DebugContext.Builder; -import jdk.compiler.graal.debug.DebugOptions; -import jdk.compiler.graal.debug.TimerKey; -import jdk.compiler.graal.options.OptionKey; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.serviceprovider.GraalServices; +import jdk.graal.compiler.debug.DebugCloseable; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.debug.DebugContext.Builder; +import jdk.graal.compiler.debug.DebugOptions; +import jdk.graal.compiler.debug.TimerKey; +import jdk.graal.compiler.options.OptionKey; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.serviceprovider.GraalServices; import org.junit.Assume; import org.junit.AssumptionViolatedException; import org.junit.Before; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/debug/test/VersionsTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/debug/test/VersionsTest.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/debug/test/VersionsTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/debug/test/VersionsTest.java index 3791cf1e9e09..ec6f2f1b4ca3 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/debug/test/VersionsTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/debug/test/VersionsTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.debug.test; +package jdk.graal.compiler.debug.test; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -45,7 +45,7 @@ import java.util.HashMap; import java.util.Map; -import jdk.compiler.graal.debug.Versions; +import jdk.graal.compiler.debug.Versions; import org.junit.After; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/graph/test/GraphTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/graph/test/GraphTest.java similarity index 90% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/graph/test/GraphTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/graph/test/GraphTest.java index 06abd8ebb673..d0d37250bff9 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/graph/test/GraphTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/graph/test/GraphTest.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.graph.test; +package jdk.graal.compiler.graph.test; -import jdk.compiler.graal.api.test.Graal; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.debug.DebugContext.Builder; -import jdk.compiler.graal.options.OptionValues; +import jdk.graal.compiler.api.test.Graal; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.debug.DebugContext.Builder; +import jdk.graal.compiler.options.OptionValues; import org.junit.After; public abstract class GraphTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/graph/test/NodeBitMapTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/graph/test/NodeBitMapTest.java similarity index 93% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/graph/test/NodeBitMapTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/graph/test/NodeBitMapTest.java index beb09e3efb68..440edf8ca4ad 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/graph/test/NodeBitMapTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/graph/test/NodeBitMapTest.java @@ -22,22 +22,22 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.graph.test; +package jdk.graal.compiler.graph.test; -import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_IGNORED; -import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_IGNORED; +import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_IGNORED; +import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_IGNORED; import java.util.ConcurrentModificationException; import java.util.Iterator; import java.util.NoSuchElementException; -import jdk.compiler.graal.api.test.Graal; -import jdk.compiler.graal.graph.Graph; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.graph.NodeBitMap; -import jdk.compiler.graal.graph.NodeClass; -import jdk.compiler.graal.nodeinfo.NodeInfo; -import jdk.compiler.graal.options.OptionValues; +import jdk.graal.compiler.api.test.Graal; +import jdk.graal.compiler.graph.Graph; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.graph.NodeBitMap; +import jdk.graal.compiler.graph.NodeClass; +import jdk.graal.compiler.nodeinfo.NodeInfo; +import jdk.graal.compiler.options.OptionValues; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/graph/test/NodeFormatToTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/graph/test/NodeFormatToTest.java similarity index 94% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/graph/test/NodeFormatToTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/graph/test/NodeFormatToTest.java index 85163efd6364..4e75805cd38f 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/graph/test/NodeFormatToTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/graph/test/NodeFormatToTest.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.graph.test; +package jdk.graal.compiler.graph.test; import java.util.Formatter; -import jdk.compiler.graal.graph.Graph; -import jdk.compiler.graal.options.OptionValues; +import jdk.graal.compiler.graph.Graph; +import jdk.graal.compiler.options.OptionValues; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/graph/test/NodeInputListTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/graph/test/NodeInputListTest.java similarity index 88% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/graph/test/NodeInputListTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/graph/test/NodeInputListTest.java index 9287ecb3d12e..899c6ecbf166 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/graph/test/NodeInputListTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/graph/test/NodeInputListTest.java @@ -22,17 +22,17 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.graph.test; +package jdk.graal.compiler.graph.test; -import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_IGNORED; -import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_IGNORED; +import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_IGNORED; +import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_IGNORED; -import jdk.compiler.graal.graph.Graph; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.graph.NodeClass; -import jdk.compiler.graal.graph.NodeInputList; -import jdk.compiler.graal.nodeinfo.NodeInfo; -import jdk.compiler.graal.options.OptionValues; +import jdk.graal.compiler.graph.Graph; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.graph.NodeClass; +import jdk.graal.compiler.graph.NodeInputList; +import jdk.graal.compiler.nodeinfo.NodeInfo; +import jdk.graal.compiler.options.OptionValues; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/graph/test/NodeMapTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/graph/test/NodeMapTest.java similarity index 90% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/graph/test/NodeMapTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/graph/test/NodeMapTest.java index 1e2af4ff283a..f71a176425b2 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/graph/test/NodeMapTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/graph/test/NodeMapTest.java @@ -22,24 +22,24 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.graph.test; +package jdk.graal.compiler.graph.test; -import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_IGNORED; -import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_IGNORED; +import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_IGNORED; +import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_IGNORED; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; -import jdk.compiler.graal.api.test.Graal; +import jdk.graal.compiler.api.test.Graal; import org.junit.Before; import org.junit.Test; -import jdk.compiler.graal.debug.Assertions; -import jdk.compiler.graal.graph.Graph; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.graph.NodeClass; -import jdk.compiler.graal.graph.NodeMap; -import jdk.compiler.graal.nodeinfo.NodeInfo; -import jdk.compiler.graal.options.OptionValues; +import jdk.graal.compiler.debug.Assertions; +import jdk.graal.compiler.graph.Graph; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.graph.NodeClass; +import jdk.graal.compiler.graph.NodeMap; +import jdk.graal.compiler.nodeinfo.NodeInfo; +import jdk.graal.compiler.options.OptionValues; public class NodeMapTest extends GraphTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/graph/test/NodeUnionFindTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/graph/test/NodeUnionFindTest.java similarity index 90% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/graph/test/NodeUnionFindTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/graph/test/NodeUnionFindTest.java index fc321532a437..1ecee7495507 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/graph/test/NodeUnionFindTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/graph/test/NodeUnionFindTest.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.graph.test; +package jdk.graal.compiler.graph.test; -import jdk.compiler.graal.graph.Graph; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.graph.NodeUnionFind; -import jdk.compiler.graal.options.OptionValues; +import jdk.graal.compiler.graph.Graph; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.graph.NodeUnionFind; +import jdk.graal.compiler.options.OptionValues; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/graph/test/NodeUsageIterableTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/graph/test/NodeUsageIterableTest.java similarity index 89% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/graph/test/NodeUsageIterableTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/graph/test/NodeUsageIterableTest.java index 98a18eeae704..347e39d3ee4b 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/graph/test/NodeUsageIterableTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/graph/test/NodeUsageIterableTest.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.graph.test; +package jdk.graal.compiler.graph.test; -import jdk.compiler.graal.graph.Graph; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.graph.iterators.NodeIterable; -import jdk.compiler.graal.options.OptionValues; +import jdk.graal.compiler.graph.Graph; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.graph.iterators.NodeIterable; +import jdk.graal.compiler.options.OptionValues; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/graph/test/NodeUsagesTests.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/graph/test/NodeUsagesTests.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/graph/test/NodeUsagesTests.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/graph/test/NodeUsagesTests.java index a91a5c34de55..dc05638ba3a8 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/graph/test/NodeUsagesTests.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/graph/test/NodeUsagesTests.java @@ -22,25 +22,25 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.graph.test; +package jdk.graal.compiler.graph.test; -import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_IGNORED; -import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_IGNORED; +import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_IGNORED; +import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_IGNORED; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; -import jdk.compiler.graal.graph.test.matchers.NodeIterableContains; -import jdk.compiler.graal.graph.test.matchers.NodeIterableIsEmpty; -import jdk.compiler.graal.graph.GraalGraphError; -import jdk.compiler.graal.graph.Graph; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.graph.NodeClass; -import jdk.compiler.graal.graph.NodeInputList; -import jdk.compiler.graal.graph.NodeSuccessorList; -import jdk.compiler.graal.graph.Position; -import jdk.compiler.graal.nodeinfo.NodeInfo; -import jdk.compiler.graal.options.OptionValues; +import jdk.graal.compiler.graph.test.matchers.NodeIterableContains; +import jdk.graal.compiler.graph.test.matchers.NodeIterableIsEmpty; +import jdk.graal.compiler.graph.GraalGraphError; +import jdk.graal.compiler.graph.Graph; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.graph.NodeClass; +import jdk.graal.compiler.graph.NodeInputList; +import jdk.graal.compiler.graph.NodeSuccessorList; +import jdk.graal.compiler.graph.Position; +import jdk.graal.compiler.nodeinfo.NodeInfo; +import jdk.graal.compiler.options.OptionValues; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/graph/test/NodeValidationChecksTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/graph/test/NodeValidationChecksTest.java similarity index 89% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/graph/test/NodeValidationChecksTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/graph/test/NodeValidationChecksTest.java index 1097cea761d1..8cdb0d443edc 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/graph/test/NodeValidationChecksTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/graph/test/NodeValidationChecksTest.java @@ -22,18 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.graph.test; +package jdk.graal.compiler.graph.test; -import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_UNKNOWN; -import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_UNKNOWN; +import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_UNKNOWN; +import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_UNKNOWN; import org.junit.Assert; import org.junit.Test; -import jdk.compiler.graal.graph.Graph; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.graph.NodeClass; -import jdk.compiler.graal.nodeinfo.NodeInfo; +import jdk.graal.compiler.graph.Graph; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.graph.NodeClass; +import jdk.graal.compiler.nodeinfo.NodeInfo; public class NodeValidationChecksTest extends GraphTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/graph/test/TestNodeInterface.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/graph/test/TestNodeInterface.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/graph/test/TestNodeInterface.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/graph/test/TestNodeInterface.java index 07941c7aa5d3..890377cb07d0 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/graph/test/TestNodeInterface.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/graph/test/TestNodeInterface.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.graph.test; +package jdk.graal.compiler.graph.test; public interface TestNodeInterface { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/graph/test/TypedNodeIteratorTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/graph/test/TypedNodeIteratorTest.java similarity index 93% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/graph/test/TypedNodeIteratorTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/graph/test/TypedNodeIteratorTest.java index 4659148122ed..c59c9ce778ec 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/graph/test/TypedNodeIteratorTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/graph/test/TypedNodeIteratorTest.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.graph.test; +package jdk.graal.compiler.graph.test; -import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_IGNORED; -import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_IGNORED; +import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_IGNORED; +import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_IGNORED; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; @@ -34,14 +34,14 @@ import java.util.Iterator; -import jdk.compiler.graal.api.test.Graal; +import jdk.graal.compiler.api.test.Graal; import org.junit.Test; -import jdk.compiler.graal.graph.Graph; -import jdk.compiler.graal.graph.IterableNodeType; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.graph.NodeClass; -import jdk.compiler.graal.nodeinfo.NodeInfo; -import jdk.compiler.graal.options.OptionValues; +import jdk.graal.compiler.graph.Graph; +import jdk.graal.compiler.graph.IterableNodeType; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.graph.NodeClass; +import jdk.graal.compiler.nodeinfo.NodeInfo; +import jdk.graal.compiler.options.OptionValues; public class TypedNodeIteratorTest extends GraphTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/graph/test/TypedNodeIteratorTest2.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/graph/test/TypedNodeIteratorTest2.java similarity index 91% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/graph/test/TypedNodeIteratorTest2.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/graph/test/TypedNodeIteratorTest2.java index 6bf7e29fc3ae..5656d4e65464 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/graph/test/TypedNodeIteratorTest2.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/graph/test/TypedNodeIteratorTest2.java @@ -22,20 +22,20 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.graph.test; +package jdk.graal.compiler.graph.test; -import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_IGNORED; -import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_IGNORED; +import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_IGNORED; +import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_IGNORED; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import org.junit.Test; -import jdk.compiler.graal.graph.Graph; -import jdk.compiler.graal.graph.IterableNodeType; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.graph.NodeClass; -import jdk.compiler.graal.nodeinfo.NodeInfo; +import jdk.graal.compiler.graph.Graph; +import jdk.graal.compiler.graph.IterableNodeType; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.graph.NodeClass; +import jdk.graal.compiler.nodeinfo.NodeInfo; public class TypedNodeIteratorTest2 extends GraphTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/graph/test/graphio/GraphOutputTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/graph/test/graphio/GraphOutputTest.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/graph/test/graphio/GraphOutputTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/graph/test/graphio/GraphOutputTest.java index 75a5873468ce..09a66b438be4 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/graph/test/graphio/GraphOutputTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/graph/test/graphio/GraphOutputTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.graph.test.graphio; +package jdk.graal.compiler.graph.test.graphio; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertFalse; @@ -38,9 +38,9 @@ import java.util.Collections; import java.util.Map; import java.util.Objects; -import jdk.compiler.graal.graphio.GraphOutput; -import jdk.compiler.graal.graphio.GraphStructure; -import jdk.compiler.graal.graphio.GraphTypes; +import jdk.graal.compiler.graphio.GraphOutput; +import jdk.graal.compiler.graphio.GraphStructure; +import jdk.graal.compiler.graphio.GraphTypes; import static org.junit.Assert.assertSame; import org.junit.Test; import java.lang.reflect.Field; @@ -125,7 +125,7 @@ public void testEmbeddedWritableByteChannel() throws IOException { @Test @SuppressWarnings({"static-method", "unchecked"}) public void testClassOfEnumValueWithImplementation() throws ClassNotFoundException, ReflectiveOperationException { - Class defaultTypesClass = (Class) Class.forName("jdk.compiler.graal.graphio.DefaultGraphTypes"); + Class defaultTypesClass = (Class) Class.forName("jdk.graal.compiler.graphio.DefaultGraphTypes"); Field f = defaultTypesClass.getDeclaredField("DEFAULT"); f.setAccessible(true); GraphTypes types = (GraphTypes) f.get(null); diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/graph/test/graphio/GraphSnippetTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/graph/test/graphio/GraphSnippetTest.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/graph/test/graphio/GraphSnippetTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/graph/test/graphio/GraphSnippetTest.java index 2bf132568aa9..f1c3124d2c8c 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/graph/test/graphio/GraphSnippetTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/graph/test/graphio/GraphSnippetTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.graph.test.graphio; +package jdk.graal.compiler.graph.test.graphio; import java.io.File; import java.lang.reflect.Method; @@ -36,7 +36,7 @@ public class GraphSnippetTest { public void dumpTheFile() throws Exception { Class snippets = null; try { - snippets = Class.forName("jdk.compiler.graal.graphio.GraphJavadocSnippets"); + snippets = Class.forName("jdk.graal.compiler.graphio.GraphJavadocSnippets"); } catch (ClassNotFoundException notFound) { Assume.assumeNoException("The snippets class has to be around", notFound); } diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/graph/test/graphio/NodeEncodingTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/graph/test/graphio/NodeEncodingTest.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/graph/test/graphio/NodeEncodingTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/graph/test/graphio/NodeEncodingTest.java index 7d2aae99a655..73f93bc753ab 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/graph/test/graphio/NodeEncodingTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/graph/test/graphio/NodeEncodingTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.graph.test.graphio; +package jdk.graal.compiler.graph.test.graphio; import java.io.ByteArrayOutputStream; import java.nio.channels.Channels; @@ -32,8 +32,8 @@ import java.util.Collections; import java.util.LinkedHashMap; import java.util.Map; -import jdk.compiler.graal.graphio.GraphOutput; -import jdk.compiler.graal.graphio.GraphStructure; +import jdk.graal.compiler.graphio.GraphOutput; +import jdk.graal.compiler.graphio.GraphStructure; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/graph/test/matchers/NodeIterableContains.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/graph/test/matchers/NodeIterableContains.java similarity index 93% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/graph/test/matchers/NodeIterableContains.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/graph/test/matchers/NodeIterableContains.java index b1142213795d..2dc51f237146 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/graph/test/matchers/NodeIterableContains.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/graph/test/matchers/NodeIterableContains.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.graph.test.matchers; +package jdk.graal.compiler.graph.test.matchers; import org.hamcrest.Description; import org.hamcrest.TypeSafeDiagnosingMatcher; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.graph.iterators.NodeIterable; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.graph.iterators.NodeIterable; public class NodeIterableContains extends TypeSafeDiagnosingMatcher> { private T node; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/graph/test/matchers/NodeIterableCount.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/graph/test/matchers/NodeIterableCount.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/graph/test/matchers/NodeIterableCount.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/graph/test/matchers/NodeIterableCount.java index bdea2c5aa0b9..ded056f9446b 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/graph/test/matchers/NodeIterableCount.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/graph/test/matchers/NodeIterableCount.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.graph.test.matchers; +package jdk.graal.compiler.graph.test.matchers; import org.hamcrest.Description; import org.hamcrest.TypeSafeDiagnosingMatcher; -import jdk.compiler.graal.graph.iterators.NodeIterable; +import jdk.graal.compiler.graph.iterators.NodeIterable; public class NodeIterableCount extends TypeSafeDiagnosingMatcher> { private int count; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/graph/test/matchers/NodeIterableIsEmpty.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/graph/test/matchers/NodeIterableIsEmpty.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/graph/test/matchers/NodeIterableIsEmpty.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/graph/test/matchers/NodeIterableIsEmpty.java index 95bc8636418a..d6e293f8dbd0 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/graph/test/matchers/NodeIterableIsEmpty.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/graph/test/matchers/NodeIterableIsEmpty.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.graph.test.matchers; +package jdk.graal.compiler.graph.test.matchers; import org.hamcrest.Description; import org.hamcrest.Matcher; import org.hamcrest.TypeSafeDiagnosingMatcher; import org.hamcrest.core.IsNot; -import jdk.compiler.graal.graph.iterators.NodeIterable; +import jdk.graal.compiler.graph.iterators.NodeIterable; public class NodeIterableIsEmpty extends TypeSafeDiagnosingMatcher> { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/aarch64/test/AArch64UncompressPointerTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/aarch64/test/AArch64UncompressPointerTest.java similarity index 93% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/aarch64/test/AArch64UncompressPointerTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/aarch64/test/AArch64UncompressPointerTest.java index ca0b2b08bd19..4e85f3fd4386 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/aarch64/test/AArch64UncompressPointerTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/aarch64/test/AArch64UncompressPointerTest.java @@ -24,16 +24,16 @@ * questions. */ -package jdk.compiler.graal.hotspot.aarch64.test; +package jdk.graal.compiler.hotspot.aarch64.test; -import jdk.compiler.graal.core.test.GraalCompilerTest; +import jdk.graal.compiler.core.test.GraalCompilerTest; import jdk.vm.ci.aarch64.AArch64; import jdk.vm.ci.code.Register; import jdk.vm.ci.code.TargetDescription; import jdk.vm.ci.runtime.JVMCI; -import jdk.compiler.graal.asm.aarch64.AArch64Assembler; -import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler; -import jdk.compiler.graal.hotspot.aarch64.AArch64HotSpotMove; +import jdk.graal.compiler.asm.aarch64.AArch64Assembler; +import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler; +import jdk.graal.compiler.hotspot.aarch64.AArch64HotSpotMove; import org.junit.Before; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/amd64/test/AMD64HotSpotFrameOmissionTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/amd64/test/AMD64HotSpotFrameOmissionTest.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/amd64/test/AMD64HotSpotFrameOmissionTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/amd64/test/AMD64HotSpotFrameOmissionTest.java index 2d62df0abe71..714815d4b403 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/amd64/test/AMD64HotSpotFrameOmissionTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/amd64/test/AMD64HotSpotFrameOmissionTest.java @@ -22,18 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.amd64.test; +package jdk.graal.compiler.hotspot.amd64.test; import static jdk.vm.ci.amd64.AMD64.rax; import java.util.Arrays; -import jdk.compiler.graal.core.test.GraalCompilerTest; +import jdk.graal.compiler.core.test.GraalCompilerTest; import org.junit.Assert; import org.junit.Ignore; import org.junit.Test; -import jdk.compiler.graal.asm.amd64.AMD64Assembler; +import jdk.graal.compiler.asm.amd64.AMD64Assembler; import jdk.vm.ci.code.InstalledCode; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/amd64/test/AMD64ReadAfterWriteMatchTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/amd64/test/AMD64ReadAfterWriteMatchTest.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/amd64/test/AMD64ReadAfterWriteMatchTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/amd64/test/AMD64ReadAfterWriteMatchTest.java index 68329369aa64..da264caff46a 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/amd64/test/AMD64ReadAfterWriteMatchTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/amd64/test/AMD64ReadAfterWriteMatchTest.java @@ -22,21 +22,21 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.amd64.test; +package jdk.graal.compiler.hotspot.amd64.test; -import static jdk.compiler.graal.phases.common.UseTrappingNullChecksPhase.Options.UseTrappingNullChecks; +import static jdk.graal.compiler.phases.common.UseTrappingNullChecksPhase.Options.UseTrappingNullChecks; import static org.junit.Assume.assumeTrue; import java.util.function.Predicate; -import jdk.compiler.graal.core.test.MatchRuleTest; -import jdk.compiler.graal.core.common.cfg.BasicBlock; -import jdk.compiler.graal.lir.LIR; -import jdk.compiler.graal.lir.LIRInstruction; -import jdk.compiler.graal.lir.amd64.AMD64BinaryConsumer.MemoryConstOp; -import jdk.compiler.graal.lir.amd64.AMD64BinaryConsumer.MemoryMROp; -import jdk.compiler.graal.lir.amd64.AMD64UnaryConsumer.MemoryOp; -import jdk.compiler.graal.options.OptionValues; +import jdk.graal.compiler.core.test.MatchRuleTest; +import jdk.graal.compiler.core.common.cfg.BasicBlock; +import jdk.graal.compiler.lir.LIR; +import jdk.graal.compiler.lir.LIRInstruction; +import jdk.graal.compiler.lir.amd64.AMD64BinaryConsumer.MemoryConstOp; +import jdk.graal.compiler.lir.amd64.AMD64BinaryConsumer.MemoryMROp; +import jdk.graal.compiler.lir.amd64.AMD64UnaryConsumer.MemoryOp; +import jdk.graal.compiler.options.OptionValues; import org.junit.Before; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/amd64/test/ArrayAccessInLoopToAddressTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/amd64/test/ArrayAccessInLoopToAddressTest.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/amd64/test/ArrayAccessInLoopToAddressTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/amd64/test/ArrayAccessInLoopToAddressTest.java index 9870bef98ead..03513c110744 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/amd64/test/ArrayAccessInLoopToAddressTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/amd64/test/ArrayAccessInLoopToAddressTest.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.amd64.test; +package jdk.graal.compiler.hotspot.amd64.test; -import jdk.compiler.graal.core.test.GraalCompilerTest; +import jdk.graal.compiler.core.test.GraalCompilerTest; import jdk.vm.ci.hotspot.HotSpotSpeculationLog; import jdk.vm.ci.meta.SpeculationLog; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/amd64/test/BinaryMathStubTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/amd64/test/BinaryMathStubTest.java similarity index 93% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/amd64/test/BinaryMathStubTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/amd64/test/BinaryMathStubTest.java index 797d358432c5..afa229644af5 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/amd64/test/BinaryMathStubTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/amd64/test/BinaryMathStubTest.java @@ -22,16 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.amd64.test; +package jdk.graal.compiler.hotspot.amd64.test; import static org.junit.Assume.assumeTrue; import java.util.ArrayList; import java.util.List; -import jdk.compiler.graal.api.test.Graal; -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.runtime.RuntimeProvider; +import jdk.graal.compiler.api.test.Graal; +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.runtime.RuntimeProvider; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/amd64/test/BmiAndn.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/amd64/test/BmiAndn.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/amd64/test/BmiAndn.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/amd64/test/BmiAndn.java index 38c726f205ca..e6c2f7d70a53 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/amd64/test/BmiAndn.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/amd64/test/BmiAndn.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.amd64.test; +package jdk.graal.compiler.hotspot.amd64.test; import org.junit.Test; import org.junit.Assert; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/amd64/test/BmiBlsi.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/amd64/test/BmiBlsi.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/amd64/test/BmiBlsi.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/amd64/test/BmiBlsi.java index c41e0c3cb729..c4b549f72cdc 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/amd64/test/BmiBlsi.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/amd64/test/BmiBlsi.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.amd64.test; +package jdk.graal.compiler.hotspot.amd64.test; import org.junit.Test; import org.junit.Assert; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/amd64/test/BmiBlsmsk.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/amd64/test/BmiBlsmsk.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/amd64/test/BmiBlsmsk.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/amd64/test/BmiBlsmsk.java index bdcd1fe122cd..11424cd40d2c 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/amd64/test/BmiBlsmsk.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/amd64/test/BmiBlsmsk.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.amd64.test; +package jdk.graal.compiler.hotspot.amd64.test; import org.junit.Test; import org.junit.Assert; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/amd64/test/BmiBlsr.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/amd64/test/BmiBlsr.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/amd64/test/BmiBlsr.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/amd64/test/BmiBlsr.java index 110b4e1b5898..255aedbf164c 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/amd64/test/BmiBlsr.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/amd64/test/BmiBlsr.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.amd64.test; +package jdk.graal.compiler.hotspot.amd64.test; import org.junit.Test; import org.junit.Assert; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/amd64/test/BmiCompilerTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/amd64/test/BmiCompilerTest.java similarity index 91% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/amd64/test/BmiCompilerTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/amd64/test/BmiCompilerTest.java index 37d4b192ec19..c89ae71c3d1c 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/amd64/test/BmiCompilerTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/amd64/test/BmiCompilerTest.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.amd64.test; +package jdk.graal.compiler.hotspot.amd64.test; import static org.junit.Assume.assumeTrue; -import jdk.compiler.graal.api.test.Graal; -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.code.CompilationResult; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.runtime.RuntimeProvider; +import jdk.graal.compiler.api.test.Graal; +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.code.CompilationResult; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.runtime.RuntimeProvider; import org.junit.Assert; import org.junit.Before; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/amd64/test/CompressedNullCheckTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/amd64/test/CompressedNullCheckTest.java similarity index 92% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/amd64/test/CompressedNullCheckTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/amd64/test/CompressedNullCheckTest.java index 48e4db0b48f3..4ab718b3bcb5 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/amd64/test/CompressedNullCheckTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/amd64/test/CompressedNullCheckTest.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.amd64.test; +package jdk.graal.compiler.hotspot.amd64.test; -import static jdk.compiler.graal.core.common.GraalOptions.OptImplicitNullChecks; +import static jdk.graal.compiler.core.common.GraalOptions.OptImplicitNullChecks; -import jdk.compiler.graal.hotspot.test.HotSpotGraalCompilerTest; -import jdk.compiler.graal.options.OptionValues; +import jdk.graal.compiler.hotspot.test.HotSpotGraalCompilerTest; +import jdk.graal.compiler.options.OptionValues; import org.junit.Assume; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/amd64/test/DataPatchInConstantsTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/amd64/test/DataPatchInConstantsTest.java similarity index 83% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/amd64/test/DataPatchInConstantsTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/amd64/test/DataPatchInConstantsTest.java index 3dd343b1b4fc..50aea91b7cfc 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/amd64/test/DataPatchInConstantsTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/amd64/test/DataPatchInConstantsTest.java @@ -23,34 +23,34 @@ * questions. */ -package jdk.compiler.graal.hotspot.amd64.test; +package jdk.graal.compiler.hotspot.amd64.test; import static jdk.vm.ci.code.ValueUtil.asRegister; -import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.REG; -import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2; -import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1; - -import jdk.compiler.graal.asm.amd64.AMD64Address; -import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler; -import jdk.compiler.graal.graph.NodeClass; -import jdk.compiler.graal.hotspot.nodes.HotSpotCompressionNode; -import jdk.compiler.graal.hotspot.test.HotSpotGraalCompilerTest; -import jdk.compiler.graal.lir.LIRInstruction; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.Variable; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; -import jdk.compiler.graal.lir.gen.LIRGeneratorTool; -import jdk.compiler.graal.nodeinfo.NodeInfo; -import jdk.compiler.graal.nodes.FixedWithNextNode; -import jdk.compiler.graal.nodes.NodeView; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext; -import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin; -import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins; -import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins.Registration; -import jdk.compiler.graal.nodes.spi.LIRLowerable; -import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool; -import jdk.compiler.graal.nodes.type.NarrowOopStamp; +import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.REG; +import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_2; +import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_1; + +import jdk.graal.compiler.asm.amd64.AMD64Address; +import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler; +import jdk.graal.compiler.graph.NodeClass; +import jdk.graal.compiler.hotspot.nodes.HotSpotCompressionNode; +import jdk.graal.compiler.hotspot.test.HotSpotGraalCompilerTest; +import jdk.graal.compiler.lir.LIRInstruction; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.Variable; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.lir.gen.LIRGeneratorTool; +import jdk.graal.compiler.nodeinfo.NodeInfo; +import jdk.graal.compiler.nodes.FixedWithNextNode; +import jdk.graal.compiler.nodes.NodeView; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext; +import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin; +import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins; +import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins.Registration; +import jdk.graal.compiler.nodes.spi.LIRLowerable; +import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool; +import jdk.graal.compiler.nodes.type.NarrowOopStamp; import org.junit.Assume; import org.junit.Before; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/amd64/test/MathPower0Point5Test.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/amd64/test/MathPower0Point5Test.java similarity index 91% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/amd64/test/MathPower0Point5Test.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/amd64/test/MathPower0Point5Test.java index 32fbf398e2e1..4787ec71a6a6 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/amd64/test/MathPower0Point5Test.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/amd64/test/MathPower0Point5Test.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.amd64.test; +package jdk.graal.compiler.hotspot.amd64.test; import static org.junit.Assume.assumeTrue; -import jdk.compiler.graal.api.test.Graal; -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.runtime.RuntimeProvider; +import jdk.graal.compiler.api.test.Graal; +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.runtime.RuntimeProvider; import org.junit.Before; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/amd64/test/NumberOfTrailingZeroings003.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/amd64/test/NumberOfTrailingZeroings003.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/amd64/test/NumberOfTrailingZeroings003.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/amd64/test/NumberOfTrailingZeroings003.java index 698c3c3bb9a1..1daca341ec1c 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/amd64/test/NumberOfTrailingZeroings003.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/amd64/test/NumberOfTrailingZeroings003.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.amd64.test; +package jdk.graal.compiler.hotspot.amd64.test; -import jdk.compiler.graal.core.test.GraalCompilerTest; +import jdk.graal.compiler.core.test.GraalCompilerTest; import org.junit.Test; public class NumberOfTrailingZeroings003 extends GraalCompilerTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/amd64/test/ReachabilityFenceCanonicalizationTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/amd64/test/ReachabilityFenceCanonicalizationTest.java similarity index 91% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/amd64/test/ReachabilityFenceCanonicalizationTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/amd64/test/ReachabilityFenceCanonicalizationTest.java index 3c69c1fc1770..a97f9af37946 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/amd64/test/ReachabilityFenceCanonicalizationTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/amd64/test/ReachabilityFenceCanonicalizationTest.java @@ -22,21 +22,21 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.amd64.test; +package jdk.graal.compiler.hotspot.amd64.test; import static org.junit.Assume.assumeTrue; import java.lang.ref.Reference; import java.util.concurrent.atomic.AtomicInteger; -import jdk.compiler.graal.asm.amd64.AMD64Address; -import jdk.compiler.graal.graph.iterators.NodePredicates; -import jdk.compiler.graal.hotspot.meta.HotSpotGraphBuilderPlugins; -import jdk.compiler.graal.hotspot.test.HotSpotGraalCompilerTest; -import jdk.compiler.graal.nodes.CompressionNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.java.ReachabilityFenceNode; -import jdk.compiler.graal.options.OptionValues; +import jdk.graal.compiler.asm.amd64.AMD64Address; +import jdk.graal.compiler.graph.iterators.NodePredicates; +import jdk.graal.compiler.hotspot.meta.HotSpotGraphBuilderPlugins; +import jdk.graal.compiler.hotspot.test.HotSpotGraalCompilerTest; +import jdk.graal.compiler.nodes.CompressionNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.java.ReachabilityFenceNode; +import jdk.graal.compiler.options.OptionValues; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/amd64/test/StubAVXTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/amd64/test/StubAVXTest.java similarity index 81% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/amd64/test/StubAVXTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/amd64/test/StubAVXTest.java index f0b904b932af..e837316add97 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/amd64/test/StubAVXTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/amd64/test/StubAVXTest.java @@ -23,44 +23,44 @@ * questions. */ -package jdk.compiler.graal.hotspot.amd64.test; - -import static jdk.compiler.graal.hotspot.HotSpotForeignCallLinkage.RegisterEffect.COMPUTES_REGISTERS_KILLED; -import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.REG; - -import jdk.compiler.graal.api.replacements.Snippet; -import jdk.compiler.graal.asm.amd64.AMD64Address; -import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler; -import jdk.compiler.graal.bytecode.BytecodeProvider; -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.lir.jtt.LIRTest; -import jdk.compiler.graal.lir.jtt.LIRTestSpecification; -import jdk.compiler.graal.core.common.CompilationIdentifier; -import jdk.compiler.graal.core.common.LIRKind; -import jdk.compiler.graal.core.common.spi.ForeignCallSignature; -import jdk.compiler.graal.core.common.type.DataPointerConstant; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.hotspot.HotSpotBackend; -import jdk.compiler.graal.hotspot.HotSpotForeignCallLinkage; -import jdk.compiler.graal.hotspot.meta.HotSpotForeignCallDescriptor; -import jdk.compiler.graal.hotspot.meta.HotSpotForeignCallsProviderImpl; -import jdk.compiler.graal.hotspot.meta.HotSpotProviders; -import jdk.compiler.graal.hotspot.stubs.SnippetStub; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.Variable; -import jdk.compiler.graal.lir.amd64.AMD64LIRInstruction; -import jdk.compiler.graal.lir.asm.ArrayDataPointerConstant; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; -import jdk.compiler.graal.lir.gen.LIRGeneratorTool; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.extended.ForeignCallNode; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext; -import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin; -import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.replacements.ReplacementsImpl; -import jdk.compiler.graal.replacements.classfile.ClassfileBytecodeProvider; +package jdk.graal.compiler.hotspot.amd64.test; + +import static jdk.graal.compiler.hotspot.HotSpotForeignCallLinkage.RegisterEffect.COMPUTES_REGISTERS_KILLED; +import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.REG; + +import jdk.graal.compiler.api.replacements.Snippet; +import jdk.graal.compiler.asm.amd64.AMD64Address; +import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler; +import jdk.graal.compiler.bytecode.BytecodeProvider; +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.lir.jtt.LIRTest; +import jdk.graal.compiler.lir.jtt.LIRTestSpecification; +import jdk.graal.compiler.core.common.CompilationIdentifier; +import jdk.graal.compiler.core.common.LIRKind; +import jdk.graal.compiler.core.common.spi.ForeignCallSignature; +import jdk.graal.compiler.core.common.type.DataPointerConstant; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.hotspot.HotSpotBackend; +import jdk.graal.compiler.hotspot.HotSpotForeignCallLinkage; +import jdk.graal.compiler.hotspot.meta.HotSpotForeignCallDescriptor; +import jdk.graal.compiler.hotspot.meta.HotSpotForeignCallsProviderImpl; +import jdk.graal.compiler.hotspot.meta.HotSpotProviders; +import jdk.graal.compiler.hotspot.stubs.SnippetStub; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.Variable; +import jdk.graal.compiler.lir.amd64.AMD64LIRInstruction; +import jdk.graal.compiler.lir.asm.ArrayDataPointerConstant; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.lir.gen.LIRGeneratorTool; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.extended.ForeignCallNode; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext; +import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin; +import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.replacements.ReplacementsImpl; +import jdk.graal.compiler.replacements.classfile.ClassfileBytecodeProvider; import org.junit.Assume; import org.junit.Before; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/amd64/test/UnaryMathStubTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/amd64/test/UnaryMathStubTest.java similarity index 94% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/amd64/test/UnaryMathStubTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/amd64/test/UnaryMathStubTest.java index 4d27feba6bee..e9aff9c4760f 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/amd64/test/UnaryMathStubTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/amd64/test/UnaryMathStubTest.java @@ -22,16 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.amd64.test; +package jdk.graal.compiler.hotspot.amd64.test; import static org.junit.Assume.assumeTrue; import java.util.ArrayList; import java.util.List; -import jdk.compiler.graal.api.test.Graal; -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.runtime.RuntimeProvider; +import jdk.graal.compiler.api.test.Graal; +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.runtime.RuntimeProvider; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/lir/test/BenchmarkCounterOverflowTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/lir/test/BenchmarkCounterOverflowTest.java similarity index 89% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/lir/test/BenchmarkCounterOverflowTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/lir/test/BenchmarkCounterOverflowTest.java index a1667c51fb5a..a61d85b45ee6 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/lir/test/BenchmarkCounterOverflowTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/lir/test/BenchmarkCounterOverflowTest.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.lir.test; +package jdk.graal.compiler.hotspot.lir.test; -import static jdk.compiler.graal.test.SubprocessUtil.getVMCommandLine; -import static jdk.compiler.graal.test.SubprocessUtil.withoutDebuggerArguments; +import static jdk.graal.compiler.test.SubprocessUtil.getVMCommandLine; +import static jdk.graal.compiler.test.SubprocessUtil.withoutDebuggerArguments; import java.io.File; import java.io.IOException; @@ -35,17 +35,17 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import jdk.compiler.graal.api.directives.GraalDirectives; -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.jtt.JTTTest; -import jdk.compiler.graal.lir.jtt.LIRTest; -import jdk.compiler.graal.lir.jtt.LIRTestSpecification; -import jdk.compiler.graal.core.common.LIRKind; -import jdk.compiler.graal.hotspot.HotSpotBackend; -import jdk.compiler.graal.hotspot.debug.BenchmarkCounters; -import jdk.compiler.graal.lir.ConstantValue; -import jdk.compiler.graal.lir.gen.LIRGeneratorTool; -import jdk.compiler.graal.test.SubprocessUtil; +import jdk.graal.compiler.api.directives.GraalDirectives; +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.jtt.JTTTest; +import jdk.graal.compiler.lir.jtt.LIRTest; +import jdk.graal.compiler.lir.jtt.LIRTestSpecification; +import jdk.graal.compiler.core.common.LIRKind; +import jdk.graal.compiler.hotspot.HotSpotBackend; +import jdk.graal.compiler.hotspot.debug.BenchmarkCounters; +import jdk.graal.compiler.lir.ConstantValue; +import jdk.graal.compiler.lir.gen.LIRGeneratorTool; +import jdk.graal.compiler.test.SubprocessUtil; import org.junit.Assert; import org.junit.Assume; import org.junit.Before; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/lir/test/ExceedMaxOopMapStackOffset.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/lir/test/ExceedMaxOopMapStackOffset.java similarity index 90% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/lir/test/ExceedMaxOopMapStackOffset.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/lir/test/ExceedMaxOopMapStackOffset.java index 1583be2e8e75..d9139cd78e1b 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/lir/test/ExceedMaxOopMapStackOffset.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/lir/test/ExceedMaxOopMapStackOffset.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.lir.test; +package jdk.graal.compiler.hotspot.lir.test; -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.lir.jtt.LIRTest; -import jdk.compiler.graal.lir.jtt.LIRTestSpecification; -import jdk.compiler.graal.core.common.LIRKind; -import jdk.compiler.graal.hotspot.HotSpotBackend; -import jdk.compiler.graal.lir.framemap.FrameMapBuilder; -import jdk.compiler.graal.lir.gen.LIRGeneratorTool; +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.lir.jtt.LIRTest; +import jdk.graal.compiler.lir.jtt.LIRTestSpecification; +import jdk.graal.compiler.core.common.LIRKind; +import jdk.graal.compiler.hotspot.HotSpotBackend; +import jdk.graal.compiler.lir.framemap.FrameMapBuilder; +import jdk.graal.compiler.lir.gen.LIRGeneratorTool; import org.junit.Test; import jdk.vm.ci.code.BailoutException; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/lir/test/MitigateExceedingMaxOopMapStackOffsetTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/lir/test/MitigateExceedingMaxOopMapStackOffsetTest.java similarity index 91% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/lir/test/MitigateExceedingMaxOopMapStackOffsetTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/lir/test/MitigateExceedingMaxOopMapStackOffsetTest.java index 72b4b8ee3415..58315dabeb5d 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/lir/test/MitigateExceedingMaxOopMapStackOffsetTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/lir/test/MitigateExceedingMaxOopMapStackOffsetTest.java @@ -22,20 +22,20 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.lir.test; +package jdk.graal.compiler.hotspot.lir.test; import java.util.ArrayList; import java.util.List; -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.lir.jtt.LIRTest; -import jdk.compiler.graal.lir.jtt.LIRTestSpecification; -import jdk.compiler.graal.core.common.LIRKind; -import jdk.compiler.graal.hotspot.HotSpotBackend; -import jdk.compiler.graal.lir.VirtualStackSlot; -import jdk.compiler.graal.lir.framemap.FrameMapBuilder; -import jdk.compiler.graal.lir.gen.LIRGeneratorTool; -import jdk.compiler.graal.lir.stackslotalloc.LSStackSlotAllocator; +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.lir.jtt.LIRTest; +import jdk.graal.compiler.lir.jtt.LIRTestSpecification; +import jdk.graal.compiler.core.common.LIRKind; +import jdk.graal.compiler.hotspot.HotSpotBackend; +import jdk.graal.compiler.lir.VirtualStackSlot; +import jdk.graal.compiler.lir.framemap.FrameMapBuilder; +import jdk.graal.compiler.lir.gen.LIRGeneratorTool; +import jdk.graal.compiler.lir.stackslotalloc.LSStackSlotAllocator; import org.junit.Assume; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/Adler32SubstitutionsTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/Adler32SubstitutionsTest.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/Adler32SubstitutionsTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/Adler32SubstitutionsTest.java index e9a5e2489109..e0614b5a778e 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/Adler32SubstitutionsTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/Adler32SubstitutionsTest.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.test; +package jdk.graal.compiler.hotspot.test; import java.io.DataInputStream; import java.io.InputStream; import java.nio.ByteBuffer; import java.util.zip.Adler32; -import jdk.compiler.graal.core.test.GraalCompilerTest; +import jdk.graal.compiler.core.test.GraalCompilerTest; import org.junit.Test; /** diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/ArrayCopyIntrinsificationTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/ArrayCopyIntrinsificationTest.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/ArrayCopyIntrinsificationTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/ArrayCopyIntrinsificationTest.java index 1cd8ee7abcee..6d3cca547bb1 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/ArrayCopyIntrinsificationTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/ArrayCopyIntrinsificationTest.java @@ -22,21 +22,21 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.test; +package jdk.graal.compiler.hotspot.test; import java.lang.reflect.Array; import java.util.ArrayList; import java.util.HashMap; -import jdk.compiler.graal.api.directives.GraalDirectives; -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.nodes.DirectCallTargetNode; -import jdk.compiler.graal.nodes.Invoke; -import jdk.compiler.graal.nodes.LoweredCallTargetNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.replacements.arraycopy.ArrayCopySnippets; +import jdk.graal.compiler.api.directives.GraalDirectives; +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.nodes.DirectCallTargetNode; +import jdk.graal.compiler.nodes.Invoke; +import jdk.graal.compiler.nodes.LoweredCallTargetNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.replacements.arraycopy.ArrayCopySnippets; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/ArrayNewInstanceTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/ArrayNewInstanceTest.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/ArrayNewInstanceTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/ArrayNewInstanceTest.java index d85043194dfc..37f056cd11e1 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/ArrayNewInstanceTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/ArrayNewInstanceTest.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.test; +package jdk.graal.compiler.hotspot.test; import java.lang.reflect.Array; import java.util.ArrayList; -import jdk.compiler.graal.api.directives.GraalDirectives; -import jdk.compiler.graal.core.test.GraalCompilerTest; +import jdk.graal.compiler.api.directives.GraalDirectives; +import jdk.graal.compiler.core.test.GraalCompilerTest; 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/hotspot/test/Base64SubstitutionsTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/Base64SubstitutionsTest.java similarity index 99% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/Base64SubstitutionsTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/Base64SubstitutionsTest.java index 5613e7d5490e..c11d10acdcdb 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/Base64SubstitutionsTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/Base64SubstitutionsTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.test; +package jdk.graal.compiler.hotspot.test; import java.nio.ByteBuffer; import java.nio.charset.StandardCharsets; @@ -39,8 +39,8 @@ import java.util.function.Supplier; import java.util.stream.Stream; -import jdk.compiler.graal.core.common.GraalOptions; -import jdk.compiler.graal.options.OptionValues; +import jdk.graal.compiler.core.common.GraalOptions; +import jdk.graal.compiler.options.OptionValues; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/BigIntegerIntrinsicsTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/BigIntegerIntrinsicsTest.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/BigIntegerIntrinsicsTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/BigIntegerIntrinsicsTest.java index b6ad3b96c2b6..c29f05ee22f4 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/BigIntegerIntrinsicsTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/BigIntegerIntrinsicsTest.java @@ -23,19 +23,19 @@ * questions. */ -package jdk.compiler.graal.hotspot.test; +package jdk.graal.compiler.hotspot.test; import java.lang.reflect.InvocationTargetException; import java.math.BigInteger; import java.util.Random; -import jdk.compiler.graal.api.test.Graal; -import jdk.compiler.graal.core.test.GraalCompilerTest; +import jdk.graal.compiler.api.test.Graal; +import jdk.graal.compiler.core.test.GraalCompilerTest; import org.graalvm.collections.EconomicMap; import org.graalvm.collections.Pair; -import jdk.compiler.graal.hotspot.GraalHotSpotVMConfig; -import jdk.compiler.graal.hotspot.HotSpotGraalRuntimeProvider; -import jdk.compiler.graal.runtime.RuntimeProvider; +import jdk.graal.compiler.hotspot.GraalHotSpotVMConfig; +import jdk.graal.compiler.hotspot.HotSpotGraalRuntimeProvider; +import jdk.graal.compiler.runtime.RuntimeProvider; import org.junit.Assume; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/BoxDeoptimizationTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/BoxDeoptimizationTest.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/BoxDeoptimizationTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/BoxDeoptimizationTest.java index f02c90ab1cfa..7934e038746a 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/BoxDeoptimizationTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/BoxDeoptimizationTest.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.test; +package jdk.graal.compiler.hotspot.test; -import jdk.compiler.graal.api.directives.GraalDirectives; -import jdk.compiler.graal.core.test.GraalCompilerTest; +import jdk.graal.compiler.api.directives.GraalDirectives; +import jdk.graal.compiler.core.test.GraalCompilerTest; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/CRC32CSubstitutionsTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/CRC32CSubstitutionsTest.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/CRC32CSubstitutionsTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/CRC32CSubstitutionsTest.java index b86204601a36..c35ed3343312 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/CRC32CSubstitutionsTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/CRC32CSubstitutionsTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.test; +package jdk.graal.compiler.hotspot.test; import java.io.DataInputStream; import java.io.InputStream; @@ -32,7 +32,7 @@ import java.nio.ByteBuffer; import java.util.zip.Checksum; -import jdk.compiler.graal.core.test.GraalCompilerTest; +import jdk.graal.compiler.core.test.GraalCompilerTest; import org.junit.Test; /** diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/CRC32SubstitutionsTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/CRC32SubstitutionsTest.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/CRC32SubstitutionsTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/CRC32SubstitutionsTest.java index d8845cef7e27..532f20718a2d 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/CRC32SubstitutionsTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/CRC32SubstitutionsTest.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.test; +package jdk.graal.compiler.hotspot.test; import java.io.DataInputStream; import java.io.InputStream; import java.nio.ByteBuffer; import java.util.zip.CRC32; -import jdk.compiler.graal.core.test.GraalCompilerTest; +import jdk.graal.compiler.core.test.GraalCompilerTest; import org.junit.Test; /** diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/CheckGraalIntrinsics.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/CheckGraalIntrinsics.java similarity index 92% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/CheckGraalIntrinsics.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/CheckGraalIntrinsics.java index 38cfd5e7a741..f109b07a71bc 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/CheckGraalIntrinsics.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/CheckGraalIntrinsics.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.test; +package jdk.graal.compiler.hotspot.test; -import static jdk.compiler.graal.hotspot.HotSpotGraalServices.isIntrinsicAvailable; -import static jdk.compiler.graal.hotspot.HotSpotGraalServices.isIntrinsicSupportedByC2; +import static jdk.graal.compiler.hotspot.HotSpotGraalServices.isIntrinsicAvailable; +import static jdk.graal.compiler.hotspot.HotSpotGraalServices.isIntrinsicSupportedByC2; import java.lang.reflect.Constructor; import java.lang.reflect.Method; @@ -36,19 +36,19 @@ import java.util.ServiceLoader; import java.util.stream.Collectors; -import jdk.compiler.graal.api.test.Graal; +import jdk.graal.compiler.api.test.Graal; import org.graalvm.collections.EconomicMap; import org.graalvm.collections.MapCursor; -import jdk.compiler.graal.hotspot.GraalHotSpotVMConfig; -import jdk.compiler.graal.hotspot.HotSpotGraalRuntimeProvider; -import jdk.compiler.graal.hotspot.meta.HotSpotProviders; -import jdk.compiler.graal.hotspot.meta.UnimplementedGraalIntrinsics; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins; -import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin; -import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.runtime.RuntimeProvider; -import jdk.compiler.graal.test.GraalTest; +import jdk.graal.compiler.hotspot.GraalHotSpotVMConfig; +import jdk.graal.compiler.hotspot.HotSpotGraalRuntimeProvider; +import jdk.graal.compiler.hotspot.meta.HotSpotProviders; +import jdk.graal.compiler.hotspot.meta.UnimplementedGraalIntrinsics; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins; +import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin; +import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.runtime.RuntimeProvider; +import jdk.graal.compiler.test.GraalTest; import org.junit.Test; import jdk.vm.ci.hotspot.HotSpotVMConfigStore; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/CheckIndexLongTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/CheckIndexLongTest.java similarity index 90% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/CheckIndexLongTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/CheckIndexLongTest.java index 2087ff8ab343..534594579c30 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/CheckIndexLongTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/CheckIndexLongTest.java @@ -22,22 +22,22 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.test; +package jdk.graal.compiler.hotspot.test; import java.nio.ByteBuffer; import java.nio.ByteOrder; import java.util.Objects; -import jdk.compiler.graal.replacements.test.MethodSubstitutionTest; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration.BytecodeExceptionMode; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext; -import jdk.compiler.graal.nodes.graphbuilderconf.InlineInvokePlugin; -import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin; -import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins; -import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins.Registration; -import jdk.compiler.graal.phases.OptimisticOptimizations; +import jdk.graal.compiler.replacements.test.MethodSubstitutionTest; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.BytecodeExceptionMode; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext; +import jdk.graal.compiler.nodes.graphbuilderconf.InlineInvokePlugin; +import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin; +import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins; +import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins.Registration; +import jdk.graal.compiler.phases.OptimisticOptimizations; import org.junit.Test; import jdk.vm.ci.meta.JavaKind; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/ClassReplacementsTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/ClassReplacementsTest.java similarity index 94% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/ClassReplacementsTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/ClassReplacementsTest.java index e7b7b7dd6338..b4839ad0df3b 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/ClassReplacementsTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/ClassReplacementsTest.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.test; +package jdk.graal.compiler.hotspot.test; -import jdk.compiler.graal.replacements.test.MethodSubstitutionTest; +import jdk.graal.compiler.replacements.test.MethodSubstitutionTest; import org.junit.Test; import java.util.function.Supplier; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/ClassSubstitutionsTests.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/ClassSubstitutionsTests.java similarity index 90% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/ClassSubstitutionsTests.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/ClassSubstitutionsTests.java index a94157d8cd56..d95354cae749 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/ClassSubstitutionsTests.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/ClassSubstitutionsTests.java @@ -23,26 +23,26 @@ * questions. */ -package jdk.compiler.graal.hotspot.test; +package jdk.graal.compiler.hotspot.test; import java.lang.reflect.Field; -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.nodes.ConstantNode; -import jdk.compiler.graal.nodes.Invoke; -import jdk.compiler.graal.nodes.ParameterNode; -import jdk.compiler.graal.nodes.ReturnNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext; -import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin; -import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins; -import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins.Registration; -import jdk.compiler.graal.nodes.java.LoadFieldNode; -import jdk.compiler.graal.phases.tiers.HighTierContext; +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.nodes.ConstantNode; +import jdk.graal.compiler.nodes.Invoke; +import jdk.graal.compiler.nodes.ParameterNode; +import jdk.graal.compiler.nodes.ReturnNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.StructuredGraph.AllowAssumptions; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext; +import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin; +import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins; +import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins.Registration; +import jdk.graal.compiler.nodes.java.LoadFieldNode; +import jdk.graal.compiler.phases.tiers.HighTierContext; import org.junit.Test; import jdk.vm.ci.meta.JavaKind; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/CompilationWrapperTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/CompilationWrapperTest.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/CompilationWrapperTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/CompilationWrapperTest.java index 41450f657ba5..69dba68d5e3d 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/CompilationWrapperTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/CompilationWrapperTest.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.test; +package jdk.graal.compiler.hotspot.test; -import static jdk.compiler.graal.debug.StandardPathUtilitiesProvider.DIAGNOSTIC_OUTPUT_DIRECTORY_MESSAGE_FORMAT; -import static jdk.compiler.graal.debug.StandardPathUtilitiesProvider.DIAGNOSTIC_OUTPUT_DIRECTORY_MESSAGE_REGEXP; -import static jdk.compiler.graal.test.SubprocessUtil.getVMCommandLine; -import static jdk.compiler.graal.test.SubprocessUtil.withoutDebuggerArguments; +import static jdk.graal.compiler.debug.StandardPathUtilitiesProvider.DIAGNOSTIC_OUTPUT_DIRECTORY_MESSAGE_FORMAT; +import static jdk.graal.compiler.debug.StandardPathUtilitiesProvider.DIAGNOSTIC_OUTPUT_DIRECTORY_MESSAGE_REGEXP; +import static jdk.graal.compiler.test.SubprocessUtil.getVMCommandLine; +import static jdk.graal.compiler.test.SubprocessUtil.withoutDebuggerArguments; import java.io.File; import java.io.IOException; @@ -42,11 +42,11 @@ import java.util.zip.ZipEntry; import java.util.zip.ZipFile; -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.core.GraalCompilerOptions; -import jdk.compiler.graal.test.SubprocessUtil; -import jdk.compiler.graal.test.SubprocessUtil.Subprocess; -import jdk.compiler.graal.truffle.test.SLTruffleGraalTestSuite; +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.core.GraalCompilerOptions; +import jdk.graal.compiler.test.SubprocessUtil; +import jdk.graal.compiler.test.SubprocessUtil.Subprocess; +import jdk.graal.compiler.truffle.test.SLTruffleGraalTestSuite; import org.junit.Assert; import org.junit.Assume; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/CompileTheWorld.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/CompileTheWorld.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/CompileTheWorld.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/CompileTheWorld.java index d6eac646a066..c714c51d9e33 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/CompileTheWorld.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/CompileTheWorld.java @@ -22,18 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.test; +package jdk.graal.compiler.hotspot.test; import static java.util.Collections.singletonList; -import static jdk.compiler.graal.core.CompilationWrapper.ExceptionAction.Print; -import static jdk.compiler.graal.core.GraalCompilerOptions.CompilationBailoutAsFailure; -import static jdk.compiler.graal.core.GraalCompilerOptions.CompilationFailureAction; -import static jdk.compiler.graal.core.test.ReflectionOptionDescriptors.extractEntries; -import static jdk.compiler.graal.debug.MemUseTrackerKey.getCurrentThreadAllocatedBytes; -import static jdk.compiler.graal.hotspot.CompilationTask.CompilationTime; -import static jdk.compiler.graal.hotspot.CompilationTask.CompiledAndInstalledBytecodes; -import static jdk.compiler.graal.hotspot.test.CompileTheWorld.Options.DESCRIPTORS; -import static jdk.compiler.graal.hotspot.test.CompileTheWorld.Options.InvalidateInstalledCode; +import static jdk.graal.compiler.core.CompilationWrapper.ExceptionAction.Print; +import static jdk.graal.compiler.core.GraalCompilerOptions.CompilationBailoutAsFailure; +import static jdk.graal.compiler.core.GraalCompilerOptions.CompilationFailureAction; +import static jdk.graal.compiler.core.test.ReflectionOptionDescriptors.extractEntries; +import static jdk.graal.compiler.debug.MemUseTrackerKey.getCurrentThreadAllocatedBytes; +import static jdk.graal.compiler.hotspot.CompilationTask.CompilationTime; +import static jdk.graal.compiler.hotspot.CompilationTask.CompiledAndInstalledBytecodes; +import static jdk.graal.compiler.hotspot.test.CompileTheWorld.Options.DESCRIPTORS; +import static jdk.graal.compiler.hotspot.test.CompileTheWorld.Options.InvalidateInstalledCode; import static sun.misc.Unsafe.ARRAY_BYTE_BASE_OFFSET; import java.io.ByteArrayOutputStream; @@ -86,35 +86,35 @@ import org.graalvm.collections.EconomicMap; import org.graalvm.collections.UnmodifiableMapCursor; -import jdk.compiler.graal.api.replacements.Snippet; -import jdk.compiler.graal.api.test.ModuleSupport; -import jdk.compiler.graal.bytecode.Bytecodes; -import jdk.compiler.graal.core.phases.HighTier; -import jdk.compiler.graal.core.phases.fuzzing.FuzzedSuites; -import jdk.compiler.graal.core.test.ReflectionOptionDescriptors; -import jdk.compiler.graal.debug.GlobalMetrics; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.debug.MethodFilter; -import jdk.compiler.graal.debug.MetricKey; -import jdk.compiler.graal.debug.TTY; -import jdk.compiler.graal.hotspot.CompilationTask; -import jdk.compiler.graal.hotspot.CompileTheWorldFuzzedSuitesCompilationTask; -import jdk.compiler.graal.hotspot.GraalHotSpotVMConfig; -import jdk.compiler.graal.hotspot.HotSpotGraalCompiler; -import jdk.compiler.graal.hotspot.HotSpotGraalRuntime; -import jdk.compiler.graal.hotspot.HotSpotGraalRuntimeProvider; -import jdk.compiler.graal.hotspot.meta.HotSpotFuzzedSuitesProvider; -import jdk.compiler.graal.hotspot.meta.HotSpotLoadedSuitesProvider; -import jdk.compiler.graal.hotspot.meta.HotSpotSuitesProvider; -import jdk.compiler.graal.hotspot.test.CompileTheWorld.LibGraalParams.OptionsBuffer; -import jdk.compiler.graal.hotspot.test.CompileTheWorld.LibGraalParams.StackTraceBuffer; -import jdk.compiler.graal.options.OptionDescriptors; -import jdk.compiler.graal.options.OptionKey; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.options.OptionsParser; -import jdk.compiler.graal.serviceprovider.GraalServices; -import jdk.compiler.graal.serviceprovider.GraalUnsafeAccess; -import jdk.compiler.graal.util.OptionsEncoder; +import jdk.graal.compiler.api.replacements.Snippet; +import jdk.graal.compiler.api.test.ModuleSupport; +import jdk.graal.compiler.bytecode.Bytecodes; +import jdk.graal.compiler.core.phases.HighTier; +import jdk.graal.compiler.core.phases.fuzzing.FuzzedSuites; +import jdk.graal.compiler.core.test.ReflectionOptionDescriptors; +import jdk.graal.compiler.debug.GlobalMetrics; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.debug.MethodFilter; +import jdk.graal.compiler.debug.MetricKey; +import jdk.graal.compiler.debug.TTY; +import jdk.graal.compiler.hotspot.CompilationTask; +import jdk.graal.compiler.hotspot.CompileTheWorldFuzzedSuitesCompilationTask; +import jdk.graal.compiler.hotspot.GraalHotSpotVMConfig; +import jdk.graal.compiler.hotspot.HotSpotGraalCompiler; +import jdk.graal.compiler.hotspot.HotSpotGraalRuntime; +import jdk.graal.compiler.hotspot.HotSpotGraalRuntimeProvider; +import jdk.graal.compiler.hotspot.meta.HotSpotFuzzedSuitesProvider; +import jdk.graal.compiler.hotspot.meta.HotSpotLoadedSuitesProvider; +import jdk.graal.compiler.hotspot.meta.HotSpotSuitesProvider; +import jdk.graal.compiler.hotspot.test.CompileTheWorld.LibGraalParams.OptionsBuffer; +import jdk.graal.compiler.hotspot.test.CompileTheWorld.LibGraalParams.StackTraceBuffer; +import jdk.graal.compiler.options.OptionDescriptors; +import jdk.graal.compiler.options.OptionKey; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.options.OptionsParser; +import jdk.graal.compiler.serviceprovider.GraalServices; +import jdk.graal.compiler.serviceprovider.GraalUnsafeAccess; +import jdk.graal.compiler.util.OptionsEncoder; import com.oracle.truffle.runtime.hotspot.libgraal.LibGraal; import com.oracle.truffle.runtime.hotspot.libgraal.LibGraalIsolate; @@ -140,7 +140,7 @@ public final class CompileTheWorld { static { ModuleSupport.exportAndOpenAllPackagesToUnnamed("jdk.internal.vm.ci"); - ModuleSupport.exportAndOpenAllPackagesToUnnamed("jdk.compiler.graal"); + ModuleSupport.exportAndOpenAllPackagesToUnnamed("jdk.graal.compiler"); // Truffle may not be on the module-path ModuleSupport.exportAndOpenAllPackagesToUnnamed("org.graalvm.truffle", false); ModuleSupport.exportAndOpenAllPackagesToUnnamed("org.graalvm.truffle.compiler", false); @@ -1436,7 +1436,7 @@ static class Options { * Ignore Graal classes by default to avoid problems associated with compiling snippets and * method substitutions. */ - public static final OptionKey LimitModules = new OptionKey<>("~jdk.compiler.graal"); + public static final OptionKey LimitModules = new OptionKey<>("~jdk.graal.compiler"); public static final OptionKey Iterations = new OptionKey<>(1); public static final OptionKey Repeat = new OptionKey<>(1); public static final OptionKey MethodFilter = new OptionKey<>(null); diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/CompileTheWorldTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/CompileTheWorldTest.java similarity index 86% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/CompileTheWorldTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/CompileTheWorldTest.java index 387e0cb3f839..3a92f22b66a3 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/CompileTheWorldTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/CompileTheWorldTest.java @@ -22,18 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.test; +package jdk.graal.compiler.hotspot.test; -import static jdk.compiler.graal.core.GraalCompilerOptions.CompilationBailoutAsFailure; -import static jdk.compiler.graal.core.GraalCompilerOptions.CompilationFailureAction; +import static jdk.graal.compiler.core.GraalCompilerOptions.CompilationBailoutAsFailure; +import static jdk.graal.compiler.core.GraalCompilerOptions.CompilationFailureAction; -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.core.CompilationWrapper.ExceptionAction; -import jdk.compiler.graal.core.phases.HighTier; -import jdk.compiler.graal.debug.DebugOptions; -import jdk.compiler.graal.debug.TTY; -import jdk.compiler.graal.hotspot.HotSpotGraalCompiler; -import jdk.compiler.graal.options.OptionValues; +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.core.CompilationWrapper.ExceptionAction; +import jdk.graal.compiler.core.phases.HighTier; +import jdk.graal.compiler.debug.DebugOptions; +import jdk.graal.compiler.debug.TTY; +import jdk.graal.compiler.hotspot.HotSpotGraalCompiler; +import jdk.graal.compiler.options.OptionValues; import org.junit.Test; import jdk.vm.ci.hotspot.HotSpotJVMCIRuntime; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/CompressedOopTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/CompressedOopTest.java similarity index 99% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/CompressedOopTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/CompressedOopTest.java index d1a90c156a3e..664e5182d69f 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/CompressedOopTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/CompressedOopTest.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.compiler.graal.hotspot.test; +package jdk.graal.compiler.hotspot.test; import java.util.ArrayDeque; import java.util.ArrayList; @@ -33,7 +33,7 @@ import java.util.List; import java.util.concurrent.atomic.AtomicReference; -import jdk.compiler.graal.core.test.GraalCompilerTest; +import jdk.graal.compiler.core.test.GraalCompilerTest; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/DataPatchTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/DataPatchTest.java similarity index 85% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/DataPatchTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/DataPatchTest.java index 3343d2a55fd5..054a4542638c 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/DataPatchTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/DataPatchTest.java @@ -23,16 +23,16 @@ * questions. */ -package jdk.compiler.graal.hotspot.test; +package jdk.graal.compiler.hotspot.test; -import jdk.compiler.graal.core.common.CompressEncoding; -import jdk.compiler.graal.hotspot.nodes.HotSpotCompressionNode; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.extended.OpaqueValueNode; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext; -import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin; -import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins; -import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins.Registration; +import jdk.graal.compiler.core.common.CompressEncoding; +import jdk.graal.compiler.hotspot.nodes.HotSpotCompressionNode; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.extended.OpaqueValueNode; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext; +import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin; +import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins; +import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins.Registration; import org.junit.Assume; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/DeferredBarrierAdditionTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/DeferredBarrierAdditionTest.java similarity index 78% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/DeferredBarrierAdditionTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/DeferredBarrierAdditionTest.java index 5637c3d56b8c..b222c21ee08d 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/DeferredBarrierAdditionTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/DeferredBarrierAdditionTest.java @@ -22,31 +22,31 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.test; +package jdk.graal.compiler.hotspot.test; import static org.junit.Assume.assumeTrue; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.hotspot.GraalHotSpotVMConfig; -import jdk.compiler.graal.hotspot.HotSpotGraalRuntime; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions; -import jdk.compiler.graal.nodes.gc.G1PostWriteBarrier; -import jdk.compiler.graal.nodes.gc.G1PreWriteBarrier; -import jdk.compiler.graal.nodes.gc.G1ReferentFieldReadBarrier; -import jdk.compiler.graal.nodes.gc.SerialWriteBarrier; -import jdk.compiler.graal.nodes.java.AbstractNewObjectNode; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.phases.OptimisticOptimizations; -import jdk.compiler.graal.phases.common.GuardLoweringPhase; -import jdk.compiler.graal.phases.common.HighTierLoweringPhase; -import jdk.compiler.graal.phases.common.MidTierLoweringPhase; -import jdk.compiler.graal.phases.common.WriteBarrierAdditionPhase; -import jdk.compiler.graal.phases.common.inlining.InliningPhase; -import jdk.compiler.graal.phases.common.inlining.policy.InlineEverythingPolicy; -import jdk.compiler.graal.phases.tiers.HighTierContext; -import jdk.compiler.graal.phases.tiers.MidTierContext; -import jdk.compiler.graal.virtual.phases.ea.PartialEscapePhase; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.hotspot.GraalHotSpotVMConfig; +import jdk.graal.compiler.hotspot.HotSpotGraalRuntime; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.StructuredGraph.AllowAssumptions; +import jdk.graal.compiler.nodes.gc.G1PostWriteBarrier; +import jdk.graal.compiler.nodes.gc.G1PreWriteBarrier; +import jdk.graal.compiler.nodes.gc.G1ReferentFieldReadBarrier; +import jdk.graal.compiler.nodes.gc.SerialWriteBarrier; +import jdk.graal.compiler.nodes.java.AbstractNewObjectNode; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.phases.OptimisticOptimizations; +import jdk.graal.compiler.phases.common.GuardLoweringPhase; +import jdk.graal.compiler.phases.common.HighTierLoweringPhase; +import jdk.graal.compiler.phases.common.MidTierLoweringPhase; +import jdk.graal.compiler.phases.common.WriteBarrierAdditionPhase; +import jdk.graal.compiler.phases.common.inlining.InliningPhase; +import jdk.graal.compiler.phases.common.inlining.policy.InlineEverythingPolicy; +import jdk.graal.compiler.phases.tiers.HighTierContext; +import jdk.graal.compiler.phases.tiers.MidTierContext; +import jdk.graal.compiler.virtual.phases.ea.PartialEscapePhase; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/DeoptimizeReasonAccountingTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/DeoptimizeReasonAccountingTest.java similarity index 85% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/DeoptimizeReasonAccountingTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/DeoptimizeReasonAccountingTest.java index e75bc80d0979..7839506a4d40 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/DeoptimizeReasonAccountingTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/DeoptimizeReasonAccountingTest.java @@ -22,23 +22,23 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.test; +package jdk.graal.compiler.hotspot.test; -import jdk.compiler.graal.api.directives.GraalDirectives; -import jdk.compiler.graal.api.replacements.SnippetReflectionProvider; -import jdk.compiler.graal.api.test.Graal; -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.code.CompilationResult; -import jdk.compiler.graal.core.common.CompilationIdentifier; -import jdk.compiler.graal.hotspot.HotSpotGraalRuntimeProvider; -import jdk.compiler.graal.nodes.ConstantNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext; -import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin; -import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins; -import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins.Registration; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.runtime.RuntimeProvider; +import jdk.graal.compiler.api.directives.GraalDirectives; +import jdk.graal.compiler.api.replacements.SnippetReflectionProvider; +import jdk.graal.compiler.api.test.Graal; +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.code.CompilationResult; +import jdk.graal.compiler.core.common.CompilationIdentifier; +import jdk.graal.compiler.hotspot.HotSpotGraalRuntimeProvider; +import jdk.graal.compiler.nodes.ConstantNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext; +import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin; +import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins; +import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins.Registration; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.runtime.RuntimeProvider; import org.junit.Assert; import org.junit.Assume; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/ExplicitExceptionTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/ExplicitExceptionTest.java similarity index 94% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/ExplicitExceptionTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/ExplicitExceptionTest.java index 0180a3519a7f..74216599fea2 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/ExplicitExceptionTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/ExplicitExceptionTest.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.test; +package jdk.graal.compiler.hotspot.test; -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.extended.ForeignCallNode; -import jdk.compiler.graal.options.OptionValues; +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.extended.ForeignCallNode; +import jdk.graal.compiler.options.OptionValues; import org.junit.Assume; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/ForeignCallDeoptimizeTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/ForeignCallDeoptimizeTest.java similarity index 84% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/ForeignCallDeoptimizeTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/ForeignCallDeoptimizeTest.java index 12dafd4c00fb..165e909fda77 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/ForeignCallDeoptimizeTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/ForeignCallDeoptimizeTest.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.test; +package jdk.graal.compiler.hotspot.test; -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.hotspot.meta.HotSpotForeignCallsProviderImpl; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.extended.ForeignCallNode; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext; -import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin; -import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins; +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.hotspot.meta.HotSpotForeignCallsProviderImpl; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.extended.ForeignCallNode; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext; +import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin; +import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins; import org.junit.Test; import jdk.vm.ci.meta.JavaKind; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/GCStressTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/GCStressTest.java similarity index 99% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/GCStressTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/GCStressTest.java index f8037508db1d..58861f1a6d1b 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/GCStressTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/GCStressTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.test; +package jdk.graal.compiler.hotspot.test; import java.util.Arrays; import java.util.Collections; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/GraalHotSpotVMConfigAccessTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/GraalHotSpotVMConfigAccessTest.java similarity index 92% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/GraalHotSpotVMConfigAccessTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/GraalHotSpotVMConfigAccessTest.java index 739822bcd802..dc98d8666c00 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/GraalHotSpotVMConfigAccessTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/GraalHotSpotVMConfigAccessTest.java @@ -23,14 +23,14 @@ * questions. */ -package jdk.compiler.graal.hotspot.test; +package jdk.graal.compiler.hotspot.test; import java.util.function.Supplier; -import jdk.compiler.graal.api.test.Graal; -import jdk.compiler.graal.hotspot.GraalHotSpotVMConfig; -import jdk.compiler.graal.hotspot.HotSpotGraalRuntimeProvider; -import jdk.compiler.graal.runtime.RuntimeProvider; +import jdk.graal.compiler.api.test.Graal; +import jdk.graal.compiler.hotspot.GraalHotSpotVMConfig; +import jdk.graal.compiler.hotspot.HotSpotGraalRuntimeProvider; +import jdk.graal.compiler.runtime.RuntimeProvider; import org.junit.Assert; import org.junit.Assume; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/GraalOSRLockTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/GraalOSRLockTest.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/GraalOSRLockTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/GraalOSRLockTest.java index f30131e711d2..b266357873bc 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/GraalOSRLockTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/GraalOSRLockTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.test; +package jdk.graal.compiler.hotspot.test; import java.lang.management.ManagementFactory; import java.lang.management.MonitorInfo; @@ -34,15 +34,15 @@ import java.util.List; import org.graalvm.collections.EconomicMap; -import jdk.compiler.graal.api.directives.GraalDirectives; -import jdk.compiler.graal.core.phases.HighTier; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.debug.TTY; -import jdk.compiler.graal.hotspot.phases.OnStackReplacementPhase; -import jdk.compiler.graal.options.OptionKey; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.serviceprovider.GraalServices; +import jdk.graal.compiler.api.directives.GraalDirectives; +import jdk.graal.compiler.core.phases.HighTier; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.debug.TTY; +import jdk.graal.compiler.hotspot.phases.OnStackReplacementPhase; +import jdk.graal.compiler.options.OptionKey; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.serviceprovider.GraalServices; import org.junit.Assert; import org.junit.Assume; import org.junit.BeforeClass; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/GraalOSRTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/GraalOSRTest.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/GraalOSRTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/GraalOSRTest.java index 15b83a5c1fd8..b99965e2e3fa 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/GraalOSRTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/GraalOSRTest.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.test; +package jdk.graal.compiler.hotspot.test; import java.util.concurrent.atomic.AtomicInteger; import java.util.regex.Pattern; import java.util.stream.Collectors; import java.util.stream.Stream; -import jdk.compiler.graal.api.directives.GraalDirectives; -import jdk.compiler.graal.bytecode.BytecodeDisassembler; +import jdk.graal.compiler.api.directives.GraalDirectives; +import jdk.graal.compiler.bytecode.BytecodeDisassembler; import org.junit.Assert; import org.junit.Test; @@ -212,7 +212,7 @@ public static ReturnValue testOopMap(Object[] local0, AtomicInteger local1, Runn 41: aload_2 42: invokeinterface#15, 1 // java.lang.Runnable.run:()void 47: goto 30 - 50: getstatic #1 // jdk.compiler.graal.hotspot.test.GraalOSRTestBase$ReturnValue.SUCCESS:jdk.compiler.graal.hotspot.test.GraalOSRTestBase$ReturnValue + 50: getstatic #1 // jdk.graal.compiler.hotspot.test.GraalOSRTestBase$ReturnValue.SUCCESS:jdk.graal.compiler.hotspot.test.GraalOSRTestBase$ReturnValue 53: areturn"""; // @formatter:on diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/GraalOSRTestBase.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/GraalOSRTestBase.java similarity index 87% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/GraalOSRTestBase.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/GraalOSRTestBase.java index 3bec0bb0a10f..462d7c65cc49 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/GraalOSRTestBase.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/GraalOSRTestBase.java @@ -23,25 +23,25 @@ * questions. */ -package jdk.compiler.graal.hotspot.test; - -import jdk.compiler.graal.bytecode.Bytecode; -import jdk.compiler.graal.bytecode.BytecodeDisassembler; -import jdk.compiler.graal.bytecode.BytecodeStream; -import jdk.compiler.graal.bytecode.ResolvedJavaMethodBytecode; -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.core.GraalCompilerOptions; -import jdk.compiler.graal.core.target.Backend; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.hotspot.CompilationTask; -import jdk.compiler.graal.hotspot.GraalHotSpotVMConfig; -import jdk.compiler.graal.hotspot.HotSpotGraalCompiler; -import jdk.compiler.graal.hotspot.HotSpotGraalRuntimeProvider; -import jdk.compiler.graal.java.BciBlockMapping; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions; -import jdk.compiler.graal.options.OptionValues; +package jdk.graal.compiler.hotspot.test; + +import jdk.graal.compiler.bytecode.Bytecode; +import jdk.graal.compiler.bytecode.BytecodeDisassembler; +import jdk.graal.compiler.bytecode.BytecodeStream; +import jdk.graal.compiler.bytecode.ResolvedJavaMethodBytecode; +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.core.GraalCompilerOptions; +import jdk.graal.compiler.core.target.Backend; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.hotspot.CompilationTask; +import jdk.graal.compiler.hotspot.GraalHotSpotVMConfig; +import jdk.graal.compiler.hotspot.HotSpotGraalCompiler; +import jdk.graal.compiler.hotspot.HotSpotGraalRuntimeProvider; +import jdk.graal.compiler.java.BciBlockMapping; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.StructuredGraph.AllowAssumptions; +import jdk.graal.compiler.options.OptionValues; import org.junit.Assert; import jdk.vm.ci.code.Architecture; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/GraalOnlyIntrinsicsTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/GraalOnlyIntrinsicsTest.java similarity index 89% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/GraalOnlyIntrinsicsTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/GraalOnlyIntrinsicsTest.java index 6b5d0f841986..d234ee5fbd1b 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/GraalOnlyIntrinsicsTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/GraalOnlyIntrinsicsTest.java @@ -22,16 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.test; +package jdk.graal.compiler.hotspot.test; import java.io.IOException; -import jdk.compiler.graal.core.test.SubprocessTest; -import jdk.compiler.graal.api.test.Graal; -import jdk.compiler.graal.hotspot.GraalHotSpotVMConfig; -import jdk.compiler.graal.hotspot.HotSpotGraalRuntimeProvider; -import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin; -import jdk.compiler.graal.runtime.RuntimeProvider; +import jdk.graal.compiler.core.test.SubprocessTest; +import jdk.graal.compiler.api.test.Graal; +import jdk.graal.compiler.hotspot.GraalHotSpotVMConfig; +import jdk.graal.compiler.hotspot.HotSpotGraalRuntimeProvider; +import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin; +import jdk.graal.compiler.runtime.RuntimeProvider; import org.junit.Test; import jdk.vm.ci.aarch64.AArch64; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/HotSpotBase64Test.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/HotSpotBase64Test.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/HotSpotBase64Test.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/HotSpotBase64Test.java index 55d6413444fb..ea1a5ca44b27 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/HotSpotBase64Test.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/HotSpotBase64Test.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.test; +package jdk.graal.compiler.hotspot.test; import static org.junit.Assume.assumeTrue; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/HotSpotClassInitializationTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/HotSpotClassInitializationTest.java similarity index 92% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/HotSpotClassInitializationTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/HotSpotClassInitializationTest.java index d69eca8706c9..c6237741c82e 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/HotSpotClassInitializationTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/HotSpotClassInitializationTest.java @@ -22,17 +22,17 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.test; +package jdk.graal.compiler.hotspot.test; import static org.junit.Assert.assertNotEquals; -import jdk.compiler.graal.api.directives.GraalDirectives; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.hotspot.nodes.KlassBeingInitializedCheckNode; -import jdk.compiler.graal.nodes.DeoptimizeNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.java.LoadFieldNode; -import jdk.compiler.graal.nodes.java.NewInstanceNode; +import jdk.graal.compiler.api.directives.GraalDirectives; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.hotspot.nodes.KlassBeingInitializedCheckNode; +import jdk.graal.compiler.nodes.DeoptimizeNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.java.LoadFieldNode; +import jdk.graal.compiler.nodes.java.NewInstanceNode; import org.junit.Assert; import org.junit.Assume; import org.junit.Before; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/HotSpotCryptoSubstitutionTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/HotSpotCryptoSubstitutionTest.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/HotSpotCryptoSubstitutionTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/HotSpotCryptoSubstitutionTest.java index e25a2316cc76..864b5c6a0376 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/HotSpotCryptoSubstitutionTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/HotSpotCryptoSubstitutionTest.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.test; +package jdk.graal.compiler.hotspot.test; -import static jdk.compiler.graal.hotspot.HotSpotBackend.SHA2_IMPL_COMPRESS_MB; -import static jdk.compiler.graal.hotspot.HotSpotBackend.SHA3_IMPL_COMPRESS_MB; -import static jdk.compiler.graal.hotspot.HotSpotBackend.SHA5_IMPL_COMPRESS_MB; -import static jdk.compiler.graal.hotspot.HotSpotBackend.SHA_IMPL_COMPRESS_MB; +import static jdk.graal.compiler.hotspot.HotSpotBackend.SHA2_IMPL_COMPRESS_MB; +import static jdk.graal.compiler.hotspot.HotSpotBackend.SHA3_IMPL_COMPRESS_MB; +import static jdk.graal.compiler.hotspot.HotSpotBackend.SHA5_IMPL_COMPRESS_MB; +import static jdk.graal.compiler.hotspot.HotSpotBackend.SHA_IMPL_COMPRESS_MB; import java.io.DataInputStream; import java.io.IOException; @@ -42,18 +42,18 @@ import javax.crypto.KeyGenerator; import javax.crypto.SecretKey; -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.hotspot.meta.HotSpotForeignCallDescriptor; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.extended.ForeignCallNode; -import jdk.compiler.graal.replacements.SnippetSubstitutionNode; -import jdk.compiler.graal.replacements.nodes.AESNode; -import jdk.compiler.graal.replacements.nodes.CipherBlockChainingAESNode; -import jdk.compiler.graal.replacements.nodes.CounterModeAESNode; -import jdk.compiler.graal.replacements.nodes.MessageDigestNode.SHA1Node; -import jdk.compiler.graal.replacements.nodes.MessageDigestNode.SHA256Node; -import jdk.compiler.graal.replacements.nodes.MessageDigestNode.SHA3Node; -import jdk.compiler.graal.replacements.nodes.MessageDigestNode.SHA512Node; +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.hotspot.meta.HotSpotForeignCallDescriptor; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.extended.ForeignCallNode; +import jdk.graal.compiler.replacements.SnippetSubstitutionNode; +import jdk.graal.compiler.replacements.nodes.AESNode; +import jdk.graal.compiler.replacements.nodes.CipherBlockChainingAESNode; +import jdk.graal.compiler.replacements.nodes.CounterModeAESNode; +import jdk.graal.compiler.replacements.nodes.MessageDigestNode.SHA1Node; +import jdk.graal.compiler.replacements.nodes.MessageDigestNode.SHA256Node; +import jdk.graal.compiler.replacements.nodes.MessageDigestNode.SHA3Node; +import jdk.graal.compiler.replacements.nodes.MessageDigestNode.SHA512Node; import org.junit.Assert; import org.junit.Assume; import org.junit.Before; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/HotSpotDeoptExplicitExceptions.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/HotSpotDeoptExplicitExceptions.java similarity index 87% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/HotSpotDeoptExplicitExceptions.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/HotSpotDeoptExplicitExceptions.java index 4bfe7d7301ff..70971d61488e 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/HotSpotDeoptExplicitExceptions.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/HotSpotDeoptExplicitExceptions.java @@ -22,17 +22,17 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.test; +package jdk.graal.compiler.hotspot.test; -import static jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration.BytecodeExceptionMode.CheckAll; +import static jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.BytecodeExceptionMode.CheckAll; import java.io.IOException; -import jdk.compiler.graal.core.test.SubprocessTest; -import jdk.compiler.graal.hotspot.HotSpotBackend; -import jdk.compiler.graal.hotspot.stubs.CreateExceptionStub; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration.BytecodeExceptionMode; +import jdk.graal.compiler.core.test.SubprocessTest; +import jdk.graal.compiler.hotspot.HotSpotBackend; +import jdk.graal.compiler.hotspot.stubs.CreateExceptionStub; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.BytecodeExceptionMode; import org.junit.Assume; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/HotSpotDeoptPostExceptions.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/HotSpotDeoptPostExceptions.java similarity index 80% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/HotSpotDeoptPostExceptions.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/HotSpotDeoptPostExceptions.java index 458508c88ba6..13b22c56fd22 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/HotSpotDeoptPostExceptions.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/HotSpotDeoptPostExceptions.java @@ -22,19 +22,19 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.test; +package jdk.graal.compiler.hotspot.test; -import static jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration.BytecodeExceptionMode.CheckAll; +import static jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.BytecodeExceptionMode.CheckAll; -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.core.phases.HighTier; -import jdk.compiler.graal.hotspot.meta.HotSpotExceptionDispatchPlugin; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext; -import jdk.compiler.graal.nodes.graphbuilderconf.InlineInvokePlugin; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.phases.tiers.Suites; +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.core.phases.HighTier; +import jdk.graal.compiler.hotspot.meta.HotSpotExceptionDispatchPlugin; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext; +import jdk.graal.compiler.nodes.graphbuilderconf.InlineInvokePlugin; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.phases.tiers.Suites; import org.junit.Test; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/HotSpotGHASHTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/HotSpotGHASHTest.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/HotSpotGHASHTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/HotSpotGHASHTest.java index fd490c02e09e..0d4494088f7c 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/HotSpotGHASHTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/HotSpotGHASHTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.test; +package jdk.graal.compiler.hotspot.test; import java.lang.reflect.Constructor; import java.lang.reflect.Field; @@ -30,10 +30,10 @@ import java.lang.reflect.Method; import java.nio.ByteBuffer; -import jdk.compiler.graal.api.test.Graal; -import jdk.compiler.graal.replacements.nodes.GHASHProcessBlocksNode; -import jdk.compiler.graal.runtime.RuntimeProvider; -import jdk.compiler.graal.test.AddExports; +import jdk.graal.compiler.api.test.Graal; +import jdk.graal.compiler.replacements.nodes.GHASHProcessBlocksNode; +import jdk.graal.compiler.runtime.RuntimeProvider; +import jdk.graal.compiler.test.AddExports; import org.junit.Assume; import org.junit.AssumptionViolatedException; import org.junit.Before; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/HotSpotGraalCompilerTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/HotSpotGraalCompilerTest.java similarity index 82% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/HotSpotGraalCompilerTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/HotSpotGraalCompilerTest.java index 1c48814c4b8f..9a32bc54e1fe 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/HotSpotGraalCompilerTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/HotSpotGraalCompilerTest.java @@ -22,25 +22,25 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.test; +package jdk.graal.compiler.hotspot.test; -import jdk.compiler.graal.api.test.Graal; -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.bytecode.Bytecode; -import jdk.compiler.graal.bytecode.ResolvedJavaMethodBytecode; -import jdk.compiler.graal.core.common.CompilationIdentifier; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.hotspot.HotSpotBackend; -import jdk.compiler.graal.hotspot.HotSpotGraalRuntimeProvider; -import jdk.compiler.graal.hotspot.HotSpotReplacementsImpl; -import jdk.compiler.graal.hotspot.meta.HotSpotProviders; -import jdk.compiler.graal.nodes.Cancellable; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration; -import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.runtime.RuntimeProvider; +import jdk.graal.compiler.api.test.Graal; +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.bytecode.Bytecode; +import jdk.graal.compiler.bytecode.ResolvedJavaMethodBytecode; +import jdk.graal.compiler.core.common.CompilationIdentifier; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.hotspot.HotSpotBackend; +import jdk.graal.compiler.hotspot.HotSpotGraalRuntimeProvider; +import jdk.graal.compiler.hotspot.HotSpotReplacementsImpl; +import jdk.graal.compiler.hotspot.meta.HotSpotProviders; +import jdk.graal.compiler.nodes.Cancellable; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.StructuredGraph.AllowAssumptions; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration; +import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.runtime.RuntimeProvider; import org.junit.Assume; import org.junit.AssumptionViolatedException; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/HotSpotGraalOptionValuesTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/HotSpotGraalOptionValuesTest.java similarity index 90% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/HotSpotGraalOptionValuesTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/HotSpotGraalOptionValuesTest.java index 019193e656bc..5b0ae6657b6e 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/HotSpotGraalOptionValuesTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/HotSpotGraalOptionValuesTest.java @@ -22,16 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.test; +package jdk.graal.compiler.hotspot.test; -import static jdk.compiler.graal.hotspot.HotSpotGraalOptionValues.GRAAL_OPTION_PROPERTY_PREFIX; +import static jdk.graal.compiler.hotspot.HotSpotGraalOptionValues.GRAAL_OPTION_PROPERTY_PREFIX; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.PrintStream; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.options.OptionsParser; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.options.OptionsParser; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/HotSpotInvokeJavaMethodTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/HotSpotInvokeJavaMethodTest.java similarity index 92% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/HotSpotInvokeJavaMethodTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/HotSpotInvokeJavaMethodTest.java index cf03d518ebd8..fc228f50bf32 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/HotSpotInvokeJavaMethodTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/HotSpotInvokeJavaMethodTest.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.test; - -import jdk.compiler.graal.hotspot.meta.HotSpotForeignCallDescriptor; -import jdk.compiler.graal.hotspot.meta.HotSpotHostForeignCallsProvider.TestForeignCalls; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.extended.ForeignCallNode; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext; -import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin; -import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins; +package jdk.graal.compiler.hotspot.test; + +import jdk.graal.compiler.hotspot.meta.HotSpotForeignCallDescriptor; +import jdk.graal.compiler.hotspot.meta.HotSpotHostForeignCallsProvider.TestForeignCalls; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.extended.ForeignCallNode; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext; +import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin; +import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins; import org.junit.Assume; import org.junit.Before; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/HotSpotManagedFailedSpeculationListTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/HotSpotManagedFailedSpeculationListTest.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/HotSpotManagedFailedSpeculationListTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/HotSpotManagedFailedSpeculationListTest.java index e49309a7680c..279e9cf0bff2 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/HotSpotManagedFailedSpeculationListTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/HotSpotManagedFailedSpeculationListTest.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.test; +package jdk.graal.compiler.hotspot.test; -import jdk.compiler.graal.api.directives.GraalDirectives; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.serviceprovider.SpeculationReasonGroup; +import jdk.graal.compiler.api.directives.GraalDirectives; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.serviceprovider.SpeculationReasonGroup; import org.junit.Assert; import org.junit.Assume; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/HotSpotMethodSubstitutionTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/HotSpotMethodSubstitutionTest.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/HotSpotMethodSubstitutionTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/HotSpotMethodSubstitutionTest.java index e6d7a2cfa61c..71c8819bd98f 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/HotSpotMethodSubstitutionTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/HotSpotMethodSubstitutionTest.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.test; +package jdk.graal.compiler.hotspot.test; import java.lang.invoke.ConstantCallSite; import java.lang.invoke.MethodHandles; import java.lang.invoke.MethodType; -import jdk.compiler.graal.api.directives.GraalDirectives; -import jdk.compiler.graal.replacements.test.MethodSubstitutionTest; +import jdk.graal.compiler.api.directives.GraalDirectives; +import jdk.graal.compiler.replacements.test.MethodSubstitutionTest; import org.junit.Test; /** diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/HotSpotMonitorValueTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/HotSpotMonitorValueTest.java similarity index 94% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/HotSpotMonitorValueTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/HotSpotMonitorValueTest.java index c5ed0e8e9443..8c105491578d 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/HotSpotMonitorValueTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/HotSpotMonitorValueTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.test; +package jdk.graal.compiler.hotspot.test; import static org.hamcrest.CoreMatchers.not; import static org.junit.Assert.assertNotNull; @@ -32,11 +32,11 @@ import java.util.Arrays; import java.util.List; -import jdk.compiler.graal.code.CompilationResult; -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.core.phases.HighTier; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.options.OptionValues; +import jdk.graal.compiler.code.CompilationResult; +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.core.phases.HighTier; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.options.OptionValues; import org.junit.Test; import jdk.vm.ci.code.BytecodeFrame; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/HotSpotNmethodTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/HotSpotNmethodTest.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/HotSpotNmethodTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/HotSpotNmethodTest.java index eb114056466d..be0c4eb81519 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/HotSpotNmethodTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/HotSpotNmethodTest.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.test; +package jdk.graal.compiler.hotspot.test; -import jdk.compiler.graal.core.test.GraalCompilerTest; +import jdk.graal.compiler.core.test.GraalCompilerTest; import org.junit.Assert; import org.junit.Test; -import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions; +import jdk.graal.compiler.nodes.StructuredGraph.AllowAssumptions; import jdk.vm.ci.code.InvalidInstalledCodeException; import jdk.vm.ci.hotspot.HotSpotNmethod; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/HotSpotNodeSubstitutionsTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/HotSpotNodeSubstitutionsTest.java similarity index 78% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/HotSpotNodeSubstitutionsTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/HotSpotNodeSubstitutionsTest.java index 89749f62d7d7..682c690939c2 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/HotSpotNodeSubstitutionsTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/HotSpotNodeSubstitutionsTest.java @@ -22,19 +22,19 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.test; +package jdk.graal.compiler.hotspot.test; -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.replacements.test.MethodSubstitutionTest; +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.replacements.test.MethodSubstitutionTest; import org.junit.Test; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.graph.NodeClass; -import jdk.compiler.graal.nodes.ConstantNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions; -import jdk.compiler.graal.options.OptionValues; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.graph.NodeClass; +import jdk.graal.compiler.nodes.ConstantNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.StructuredGraph.AllowAssumptions; +import jdk.graal.compiler.options.OptionValues; /** * Tests HotSpot specific substitutions for {@link Node}. diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/HotSpotObjectSizeTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/HotSpotObjectSizeTest.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/HotSpotObjectSizeTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/HotSpotObjectSizeTest.java index 6ff790b961a7..169cd59d2fc7 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/HotSpotObjectSizeTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/HotSpotObjectSizeTest.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.test; +package jdk.graal.compiler.hotspot.test; import java.lang.instrument.Instrumentation; import java.util.ArrayList; import java.util.List; import org.graalvm.collections.Pair; -import jdk.compiler.graal.test.AddExports; +import jdk.graal.compiler.test.AddExports; import org.junit.Test; import jdk.vm.ci.code.InstalledCode; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/HotSpotResolvedObjectTypeTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/HotSpotResolvedObjectTypeTest.java similarity index 94% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/HotSpotResolvedObjectTypeTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/HotSpotResolvedObjectTypeTest.java index 12f0ee0e37be..b99d6dd68f6d 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/HotSpotResolvedObjectTypeTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/HotSpotResolvedObjectTypeTest.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.test; +package jdk.graal.compiler.hotspot.test; -import jdk.compiler.graal.core.common.type.StampFactory; -import jdk.compiler.graal.hotspot.GraalHotSpotVMConfig; +import jdk.graal.compiler.core.common.type.StampFactory; +import jdk.graal.compiler.hotspot.GraalHotSpotVMConfig; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/HotSpotStackIntrospectionTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/HotSpotStackIntrospectionTest.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/HotSpotStackIntrospectionTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/HotSpotStackIntrospectionTest.java index 8c1e1defea4e..6991779750e5 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/HotSpotStackIntrospectionTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/HotSpotStackIntrospectionTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.test; +package jdk.graal.compiler.hotspot.test; import java.util.function.Function; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/HotSpotStampMemoryAccessTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/HotSpotStampMemoryAccessTest.java similarity index 86% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/HotSpotStampMemoryAccessTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/HotSpotStampMemoryAccessTest.java index 211632c50ac6..a1140a394370 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/HotSpotStampMemoryAccessTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/HotSpotStampMemoryAccessTest.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.test; +package jdk.graal.compiler.hotspot.test; -import jdk.compiler.graal.core.common.CompressEncoding; -import jdk.compiler.graal.core.common.type.ObjectStamp; -import jdk.compiler.graal.core.common.type.Stamp; -import jdk.compiler.graal.core.common.type.StampFactory; -import jdk.compiler.graal.hotspot.nodes.type.HotSpotNarrowOopStamp; +import jdk.graal.compiler.core.common.CompressEncoding; +import jdk.graal.compiler.core.common.type.ObjectStamp; +import jdk.graal.compiler.core.common.type.Stamp; +import jdk.graal.compiler.core.common.type.StampFactory; +import jdk.graal.compiler.hotspot.nodes.type.HotSpotNarrowOopStamp; import org.junit.Assume; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/HotSpotStubsTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/HotSpotStubsTest.java similarity index 86% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/HotSpotStubsTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/HotSpotStubsTest.java index a08f66185ab0..1686f7bf9971 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/HotSpotStubsTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/HotSpotStubsTest.java @@ -23,20 +23,20 @@ * questions. */ -package jdk.compiler.graal.hotspot.test; +package jdk.graal.compiler.hotspot.test; import java.lang.reflect.Field; import java.lang.reflect.Modifier; import java.util.Map; -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.core.common.spi.ForeignCallDescriptor; -import jdk.compiler.graal.core.common.spi.ForeignCallSignature; -import jdk.compiler.graal.core.common.spi.ForeignCallsProvider; -import jdk.compiler.graal.core.target.Backend; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.hotspot.meta.DefaultHotSpotLoweringProvider.RuntimeCalls; -import jdk.compiler.graal.nodes.extended.BytecodeExceptionNode.BytecodeExceptionKind; +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.core.common.spi.ForeignCallDescriptor; +import jdk.graal.compiler.core.common.spi.ForeignCallSignature; +import jdk.graal.compiler.core.common.spi.ForeignCallsProvider; +import jdk.graal.compiler.core.target.Backend; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.hotspot.meta.DefaultHotSpotLoweringProvider.RuntimeCalls; +import jdk.graal.compiler.nodes.extended.BytecodeExceptionNode.BytecodeExceptionKind; import org.junit.Test; /** diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/HotSpotUnsafeSubstitutionTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/HotSpotUnsafeSubstitutionTest.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/HotSpotUnsafeSubstitutionTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/HotSpotUnsafeSubstitutionTest.java index 4af29fd70459..60f0147d0182 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/HotSpotUnsafeSubstitutionTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/HotSpotUnsafeSubstitutionTest.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.test; +package jdk.graal.compiler.hotspot.test; -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.replacements.test.MethodSubstitutionTest; +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.replacements.test.MethodSubstitutionTest; import org.junit.Test; import jdk.vm.ci.code.InstalledCode; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/HsErrLogTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/HsErrLogTest.java similarity index 91% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/HsErrLogTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/HsErrLogTest.java index e336b85a37d0..f1c3590a855d 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/HsErrLogTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/HsErrLogTest.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.test; +package jdk.graal.compiler.hotspot.test; -import static jdk.compiler.graal.test.SubprocessUtil.getVMCommandLine; -import static jdk.compiler.graal.test.SubprocessUtil.withoutDebuggerArguments; +import static jdk.graal.compiler.test.SubprocessUtil.getVMCommandLine; +import static jdk.graal.compiler.test.SubprocessUtil.withoutDebuggerArguments; import java.io.BufferedReader; import java.io.File; @@ -37,10 +37,10 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import jdk.compiler.graal.api.directives.GraalDirectives; -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.test.SubprocessUtil; -import jdk.compiler.graal.test.SubprocessUtil.Subprocess; +import jdk.graal.compiler.api.directives.GraalDirectives; +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.test.SubprocessUtil; +import jdk.graal.compiler.test.SubprocessUtil.Subprocess; import org.junit.Assert; import org.junit.Test; @@ -54,7 +54,7 @@ public class HsErrLogTest extends GraalCompilerTest { @Test public void test1() throws IOException, InterruptedException { List args = new ArrayList<>(); - args.add("--add-exports=jdk.compiler.graal/jdk.compiler.graal.api.directives=ALL-UNNAMED"); + args.add("--add-exports=jdk.graal.compiler/jdk.graal.compiler.api.directives=ALL-UNNAMED"); args.add("-XX:+UseJVMCICompiler"); args.add("-XX:CompileOnly=" + Crasher.class.getName() + "::tryCrash"); args.add(Crasher.class.getName()); diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/InstalledCodeExecuteHelperTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/InstalledCodeExecuteHelperTest.java similarity index 90% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/InstalledCodeExecuteHelperTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/InstalledCodeExecuteHelperTest.java index 9fa11635b47d..6cef54fa86e0 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/InstalledCodeExecuteHelperTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/InstalledCodeExecuteHelperTest.java @@ -22,17 +22,17 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.test; +package jdk.graal.compiler.hotspot.test; import static java.lang.reflect.Modifier.isStatic; -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.nodes.ConstantNode; -import jdk.compiler.graal.nodes.ParameterNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.StructuredGraph.Builder; -import jdk.compiler.graal.phases.PhaseSuite; -import jdk.compiler.graal.phases.tiers.HighTierContext; +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.nodes.ConstantNode; +import jdk.graal.compiler.nodes.ParameterNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.StructuredGraph.Builder; +import jdk.graal.compiler.phases.PhaseSuite; +import jdk.graal.compiler.phases.tiers.HighTierContext; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/JVMCIInfopointErrorTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/JVMCIInfopointErrorTest.java similarity index 89% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/JVMCIInfopointErrorTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/JVMCIInfopointErrorTest.java index d77e3d8a3bf2..7e2c4178b0d7 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/JVMCIInfopointErrorTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/JVMCIInfopointErrorTest.java @@ -22,38 +22,38 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.test; +package jdk.graal.compiler.hotspot.test; -import static jdk.compiler.graal.debug.DebugOptions.DumpOnError; -import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.REG; -import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.STACK; -import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_IGNORED; -import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_IGNORED; +import static jdk.graal.compiler.debug.DebugOptions.DumpOnError; +import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.REG; +import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.STACK; +import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_IGNORED; +import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_IGNORED; import java.util.function.Consumer; -import jdk.compiler.graal.code.CompilationResult; -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.core.common.LIRKind; -import jdk.compiler.graal.core.common.type.StampFactory; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.debug.DebugContext.Builder; -import jdk.compiler.graal.debug.DebugContext.Scope; -import jdk.compiler.graal.graph.NodeClass; -import jdk.compiler.graal.hotspot.HotSpotCompiledCodeBuilder; -import jdk.compiler.graal.lir.FullInfopointOp; -import jdk.compiler.graal.lir.LIRFrameState; -import jdk.compiler.graal.lir.LIRInstruction; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.Variable; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; -import jdk.compiler.graal.lir.gen.LIRGeneratorTool; -import jdk.compiler.graal.nodeinfo.NodeInfo; -import jdk.compiler.graal.nodes.DeoptimizingFixedWithNextNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.spi.LIRLowerable; -import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool; -import jdk.compiler.graal.options.OptionValues; +import jdk.graal.compiler.code.CompilationResult; +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.core.common.LIRKind; +import jdk.graal.compiler.core.common.type.StampFactory; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.debug.DebugContext.Builder; +import jdk.graal.compiler.debug.DebugContext.Scope; +import jdk.graal.compiler.graph.NodeClass; +import jdk.graal.compiler.hotspot.HotSpotCompiledCodeBuilder; +import jdk.graal.compiler.lir.FullInfopointOp; +import jdk.graal.compiler.lir.LIRFrameState; +import jdk.graal.compiler.lir.LIRInstruction; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.Variable; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.lir.gen.LIRGeneratorTool; +import jdk.graal.compiler.nodeinfo.NodeInfo; +import jdk.graal.compiler.nodes.DeoptimizingFixedWithNextNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.spi.LIRLowerable; +import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool; +import jdk.graal.compiler.options.OptionValues; import org.junit.Test; import jdk.vm.ci.code.BytecodeFrame; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/JVMCIVersionCheckMaxValueTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/JVMCIVersionCheckMaxValueTest.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/JVMCIVersionCheckMaxValueTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/JVMCIVersionCheckMaxValueTest.java index 3cc0caf9c391..e7c573e96a0b 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/JVMCIVersionCheckMaxValueTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/JVMCIVersionCheckMaxValueTest.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.test; +package jdk.graal.compiler.hotspot.test; -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.hotspot.JVMCIVersionCheck; +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.hotspot.JVMCIVersionCheck; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/JVMCIVersionCheckTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/JVMCIVersionCheckTest.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/JVMCIVersionCheckTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/JVMCIVersionCheckTest.java index b7d297dc1092..0b74b4c1ff36 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/JVMCIVersionCheckTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/JVMCIVersionCheckTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.test; +package jdk.graal.compiler.hotspot.test; import java.util.ArrayList; import java.util.Collection; @@ -32,9 +32,9 @@ import java.util.Properties; import java.util.Random; -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.hotspot.JVMCIVersionCheck; -import jdk.compiler.graal.hotspot.JVMCIVersionCheck.Version; +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.hotspot.JVMCIVersionCheck; +import jdk.graal.compiler.hotspot.JVMCIVersionCheck.Version; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/LambdaStableNameTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/LambdaStableNameTest.java similarity index 84% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/LambdaStableNameTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/LambdaStableNameTest.java index 69314c839a38..5d4a1c851abd 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/LambdaStableNameTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/LambdaStableNameTest.java @@ -23,20 +23,20 @@ * questions. */ -package jdk.compiler.graal.hotspot.test; +package jdk.graal.compiler.hotspot.test; import java.math.BigInteger; import java.util.Collections; import jdk.vm.ci.meta.ResolvedJavaType; import jdk.vm.ci.runtime.JVMCI; -import jdk.compiler.graal.api.runtime.GraalJVMCICompiler; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.debug.DebugContext.Builder; -import jdk.compiler.graal.hotspot.meta.HotSpotJITClassInitializationPlugin; -import jdk.compiler.graal.java.LambdaUtils; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.phases.util.Providers; -import jdk.compiler.graal.runtime.RuntimeProvider; +import jdk.graal.compiler.api.runtime.GraalJVMCICompiler; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.debug.DebugContext.Builder; +import jdk.graal.compiler.hotspot.meta.HotSpotJITClassInitializationPlugin; +import jdk.graal.compiler.java.LambdaUtils; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.phases.util.Providers; +import jdk.graal.compiler.runtime.RuntimeProvider; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; @@ -56,19 +56,20 @@ private String findStableLambdaName(ResolvedJavaType type) { @Test public void checkStableLamdaNameForRunnableAndAutoCloseable() { - Runnable r = this::checkStableLamdaNameForRunnableAndAutoCloseable; + String s = "a string"; + Runnable r = s::hashCode; ResolvedJavaType rType = JVMCI.getRuntime().getHostJVMCIBackend().getMetaAccess().lookupJavaType(r.getClass()); String name = findStableLambdaName(rType); assertLambdaName(name); - AutoCloseable ac = this::checkStableLamdaNameForRunnableAndAutoCloseable; + AutoCloseable ac = s::hashCode; ResolvedJavaType acType = JVMCI.getRuntime().getHostJVMCIBackend().getMetaAccess().lookupJavaType(ac.getClass()); String acName = findStableLambdaName(acType); assertEquals("Both stable lambda names are the same as they reference the same method", name, acName); String myName = Type.getInternalName(getClass()); - assertEquals("The name known in 19.3 version is computed", "L" + myName + "$$Lambda$b3eecdea57538cc530ec63a3f2a3564b121557a6;", name); + assertEquals("The name known in 19.3 version is computed", "L" + myName + "$$Lambda$0a7a1b7da3e20b4eff3f548c6ba3e47a0c3be612;", name); } private static void assertLambdaName(String name) { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/LibGraalCompilerTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/LibGraalCompilerTest.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/LibGraalCompilerTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/LibGraalCompilerTest.java index 1553ae204ee3..3f6c00e73db3 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/LibGraalCompilerTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/LibGraalCompilerTest.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.test; +package jdk.graal.compiler.hotspot.test; -import jdk.compiler.graal.hotspot.HotSpotGraalServices; +import jdk.graal.compiler.hotspot.HotSpotGraalServices; import org.junit.Assume; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/LogNodeTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/LogNodeTest.java similarity index 91% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/LogNodeTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/LogNodeTest.java index 70d56c74e89c..2f290140ab0b 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/LogNodeTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/LogNodeTest.java @@ -22,20 +22,20 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.test; +package jdk.graal.compiler.hotspot.test; -import static jdk.compiler.graal.test.SubprocessUtil.getVMCommandLine; -import static jdk.compiler.graal.test.SubprocessUtil.withoutDebuggerArguments; +import static jdk.graal.compiler.test.SubprocessUtil.getVMCommandLine; +import static jdk.graal.compiler.test.SubprocessUtil.withoutDebuggerArguments; import java.io.IOException; import java.util.ArrayList; import java.util.List; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.replacements.nodes.LogNode; -import jdk.compiler.graal.test.SubprocessUtil; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.StructuredGraph.AllowAssumptions; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.replacements.nodes.LogNode; +import jdk.graal.compiler.test.SubprocessUtil; import org.junit.Assert; import org.junit.Assume; import org.junit.Before; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/MathDoubleFMATest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/MathDoubleFMATest.java similarity index 92% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/MathDoubleFMATest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/MathDoubleFMATest.java index c65d57b5d598..994a49f45d30 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/MathDoubleFMATest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/MathDoubleFMATest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.test; +package jdk.graal.compiler.hotspot.test; import static org.junit.Assume.assumeTrue; @@ -30,10 +30,10 @@ import java.util.Collection; import java.util.List; -import jdk.compiler.graal.api.test.Graal; -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.hotspot.HotSpotGraalRuntimeProvider; -import jdk.compiler.graal.runtime.RuntimeProvider; +import jdk.graal.compiler.api.test.Graal; +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.hotspot.HotSpotGraalRuntimeProvider; +import jdk.graal.compiler.runtime.RuntimeProvider; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/MathFMAConstantInputTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/MathFMAConstantInputTest.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/MathFMAConstantInputTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/MathFMAConstantInputTest.java index e504e7b55bb7..f20784fa98f5 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/MathFMAConstantInputTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/MathFMAConstantInputTest.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.test; +package jdk.graal.compiler.hotspot.test; -import jdk.compiler.graal.core.test.GraalCompilerTest; +import jdk.graal.compiler.core.test.GraalCompilerTest; import org.junit.Test; public final class MathFMAConstantInputTest extends GraalCompilerTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/MathFloatFMATest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/MathFloatFMATest.java similarity index 91% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/MathFloatFMATest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/MathFloatFMATest.java index dbb4c7584fe4..31d9e4cf8107 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/MathFloatFMATest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/MathFloatFMATest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.test; +package jdk.graal.compiler.hotspot.test; import static org.junit.Assume.assumeTrue; @@ -30,10 +30,10 @@ import java.util.Collection; import java.util.List; -import jdk.compiler.graal.api.test.Graal; -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.hotspot.HotSpotGraalRuntimeProvider; -import jdk.compiler.graal.runtime.RuntimeProvider; +import jdk.graal.compiler.api.test.Graal; +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.hotspot.HotSpotGraalRuntimeProvider; +import jdk.graal.compiler.runtime.RuntimeProvider; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/MemoryUsageBenchmark.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/MemoryUsageBenchmark.java similarity index 90% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/MemoryUsageBenchmark.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/MemoryUsageBenchmark.java index a0d4429d59fe..16b427a43b67 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/MemoryUsageBenchmark.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/MemoryUsageBenchmark.java @@ -22,17 +22,17 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.test; +package jdk.graal.compiler.hotspot.test; -import static jdk.compiler.graal.debug.MemUseTrackerKey.getCurrentThreadAllocatedBytes; +import static jdk.graal.compiler.debug.MemUseTrackerKey.getCurrentThreadAllocatedBytes; -import jdk.compiler.graal.api.test.Graal; -import jdk.compiler.graal.core.test.AllocSpy; -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.hotspot.CompilationTask; -import jdk.compiler.graal.hotspot.HotSpotGraalCompiler; -import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions; -import jdk.compiler.graal.options.OptionValues; +import jdk.graal.compiler.api.test.Graal; +import jdk.graal.compiler.core.test.AllocSpy; +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.hotspot.CompilationTask; +import jdk.graal.compiler.hotspot.HotSpotGraalCompiler; +import jdk.graal.compiler.nodes.StructuredGraph.AllowAssumptions; +import jdk.graal.compiler.options.OptionValues; import jdk.vm.ci.hotspot.HotSpotCompilationRequest; import jdk.vm.ci.hotspot.HotSpotJVMCIRuntime; @@ -45,13 +45,13 @@ * To benchmark: * * 
- *     mx vm -XX:-UseJVMCIClassLoader -cp @jdk.compiler.graal.hotspot.test jdk.compiler.graal.test.hotspot.compiler.MemoryUsageBenchmark
+ *     mx vm -XX:-UseJVMCIClassLoader -cp @jdk.graal.compiler.hotspot.test jdk.graal.compiler.test.hotspot.compiler.MemoryUsageBenchmark
  *
* * Memory analysis for a {@link CompileTheWorld} execution can also be performed. For example: * * 
- *     mx vm -XX:-UseJVMCIClassLoader -DCompileTheWorld.Classpath=$HOME/SPECjvm2008/SPECjvm2008.jar -cp @jdk.compiler.graal.hotspot.test jdk.compiler.graal.test.hotspot.compiler.MemoryUsageBenchmark
+ *     mx vm -XX:-UseJVMCIClassLoader -DCompileTheWorld.Classpath=$HOME/SPECjvm2008/SPECjvm2008.jar -cp @jdk.graal.compiler.hotspot.test jdk.graal.compiler.test.hotspot.compiler.MemoryUsageBenchmark
  *
*/ public class MemoryUsageBenchmark extends HotSpotGraalCompilerTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/ObjectCloneTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/ObjectCloneTest.java similarity index 92% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/ObjectCloneTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/ObjectCloneTest.java index 4e07ef3a5f99..f1c9de73b1fb 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/ObjectCloneTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/ObjectCloneTest.java @@ -22,22 +22,22 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.test; +package jdk.graal.compiler.hotspot.test; import java.util.ArrayList; import java.util.Optional; -import jdk.compiler.graal.api.directives.GraalDirectives; -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.hotspot.replacements.ObjectCloneNode; -import jdk.compiler.graal.nodes.GraphState; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.phases.BasePhase; -import jdk.compiler.graal.phases.tiers.HighTierContext; -import jdk.compiler.graal.phases.tiers.Suites; -import jdk.compiler.graal.virtual.phases.ea.FinalPartialEscapePhase; +import jdk.graal.compiler.api.directives.GraalDirectives; +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.hotspot.replacements.ObjectCloneNode; +import jdk.graal.compiler.nodes.GraphState; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.phases.BasePhase; +import jdk.graal.compiler.phases.tiers.HighTierContext; +import jdk.graal.compiler.phases.tiers.Suites; +import jdk.graal.compiler.virtual.phases.ea.FinalPartialEscapePhase; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/ObjectHashCodeInliningTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/ObjectHashCodeInliningTest.java similarity index 91% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/ObjectHashCodeInliningTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/ObjectHashCodeInliningTest.java index aabca876bb7c..035ff0fdeccc 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/ObjectHashCodeInliningTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/ObjectHashCodeInliningTest.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.test; +package jdk.graal.compiler.hotspot.test; -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.extended.ForeignCallNode; -import jdk.compiler.graal.nodes.java.MethodCallTargetNode; -import jdk.compiler.graal.nodes.memory.ReadNode; +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.extended.ForeignCallNode; +import jdk.graal.compiler.nodes.java.MethodCallTargetNode; +import jdk.graal.compiler.nodes.memory.ReadNode; import org.junit.Test; import jdk.vm.ci.meta.JavaTypeProfile; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/OptionsInFileTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/OptionsInFileTest.java similarity index 86% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/OptionsInFileTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/OptionsInFileTest.java index 0e9c3eb954ec..5cc8ac61ec91 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/OptionsInFileTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/OptionsInFileTest.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.test; +package jdk.graal.compiler.hotspot.test; -import static jdk.compiler.graal.debug.DebugOptions.Dump; -import static jdk.compiler.graal.debug.DebugOptions.MethodFilter; -import static jdk.compiler.graal.debug.DebugOptions.PrintGraph; -import static jdk.compiler.graal.test.SubprocessUtil.getVMCommandLine; -import static jdk.compiler.graal.test.SubprocessUtil.withoutDebuggerArguments; +import static jdk.graal.compiler.debug.DebugOptions.Dump; +import static jdk.graal.compiler.debug.DebugOptions.MethodFilter; +import static jdk.graal.compiler.debug.DebugOptions.PrintGraph; +import static jdk.graal.compiler.test.SubprocessUtil.getVMCommandLine; +import static jdk.graal.compiler.test.SubprocessUtil.withoutDebuggerArguments; import java.io.File; import java.io.FileOutputStream; @@ -36,10 +36,10 @@ import java.io.PrintStream; import java.util.List; -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.debug.DebugOptions.PrintGraphTarget; -import jdk.compiler.graal.test.SubprocessUtil; -import jdk.compiler.graal.test.SubprocessUtil.Subprocess; +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.debug.DebugOptions.PrintGraphTarget; +import jdk.graal.compiler.test.SubprocessUtil; +import jdk.graal.compiler.test.SubprocessUtil.Subprocess; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/PolymorphicInliningTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/PolymorphicInliningTest.java similarity index 94% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/PolymorphicInliningTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/PolymorphicInliningTest.java index 1f8494ed355f..64bee38dd1f5 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/PolymorphicInliningTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/PolymorphicInliningTest.java @@ -22,16 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.test; - -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.nodes.AbstractDeoptimizeNode; -import jdk.compiler.graal.nodes.InvokeNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.java.MethodCallTargetNode; -import jdk.compiler.graal.nodes.java.TypeSwitchNode; -import jdk.compiler.graal.test.SubprocessUtil; +package jdk.graal.compiler.hotspot.test; + +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.nodes.AbstractDeoptimizeNode; +import jdk.graal.compiler.nodes.InvokeNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.java.MethodCallTargetNode; +import jdk.graal.compiler.nodes.java.TypeSwitchNode; +import jdk.graal.compiler.test.SubprocessUtil; import org.junit.Assume; import org.junit.Before; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/ProfileReplayTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/ProfileReplayTest.java similarity index 92% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/ProfileReplayTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/ProfileReplayTest.java index a0d256774553..23009fd2143b 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/ProfileReplayTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/ProfileReplayTest.java @@ -22,18 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.test; +package jdk.graal.compiler.hotspot.test; import java.io.IOException; import java.nio.file.Paths; -import jdk.compiler.graal.api.directives.GraalDirectives; -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.debug.DebugOptions; -import jdk.compiler.graal.hotspot.CompilationTask; -import jdk.compiler.graal.hotspot.HotSpotGraalCompiler; -import jdk.compiler.graal.hotspot.ProfileReplaySupport; -import jdk.compiler.graal.options.OptionValues; +import jdk.graal.compiler.api.directives.GraalDirectives; +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.debug.DebugOptions; +import jdk.graal.compiler.hotspot.CompilationTask; +import jdk.graal.compiler.hotspot.HotSpotGraalCompiler; +import jdk.graal.compiler.hotspot.ProfileReplaySupport; +import jdk.graal.compiler.options.OptionValues; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/RangeCheckPredicatesTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/RangeCheckPredicatesTest.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/RangeCheckPredicatesTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/RangeCheckPredicatesTest.java index 055a4059d2a2..ee2d2c040290 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/RangeCheckPredicatesTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/RangeCheckPredicatesTest.java @@ -24,27 +24,27 @@ * questions. */ -package jdk.compiler.graal.hotspot.test; +package jdk.graal.compiler.hotspot.test; import static jdk.vm.ci.meta.DeoptimizationReason.BoundsCheckException; import static jdk.vm.ci.meta.DeoptimizationReason.LoopLimitCheck; -import static jdk.compiler.graal.core.common.GraalOptions.LoopPredication; -import static jdk.compiler.graal.core.common.GraalOptions.LoopPredicationMainPath; -import static jdk.compiler.graal.core.common.GraalOptions.SpeculativeGuardMovement; +import static jdk.graal.compiler.core.common.GraalOptions.LoopPredication; +import static jdk.graal.compiler.core.common.GraalOptions.LoopPredicationMainPath; +import static jdk.graal.compiler.core.common.GraalOptions.SpeculativeGuardMovement; import java.util.HashSet; import java.util.List; -import jdk.compiler.graal.core.test.GraalCompilerTest; +import jdk.graal.compiler.core.test.GraalCompilerTest; import org.graalvm.collections.EconomicMap; -import jdk.compiler.graal.core.common.cfg.Loop; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.loop.phases.LoopPredicationPhase; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.calc.IntegerBelowNode; -import jdk.compiler.graal.nodes.cfg.HIRBlock; -import jdk.compiler.graal.options.OptionKey; -import jdk.compiler.graal.options.OptionValues; +import jdk.graal.compiler.core.common.cfg.Loop; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.loop.phases.LoopPredicationPhase; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.calc.IntegerBelowNode; +import jdk.graal.compiler.nodes.cfg.HIRBlock; +import jdk.graal.compiler.options.OptionKey; +import jdk.graal.compiler.options.OptionValues; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/ReferenceTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/ReferenceTest.java similarity index 93% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/ReferenceTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/ReferenceTest.java index e1adf6dce786..c010e26393ec 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/ReferenceTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/ReferenceTest.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.test; +package jdk.graal.compiler.hotspot.test; import java.lang.ref.PhantomReference; import java.lang.ref.ReferenceQueue; import java.lang.ref.WeakReference; -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.nodes.InvokeNode; -import jdk.compiler.graal.nodes.StructuredGraph; +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.nodes.InvokeNode; +import jdk.graal.compiler.nodes.StructuredGraph; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/ReservedStackAccessTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/ReservedStackAccessTest.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/ReservedStackAccessTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/ReservedStackAccessTest.java index f6285f265117..265f13a8eb02 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/ReservedStackAccessTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/ReservedStackAccessTest.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.test; +package jdk.graal.compiler.hotspot.test; import java.io.IOException; import java.util.List; import java.util.concurrent.locks.ReentrantLock; -import jdk.compiler.graal.test.SubprocessUtil; -import jdk.compiler.graal.test.SubprocessUtil.Subprocess; +import jdk.graal.compiler.test.SubprocessUtil; +import jdk.graal.compiler.test.SubprocessUtil.Subprocess; import org.junit.Assume; import org.junit.Before; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/StringInternConstantTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/StringInternConstantTest.java similarity index 90% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/StringInternConstantTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/StringInternConstantTest.java index b5fe186abd7f..f91206cc38c2 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/StringInternConstantTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/StringInternConstantTest.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.test; +package jdk.graal.compiler.hotspot.test; -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.nodes.ConstantNode; -import jdk.compiler.graal.nodes.FixedNode; -import jdk.compiler.graal.nodes.ReturnNode; -import jdk.compiler.graal.nodes.StructuredGraph; +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.nodes.ConstantNode; +import jdk.graal.compiler.nodes.FixedNode; +import jdk.graal.compiler.nodes.ReturnNode; +import jdk.graal.compiler.nodes.StructuredGraph; import org.junit.Test; import jdk.vm.ci.hotspot.HotSpotObjectConstant; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/StringUTF16ToBytesGetCharsTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/StringUTF16ToBytesGetCharsTest.java similarity index 91% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/StringUTF16ToBytesGetCharsTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/StringUTF16ToBytesGetCharsTest.java index d0bd115c8fef..fb442b65dc30 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/StringUTF16ToBytesGetCharsTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/StringUTF16ToBytesGetCharsTest.java @@ -22,16 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.test; +package jdk.graal.compiler.hotspot.test; -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.core.common.CompilationIdentifier; -import jdk.compiler.graal.hotspot.meta.HotSpotGraphBuilderPlugins; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions; -import jdk.compiler.graal.nodes.java.NewArrayNode; -import jdk.compiler.graal.replacements.arraycopy.ArrayCopyCallNode; -import jdk.compiler.graal.test.AddExports; +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.core.common.CompilationIdentifier; +import jdk.graal.compiler.hotspot.meta.HotSpotGraphBuilderPlugins; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.StructuredGraph.AllowAssumptions; +import jdk.graal.compiler.nodes.java.NewArrayNode; +import jdk.graal.compiler.replacements.arraycopy.ArrayCopyCallNode; +import jdk.graal.compiler.test.AddExports; import org.junit.Test; import jdk.vm.ci.code.InstalledCode; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/TestIntrinsicCompiles.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/TestIntrinsicCompiles.java similarity index 82% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/TestIntrinsicCompiles.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/TestIntrinsicCompiles.java index 591e863ebcff..c4b9cf79b85e 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/TestIntrinsicCompiles.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/TestIntrinsicCompiles.java @@ -22,27 +22,27 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.test; +package jdk.graal.compiler.hotspot.test; -import static jdk.compiler.graal.core.common.CompilationIdentifier.INVALID_COMPILATION_ID; +import static jdk.graal.compiler.core.common.CompilationIdentifier.INVALID_COMPILATION_ID; import java.util.List; -import jdk.compiler.graal.api.test.Graal; -import jdk.compiler.graal.core.test.GraalCompilerTest; +import jdk.graal.compiler.api.test.Graal; +import jdk.graal.compiler.core.test.GraalCompilerTest; import org.graalvm.collections.EconomicMap; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.hotspot.HotSpotGraalRuntimeProvider; -import jdk.compiler.graal.hotspot.meta.HotSpotProviders; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions; -import jdk.compiler.graal.nodes.extended.ForeignCallNode; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins; -import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin; -import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.runtime.RuntimeProvider; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.hotspot.HotSpotGraalRuntimeProvider; +import jdk.graal.compiler.hotspot.meta.HotSpotProviders; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.StructuredGraph.AllowAssumptions; +import jdk.graal.compiler.nodes.extended.ForeignCallNode; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins; +import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin; +import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.runtime.RuntimeProvider; import org.junit.Test; import jdk.vm.ci.hotspot.HotSpotVMConfigStore; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/UnsafeNewArrayTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/UnsafeNewArrayTest.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/UnsafeNewArrayTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/UnsafeNewArrayTest.java index 2af72d60b645..6eaee41f14bb 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/UnsafeNewArrayTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/UnsafeNewArrayTest.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.test; +package jdk.graal.compiler.hotspot.test; import java.lang.reflect.Array; -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.test.AddExports; +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.test.AddExports; import org.junit.Test; import jdk.internal.misc.Unsafe; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/UnsafeWritebackMemoryTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/UnsafeWritebackMemoryTest.java similarity index 93% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/UnsafeWritebackMemoryTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/UnsafeWritebackMemoryTest.java index dcf14bd5dc9f..2fb34a4cd1e6 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/UnsafeWritebackMemoryTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/UnsafeWritebackMemoryTest.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.test; +package jdk.graal.compiler.hotspot.test; -import jdk.compiler.graal.replacements.test.MethodSubstitutionTest; -import jdk.compiler.graal.test.AddExports; +import jdk.graal.compiler.replacements.test.MethodSubstitutionTest; +import jdk.graal.compiler.test.AddExports; import org.junit.Assume; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/VirtualThreadCarrierThreadTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/VirtualThreadCarrierThreadTest.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/VirtualThreadCarrierThreadTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/VirtualThreadCarrierThreadTest.java index 53832a6bce22..a5b620312acd 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/VirtualThreadCarrierThreadTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/VirtualThreadCarrierThreadTest.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.test; +package jdk.graal.compiler.hotspot.test; import static org.junit.Assume.assumeTrue; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import jdk.compiler.graal.api.test.ModuleSupport; +import jdk.graal.compiler.api.test.ModuleSupport; import org.junit.Test; public class VirtualThreadCarrierThreadTest extends HotSpotGraalCompilerTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/VirtualThreadJFRTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/VirtualThreadJFRTest.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/VirtualThreadJFRTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/VirtualThreadJFRTest.java index 66cc05bf64d8..0d53aa2744d4 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/VirtualThreadJFRTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/VirtualThreadJFRTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.test; +package jdk.graal.compiler.hotspot.test; import java.io.IOException; import java.nio.file.Files; @@ -31,9 +31,9 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.ThreadFactory; -import jdk.compiler.graal.core.common.GraalOptions; -import jdk.compiler.graal.core.test.SubprocessTest; -import jdk.compiler.graal.options.OptionValues; +import jdk.graal.compiler.core.common.GraalOptions; +import jdk.graal.compiler.core.test.SubprocessTest; +import jdk.graal.compiler.options.OptionValues; import org.junit.Test; import jdk.jfr.Event; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/WriteBarrierAdditionTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/WriteBarrierAdditionTest.java similarity index 89% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/WriteBarrierAdditionTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/WriteBarrierAdditionTest.java index 4f4a3a068c68..43a4b25509f5 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/WriteBarrierAdditionTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/hotspot/test/WriteBarrierAdditionTest.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.test; +package jdk.graal.compiler.hotspot.test; -import static jdk.compiler.graal.core.common.GraalOptions.FullUnroll; -import static jdk.compiler.graal.core.common.GraalOptions.LoopPeeling; -import static jdk.compiler.graal.core.common.GraalOptions.PartialEscapeAnalysis; -import static jdk.compiler.graal.core.common.GraalOptions.PartialUnroll; -import static jdk.compiler.graal.hotspot.replacements.HotSpotReplacementsUtil.referentOffset; +import static jdk.graal.compiler.core.common.GraalOptions.FullUnroll; +import static jdk.graal.compiler.core.common.GraalOptions.LoopPeeling; +import static jdk.graal.compiler.core.common.GraalOptions.PartialEscapeAnalysis; +import static jdk.graal.compiler.core.common.GraalOptions.PartialUnroll; +import static jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil.referentOffset; import static org.junit.Assume.assumeTrue; import java.lang.ref.Reference; @@ -37,30 +37,30 @@ import java.util.ListIterator; import java.util.Objects; -import jdk.compiler.graal.api.test.Graal; -import jdk.compiler.graal.core.test.TestPhase; -import jdk.compiler.graal.nodes.extended.RawLoadNode; -import jdk.compiler.graal.nodes.java.LoadFieldNode; -import jdk.compiler.graal.core.common.memory.BarrierType; -import jdk.compiler.graal.hotspot.GraalHotSpotVMConfig; -import jdk.compiler.graal.hotspot.HotSpotBackend; -import jdk.compiler.graal.hotspot.HotSpotGraalRuntime.HotSpotGC; -import jdk.compiler.graal.hotspot.replacements.HotSpotReplacementsUtil; -import jdk.compiler.graal.nodeinfo.NodeSize; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.gc.G1PostWriteBarrier; -import jdk.compiler.graal.nodes.gc.G1PreWriteBarrier; -import jdk.compiler.graal.nodes.gc.G1ReferentFieldReadBarrier; -import jdk.compiler.graal.nodes.gc.SerialWriteBarrier; -import jdk.compiler.graal.nodes.memory.ReadNode; -import jdk.compiler.graal.nodes.memory.WriteNode; -import jdk.compiler.graal.nodes.memory.address.OffsetAddressNode; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.phases.BasePhase; -import jdk.compiler.graal.phases.common.WriteBarrierAdditionPhase; -import jdk.compiler.graal.phases.tiers.MidTierContext; -import jdk.compiler.graal.phases.tiers.Suites; -import jdk.compiler.graal.runtime.RuntimeProvider; +import jdk.graal.compiler.api.test.Graal; +import jdk.graal.compiler.core.test.TestPhase; +import jdk.graal.compiler.nodes.extended.RawLoadNode; +import jdk.graal.compiler.nodes.java.LoadFieldNode; +import jdk.graal.compiler.core.common.memory.BarrierType; +import jdk.graal.compiler.hotspot.GraalHotSpotVMConfig; +import jdk.graal.compiler.hotspot.HotSpotBackend; +import jdk.graal.compiler.hotspot.HotSpotGraalRuntime.HotSpotGC; +import jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil; +import jdk.graal.compiler.nodeinfo.NodeSize; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.gc.G1PostWriteBarrier; +import jdk.graal.compiler.nodes.gc.G1PreWriteBarrier; +import jdk.graal.compiler.nodes.gc.G1ReferentFieldReadBarrier; +import jdk.graal.compiler.nodes.gc.SerialWriteBarrier; +import jdk.graal.compiler.nodes.memory.ReadNode; +import jdk.graal.compiler.nodes.memory.WriteNode; +import jdk.graal.compiler.nodes.memory.address.OffsetAddressNode; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.phases.BasePhase; +import jdk.graal.compiler.phases.common.WriteBarrierAdditionPhase; +import jdk.graal.compiler.phases.tiers.MidTierContext; +import jdk.graal.compiler.phases.tiers.Suites; +import jdk.graal.compiler.runtime.RuntimeProvider; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/JTTTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/JTTTest.java similarity index 94% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/JTTTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/JTTTest.java index c9cc1f433004..9cc72f8a4029 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/JTTTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/JTTTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt; +package jdk.graal.compiler.jtt; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -36,26 +36,26 @@ import java.util.Optional; import java.util.Set; -import jdk.compiler.graal.api.test.Graal; -import jdk.compiler.graal.core.phases.fuzzing.AbstractCompilationPlan; -import jdk.compiler.graal.core.phases.fuzzing.FullFuzzedCompilationPlan; -import jdk.compiler.graal.core.phases.fuzzing.FullFuzzedTierPlan; -import jdk.compiler.graal.core.phases.fuzzing.FuzzedSuites; -import jdk.compiler.graal.core.phases.fuzzing.MinimalFuzzedCompilationPlan; -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.core.test.TestPhase; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.nodeinfo.NodeSize; -import jdk.compiler.graal.nodes.GraphState; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.phases.BasePhase; -import jdk.compiler.graal.phases.PhaseSuite; -import jdk.compiler.graal.phases.tiers.HighTierContext; -import jdk.compiler.graal.phases.tiers.LowTierContext; -import jdk.compiler.graal.phases.tiers.MidTierContext; -import jdk.compiler.graal.phases.tiers.Suites; -import jdk.compiler.graal.runtime.RuntimeProvider; +import jdk.graal.compiler.api.test.Graal; +import jdk.graal.compiler.core.phases.fuzzing.AbstractCompilationPlan; +import jdk.graal.compiler.core.phases.fuzzing.FullFuzzedCompilationPlan; +import jdk.graal.compiler.core.phases.fuzzing.FullFuzzedTierPlan; +import jdk.graal.compiler.core.phases.fuzzing.FuzzedSuites; +import jdk.graal.compiler.core.phases.fuzzing.MinimalFuzzedCompilationPlan; +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.core.test.TestPhase; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.nodeinfo.NodeSize; +import jdk.graal.compiler.nodes.GraphState; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.phases.BasePhase; +import jdk.graal.compiler.phases.PhaseSuite; +import jdk.graal.compiler.phases.tiers.HighTierContext; +import jdk.graal.compiler.phases.tiers.LowTierContext; +import jdk.graal.compiler.phases.tiers.MidTierContext; +import jdk.graal.compiler.phases.tiers.Suites; +import jdk.graal.compiler.runtime.RuntimeProvider; import org.junit.Assert; import org.junit.AssumptionViolatedException; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/backend/ConstantPhiTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/backend/ConstantPhiTest.java similarity index 88% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/backend/ConstantPhiTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/backend/ConstantPhiTest.java index 0ac6988790cb..677bf7e4c75d 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/backend/ConstantPhiTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/backend/ConstantPhiTest.java @@ -22,16 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.backend; +package jdk.graal.compiler.jtt.backend; -import static jdk.compiler.graal.api.directives.GraalDirectives.LIKELY_PROBABILITY; -import static jdk.compiler.graal.api.directives.GraalDirectives.injectBranchProbability; -import static jdk.compiler.graal.core.common.GraalOptions.MaximumInliningSize; +import static jdk.graal.compiler.api.directives.GraalDirectives.LIKELY_PROBABILITY; +import static jdk.graal.compiler.api.directives.GraalDirectives.injectBranchProbability; +import static jdk.graal.compiler.core.common.GraalOptions.MaximumInliningSize; import java.lang.reflect.Method; -import jdk.compiler.graal.jtt.JTTTest; -import jdk.compiler.graal.options.OptionValues; +import jdk.graal.compiler.jtt.JTTTest; +import jdk.graal.compiler.options.OptionValues; import org.junit.Test; public class ConstantPhiTest extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/backend/EmptyMethodTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/backend/EmptyMethodTest.java similarity index 91% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/backend/EmptyMethodTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/backend/EmptyMethodTest.java index 0593d00fa699..69292ec3efdc 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/backend/EmptyMethodTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/backend/EmptyMethodTest.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.backend; +package jdk.graal.compiler.jtt.backend; import org.junit.Test; -import jdk.compiler.graal.api.directives.GraalDirectives; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.api.directives.GraalDirectives; +import jdk.graal.compiler.jtt.JTTTest; public class EmptyMethodTest extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/backend/LargeConstantSectionTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/backend/LargeConstantSectionTest.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/backend/LargeConstantSectionTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/backend/LargeConstantSectionTest.java index a3eb819a2443..5077c4c7783f 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/backend/LargeConstantSectionTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/backend/LargeConstantSectionTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.backend; +package jdk.graal.compiler.jtt.backend; import static org.objectweb.asm.Opcodes.ACC_FINAL; import static org.objectweb.asm.Opcodes.ACC_PUBLIC; @@ -36,9 +36,9 @@ import java.util.Collection; import java.util.List; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.jtt.JTTTest; -import jdk.compiler.graal.api.test.ExportingClassLoader; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.jtt.JTTTest; +import jdk.graal.compiler.api.test.ExportingClassLoader; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_aaload.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_aaload.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_aaload.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_aaload.java index de244a470038..ef8bd156bf37 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_aaload.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_aaload.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_aaload_1.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_aaload_1.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_aaload_1.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_aaload_1.java index ec877dcad7ca..2cc3f3ba06df 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_aaload_1.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_aaload_1.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_aastore.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_aastore.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_aastore.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_aastore.java index 2c58804d1fad..9ba087ed824c 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_aastore.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_aastore.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_aload_0.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_aload_0.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_aload_0.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_aload_0.java index da8359b89295..c37719c6b0d6 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_aload_0.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_aload_0.java @@ -25,9 +25,9 @@ /* * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_aload_1.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_aload_1.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_aload_1.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_aload_1.java index b5bcca53c79d..5989b14163e6 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_aload_1.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_aload_1.java @@ -25,9 +25,9 @@ /* * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_aload_2.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_aload_2.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_aload_2.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_aload_2.java index 3c85430f6da0..1a68801f198a 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_aload_2.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_aload_2.java @@ -25,9 +25,9 @@ /* * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_aload_3.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_aload_3.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_aload_3.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_aload_3.java index 85b39c863896..fcd1ccf14888 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_aload_3.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_aload_3.java @@ -25,9 +25,9 @@ /* * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_anewarray.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_anewarray.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_anewarray.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_anewarray.java index 7b0e4fb497fe..846e09295d9d 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_anewarray.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_anewarray.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_areturn.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_areturn.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_areturn.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_areturn.java index b012f141dd9f..eaa40d372cb1 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_areturn.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_areturn.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_arraylength.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_arraylength.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_arraylength.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_arraylength.java index 56532fb15063..1af44a2fb77c 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_arraylength.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_arraylength.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_athrow.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_athrow.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_athrow.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_athrow.java index 551d6ff5fdcf..175130148f25 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_athrow.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_athrow.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_baload.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_baload.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_baload.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_baload.java index 1a871dee6546..57723d140745 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_baload.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_baload.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_bastore.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_bastore.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_bastore.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_bastore.java index 79b53c64c2d6..7d211cc88fab 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_bastore.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_bastore.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_caload.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_caload.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_caload.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_caload.java index 6aed927fad68..1bbc6d57f345 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_caload.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_caload.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_castore.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_castore.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_castore.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_castore.java index 4dc584c283a2..8ad6a9847996 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_castore.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_castore.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_checkcast01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_checkcast01.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_checkcast01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_checkcast01.java index 9019a2bbcc55..7d6355099e2f 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_checkcast01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_checkcast01.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_checkcast02.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_checkcast02.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_checkcast02.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_checkcast02.java index e37bd1c8007e..668b022c1e72 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_checkcast02.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_checkcast02.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_checkcast03.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_checkcast03.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_checkcast03.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_checkcast03.java index 541254e22664..61c379ad3089 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_checkcast03.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_checkcast03.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /** diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_d2f.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_d2f.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_d2f.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_d2f.java index 61901d37ef60..d4308c942488 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_d2f.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_d2f.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_d2i01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_d2i01.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_d2i01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_d2i01.java index 77d3c2b30a5f..0bdbcad37f6c 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_d2i01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_d2i01.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_d2i02.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_d2i02.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_d2i02.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_d2i02.java index 531a0f5ec269..99f968f2db5e 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_d2i02.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_d2i02.java @@ -23,9 +23,9 @@ * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_d2l01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_d2l01.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_d2l01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_d2l01.java index 6f11f931de82..c5395c85c6ad 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_d2l01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_d2l01.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_d2l02.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_d2l02.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_d2l02.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_d2l02.java index 222beffabe82..5006df705a71 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_d2l02.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_d2l02.java @@ -23,9 +23,9 @@ * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_d2l03.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_d2l03.java similarity index 94% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_d2l03.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_d2l03.java index 716ef12ebda5..a1995af8fc84 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_d2l03.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_d2l03.java @@ -23,9 +23,9 @@ * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_dadd.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_dadd.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_dadd.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_dadd.java index eb25241b1836..f9b9ad40888e 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_dadd.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_dadd.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_daload.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_daload.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_daload.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_daload.java index 4550310f552b..78ba3960f90b 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_daload.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_daload.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_dastore.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_dastore.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_dastore.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_dastore.java index 122c4705ee0d..3c4b82a320a7 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_dastore.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_dastore.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_dcmp01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_dcmp01.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_dcmp01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_dcmp01.java index 957e5fc09515..943d64baa260 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_dcmp01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_dcmp01.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_dcmp02.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_dcmp02.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_dcmp02.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_dcmp02.java index 3dcd8fb59c1f..b2e86a52e139 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_dcmp02.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_dcmp02.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_dcmp03.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_dcmp03.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_dcmp03.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_dcmp03.java index 2a8f876ffa06..dc9949db2d68 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_dcmp03.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_dcmp03.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_dcmp04.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_dcmp04.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_dcmp04.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_dcmp04.java index d4c42d4cac91..bf77d124d47b 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_dcmp04.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_dcmp04.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_dcmp05.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_dcmp05.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_dcmp05.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_dcmp05.java index ad1e92e6e331..93cfd169c7da 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_dcmp05.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_dcmp05.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_dcmp06.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_dcmp06.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_dcmp06.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_dcmp06.java index 73e0a8a0fd45..ee56d84ceffb 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_dcmp06.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_dcmp06.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_dcmp07.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_dcmp07.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_dcmp07.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_dcmp07.java index 4daf4fe06d20..314d19cec4fb 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_dcmp07.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_dcmp07.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_dcmp08.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_dcmp08.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_dcmp08.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_dcmp08.java index a5b5e9633e5f..c95c50a5dbd2 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_dcmp08.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_dcmp08.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_dcmp09.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_dcmp09.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_dcmp09.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_dcmp09.java index 5914e1ed84ad..b52fa0de51a0 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_dcmp09.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_dcmp09.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_dcmp10.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_dcmp10.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_dcmp10.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_dcmp10.java index 4fa016541394..5d36058ab3e6 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_dcmp10.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_dcmp10.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ddiv.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_ddiv.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ddiv.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_ddiv.java index 17630e3916ac..e95989e3ad99 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ddiv.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_ddiv.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_dmul.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_dmul.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_dmul.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_dmul.java index 2119f0a90cc8..8fa79958706a 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_dmul.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_dmul.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_dneg.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_dneg.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_dneg.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_dneg.java index 5b0c439273b6..63e9f595c140 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_dneg.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_dneg.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_dneg2.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_dneg2.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_dneg2.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_dneg2.java index 8ae0bebf06e4..7a0b40b0e50a 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_dneg2.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_dneg2.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_double_base.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_double_base.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_double_base.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_double_base.java index 5aa9e83e9a98..aee14a49b139 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_double_base.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_double_base.java @@ -23,13 +23,13 @@ * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; import java.util.ArrayList; import java.util.Collection; import java.util.List; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameter; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_drem.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_drem.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_drem.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_drem.java index bae8d3e0d85d..090496165c45 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_drem.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_drem.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_dreturn.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_dreturn.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_dreturn.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_dreturn.java index b0fc1b52f5bf..3cfa5024c079 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_dreturn.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_dreturn.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_dsub.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_dsub.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_dsub.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_dsub.java index 52d0c1569f0a..ff67e94d8ac6 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_dsub.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_dsub.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_dsub2.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_dsub2.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_dsub2.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_dsub2.java index 3aead3f8d192..82a0cad522a0 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_dsub2.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_dsub2.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_f2d.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_f2d.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_f2d.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_f2d.java index f8ea808a4ba4..99ed1d0286da 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_f2d.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_f2d.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_f2i01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_f2i01.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_f2i01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_f2i01.java index a97d8f905b25..0e5373b583d2 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_f2i01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_f2i01.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_f2i02.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_f2i02.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_f2i02.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_f2i02.java index 0773cc9beca6..c848864f0e95 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_f2i02.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_f2i02.java @@ -23,9 +23,9 @@ * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_f2l01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_f2l01.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_f2l01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_f2l01.java index 1b169a720d38..b1f16bf81b41 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_f2l01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_f2l01.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_f2l02.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_f2l02.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_f2l02.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_f2l02.java index f04ee7bc6b15..1600b20ce2e1 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_f2l02.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_f2l02.java @@ -23,9 +23,9 @@ * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_fadd.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_fadd.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_fadd.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_fadd.java index d8efd8361f8c..2a071431c1f1 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_fadd.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_fadd.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_faload.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_faload.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_faload.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_faload.java index 491892e46ddf..4ca21f566096 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_faload.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_faload.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_fastore.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_fastore.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_fastore.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_fastore.java index a65b2f8268e1..5ba2f5259adf 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_fastore.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_fastore.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_fcmp01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_fcmp01.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_fcmp01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_fcmp01.java index afa59ee99b51..bd15067dcd77 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_fcmp01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_fcmp01.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_fcmp02.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_fcmp02.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_fcmp02.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_fcmp02.java index 13401dbb5167..7eb71fb01520 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_fcmp02.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_fcmp02.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_fcmp03.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_fcmp03.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_fcmp03.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_fcmp03.java index e6b8aaf4944f..f24bb58b2acf 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_fcmp03.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_fcmp03.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_fcmp04.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_fcmp04.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_fcmp04.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_fcmp04.java index 478e768c4968..612566658d11 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_fcmp04.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_fcmp04.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_fcmp05.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_fcmp05.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_fcmp05.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_fcmp05.java index 9c08f55c1433..8d042a2d9a7a 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_fcmp05.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_fcmp05.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_fcmp06.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_fcmp06.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_fcmp06.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_fcmp06.java index 7a192c748196..7aa6e63a45df 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_fcmp06.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_fcmp06.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_fcmp07.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_fcmp07.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_fcmp07.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_fcmp07.java index 03d6cd4ce391..723e24e3af95 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_fcmp07.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_fcmp07.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_fcmp08.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_fcmp08.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_fcmp08.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_fcmp08.java index 2994557ce5d4..d83d11777261 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_fcmp08.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_fcmp08.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_fcmp09.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_fcmp09.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_fcmp09.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_fcmp09.java index e98ea5a42cf1..a8a791b1a8e7 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_fcmp09.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_fcmp09.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_fcmp10.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_fcmp10.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_fcmp10.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_fcmp10.java index fe9f47efc7ec..4832a58472a4 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_fcmp10.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_fcmp10.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_fdiv.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_fdiv.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_fdiv.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_fdiv.java index 86980cf36bd4..f58a684501a9 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_fdiv.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_fdiv.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_fload.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_fload.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_fload.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_fload.java index 4fdbb1a932a2..5d78581852ba 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_fload.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_fload.java @@ -25,9 +25,9 @@ /* * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_fload_2.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_fload_2.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_fload_2.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_fload_2.java index fa3ee6358d90..41218caac522 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_fload_2.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_fload_2.java @@ -25,9 +25,9 @@ /* * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_float_base.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_float_base.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_float_base.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_float_base.java index fa0b676a66cd..b6eb1dfaddb2 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_float_base.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_float_base.java @@ -23,13 +23,13 @@ * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; import java.util.ArrayList; import java.util.Collection; import java.util.List; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameter; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_fmul.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_fmul.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_fmul.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_fmul.java index 990e73d00fef..0b4bfeee97ba 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_fmul.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_fmul.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_fneg.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_fneg.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_fneg.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_fneg.java index 252639cbfeab..aba7c7544502 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_fneg.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_fneg.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_frem.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_frem.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_frem.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_frem.java index 1b89518f883f..4177a3a59ad8 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_frem.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_frem.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_freturn.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_freturn.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_freturn.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_freturn.java index ca3a2412d1f7..36ff2abe103d 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_freturn.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_freturn.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_fsub.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_fsub.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_fsub.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_fsub.java index 6e91ea40f3e0..c62a79da3bef 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_fsub.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_fsub.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_getfield.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_getfield.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_getfield.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_getfield.java index 8776a94a4753..f9fc2eef77d3 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_getfield.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_getfield.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_getfield_b.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_getfield_b.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_getfield_b.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_getfield_b.java index 22e96020d509..b3d83be4ccdb 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_getfield_b.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_getfield_b.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; public class BC_getfield_b extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_getfield_c.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_getfield_c.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_getfield_c.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_getfield_c.java index 9ad2fc811c03..84286f8b13e8 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_getfield_c.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_getfield_c.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; public class BC_getfield_c extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_getfield_d.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_getfield_d.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_getfield_d.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_getfield_d.java index 49b7f885b118..866aa18056f9 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_getfield_d.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_getfield_d.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; public class BC_getfield_d extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_getfield_f.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_getfield_f.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_getfield_f.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_getfield_f.java index aa383936d686..82b836028871 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_getfield_f.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_getfield_f.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; public class BC_getfield_f extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_getfield_i.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_getfield_i.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_getfield_i.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_getfield_i.java index d843e1b5d7ea..f17bbefbf3dc 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_getfield_i.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_getfield_i.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; public class BC_getfield_i extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_getfield_l.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_getfield_l.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_getfield_l.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_getfield_l.java index 6bc4e1eb6064..7834e223e3d2 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_getfield_l.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_getfield_l.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; public class BC_getfield_l extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_getfield_o.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_getfield_o.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_getfield_o.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_getfield_o.java index 1aa28e1f315e..1ec1fd79a545 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_getfield_o.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_getfield_o.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; public class BC_getfield_o extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_getfield_s.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_getfield_s.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_getfield_s.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_getfield_s.java index 3b8b300667f5..54d11854f415 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_getfield_s.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_getfield_s.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; public class BC_getfield_s extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_getfield_z.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_getfield_z.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_getfield_z.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_getfield_z.java index 105019c2c800..df62897c30df 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_getfield_z.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_getfield_z.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; public class BC_getfield_z extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_getstatic_b.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_getstatic_b.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_getstatic_b.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_getstatic_b.java index e053eadc1c41..c8e16527b418 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_getstatic_b.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_getstatic_b.java @@ -25,9 +25,9 @@ /* * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_getstatic_c.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_getstatic_c.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_getstatic_c.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_getstatic_c.java index 46843868b938..0fc215e5b713 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_getstatic_c.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_getstatic_c.java @@ -25,9 +25,9 @@ /* * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_getstatic_d.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_getstatic_d.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_getstatic_d.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_getstatic_d.java index 53f0968ec2ab..1a0eede657fc 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_getstatic_d.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_getstatic_d.java @@ -25,9 +25,9 @@ /* * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_getstatic_f.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_getstatic_f.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_getstatic_f.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_getstatic_f.java index 765d3dfde08b..1baba4919bb5 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_getstatic_f.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_getstatic_f.java @@ -25,9 +25,9 @@ /* * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_getstatic_i.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_getstatic_i.java similarity index 94% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_getstatic_i.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_getstatic_i.java index 0af77f714eec..d4d138afb67d 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_getstatic_i.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_getstatic_i.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_getstatic_l.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_getstatic_l.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_getstatic_l.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_getstatic_l.java index ecb53b7b5479..fc53950e4847 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_getstatic_l.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_getstatic_l.java @@ -25,9 +25,9 @@ /* * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_getstatic_s.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_getstatic_s.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_getstatic_s.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_getstatic_s.java index 3695ac2d9f66..209efb0ef7b0 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_getstatic_s.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_getstatic_s.java @@ -25,9 +25,9 @@ /* * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_getstatic_z.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_getstatic_z.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_getstatic_z.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_getstatic_z.java index b2fcaf4921cf..4adf58a2f6ad 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_getstatic_z.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_getstatic_z.java @@ -25,9 +25,9 @@ /* * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_i2b.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_i2b.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_i2b.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_i2b.java index f4a19dff71dd..f1f90a25bc93 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_i2b.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_i2b.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_i2c.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_i2c.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_i2c.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_i2c.java index ec2f9e8c9057..64aab9654be1 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_i2c.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_i2c.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_i2d.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_i2d.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_i2d.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_i2d.java index e5214839ec8c..1a6897227cd2 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_i2d.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_i2d.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_i2f.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_i2f.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_i2f.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_i2f.java index 3de4204eb52a..419fbe660d34 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_i2f.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_i2f.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_i2l.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_i2l.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_i2l.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_i2l.java index 99f9516caa9b..8501862a7ea9 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_i2l.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_i2l.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_i2s.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_i2s.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_i2s.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_i2s.java index 79aaa13d6690..c16e9120db0c 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_i2s.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_i2s.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iadd.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_iadd.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iadd.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_iadd.java index dd168d9c4a04..608a91364e50 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iadd.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_iadd.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iadd2.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_iadd2.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iadd2.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_iadd2.java index 7e45ba43a645..d1daaed25cc2 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iadd2.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_iadd2.java @@ -25,9 +25,9 @@ /* * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iadd3.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_iadd3.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iadd3.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_iadd3.java index e6ce93c6dd9d..af2b4281b90b 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iadd3.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_iadd3.java @@ -25,9 +25,9 @@ /* * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iadd_const0.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_iadd_const0.java similarity index 93% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iadd_const0.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_iadd_const0.java index 6825fd9a6b10..75e3c8659f70 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iadd_const0.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_iadd_const0.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; -import jdk.compiler.graal.api.directives.GraalDirectives; +import jdk.graal.compiler.api.directives.GraalDirectives; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iadd_const1.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_iadd_const1.java similarity index 93% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iadd_const1.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_iadd_const1.java index 24d6cd6b17ac..b17b821e21d6 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iadd_const1.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_iadd_const1.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; -import jdk.compiler.graal.api.directives.GraalDirectives; +import jdk.graal.compiler.api.directives.GraalDirectives; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iadd_const2.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_iadd_const2.java similarity index 93% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iadd_const2.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_iadd_const2.java index cf15765943e2..7ef85174189d 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iadd_const2.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_iadd_const2.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; -import jdk.compiler.graal.api.directives.GraalDirectives; +import jdk.graal.compiler.api.directives.GraalDirectives; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iadd_const3.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_iadd_const3.java similarity index 93% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iadd_const3.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_iadd_const3.java index cd4c5fdfa2b1..f6652857c47a 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iadd_const3.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_iadd_const3.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; -import jdk.compiler.graal.api.directives.GraalDirectives; +import jdk.graal.compiler.api.directives.GraalDirectives; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iaload.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_iaload.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iaload.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_iaload.java index 563b8580ec42..4edd33c05d80 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iaload.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_iaload.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iand.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_iand.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iand.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_iand.java index 23439181951b..8d522f89a5f6 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iand.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_iand.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iastore.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_iastore.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iastore.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_iastore.java index 8ed37ac7f985..3f435c8fb56a 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iastore.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_iastore.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iconst.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_iconst.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iconst.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_iconst.java index 16363c0ef0f1..927b58f4961d 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iconst.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_iconst.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_idiv.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_idiv.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_idiv.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_idiv.java index bfcc77eb9f4e..2a65c39adb3b 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_idiv.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_idiv.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_idiv2.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_idiv2.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_idiv2.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_idiv2.java index bd6330967165..fe5a6920821b 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_idiv2.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_idiv2.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_idiv_overflow.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_idiv_overflow.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_idiv_overflow.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_idiv_overflow.java index 3c286479eb4a..80f5a1c2aec9 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_idiv_overflow.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_idiv_overflow.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifeq.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_ifeq.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifeq.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_ifeq.java index 0fb2ff331919..2d9b355e7286 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifeq.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_ifeq.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifeq_2.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_ifeq_2.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifeq_2.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_ifeq_2.java index f1827bc98d7b..c69b891f1154 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifeq_2.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_ifeq_2.java @@ -25,9 +25,9 @@ /* * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifeq_3.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_ifeq_3.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifeq_3.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_ifeq_3.java index 409322956f3a..f40425977cef 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifeq_3.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_ifeq_3.java @@ -25,9 +25,9 @@ /* * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifge.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_ifge.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifge.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_ifge.java index 4acbaf40a905..3552951df1a2 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifge.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_ifge.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifge_2.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_ifge_2.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifge_2.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_ifge_2.java index 65363bd6ada4..decd75db5405 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifge_2.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_ifge_2.java @@ -25,9 +25,9 @@ /* * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifge_3.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_ifge_3.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifge_3.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_ifge_3.java index 0f37ddfb494a..1782cad8fd15 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifge_3.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_ifge_3.java @@ -25,9 +25,9 @@ /* * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifgt.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_ifgt.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifgt.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_ifgt.java index e37111612937..af376971f3bc 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifgt.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_ifgt.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ificmplt1.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_ificmplt1.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ificmplt1.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_ificmplt1.java index f97249ddffac..d6d8d58a946a 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ificmplt1.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_ificmplt1.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ificmplt2.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_ificmplt2.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ificmplt2.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_ificmplt2.java index 1ac0a8fdcdc2..6fd3586e3a92 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ificmplt2.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_ificmplt2.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ificmpne1.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_ificmpne1.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ificmpne1.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_ificmpne1.java index 9a12ffd02570..8206ec01457b 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ificmpne1.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_ificmpne1.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ificmpne2.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_ificmpne2.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ificmpne2.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_ificmpne2.java index beb5526babc6..0351552bc2eb 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ificmpne2.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_ificmpne2.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifle.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_ifle.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifle.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_ifle.java index b164f6e2becb..7a0d36cf519f 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifle.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_ifle.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iflt.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_iflt.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iflt.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_iflt.java index 26d12408edb2..d98acbaa9743 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iflt.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_iflt.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifne.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_ifne.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifne.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_ifne.java index 2048ad940ad5..a5cbff87cd0d 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifne.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_ifne.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifnonnull.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_ifnonnull.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifnonnull.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_ifnonnull.java index 6e2fcb36127e..f1612b31af72 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifnonnull.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_ifnonnull.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifnonnull_2.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_ifnonnull_2.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifnonnull_2.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_ifnonnull_2.java index 74b0b527cbcb..6dc102a8e5ef 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifnonnull_2.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_ifnonnull_2.java @@ -25,9 +25,9 @@ /* * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifnonnull_3.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_ifnonnull_3.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifnonnull_3.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_ifnonnull_3.java index a542233b073d..d0d49c76d0ef 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifnonnull_3.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_ifnonnull_3.java @@ -25,9 +25,9 @@ /* * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifnull.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_ifnull.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifnull.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_ifnull.java index bb7e1378c11b..00416425c193 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifnull.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_ifnull.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifnull_2.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_ifnull_2.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifnull_2.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_ifnull_2.java index 5e8282663d6d..adb3c34bc9d1 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifnull_2.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_ifnull_2.java @@ -25,9 +25,9 @@ /* * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifnull_3.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_ifnull_3.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifnull_3.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_ifnull_3.java index 64407d3e18ef..506201efa702 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifnull_3.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_ifnull_3.java @@ -25,9 +25,9 @@ /* * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iinc_1.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_iinc_1.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iinc_1.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_iinc_1.java index 221734f2f3aa..16d41b1ce676 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iinc_1.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_iinc_1.java @@ -25,9 +25,9 @@ /* * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iinc_2.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_iinc_2.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iinc_2.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_iinc_2.java index 8410e0af85e3..456be87ad33c 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iinc_2.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_iinc_2.java @@ -25,9 +25,9 @@ /* * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iinc_3.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_iinc_3.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iinc_3.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_iinc_3.java index 9de1fb902eaf..f7d2b83d90f0 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iinc_3.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_iinc_3.java @@ -25,9 +25,9 @@ /* * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iinc_4.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_iinc_4.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iinc_4.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_iinc_4.java index 7332e44c835c..7010f0816316 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iinc_4.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_iinc_4.java @@ -25,9 +25,9 @@ /* * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iload_0.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_iload_0.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iload_0.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_iload_0.java index 28101b0570cc..ae6fa697604a 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iload_0.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_iload_0.java @@ -25,9 +25,9 @@ /* * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iload_0_1.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_iload_0_1.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iload_0_1.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_iload_0_1.java index 98f022c0ec09..90140a992545 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iload_0_1.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_iload_0_1.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iload_0_2.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_iload_0_2.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iload_0_2.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_iload_0_2.java index 71dbb89f28a3..7c22b0148891 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iload_0_2.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_iload_0_2.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iload_1.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_iload_1.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iload_1.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_iload_1.java index c5d97a5149fc..3b3cf18a9632 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iload_1.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_iload_1.java @@ -25,9 +25,9 @@ /* * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iload_1_1.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_iload_1_1.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iload_1_1.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_iload_1_1.java index 5fd20d8a7de0..fde31b1661a6 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iload_1_1.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_iload_1_1.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iload_2.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_iload_2.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iload_2.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_iload_2.java index ca6988a4bbff..83aba8a43ada 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iload_2.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_iload_2.java @@ -25,9 +25,9 @@ /* * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iload_3.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_iload_3.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iload_3.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_iload_3.java index 7dd0e99bd278..5f58fd8259a2 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iload_3.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_iload_3.java @@ -25,9 +25,9 @@ /* * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_imul.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_imul.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_imul.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_imul.java index a8a1aa9b0226..006ea62fb1b6 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_imul.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_imul.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ineg.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_ineg.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ineg.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_ineg.java index e71ea3a5eb92..3193f95ef6b8 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ineg.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_ineg.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_instanceof.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_instanceof.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_instanceof.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_instanceof.java index 958dd443c563..e35a02f54f95 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_instanceof.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_instanceof.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_instanceof01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_instanceof01.java similarity index 92% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_instanceof01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_instanceof01.java index fbff1f95b44c..2f418d0860ed 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_instanceof01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_instanceof01.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; -import jdk.compiler.graal.core.phases.HighTier; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.phases.tiers.Suites; +import jdk.graal.compiler.core.phases.HighTier; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.phases.tiers.Suites; /** * Tests the instanceof works, when casting an array of interface. diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_invokeinterface.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_invokeinterface.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_invokeinterface.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_invokeinterface.java index 34d2a8e1f889..79ee000091a9 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_invokeinterface.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_invokeinterface.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_invokespecial.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_invokespecial.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_invokespecial.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_invokespecial.java index 9bc689d4f5ba..810d9b734033 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_invokespecial.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_invokespecial.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_invokespecial2.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_invokespecial2.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_invokespecial2.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_invokespecial2.java index d34ea5e2ee96..d375164a9160 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_invokespecial2.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_invokespecial2.java @@ -25,9 +25,9 @@ /* * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_invokestatic.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_invokestatic.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_invokestatic.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_invokestatic.java index 8eee59b486e4..13094cd39d45 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_invokestatic.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_invokestatic.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_invokevirtual.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_invokevirtual.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_invokevirtual.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_invokevirtual.java index d518c4f1684d..1a1e34faeb39 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_invokevirtual.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_invokevirtual.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ior.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_ior.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ior.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_ior.java index 67cc21b40993..3e47c61f95bd 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ior.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_ior.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_irem.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_irem.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_irem.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_irem.java index 5a66c454aa0f..fcd02609c4a2 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_irem.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_irem.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_irem2.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_irem2.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_irem2.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_irem2.java index 416916ba7f42..9c1810a4393e 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_irem2.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_irem2.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_irem3.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_irem3.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_irem3.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_irem3.java index c8c30ddace9e..e9b45e875181 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_irem3.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_irem3.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_irem4.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_irem4.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_irem4.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_irem4.java index fcedf238ab0b..40db3812a3bf 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_irem4.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_irem4.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; public class BC_irem4 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ireturn.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_ireturn.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ireturn.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_ireturn.java index ff3dc9f9074a..1d0118da0a89 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ireturn.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_ireturn.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ishl.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_ishl.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ishl.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_ishl.java index 0976b91630ea..780a7fa8f3c1 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ishl.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_ishl.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ishr.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_ishr.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ishr.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_ishr.java index e227fde59e37..eb7bc9407f28 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ishr.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_ishr.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_isub.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_isub.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_isub.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_isub.java index f4475753f12d..fdc0e4a75048 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_isub.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_isub.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iushr.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_iushr.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iushr.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_iushr.java index e1c60017c99d..d683dccc6ce8 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iushr.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_iushr.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ixor.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_ixor.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ixor.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_ixor.java index a52404efd4a3..c38994725d4a 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ixor.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_ixor.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_l2d.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_l2d.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_l2d.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_l2d.java index f6c01b2c22ed..20882d58b05a 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_l2d.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_l2d.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_l2f.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_l2f.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_l2f.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_l2f.java index c0bf8468f910..56c0730674b5 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_l2f.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_l2f.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_l2i.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_l2i.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_l2i.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_l2i.java index 05197f097470..37102909410e 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_l2i.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_l2i.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; public class BC_l2i extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_l2i_2.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_l2i_2.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_l2i_2.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_l2i_2.java index 2ad730ceea92..aeeea9f33de7 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_l2i_2.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_l2i_2.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ladd.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_ladd.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ladd.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_ladd.java index 1ecbfeee510c..9c97731cf157 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ladd.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_ladd.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ladd2.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_ladd2.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ladd2.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_ladd2.java index 1c273fb088c4..69dae41e8a18 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ladd2.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_ladd2.java @@ -25,9 +25,9 @@ /* * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_laload.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_laload.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_laload.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_laload.java index 960190335dd8..78a0b5505570 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_laload.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_laload.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_land.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_land.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_land.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_land.java index 26e37182d504..d574eacd0afa 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_land.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_land.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lastore.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_lastore.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lastore.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_lastore.java index bbcd5a1c36f4..abe7be4f8769 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lastore.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_lastore.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lcmp.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_lcmp.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lcmp.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_lcmp.java index 404ddfd7a65c..bb4af4cbca94 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lcmp.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_lcmp.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ldc_01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_ldc_01.java similarity index 94% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ldc_01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_ldc_01.java index a86f1beddd60..8538ebc50f67 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ldc_01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_ldc_01.java @@ -25,9 +25,9 @@ /* * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ldc_02.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_ldc_02.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ldc_02.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_ldc_02.java index a6524b0eb39e..c38267c09650 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ldc_02.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_ldc_02.java @@ -25,9 +25,9 @@ /* * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ldc_03.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_ldc_03.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ldc_03.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_ldc_03.java index ab479b004220..b341fc46479c 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ldc_03.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_ldc_03.java @@ -25,9 +25,9 @@ /* * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ldc_04.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_ldc_04.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ldc_04.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_ldc_04.java index 06995f84bf86..9f728514d669 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ldc_04.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_ldc_04.java @@ -25,9 +25,9 @@ /* * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ldc_05.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_ldc_05.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ldc_05.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_ldc_05.java index b0f28d828756..384e43973c78 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ldc_05.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_ldc_05.java @@ -25,9 +25,9 @@ /* * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ldc_06.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_ldc_06.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ldc_06.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_ldc_06.java index a2deb8d81a04..cf3a583f76ad 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ldc_06.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_ldc_06.java @@ -25,9 +25,9 @@ /* * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ldiv.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_ldiv.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ldiv.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_ldiv.java index e1d483129b89..b58cb421dbea 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ldiv.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_ldiv.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ldiv2.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_ldiv2.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ldiv2.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_ldiv2.java index c53f784ac1e8..91e9dd16fd03 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ldiv2.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_ldiv2.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ldiv3.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_ldiv3.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ldiv3.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_ldiv3.java index 48bddbcb2e0e..ec5248d35836 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ldiv3.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_ldiv3.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ldiv_overflow.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_ldiv_overflow.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ldiv_overflow.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_ldiv_overflow.java index 9734a944eb88..e6d7cdbe7e4c 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ldiv_overflow.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_ldiv_overflow.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lload_0.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_lload_0.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lload_0.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_lload_0.java index 8afc9e15580e..ed57d8af723a 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lload_0.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_lload_0.java @@ -25,9 +25,9 @@ /* * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lload_01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_lload_01.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lload_01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_lload_01.java index 89c3ba53d074..c8f983cf5365 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lload_01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_lload_01.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lload_1.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_lload_1.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lload_1.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_lload_1.java index 2b4546b46c63..fcfae35d71f4 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lload_1.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_lload_1.java @@ -25,9 +25,9 @@ /* * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lload_2.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_lload_2.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lload_2.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_lload_2.java index 41fd864b581c..4964b7d07d55 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lload_2.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_lload_2.java @@ -25,9 +25,9 @@ /* * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lload_3.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_lload_3.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lload_3.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_lload_3.java index 600e909b2eab..7476ec6aa176 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lload_3.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_lload_3.java @@ -25,9 +25,9 @@ /* * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lmul.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_lmul.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lmul.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_lmul.java index 6a351bd6a1d7..5f775228819c 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lmul.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_lmul.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lneg.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_lneg.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lneg.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_lneg.java index 42c7bb53bda2..3b34d6d063f5 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lneg.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_lneg.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lookupswitch01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_lookupswitch01.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lookupswitch01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_lookupswitch01.java index 2e0376410021..cf472053b584 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lookupswitch01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_lookupswitch01.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lookupswitch02.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_lookupswitch02.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lookupswitch02.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_lookupswitch02.java index 04b622631a58..d9568fa65299 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lookupswitch02.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_lookupswitch02.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lookupswitch03.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_lookupswitch03.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lookupswitch03.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_lookupswitch03.java index 52a5c68c39de..7caaa90ea022 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lookupswitch03.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_lookupswitch03.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lookupswitch04.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_lookupswitch04.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lookupswitch04.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_lookupswitch04.java index ce0ba4bc310f..316ddcdd15de 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lookupswitch04.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_lookupswitch04.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lookupswitch05.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_lookupswitch05.java similarity index 94% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lookupswitch05.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_lookupswitch05.java index bbd7bfb2d0df..b91351cc0170 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lookupswitch05.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_lookupswitch05.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lor.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_lor.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lor.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_lor.java index 9d09220bbd52..09dfeacec334 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lor.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_lor.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lrem.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_lrem.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lrem.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_lrem.java index 0cd59886ed03..ec1940332b4c 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lrem.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_lrem.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lrem2.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_lrem2.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lrem2.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_lrem2.java index 4f515a3e60a6..2c444371d32c 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lrem2.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_lrem2.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lreturn.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_lreturn.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lreturn.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_lreturn.java index 2facb25e93e5..478cfc61a574 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lreturn.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_lreturn.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lshl.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_lshl.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lshl.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_lshl.java index ac4acb8d985c..f019c38576ad 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lshl.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_lshl.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lshr.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_lshr.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lshr.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_lshr.java index fb81995d2b0f..dd8ab79bb39c 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lshr.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_lshr.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lshr02.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_lshr02.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lshr02.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_lshr02.java index 04007020801b..b498c8decb79 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lshr02.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_lshr02.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lsub.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_lsub.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lsub.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_lsub.java index 677a8606ef99..ee347b661870 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lsub.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_lsub.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lushr.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_lushr.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lushr.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_lushr.java index 644ae92f554e..67f1ed3833b5 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lushr.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_lushr.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lxor.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_lxor.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lxor.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_lxor.java index 7592154085dd..31e4bf5b4b4e 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lxor.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_lxor.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_monitorenter.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_monitorenter.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_monitorenter.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_monitorenter.java index 49fc7fc2db5a..7d4bb8e0c1bb 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_monitorenter.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_monitorenter.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_monitorenter02.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_monitorenter02.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_monitorenter02.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_monitorenter02.java index 367861f0af39..5b811c8ae5ab 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_monitorenter02.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_monitorenter02.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_multianewarray01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_multianewarray01.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_multianewarray01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_multianewarray01.java index c14885bd26ed..cf4ff206f061 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_multianewarray01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_multianewarray01.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_multianewarray02.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_multianewarray02.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_multianewarray02.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_multianewarray02.java index 77c90a4d4660..08d37fc4703a 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_multianewarray02.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_multianewarray02.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_multianewarray03.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_multianewarray03.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_multianewarray03.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_multianewarray03.java index eff78355216f..c8ccfda8230f 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_multianewarray03.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_multianewarray03.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_multianewarray04.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_multianewarray04.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_multianewarray04.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_multianewarray04.java index 182a879b3390..a6a1bb59b96e 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_multianewarray04.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_multianewarray04.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_new.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_new.java similarity index 94% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_new.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_new.java index 1b3551f26f2b..027634d38144 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_new.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_new.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_newarray.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_newarray.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_newarray.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_newarray.java index 0617b4b418b2..c72b4f76b282 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_newarray.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_newarray.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_newarray_02.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_newarray_02.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_newarray_02.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_newarray_02.java index 177dda291eed..c8bf585413d4 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_newarray_02.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_newarray_02.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; public class BC_newarray_02 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_putfield_01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_putfield_01.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_putfield_01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_putfield_01.java index 575109f04e0b..f49c0d033d90 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_putfield_01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_putfield_01.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_putfield_02.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_putfield_02.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_putfield_02.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_putfield_02.java index 7b48457d73ab..32e1b6dcf1f8 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_putfield_02.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_putfield_02.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_putfield_03.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_putfield_03.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_putfield_03.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_putfield_03.java index 7d0db421c72c..510831a87f83 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_putfield_03.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_putfield_03.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_putfield_04.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_putfield_04.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_putfield_04.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_putfield_04.java index 9e6811674f0f..32e67048dd1a 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_putfield_04.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_putfield_04.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_putstatic.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_putstatic.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_putstatic.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_putstatic.java index 532463068937..b518449f9c6d 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_putstatic.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_putstatic.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_saload.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_saload.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_saload.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_saload.java index 4323160f0ecf..49de9aca92f4 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_saload.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_saload.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_sastore.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_sastore.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_sastore.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_sastore.java index 42a7abdcb626..90a63778952f 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_sastore.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_sastore.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_tableswitch.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_tableswitch.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_tableswitch.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_tableswitch.java index 4d5c90ac0da1..a796c32ad9f5 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_tableswitch.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_tableswitch.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_tableswitch2.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_tableswitch2.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_tableswitch2.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_tableswitch2.java index 5c52325f0165..08f425f49bea 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_tableswitch2.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_tableswitch2.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_tableswitch3.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_tableswitch3.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_tableswitch3.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_tableswitch3.java index 1aa8ada9cd95..0129eb87ba66 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_tableswitch3.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_tableswitch3.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_tableswitch4.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_tableswitch4.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_tableswitch4.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_tableswitch4.java index ee8f370dda38..27ae3544a89c 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_tableswitch4.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_tableswitch4.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_wide01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_wide01.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_wide01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_wide01.java index 8d44f2d5367d..c91e15c448e7 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_wide01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_wide01.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_wide02.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_wide02.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_wide02.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_wide02.java index 11fd11676a1d..28f28e802ce1 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_wide02.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/bytecode/BC_wide02.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.bytecode; +package jdk.graal.compiler.jtt.bytecode; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_aaload0.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_aaload0.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_aaload0.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_aaload0.java index ff167f815510..5fc131183caf 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_aaload0.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_aaload0.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.except; +package jdk.graal.compiler.jtt.except; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public class BC_aaload0 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_aaload1.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_aaload1.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_aaload1.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_aaload1.java index b3c774164edf..0aa214321e8b 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_aaload1.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_aaload1.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.except; +package jdk.graal.compiler.jtt.except; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_aastore0.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_aastore0.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_aastore0.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_aastore0.java index f2ad83ad904e..83d7a3d05c64 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_aastore0.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_aastore0.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.except; +package jdk.graal.compiler.jtt.except; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public class BC_aastore0 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_aastore1.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_aastore1.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_aastore1.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_aastore1.java index cb30bc451b4f..471c037c8e3f 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_aastore1.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_aastore1.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.except; +package jdk.graal.compiler.jtt.except; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_anewarray.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_anewarray.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_anewarray.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_anewarray.java index eb79e0c270c4..76e355f59b38 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_anewarray.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_anewarray.java @@ -25,11 +25,11 @@ /* * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. */ -package jdk.compiler.graal.jtt.except; +package jdk.graal.compiler.jtt.except; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_arraylength.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_arraylength.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_arraylength.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_arraylength.java index 7f8ca896a630..f7a2294f11d6 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_arraylength.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_arraylength.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.except; +package jdk.graal.compiler.jtt.except; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public class BC_arraylength extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_athrow0.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_athrow0.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_athrow0.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_athrow0.java index a153b1045ed7..5882f684bc1a 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_athrow0.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_athrow0.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.except; +package jdk.graal.compiler.jtt.except; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public class BC_athrow0 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_athrow1.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_athrow1.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_athrow1.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_athrow1.java index f998aa92efa5..2f347547e34f 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_athrow1.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_athrow1.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.except; +package jdk.graal.compiler.jtt.except; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_athrow2.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_athrow2.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_athrow2.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_athrow2.java index ad836a5109dd..da0d5ca9ebb7 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_athrow2.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_athrow2.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.except; +package jdk.graal.compiler.jtt.except; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public class BC_athrow2 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_athrow3.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_athrow3.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_athrow3.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_athrow3.java index ba2084ac2aa9..504de65a014c 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_athrow3.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_athrow3.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.except; +package jdk.graal.compiler.jtt.except; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public class BC_athrow3 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_baload.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_baload.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_baload.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_baload.java index 7c5600b9d8ab..eb0f270916cb 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_baload.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_baload.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.except; +package jdk.graal.compiler.jtt.except; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public class BC_baload extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_bastore.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_bastore.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_bastore.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_bastore.java index d4700553bd36..31e8d82ee361 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_bastore.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_bastore.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.except; +package jdk.graal.compiler.jtt.except; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public class BC_bastore extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_caload.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_caload.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_caload.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_caload.java index d6ebf6121a55..2485ebe96687 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_caload.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_caload.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.except; +package jdk.graal.compiler.jtt.except; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public class BC_caload extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_castore.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_castore.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_castore.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_castore.java index 96b667bd39ee..7f3a931fa6e1 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_castore.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_castore.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.except; +package jdk.graal.compiler.jtt.except; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public class BC_castore extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_checkcast.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_checkcast.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_checkcast.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_checkcast.java index 98d72a8733d1..044312beef28 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_checkcast.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_checkcast.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.except; +package jdk.graal.compiler.jtt.except; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_checkcast1.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_checkcast1.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_checkcast1.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_checkcast1.java index 247ad95c5287..fa3fc193b657 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_checkcast1.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_checkcast1.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.except; +package jdk.graal.compiler.jtt.except; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_checkcast2.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_checkcast2.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_checkcast2.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_checkcast2.java index c21729c53789..bf9ddfc58dd7 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_checkcast2.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_checkcast2.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.except; +package jdk.graal.compiler.jtt.except; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_checkcast3.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_checkcast3.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_checkcast3.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_checkcast3.java index 4a401ca07929..0b4e896e3ab7 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_checkcast3.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_checkcast3.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.except; +package jdk.graal.compiler.jtt.except; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_checkcast4.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_checkcast4.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_checkcast4.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_checkcast4.java index 8cdec22dab2d..747356c6601b 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_checkcast4.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_checkcast4.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.except; +package jdk.graal.compiler.jtt.except; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_checkcast5.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_checkcast5.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_checkcast5.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_checkcast5.java index 5b6e250cc7db..a3812d99b56e 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_checkcast5.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_checkcast5.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.except; +package jdk.graal.compiler.jtt.except; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_checkcast6.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_checkcast6.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_checkcast6.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_checkcast6.java index bef7113064fb..18beecce3061 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_checkcast6.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_checkcast6.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.except; +package jdk.graal.compiler.jtt.except; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_daload.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_daload.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_daload.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_daload.java index fb4c1d34ed5e..7b2cca581475 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_daload.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_daload.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.except; +package jdk.graal.compiler.jtt.except; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public class BC_daload extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_dastore.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_dastore.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_dastore.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_dastore.java index 1ede9272d0d7..d7795a0b3ac3 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_dastore.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_dastore.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.except; +package jdk.graal.compiler.jtt.except; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public class BC_dastore extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_faload.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_faload.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_faload.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_faload.java index 6ed39a9b61c2..37862165fc54 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_faload.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_faload.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.except; +package jdk.graal.compiler.jtt.except; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public class BC_faload extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_fastore.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_fastore.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_fastore.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_fastore.java index 314d824c1a20..2e11404e9192 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_fastore.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_fastore.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.except; +package jdk.graal.compiler.jtt.except; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public class BC_fastore extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_getfield.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_getfield.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_getfield.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_getfield.java index 3fad93733ce1..6ae781e17926 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_getfield.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_getfield.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.except; +package jdk.graal.compiler.jtt.except; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public class BC_getfield extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_getfield1.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_getfield1.java similarity index 93% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_getfield1.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_getfield1.java index 899b82bcbcc8..b23857ba69e8 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_getfield1.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_getfield1.java @@ -24,10 +24,10 @@ */ /* */ -package jdk.compiler.graal.jtt.except; +package jdk.graal.compiler.jtt.except; -import jdk.compiler.graal.jtt.JTTTest; -import jdk.compiler.graal.phases.OptimisticOptimizations; +import jdk.graal.compiler.jtt.JTTTest; +import jdk.graal.compiler.phases.OptimisticOptimizations; import org.junit.Test; public class BC_getfield1 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_iaload.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_iaload.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_iaload.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_iaload.java index b46dfa306924..f8cdff4eb8bf 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_iaload.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_iaload.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.except; +package jdk.graal.compiler.jtt.except; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public class BC_iaload extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_iastore.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_iastore.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_iastore.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_iastore.java index d771a66d02ad..9bb42582b366 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_iastore.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_iastore.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.except; +package jdk.graal.compiler.jtt.except; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public class BC_iastore extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_idiv.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_idiv.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_idiv.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_idiv.java index 82c13ec33761..8142fe848879 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_idiv.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_idiv.java @@ -25,11 +25,11 @@ /* */ -package jdk.compiler.graal.jtt.except; +package jdk.graal.compiler.jtt.except; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public class BC_idiv extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_idiv2.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_idiv2.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_idiv2.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_idiv2.java index a42142938535..fee2de6bd652 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_idiv2.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_idiv2.java @@ -25,11 +25,11 @@ /* */ -package jdk.compiler.graal.jtt.except; +package jdk.graal.compiler.jtt.except; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public class BC_idiv2 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_invokespecial01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_invokespecial01.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_invokespecial01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_invokespecial01.java index c7feae86a07a..a04ea9895b69 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_invokespecial01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_invokespecial01.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.except; +package jdk.graal.compiler.jtt.except; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_invokevirtual01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_invokevirtual01.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_invokevirtual01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_invokevirtual01.java index 63ebc00bea51..57aeb0e6dd1b 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_invokevirtual01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_invokevirtual01.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.except; +package jdk.graal.compiler.jtt.except; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_invokevirtual02.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_invokevirtual02.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_invokevirtual02.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_invokevirtual02.java index 4cdb13396f5a..5f1ee8c31d79 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_invokevirtual02.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_invokevirtual02.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.except; +package jdk.graal.compiler.jtt.except; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_irem.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_irem.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_irem.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_irem.java index e3e6a911b214..0576e3b88a3d 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_irem.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_irem.java @@ -25,11 +25,11 @@ /* */ -package jdk.compiler.graal.jtt.except; +package jdk.graal.compiler.jtt.except; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public class BC_irem extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_laload.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_laload.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_laload.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_laload.java index cc484a874225..871621b804a4 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_laload.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_laload.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.except; +package jdk.graal.compiler.jtt.except; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public class BC_laload extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_lastore.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_lastore.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_lastore.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_lastore.java index 8db32700c402..73302e6bd90e 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_lastore.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_lastore.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.except; +package jdk.graal.compiler.jtt.except; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public class BC_lastore extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_ldiv.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_ldiv.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_ldiv.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_ldiv.java index f816fbd79f48..556a90214fdf 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_ldiv.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_ldiv.java @@ -25,11 +25,11 @@ /* */ -package jdk.compiler.graal.jtt.except; +package jdk.graal.compiler.jtt.except; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public class BC_ldiv extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_ldiv2.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_ldiv2.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_ldiv2.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_ldiv2.java index fbd900b40ec1..9eb91a240871 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_ldiv2.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_ldiv2.java @@ -25,11 +25,11 @@ /* */ -package jdk.compiler.graal.jtt.except; +package jdk.graal.compiler.jtt.except; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public class BC_ldiv2 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_lrem.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_lrem.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_lrem.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_lrem.java index cfc8cc03bb13..85bde892735a 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_lrem.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_lrem.java @@ -25,11 +25,11 @@ /* */ -package jdk.compiler.graal.jtt.except; +package jdk.graal.compiler.jtt.except; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public class BC_lrem extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_monitorenter.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_monitorenter.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_monitorenter.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_monitorenter.java index 2aa73925c25f..6e1802dc7225 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_monitorenter.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_monitorenter.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.except; +package jdk.graal.compiler.jtt.except; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_multianewarray.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_multianewarray.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_multianewarray.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_multianewarray.java index 6cec1c379915..a3547b613a3d 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_multianewarray.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_multianewarray.java @@ -25,11 +25,11 @@ /* * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. */ -package jdk.compiler.graal.jtt.except; +package jdk.graal.compiler.jtt.except; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_newarray.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_newarray.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_newarray.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_newarray.java index ad43cb35bbfa..7dcf82bdf230 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_newarray.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_newarray.java @@ -25,11 +25,11 @@ /* * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. */ -package jdk.compiler.graal.jtt.except; +package jdk.graal.compiler.jtt.except; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_putfield.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_putfield.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_putfield.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_putfield.java index a319353c1750..4c884108b96d 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_putfield.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_putfield.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.except; +package jdk.graal.compiler.jtt.except; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public class BC_putfield extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_saload.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_saload.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_saload.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_saload.java index b2ebd85d28cc..a450b827a47b 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_saload.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_saload.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.except; +package jdk.graal.compiler.jtt.except; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public class BC_saload extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_sastore.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_sastore.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_sastore.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_sastore.java index 77ab2abf163f..ad8a1b5093a0 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_sastore.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/BC_sastore.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.except; +package jdk.graal.compiler.jtt.except; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public class BC_sastore extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_Loop01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Catch_Loop01.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_Loop01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Catch_Loop01.java index 6e53c9615094..d2d79d55f210 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_Loop01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Catch_Loop01.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.except; +package jdk.graal.compiler.jtt.except; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_Loop02.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Catch_Loop02.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_Loop02.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Catch_Loop02.java index 67fa4157e456..4d93973ea52c 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_Loop02.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Catch_Loop02.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.except; +package jdk.graal.compiler.jtt.except; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_Loop03.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Catch_Loop03.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_Loop03.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Catch_Loop03.java index 006348f85238..e9c1b5712bbb 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_Loop03.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Catch_Loop03.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.except; +package jdk.graal.compiler.jtt.except; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_NASE_1.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Catch_NASE_1.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_NASE_1.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Catch_NASE_1.java index b01752fc5697..8023f669f1af 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_NASE_1.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Catch_NASE_1.java @@ -25,11 +25,11 @@ /* * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. */ -package jdk.compiler.graal.jtt.except; +package jdk.graal.compiler.jtt.except; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_NASE_2.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Catch_NASE_2.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_NASE_2.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Catch_NASE_2.java index 3f4becf34a02..0de6e6bbc685 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_NASE_2.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Catch_NASE_2.java @@ -25,11 +25,11 @@ /* * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. */ -package jdk.compiler.graal.jtt.except; +package jdk.graal.compiler.jtt.except; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_NPE_00.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Catch_NPE_00.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_NPE_00.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Catch_NPE_00.java index 2be6345a5b4d..662f30698ed5 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_NPE_00.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Catch_NPE_00.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.except; +package jdk.graal.compiler.jtt.except; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_NPE_01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Catch_NPE_01.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_NPE_01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Catch_NPE_01.java index 2afb047c70ac..88e1fc8a0bee 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_NPE_01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Catch_NPE_01.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.except; +package jdk.graal.compiler.jtt.except; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_NPE_02.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Catch_NPE_02.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_NPE_02.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Catch_NPE_02.java index 565f23669a05..aa2d54aac939 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_NPE_02.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Catch_NPE_02.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.except; +package jdk.graal.compiler.jtt.except; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_NPE_03.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Catch_NPE_03.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_NPE_03.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Catch_NPE_03.java index 11586caa833f..3bd0c5ff605d 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_NPE_03.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Catch_NPE_03.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.except; +package jdk.graal.compiler.jtt.except; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_NPE_04.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Catch_NPE_04.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_NPE_04.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Catch_NPE_04.java index ca84de990465..294ec98152ba 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_NPE_04.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Catch_NPE_04.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.except; +package jdk.graal.compiler.jtt.except; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_NPE_05.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Catch_NPE_05.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_NPE_05.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Catch_NPE_05.java index 39ff2776d2a3..95461334f405 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_NPE_05.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Catch_NPE_05.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.except; +package jdk.graal.compiler.jtt.except; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_NPE_06.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Catch_NPE_06.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_NPE_06.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Catch_NPE_06.java index ab4997e10994..258f9fd5096d 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_NPE_06.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Catch_NPE_06.java @@ -25,11 +25,11 @@ /* * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. */ -package jdk.compiler.graal.jtt.except; +package jdk.graal.compiler.jtt.except; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_NPE_07.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Catch_NPE_07.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_NPE_07.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Catch_NPE_07.java index ddb336aac5ed..224867044265 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_NPE_07.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Catch_NPE_07.java @@ -23,11 +23,11 @@ * questions. */ -package jdk.compiler.graal.jtt.except; +package jdk.graal.compiler.jtt.except; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_NPE_08.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Catch_NPE_08.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_NPE_08.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Catch_NPE_08.java index 2cd8607b47ee..7321c774800a 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_NPE_08.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Catch_NPE_08.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.except; +package jdk.graal.compiler.jtt.except; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_NPE_09.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Catch_NPE_09.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_NPE_09.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Catch_NPE_09.java index fdf590ded8e0..95e5ac5dbe50 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_NPE_09.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Catch_NPE_09.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.except; +package jdk.graal.compiler.jtt.except; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_NPE_10.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Catch_NPE_10.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_NPE_10.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Catch_NPE_10.java index 8dd36c70bc13..d16192a518a3 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_NPE_10.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Catch_NPE_10.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.except; +package jdk.graal.compiler.jtt.except; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_NPE_11.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Catch_NPE_11.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_NPE_11.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Catch_NPE_11.java index 6c901b678071..9ae92e7b23e5 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_NPE_11.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Catch_NPE_11.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.except; +package jdk.graal.compiler.jtt.except; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_StackOverflowError_01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Catch_StackOverflowError_01.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_StackOverflowError_01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Catch_StackOverflowError_01.java index f2b5de216353..bb048050e04f 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_StackOverflowError_01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Catch_StackOverflowError_01.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.except; +package jdk.graal.compiler.jtt.except; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_StackOverflowError_02.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Catch_StackOverflowError_02.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_StackOverflowError_02.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Catch_StackOverflowError_02.java index 2de701b21fa9..b79a4bacd4e5 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_StackOverflowError_02.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Catch_StackOverflowError_02.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.except; +package jdk.graal.compiler.jtt.except; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_StackOverflowError_03.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Catch_StackOverflowError_03.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_StackOverflowError_03.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Catch_StackOverflowError_03.java index b7325d614fd9..7f02e44d3ccb 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_StackOverflowError_03.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Catch_StackOverflowError_03.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.except; +package jdk.graal.compiler.jtt.except; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /** * Some basic checking of the stack trace produced after a StackOverflowError. diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_Two01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Catch_Two01.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_Two01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Catch_Two01.java index 1d2ed33208f3..7a8972f74642 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_Two01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Catch_Two01.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.except; +package jdk.graal.compiler.jtt.except; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_Two02.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Catch_Two02.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_Two02.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Catch_Two02.java index e7b9db37aed4..ec86330ed716 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_Two02.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Catch_Two02.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.except; +package jdk.graal.compiler.jtt.except; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_Two03.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Catch_Two03.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_Two03.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Catch_Two03.java index 6b60d8976c83..c330e1a4ecfb 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_Two03.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Catch_Two03.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.except; +package jdk.graal.compiler.jtt.except; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_Unresolved.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Catch_Unresolved.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_Unresolved.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Catch_Unresolved.java index a03e5dce0c61..4ca26c443774 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_Unresolved.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Catch_Unresolved.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.except; +package jdk.graal.compiler.jtt.except; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_Unresolved01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Catch_Unresolved01.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_Unresolved01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Catch_Unresolved01.java index 1cb5d069425f..ea042eff80e9 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_Unresolved01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Catch_Unresolved01.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.except; +package jdk.graal.compiler.jtt.except; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_Unresolved02.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Catch_Unresolved02.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_Unresolved02.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Catch_Unresolved02.java index 594252dd999d..d57bc76be512 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_Unresolved02.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Catch_Unresolved02.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.except; +package jdk.graal.compiler.jtt.except; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_Unresolved03.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Catch_Unresolved03.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_Unresolved03.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Catch_Unresolved03.java index 980f083147d4..2f9d15c49550 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_Unresolved03.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Catch_Unresolved03.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.except; +package jdk.graal.compiler.jtt.except; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Except_Locals.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Except_Locals.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Except_Locals.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Except_Locals.java index 93bffb5988b4..5b80ee922c86 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Except_Locals.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Except_Locals.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.except; +package jdk.graal.compiler.jtt.except; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public class Except_Locals extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Except_Synchronized01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Except_Synchronized01.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Except_Synchronized01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Except_Synchronized01.java index fddaf992f4c6..ece7667ca745 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Except_Synchronized01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Except_Synchronized01.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.except; +package jdk.graal.compiler.jtt.except; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Except_Synchronized02.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Except_Synchronized02.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Except_Synchronized02.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Except_Synchronized02.java index 836355e1c5d5..b169c5f9daad 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Except_Synchronized02.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Except_Synchronized02.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.except; +package jdk.graal.compiler.jtt.except; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public class Except_Synchronized02 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Except_Synchronized03.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Except_Synchronized03.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Except_Synchronized03.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Except_Synchronized03.java index ac47b5a77f78..65351b0fff76 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Except_Synchronized03.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Except_Synchronized03.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.except; +package jdk.graal.compiler.jtt.except; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Except_Synchronized04.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Except_Synchronized04.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Except_Synchronized04.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Except_Synchronized04.java index 9e622c7775f6..fa4668ef840d 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Except_Synchronized04.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Except_Synchronized04.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.except; +package jdk.graal.compiler.jtt.except; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public class Except_Synchronized04 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Except_Synchronized05.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Except_Synchronized05.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Except_Synchronized05.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Except_Synchronized05.java index 26aa7eeb6b70..3ce367a50b49 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Except_Synchronized05.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Except_Synchronized05.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.except; +package jdk.graal.compiler.jtt.except; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public class Except_Synchronized05 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Finally01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Finally01.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Finally01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Finally01.java index 0f69cee2279f..9c526eb72a2f 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Finally01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Finally01.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.except; +package jdk.graal.compiler.jtt.except; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Finally02.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Finally02.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Finally02.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Finally02.java index 0a5090e860fa..1c851c458650 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Finally02.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Finally02.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.except; +package jdk.graal.compiler.jtt.except; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/StackTrace_AIOOBE_00.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/StackTrace_AIOOBE_00.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/StackTrace_AIOOBE_00.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/StackTrace_AIOOBE_00.java index 41e343835861..84220f41bc51 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/StackTrace_AIOOBE_00.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/StackTrace_AIOOBE_00.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.except; +package jdk.graal.compiler.jtt.except; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/StackTrace_CCE_00.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/StackTrace_CCE_00.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/StackTrace_CCE_00.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/StackTrace_CCE_00.java index 7f97cfa5d60d..fdde4e83741a 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/StackTrace_CCE_00.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/StackTrace_CCE_00.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.except; +package jdk.graal.compiler.jtt.except; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/StackTrace_NPE_00.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/StackTrace_NPE_00.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/StackTrace_NPE_00.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/StackTrace_NPE_00.java index 8f47a472a046..8b70914376c8 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/StackTrace_NPE_00.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/StackTrace_NPE_00.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.except; +package jdk.graal.compiler.jtt.except; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/StackTrace_NPE_01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/StackTrace_NPE_01.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/StackTrace_NPE_01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/StackTrace_NPE_01.java index 15fb9f9e4ae2..18b69b792311 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/StackTrace_NPE_01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/StackTrace_NPE_01.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.except; +package jdk.graal.compiler.jtt.except; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/StackTrace_NPE_02.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/StackTrace_NPE_02.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/StackTrace_NPE_02.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/StackTrace_NPE_02.java index 7ce0f9a60502..869804caf09a 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/StackTrace_NPE_02.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/StackTrace_NPE_02.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.except; +package jdk.graal.compiler.jtt.except; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/StackTrace_NPE_03.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/StackTrace_NPE_03.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/StackTrace_NPE_03.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/StackTrace_NPE_03.java index 1aabd1b002ea..e86549d4e112 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/StackTrace_NPE_03.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/StackTrace_NPE_03.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.except; +package jdk.graal.compiler.jtt.except; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Throw_InCatch01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Throw_InCatch01.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Throw_InCatch01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Throw_InCatch01.java index c14e6023dccf..9184446f5b2c 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Throw_InCatch01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Throw_InCatch01.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.except; +package jdk.graal.compiler.jtt.except; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public class Throw_InCatch01 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Throw_InCatch02.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Throw_InCatch02.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Throw_InCatch02.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Throw_InCatch02.java index f6a1d436e025..1ea5b9ed3458 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Throw_InCatch02.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Throw_InCatch02.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.except; +package jdk.graal.compiler.jtt.except; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public class Throw_InCatch02 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Throw_InCatch03.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Throw_InCatch03.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Throw_InCatch03.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Throw_InCatch03.java index 3e0658d3ea68..2f6b82e4067a 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Throw_InCatch03.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Throw_InCatch03.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.except; +package jdk.graal.compiler.jtt.except; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public class Throw_InCatch03 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Throw_InNested.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Throw_InNested.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Throw_InNested.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Throw_InNested.java index 37e6c4f1ae8e..b8dda36ffa75 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Throw_InNested.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Throw_InNested.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.except; +package jdk.graal.compiler.jtt.except; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public class Throw_InNested extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Throw_NPE_01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Throw_NPE_01.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Throw_NPE_01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Throw_NPE_01.java index 4366ece05d8b..4c2d1e1b5a08 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Throw_NPE_01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Throw_NPE_01.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.except; +package jdk.graal.compiler.jtt.except; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public class Throw_NPE_01 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Throw_Synchronized01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Throw_Synchronized01.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Throw_Synchronized01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Throw_Synchronized01.java index 688267e095d3..9121c8f32878 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Throw_Synchronized01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Throw_Synchronized01.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.except; +package jdk.graal.compiler.jtt.except; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public class Throw_Synchronized01 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Throw_Synchronized02.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Throw_Synchronized02.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Throw_Synchronized02.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Throw_Synchronized02.java index 3d323abe9e7e..5d7cd082e84d 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Throw_Synchronized02.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Throw_Synchronized02.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.except; +package jdk.graal.compiler.jtt.except; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public class Throw_Synchronized02 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Throw_Synchronized03.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Throw_Synchronized03.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Throw_Synchronized03.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Throw_Synchronized03.java index 6bca2ce6c96d..b2307a97df7d 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Throw_Synchronized03.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Throw_Synchronized03.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.except; +package jdk.graal.compiler.jtt.except; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public class Throw_Synchronized03 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Throw_Synchronized04.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Throw_Synchronized04.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Throw_Synchronized04.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Throw_Synchronized04.java index 21aa3bbcc53e..81e8ba182945 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Throw_Synchronized04.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Throw_Synchronized04.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.except; +package jdk.graal.compiler.jtt.except; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public class Throw_Synchronized04 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Throw_Synchronized05.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Throw_Synchronized05.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Throw_Synchronized05.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Throw_Synchronized05.java index 563dd6dc45ac..cea2926691f2 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Throw_Synchronized05.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/Throw_Synchronized05.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.except; +package jdk.graal.compiler.jtt.except; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public class Throw_Synchronized05 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/UntrustedInterfaces.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/UntrustedInterfaces.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/UntrustedInterfaces.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/UntrustedInterfaces.java index 47b318ae2508..78559e9d837a 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/UntrustedInterfaces.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/except/UntrustedInterfaces.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.except; +package jdk.graal.compiler.jtt.except; -import jdk.compiler.graal.jtt.JTTTest; -import jdk.compiler.graal.api.test.ExportingClassLoader; +import jdk.graal.compiler.jtt.JTTTest; +import jdk.graal.compiler.api.test.ExportingClassLoader; import org.junit.BeforeClass; import org.junit.Test; import org.objectweb.asm.ClassWriter; @@ -218,7 +218,7 @@ public void testReturn2() { } private static class PoisonLoader extends ExportingClassLoader { - public static final String POISON_IMPL_NAME = "jdk.compiler.graal.jtt.except.PoisonPill"; + public static final String POISON_IMPL_NAME = "jdk.graal.compiler.jtt.except.PoisonPill"; @Override protected Class findClass(String name) throws ClassNotFoundException { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_allocate01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/hotpath/HP_allocate01.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_allocate01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/hotpath/HP_allocate01.java index 144fc6bf6fd2..bbd6e509235e 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_allocate01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/hotpath/HP_allocate01.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.hotpath; +package jdk.graal.compiler.jtt.hotpath; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_allocate02.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/hotpath/HP_allocate02.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_allocate02.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/hotpath/HP_allocate02.java index 3cd69e85fe6a..e3b81a2c2188 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_allocate02.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/hotpath/HP_allocate02.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.hotpath; +package jdk.graal.compiler.jtt.hotpath; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_allocate03.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/hotpath/HP_allocate03.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_allocate03.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/hotpath/HP_allocate03.java index 8f6633fe317c..cf147403882d 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_allocate03.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/hotpath/HP_allocate03.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.hotpath; +package jdk.graal.compiler.jtt.hotpath; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_allocate04.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/hotpath/HP_allocate04.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_allocate04.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/hotpath/HP_allocate04.java index 82667345605e..a9cd522035fd 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_allocate04.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/hotpath/HP_allocate04.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.hotpath; +package jdk.graal.compiler.jtt.hotpath; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_array01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/hotpath/HP_array01.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_array01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/hotpath/HP_array01.java index ea2d62f9a3f4..9ba4e4f10fe4 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_array01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/hotpath/HP_array01.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.hotpath; +package jdk.graal.compiler.jtt.hotpath; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_array02.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/hotpath/HP_array02.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_array02.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/hotpath/HP_array02.java index b3d893d323a9..2cf395ff7a85 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_array02.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/hotpath/HP_array02.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.hotpath; +package jdk.graal.compiler.jtt.hotpath; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_array03.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/hotpath/HP_array03.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_array03.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/hotpath/HP_array03.java index b345bfe1a027..724bf9f035ff 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_array03.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/hotpath/HP_array03.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.hotpath; +package jdk.graal.compiler.jtt.hotpath; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_array04.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/hotpath/HP_array04.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_array04.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/hotpath/HP_array04.java index 5f31f4cdc68c..cdc40b26c88f 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_array04.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/hotpath/HP_array04.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.hotpath; +package jdk.graal.compiler.jtt.hotpath; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_control01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/hotpath/HP_control01.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_control01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/hotpath/HP_control01.java index f448460922de..6de8b3ecf91b 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_control01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/hotpath/HP_control01.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.hotpath; +package jdk.graal.compiler.jtt.hotpath; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_control02.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/hotpath/HP_control02.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_control02.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/hotpath/HP_control02.java index 60219f0f2059..12072f1abee8 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_control02.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/hotpath/HP_control02.java @@ -23,11 +23,11 @@ * questions. */ // Checkstyle: stop -package jdk.compiler.graal.jtt.hotpath; +package jdk.graal.compiler.jtt.hotpath; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_convert01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/hotpath/HP_convert01.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_convert01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/hotpath/HP_convert01.java index c54aefb39dd7..ea8f885829ab 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_convert01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/hotpath/HP_convert01.java @@ -23,9 +23,9 @@ * questions. */ // Checkstyle: stop -package jdk.compiler.graal.jtt.hotpath; +package jdk.graal.compiler.jtt.hotpath; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_count.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/hotpath/HP_count.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_count.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/hotpath/HP_count.java index 2465ce0df76b..266e10c8ec2d 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_count.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/hotpath/HP_count.java @@ -23,9 +23,9 @@ * questions. */ // Checkstyle: stop -package jdk.compiler.graal.jtt.hotpath; +package jdk.graal.compiler.jtt.hotpath; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_dead01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/hotpath/HP_dead01.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_dead01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/hotpath/HP_dead01.java index 95153cc4ff37..66703a5e6d53 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_dead01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/hotpath/HP_dead01.java @@ -23,9 +23,9 @@ * questions. */ // Checkstyle: stop -package jdk.compiler.graal.jtt.hotpath; +package jdk.graal.compiler.jtt.hotpath; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_demo01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/hotpath/HP_demo01.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_demo01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/hotpath/HP_demo01.java index 4d1c2edbe50f..946a138396db 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_demo01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/hotpath/HP_demo01.java @@ -23,9 +23,9 @@ * questions. */ // Checkstyle: stop -package jdk.compiler.graal.jtt.hotpath; +package jdk.graal.compiler.jtt.hotpath; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_field01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/hotpath/HP_field01.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_field01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/hotpath/HP_field01.java index 054605865021..6b2e6f30726b 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_field01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/hotpath/HP_field01.java @@ -23,13 +23,13 @@ * questions. */ // Checkstyle: stop -package jdk.compiler.graal.jtt.hotpath; +package jdk.graal.compiler.jtt.hotpath; import jdk.vm.ci.meta.ResolvedJavaMethod; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_field02.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/hotpath/HP_field02.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_field02.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/hotpath/HP_field02.java index d27e050d82c2..25d2cc2758ed 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_field02.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/hotpath/HP_field02.java @@ -23,11 +23,11 @@ * questions. */ // Checkstyle: stop -package jdk.compiler.graal.jtt.hotpath; +package jdk.graal.compiler.jtt.hotpath; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* * Runs: 10 = 55; 20 = 210; 30 = 465; 40 = 820; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_field03.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/hotpath/HP_field03.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_field03.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/hotpath/HP_field03.java index 0a9bfce8ea24..bde83e4d8a07 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_field03.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/hotpath/HP_field03.java @@ -23,9 +23,9 @@ * questions. */ // Checkstyle: stop -package jdk.compiler.graal.jtt.hotpath; +package jdk.graal.compiler.jtt.hotpath; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import jdk.vm.ci.meta.ResolvedJavaMethod; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_field04.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/hotpath/HP_field04.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_field04.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/hotpath/HP_field04.java index d9dd7a32f1ff..c2cdb1db6b62 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_field04.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/hotpath/HP_field04.java @@ -23,9 +23,9 @@ * questions. */ // Checkstyle: stop -package jdk.compiler.graal.jtt.hotpath; +package jdk.graal.compiler.jtt.hotpath; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_idea.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/hotpath/HP_idea.java similarity index 99% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_idea.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/hotpath/HP_idea.java index f0bfe244f4cd..b0422c9b2685 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_idea.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/hotpath/HP_idea.java @@ -24,11 +24,11 @@ */ // Checkstyle: stop -package jdk.compiler.graal.jtt.hotpath; +package jdk.graal.compiler.jtt.hotpath; import java.util.Random; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; public class HP_idea extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_inline01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/hotpath/HP_inline01.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_inline01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/hotpath/HP_inline01.java index 08b3c3f721c7..a877c0f34469 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_inline01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/hotpath/HP_inline01.java @@ -23,9 +23,9 @@ * questions. */ // Checkstyle: stop -package jdk.compiler.graal.jtt.hotpath; +package jdk.graal.compiler.jtt.hotpath; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_inline02.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/hotpath/HP_inline02.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_inline02.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/hotpath/HP_inline02.java index 001df2b156c8..857b7fd03813 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_inline02.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/hotpath/HP_inline02.java @@ -23,11 +23,11 @@ * questions. */ // Checkstyle: stop -package jdk.compiler.graal.jtt.hotpath; +package jdk.graal.compiler.jtt.hotpath; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_invoke01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/hotpath/HP_invoke01.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_invoke01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/hotpath/HP_invoke01.java index 8c370366c1d7..67ea756ecae4 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_invoke01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/hotpath/HP_invoke01.java @@ -24,9 +24,9 @@ */ // Checkstyle: stop -package jdk.compiler.graal.jtt.hotpath; +package jdk.graal.compiler.jtt.hotpath; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_life.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/hotpath/HP_life.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_life.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/hotpath/HP_life.java index 944c724e09e3..796db712410f 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_life.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/hotpath/HP_life.java @@ -23,13 +23,13 @@ * questions. */ // Checkstyle: stop -package jdk.compiler.graal.jtt.hotpath; +package jdk.graal.compiler.jtt.hotpath; import java.util.Random; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_nest01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/hotpath/HP_nest01.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_nest01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/hotpath/HP_nest01.java index 27cee059356e..1d336021a735 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_nest01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/hotpath/HP_nest01.java @@ -23,11 +23,11 @@ * questions. */ // Checkstyle: stop -package jdk.compiler.graal.jtt.hotpath; +package jdk.graal.compiler.jtt.hotpath; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_nest02.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/hotpath/HP_nest02.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_nest02.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/hotpath/HP_nest02.java index 68ac04009f05..f21316878a40 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_nest02.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/hotpath/HP_nest02.java @@ -23,9 +23,9 @@ * questions. */ // Checkstyle: stop -package jdk.compiler.graal.jtt.hotpath; +package jdk.graal.compiler.jtt.hotpath; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_scope01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/hotpath/HP_scope01.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_scope01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/hotpath/HP_scope01.java index 8600b685ea88..3cbebb72b54a 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_scope01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/hotpath/HP_scope01.java @@ -23,9 +23,9 @@ * questions. */ // Checkstyle: stop -package jdk.compiler.graal.jtt.hotpath; +package jdk.graal.compiler.jtt.hotpath; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Ignore; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_scope02.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/hotpath/HP_scope02.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_scope02.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/hotpath/HP_scope02.java index 53ec41d91ea6..aac018c3c93a 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_scope02.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/hotpath/HP_scope02.java @@ -23,11 +23,11 @@ * questions. */ // Checkstyle: stop -package jdk.compiler.graal.jtt.hotpath; +package jdk.graal.compiler.jtt.hotpath; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_series.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/hotpath/HP_series.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_series.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/hotpath/HP_series.java index ed3b9f30d9f1..00c36f5913d2 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_series.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/hotpath/HP_series.java @@ -24,9 +24,9 @@ */ // Checkstyle: stop -package jdk.compiler.graal.jtt.hotpath; +package jdk.graal.compiler.jtt.hotpath; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_trees01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/hotpath/HP_trees01.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_trees01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/hotpath/HP_trees01.java index 34c971e48d91..84e90eb2d000 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_trees01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/hotpath/HP_trees01.java @@ -23,9 +23,9 @@ * questions. */ // Checkstyle: stop -package jdk.compiler.graal.jtt.hotpath; +package jdk.graal.compiler.jtt.hotpath; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotspot/Test6186134.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/hotspot/Test6186134.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotspot/Test6186134.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/hotspot/Test6186134.java index 76cf7cc1cebd..e22dd3953f81 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotspot/Test6186134.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/hotspot/Test6186134.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.hotspot; +package jdk.graal.compiler.jtt.hotspot; import java.util.ArrayList; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; // @formatter:off diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotspot/Test6196102.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/hotspot/Test6196102.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotspot/Test6196102.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/hotspot/Test6196102.java index af805f00d663..1a5475f517a8 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotspot/Test6196102.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/hotspot/Test6196102.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.hotspot; +package jdk.graal.compiler.jtt.hotspot; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /** diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotspot/Test6753639.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/hotspot/Test6753639.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotspot/Test6753639.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/hotspot/Test6753639.java index c45f5142073b..750e15f716a3 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotspot/Test6753639.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/hotspot/Test6753639.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.hotspot; +package jdk.graal.compiler.jtt.hotspot; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /** diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotspot/Test6823354.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/hotspot/Test6823354.java similarity index 99% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotspot/Test6823354.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/hotspot/Test6823354.java index b012ce0f3367..35b716e54d84 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotspot/Test6823354.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/hotspot/Test6823354.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.hotspot; +package jdk.graal.compiler.jtt.hotspot; import java.net.URLClassLoader; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotspot/Test6850611.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/hotspot/Test6850611.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotspot/Test6850611.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/hotspot/Test6850611.java index 76442601d23e..5eed993e0f11 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotspot/Test6850611.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/hotspot/Test6850611.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.hotspot; +package jdk.graal.compiler.jtt.hotspot; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; //@formatter:off diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotspot/Test6959129.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/hotspot/Test6959129.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotspot/Test6959129.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/hotspot/Test6959129.java index 42e0a9ef53ab..782b932903fd 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotspot/Test6959129.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/hotspot/Test6959129.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.hotspot; +package jdk.graal.compiler.jtt.hotspot; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TestRule; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotspot/Test7005594.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/hotspot/Test7005594.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotspot/Test7005594.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/hotspot/Test7005594.java index 9030ffd10c39..b49fe8266938 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotspot/Test7005594.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/hotspot/Test7005594.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.hotspot; +package jdk.graal.compiler.jtt.hotspot; //@formatter:off diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/jdk/CharacterBits.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/jdk/CharacterBits.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/jdk/CharacterBits.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/jdk/CharacterBits.java index 48a78b09c1a4..58b6f5faff83 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/jdk/CharacterBits.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/jdk/CharacterBits.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.jdk; +package jdk.graal.compiler.jtt.jdk; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public class CharacterBits extends JTTTest { @SuppressWarnings("unused") private static char init = Character.reverseBytes((char) 42); diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/jdk/Class_getName.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/jdk/Class_getName.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/jdk/Class_getName.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/jdk/Class_getName.java index ab8485546562..2154079ade47 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/jdk/Class_getName.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/jdk/Class_getName.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.jdk; +package jdk.graal.compiler.jtt.jdk; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/jdk/DivideUnsigned.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/jdk/DivideUnsigned.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/jdk/DivideUnsigned.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/jdk/DivideUnsigned.java index 2d3f86df1abd..9bbcfef7f3a3 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/jdk/DivideUnsigned.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/jdk/DivideUnsigned.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.jdk; +package jdk.graal.compiler.jtt.jdk; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public class DivideUnsigned extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/jdk/EnumMap01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/jdk/EnumMap01.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/jdk/EnumMap01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/jdk/EnumMap01.java index 5445c331d248..2b585a752706 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/jdk/EnumMap01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/jdk/EnumMap01.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.jdk; +package jdk.graal.compiler.jtt.jdk; import java.util.EnumMap; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/jdk/EnumMap02.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/jdk/EnumMap02.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/jdk/EnumMap02.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/jdk/EnumMap02.java index 66cfa8ddc527..e2061c983082 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/jdk/EnumMap02.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/jdk/EnumMap02.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.jdk; +package jdk.graal.compiler.jtt.jdk; import java.util.EnumMap; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/jdk/IntegerBits.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/jdk/IntegerBits.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/jdk/IntegerBits.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/jdk/IntegerBits.java index 60a974120bab..142d11436d63 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/jdk/IntegerBits.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/jdk/IntegerBits.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.jdk; +package jdk.graal.compiler.jtt.jdk; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public class IntegerBits extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/jdk/IntegerShuffleBitsTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/jdk/IntegerShuffleBitsTest.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/jdk/IntegerShuffleBitsTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/jdk/IntegerShuffleBitsTest.java index 9eae411257f8..932f79b01a31 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/jdk/IntegerShuffleBitsTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/jdk/IntegerShuffleBitsTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.jdk; +package jdk.graal.compiler.jtt.jdk; import static org.junit.Assume.assumeTrue; @@ -30,9 +30,9 @@ import java.util.Collection; import java.util.List; -import jdk.compiler.graal.api.test.Graal; -import jdk.compiler.graal.jtt.JTTTest; -import jdk.compiler.graal.runtime.RuntimeProvider; +import jdk.graal.compiler.api.test.Graal; +import jdk.graal.compiler.jtt.JTTTest; +import jdk.graal.compiler.runtime.RuntimeProvider; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/jdk/LongBits.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/jdk/LongBits.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/jdk/LongBits.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/jdk/LongBits.java index b276feaabc42..603362924ca1 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/jdk/LongBits.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/jdk/LongBits.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.jdk; +package jdk.graal.compiler.jtt.jdk; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public class LongBits extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/jdk/LongShuffleBitsTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/jdk/LongShuffleBitsTest.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/jdk/LongShuffleBitsTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/jdk/LongShuffleBitsTest.java index c567671bbe72..6ab309ce7255 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/jdk/LongShuffleBitsTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/jdk/LongShuffleBitsTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.jdk; +package jdk.graal.compiler.jtt.jdk; import static org.junit.Assume.assumeTrue; @@ -30,9 +30,9 @@ import java.util.Collection; import java.util.List; -import jdk.compiler.graal.api.test.Graal; -import jdk.compiler.graal.jtt.JTTTest; -import jdk.compiler.graal.runtime.RuntimeProvider; +import jdk.graal.compiler.api.test.Graal; +import jdk.graal.compiler.jtt.JTTTest; +import jdk.graal.compiler.runtime.RuntimeProvider; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/jdk/ShortBits.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/jdk/ShortBits.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/jdk/ShortBits.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/jdk/ShortBits.java index 5a78c8081397..1247e8a504a0 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/jdk/ShortBits.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/jdk/ShortBits.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.jdk; +package jdk.graal.compiler.jtt.jdk; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public class ShortBits extends JTTTest { @SuppressWarnings("unused") private static short init = Short.reverseBytes((short) 42); diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/jdk/System_currentTimeMillis01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/jdk/System_currentTimeMillis01.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/jdk/System_currentTimeMillis01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/jdk/System_currentTimeMillis01.java index 83e962226cc5..95f1fc4aa269 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/jdk/System_currentTimeMillis01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/jdk/System_currentTimeMillis01.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.jdk; +package jdk.graal.compiler.jtt.jdk; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/jdk/System_currentTimeMillis02.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/jdk/System_currentTimeMillis02.java similarity index 93% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/jdk/System_currentTimeMillis02.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/jdk/System_currentTimeMillis02.java index b5b5c89da56a..3cca047638cd 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/jdk/System_currentTimeMillis02.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/jdk/System_currentTimeMillis02.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.jdk; +package jdk.graal.compiler.jtt.jdk; -import jdk.compiler.graal.api.directives.GraalDirectives; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.api.directives.GraalDirectives; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /** diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/jdk/System_nanoTime01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/jdk/System_nanoTime01.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/jdk/System_nanoTime01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/jdk/System_nanoTime01.java index 658f7f8efa5a..afe4f3793862 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/jdk/System_nanoTime01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/jdk/System_nanoTime01.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.jdk; +package jdk.graal.compiler.jtt.jdk; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/jdk/System_nanoTime02.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/jdk/System_nanoTime02.java similarity index 93% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/jdk/System_nanoTime02.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/jdk/System_nanoTime02.java index 43a5cca1a689..3f6f71878d3c 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/jdk/System_nanoTime02.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/jdk/System_nanoTime02.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.jdk; +package jdk.graal.compiler.jtt.jdk; -import jdk.compiler.graal.api.directives.GraalDirectives; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.api.directives.GraalDirectives; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /** diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/jdk/System_setOut.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/jdk/System_setOut.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/jdk/System_setOut.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/jdk/System_setOut.java index 06764da7c7be..f9b29d15ecc5 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/jdk/System_setOut.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/jdk/System_setOut.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.jdk; +package jdk.graal.compiler.jtt.jdk; import java.io.ByteArrayOutputStream; import java.io.PrintStream; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/jdk/Thread_setName.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/jdk/Thread_setName.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/jdk/Thread_setName.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/jdk/Thread_setName.java index 50b0561edac7..6d8adf60333e 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/jdk/Thread_setName.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/jdk/Thread_setName.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.jdk; +package jdk.graal.compiler.jtt.jdk; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/jdk/UnsafeAccess01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/jdk/UnsafeAccess01.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/jdk/UnsafeAccess01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/jdk/UnsafeAccess01.java index a4d54ff9c111..3f3d392a6b71 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/jdk/UnsafeAccess01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/jdk/UnsafeAccess01.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.jdk; +package jdk.graal.compiler.jtt.jdk; import java.lang.reflect.Field; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/jdk/UnsafeAllocateInstance01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/jdk/UnsafeAllocateInstance01.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/jdk/UnsafeAllocateInstance01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/jdk/UnsafeAllocateInstance01.java index 9d49f985faea..4088a0dd332b 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/jdk/UnsafeAllocateInstance01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/jdk/UnsafeAllocateInstance01.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.jdk; +package jdk.graal.compiler.jtt.jdk; import java.util.AbstractList; import java.util.List; @@ -30,7 +30,7 @@ import org.junit.Ignore; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/jdk/Unsafe_compareAndSwap.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/jdk/Unsafe_compareAndSwap.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/jdk/Unsafe_compareAndSwap.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/jdk/Unsafe_compareAndSwap.java index bfb57a82d164..5ce39d2611ce 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/jdk/Unsafe_compareAndSwap.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/jdk/Unsafe_compareAndSwap.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.jdk; +package jdk.graal.compiler.jtt.jdk; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/jdk/Unsafe_compareAndSwapNullCheck.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/jdk/Unsafe_compareAndSwapNullCheck.java similarity index 94% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/jdk/Unsafe_compareAndSwapNullCheck.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/jdk/Unsafe_compareAndSwapNullCheck.java index 224a0e666a05..2828d9e2c985 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/jdk/Unsafe_compareAndSwapNullCheck.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/jdk/Unsafe_compareAndSwapNullCheck.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.jdk; +package jdk.graal.compiler.jtt.jdk; -import jdk.compiler.graal.jtt.JTTTest; -import jdk.compiler.graal.phases.OptimisticOptimizations; +import jdk.graal.compiler.jtt.JTTTest; +import jdk.graal.compiler.phases.OptimisticOptimizations; import org.junit.Test; public class Unsafe_compareAndSwapNullCheck extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Boxed_TYPE_01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Boxed_TYPE_01.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Boxed_TYPE_01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Boxed_TYPE_01.java index 1df84e5d81fb..d608195e201d 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Boxed_TYPE_01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Boxed_TYPE_01.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.lang; +package jdk.graal.compiler.jtt.lang; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Bridge_method01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Bridge_method01.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Bridge_method01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Bridge_method01.java index 8652a3be7bf9..26e0833eb6d2 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Bridge_method01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Bridge_method01.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.lang; +package jdk.graal.compiler.jtt.lang; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/CheckedListTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/CheckedListTest.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/CheckedListTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/CheckedListTest.java index ced7935a92ed..5c703dca674f 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/CheckedListTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/CheckedListTest.java @@ -24,9 +24,9 @@ */ /* */ -package jdk.compiler.graal.jtt.lang; +package jdk.graal.compiler.jtt.lang; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/ClassLoader_loadClass01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/ClassLoader_loadClass01.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/ClassLoader_loadClass01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/ClassLoader_loadClass01.java index 0223ed4ebda0..09ae74734e05 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/ClassLoader_loadClass01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/ClassLoader_loadClass01.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.lang; +package jdk.graal.compiler.jtt.lang; import java.net.URL; import java.net.URLClassLoader; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_Literal01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Class_Literal01.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_Literal01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Class_Literal01.java index c6273301309f..1b2b6810fc91 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_Literal01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Class_Literal01.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.lang; +package jdk.graal.compiler.jtt.lang; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public final class Class_Literal01 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_asSubclass01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Class_asSubclass01.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_asSubclass01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Class_asSubclass01.java index 3cde271f3bbb..4feb1216a5d2 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_asSubclass01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Class_asSubclass01.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.lang; +package jdk.graal.compiler.jtt.lang; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public final class Class_asSubclass01 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_cast01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Class_cast01.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_cast01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Class_cast01.java index 248c8efadcc3..298d4b6cb2f4 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_cast01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Class_cast01.java @@ -24,9 +24,9 @@ */ /* */ -package jdk.compiler.graal.jtt.lang; +package jdk.graal.compiler.jtt.lang; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; public final class Class_cast01 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_cast02.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Class_cast02.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_cast02.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Class_cast02.java index 50ff34a4b1d2..92944076df3d 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_cast02.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Class_cast02.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.lang; +package jdk.graal.compiler.jtt.lang; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public final class Class_cast02 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_forName01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Class_forName01.java similarity index 93% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_forName01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Class_forName01.java index 19a4365cda78..8299f0ea2be8 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_forName01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Class_forName01.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.lang; +package jdk.graal.compiler.jtt.lang; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public final class Class_forName01 extends JTTTest { @@ -40,7 +40,7 @@ public static String test(int i) throws ClassNotFoundException { return Class.forName("java.lang.String").toString(); } if (i == 2) { - return Class.forName("jdk.compiler.graal.jtt.lang.Class_forName01").toString(); + return Class.forName("jdk.graal.compiler.jtt.lang.Class_forName01").toString(); } if (i == 3) { return Class.forName("xyxzz.xyzyzyz.XXYYY").toString(); diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_forName02.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Class_forName02.java similarity index 94% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_forName02.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Class_forName02.java index a614a2b2ccaa..98471f597cc2 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_forName02.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Class_forName02.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.lang; +package jdk.graal.compiler.jtt.lang; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public final class Class_forName02 extends JTTTest { @@ -42,7 +42,7 @@ public static String test(int i) throws ClassNotFoundException { clname = "java.lang.String"; cl = String.class; } else if (i == 2) { - clname = "jdk.compiler.graal.lang.jtt.compiler.Class_forName02"; + clname = "jdk.graal.compiler.lang.jtt.compiler.Class_forName02"; cl = Class_forName02.class; } else if (i == 3) { clname = "xyzz.zyxy.XYXY"; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_forName03.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Class_forName03.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_forName03.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Class_forName03.java index a5fc8ae2591f..cc4011909c39 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_forName03.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Class_forName03.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.lang; +package jdk.graal.compiler.jtt.lang; import java.net.URL; import java.net.URLClassLoader; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_forName04.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Class_forName04.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_forName04.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Class_forName04.java index 9bb21fede8a9..dce36221695e 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_forName04.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Class_forName04.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.lang; +package jdk.graal.compiler.jtt.lang; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_forName05.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Class_forName05.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_forName05.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Class_forName05.java index beaf34a4cbf6..a1d047ebf9cc 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_forName05.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Class_forName05.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.lang; +package jdk.graal.compiler.jtt.lang; import java.net.URL; import java.net.URLClassLoader; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_getComponentType01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Class_getComponentType01.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_getComponentType01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Class_getComponentType01.java index ffe19dbf240a..a48611e228e2 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_getComponentType01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Class_getComponentType01.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.lang; +package jdk.graal.compiler.jtt.lang; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public final class Class_getComponentType01 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_getInterfaces01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Class_getInterfaces01.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_getInterfaces01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Class_getInterfaces01.java index 6b44972b967a..f9dfe953c431 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_getInterfaces01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Class_getInterfaces01.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.lang; +package jdk.graal.compiler.jtt.lang; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_getModifiers01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Class_getModifiers01.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_getModifiers01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Class_getModifiers01.java index 11345587fab2..eddade33835e 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_getModifiers01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Class_getModifiers01.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.lang; +package jdk.graal.compiler.jtt.lang; import java.io.Serializable; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public final class Class_getModifiers01 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_getModifiers02.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Class_getModifiers02.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_getModifiers02.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Class_getModifiers02.java index 9eb46ad3fbab..4bf3992eb0b5 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_getModifiers02.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Class_getModifiers02.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.lang; +package jdk.graal.compiler.jtt.lang; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public final class Class_getModifiers02 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_getName01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Class_getName01.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_getName01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Class_getName01.java index 4f5d8d46330f..4d9d4489574e 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_getName01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Class_getName01.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.lang; +package jdk.graal.compiler.jtt.lang; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public final class Class_getName01 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_getName02.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Class_getName02.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_getName02.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Class_getName02.java index d743bfaef89f..7bb84255de22 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_getName02.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Class_getName02.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.lang; +package jdk.graal.compiler.jtt.lang; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public final class Class_getName02 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_getSimpleName01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Class_getSimpleName01.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_getSimpleName01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Class_getSimpleName01.java index 82244573f307..8e89ab3094d2 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_getSimpleName01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Class_getSimpleName01.java @@ -27,11 +27,11 @@ */ /* */ -package jdk.compiler.graal.jtt.lang; +package jdk.graal.compiler.jtt.lang; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public final class Class_getSimpleName01 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_getSimpleName02.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Class_getSimpleName02.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_getSimpleName02.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Class_getSimpleName02.java index a9c5167e5bc4..12584829715c 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_getSimpleName02.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Class_getSimpleName02.java @@ -27,11 +27,11 @@ */ /* */ -package jdk.compiler.graal.jtt.lang; +package jdk.graal.compiler.jtt.lang; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public final class Class_getSimpleName02 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_getSuperClass01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Class_getSuperClass01.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_getSuperClass01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Class_getSuperClass01.java index 0112865712ab..aded642464a5 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_getSuperClass01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Class_getSuperClass01.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.lang; +package jdk.graal.compiler.jtt.lang; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public final class Class_getSuperClass01 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_isArray01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Class_isArray01.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_isArray01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Class_isArray01.java index e73b6d20a2fa..0b95237291ef 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_isArray01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Class_isArray01.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.lang; +package jdk.graal.compiler.jtt.lang; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public final class Class_isArray01 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_isAssignableFrom01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Class_isAssignableFrom01.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_isAssignableFrom01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Class_isAssignableFrom01.java index 2a38d6b55122..4cd780858650 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_isAssignableFrom01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Class_isAssignableFrom01.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.lang; +package jdk.graal.compiler.jtt.lang; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public final class Class_isAssignableFrom01 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_isAssignableFrom02.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Class_isAssignableFrom02.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_isAssignableFrom02.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Class_isAssignableFrom02.java index 82900b740a18..28723759b1a3 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_isAssignableFrom02.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Class_isAssignableFrom02.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.lang; +package jdk.graal.compiler.jtt.lang; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public final class Class_isAssignableFrom02 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_isAssignableFrom03.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Class_isAssignableFrom03.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_isAssignableFrom03.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Class_isAssignableFrom03.java index 088399c51268..9a0047c485fb 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_isAssignableFrom03.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Class_isAssignableFrom03.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.lang; +package jdk.graal.compiler.jtt.lang; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public final class Class_isAssignableFrom03 extends JTTTest implements Cloneable { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_isInstance01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Class_isInstance01.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_isInstance01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Class_isInstance01.java index 7cb93264ca0c..2c1e3425f22f 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_isInstance01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Class_isInstance01.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.lang; +package jdk.graal.compiler.jtt.lang; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public final class Class_isInstance01 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_isInstance02.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Class_isInstance02.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_isInstance02.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Class_isInstance02.java index fff5d42a6ad8..4ceff5dac87d 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_isInstance02.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Class_isInstance02.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.lang; +package jdk.graal.compiler.jtt.lang; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public final class Class_isInstance02 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_isInstance03.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Class_isInstance03.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_isInstance03.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Class_isInstance03.java index d34475945d43..c74f3b0dcbe0 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_isInstance03.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Class_isInstance03.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.lang; +package jdk.graal.compiler.jtt.lang; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public final class Class_isInstance03 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_isInstance04.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Class_isInstance04.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_isInstance04.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Class_isInstance04.java index a158f75f6113..5992751fcfd7 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_isInstance04.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Class_isInstance04.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.lang; +package jdk.graal.compiler.jtt.lang; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public final class Class_isInstance04 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_isInstance05.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Class_isInstance05.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_isInstance05.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Class_isInstance05.java index 1907b8cb33ed..ccd3de82091b 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_isInstance05.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Class_isInstance05.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.lang; +package jdk.graal.compiler.jtt.lang; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public final class Class_isInstance05 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_isInstance06.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Class_isInstance06.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_isInstance06.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Class_isInstance06.java index ae5f02337c52..6001341b1aeb 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_isInstance06.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Class_isInstance06.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.lang; +package jdk.graal.compiler.jtt.lang; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public final class Class_isInstance06 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_isInstance07.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Class_isInstance07.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_isInstance07.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Class_isInstance07.java index 557ff18f38b7..15c132c02036 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_isInstance07.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Class_isInstance07.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.lang; +package jdk.graal.compiler.jtt.lang; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public final class Class_isInstance07 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_isInterface01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Class_isInterface01.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_isInterface01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Class_isInterface01.java index be46fd392065..57274adf927f 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_isInterface01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Class_isInterface01.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.lang; +package jdk.graal.compiler.jtt.lang; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public final class Class_isInterface01 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_isPrimitive01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Class_isPrimitive01.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_isPrimitive01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Class_isPrimitive01.java index 8d91af335d3c..1489662099e1 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_isPrimitive01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Class_isPrimitive01.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.lang; +package jdk.graal.compiler.jtt.lang; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public final class Class_isPrimitive01 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Double_01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Double_01.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Double_01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Double_01.java index b98789524fe7..67e2c835a34b 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Double_01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Double_01.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.lang; +package jdk.graal.compiler.jtt.lang; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Double_conditional.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Double_conditional.java similarity index 94% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Double_conditional.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Double_conditional.java index 1f5634c2a143..b3478c9b46c1 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Double_conditional.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Double_conditional.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.lang; +package jdk.graal.compiler.jtt.lang; import org.junit.Test; -import jdk.compiler.graal.jtt.bytecode.BC_double_base; +import jdk.graal.compiler.jtt.bytecode.BC_double_base; public final class Double_conditional extends BC_double_base { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Double_isInfinite.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Double_isInfinite.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Double_isInfinite.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Double_isInfinite.java index ea5ef23931f6..ca4407a8d215 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Double_isInfinite.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Double_isInfinite.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.lang; +package jdk.graal.compiler.jtt.lang; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; public class Double_isInfinite extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Double_toString.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Double_toString.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Double_toString.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Double_toString.java index d12c134e3231..0c83efba2a1c 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Double_toString.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Double_toString.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.lang; +package jdk.graal.compiler.jtt.lang; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Float_01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Float_01.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Float_01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Float_01.java index c6a9a2e16c59..d85d706a3481 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Float_01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Float_01.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.lang; +package jdk.graal.compiler.jtt.lang; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public class Float_01 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Float_02.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Float_02.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Float_02.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Float_02.java index 46af87dbc688..9b22284df406 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Float_02.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Float_02.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.lang; +package jdk.graal.compiler.jtt.lang; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Float_03.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Float_03.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Float_03.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Float_03.java index c9a0348dd4c4..565a1b849cd4 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Float_03.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Float_03.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.lang; +package jdk.graal.compiler.jtt.lang; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Float_conditional.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Float_conditional.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Float_conditional.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Float_conditional.java index a17c85a33d3d..adca910bbbf6 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Float_conditional.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Float_conditional.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.lang; +package jdk.graal.compiler.jtt.lang; import org.junit.Test; -import jdk.compiler.graal.jtt.bytecode.BC_float_base; +import jdk.graal.compiler.jtt.bytecode.BC_float_base; public final class Float_conditional extends BC_float_base { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Float_isInfinite.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Float_isInfinite.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Float_isInfinite.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Float_isInfinite.java index abca261b2869..7c64b025c9d5 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Float_isInfinite.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Float_isInfinite.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.lang; +package jdk.graal.compiler.jtt.lang; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; public class Float_isInfinite extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Int_greater01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Int_greater01.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Int_greater01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Int_greater01.java index 851993036835..a0a07b982a1a 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Int_greater01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Int_greater01.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.lang; +package jdk.graal.compiler.jtt.lang; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public final class Int_greater01 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Int_greater02.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Int_greater02.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Int_greater02.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Int_greater02.java index 59db41c043ce..c6a75e9213db 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Int_greater02.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Int_greater02.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.lang; +package jdk.graal.compiler.jtt.lang; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public final class Int_greater02 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Int_greater03.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Int_greater03.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Int_greater03.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Int_greater03.java index 87dd161d94f0..9978035a980e 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Int_greater03.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Int_greater03.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.lang; +package jdk.graal.compiler.jtt.lang; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public final class Int_greater03 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Int_greaterEqual01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Int_greaterEqual01.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Int_greaterEqual01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Int_greaterEqual01.java index 7a530702c024..4f7f8bf76543 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Int_greaterEqual01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Int_greaterEqual01.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.lang; +package jdk.graal.compiler.jtt.lang; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public final class Int_greaterEqual01 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Int_greaterEqual02.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Int_greaterEqual02.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Int_greaterEqual02.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Int_greaterEqual02.java index 0574bb829301..eb584de12e8e 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Int_greaterEqual02.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Int_greaterEqual02.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.lang; +package jdk.graal.compiler.jtt.lang; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public final class Int_greaterEqual02 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Int_greaterEqual03.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Int_greaterEqual03.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Int_greaterEqual03.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Int_greaterEqual03.java index afe265ba3146..f54b8b69aab2 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Int_greaterEqual03.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Int_greaterEqual03.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.lang; +package jdk.graal.compiler.jtt.lang; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public final class Int_greaterEqual03 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Int_less01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Int_less01.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Int_less01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Int_less01.java index 3c052b6b2d45..411fee101ee8 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Int_less01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Int_less01.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.lang; +package jdk.graal.compiler.jtt.lang; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public final class Int_less01 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Int_less02.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Int_less02.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Int_less02.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Int_less02.java index 1549423c9ace..866d41e4cc7a 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Int_less02.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Int_less02.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.lang; +package jdk.graal.compiler.jtt.lang; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public final class Int_less02 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Int_less03.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Int_less03.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Int_less03.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Int_less03.java index 7ddac14c3b33..44cd79cd2e34 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Int_less03.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Int_less03.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.lang; +package jdk.graal.compiler.jtt.lang; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public final class Int_less03 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Int_lessEqual01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Int_lessEqual01.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Int_lessEqual01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Int_lessEqual01.java index fde87a9d8386..71e34ca6c501 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Int_lessEqual01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Int_lessEqual01.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.lang; +package jdk.graal.compiler.jtt.lang; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public final class Int_lessEqual01 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Int_lessEqual02.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Int_lessEqual02.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Int_lessEqual02.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Int_lessEqual02.java index f32cc1082004..422802a1bb84 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Int_lessEqual02.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Int_lessEqual02.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.lang; +package jdk.graal.compiler.jtt.lang; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public final class Int_lessEqual02 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Int_lessEqual03.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Int_lessEqual03.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Int_lessEqual03.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Int_lessEqual03.java index 66c53833c213..0f3a67c47c3a 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Int_lessEqual03.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Int_lessEqual03.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.lang; +package jdk.graal.compiler.jtt.lang; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public final class Int_lessEqual03 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Int_reverseBits.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Int_reverseBits.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Int_reverseBits.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Int_reverseBits.java index 9eaaf63aff2e..2c3767cffd85 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Int_reverseBits.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Int_reverseBits.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.lang; +package jdk.graal.compiler.jtt.lang; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; public class Int_reverseBits extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/JDK_ClassLoaders01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/JDK_ClassLoaders01.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/JDK_ClassLoaders01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/JDK_ClassLoaders01.java index 4a78d99c9ac5..93d7f7cce6cf 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/JDK_ClassLoaders01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/JDK_ClassLoaders01.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.lang; +package jdk.graal.compiler.jtt.lang; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/JDK_ClassLoaders02.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/JDK_ClassLoaders02.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/JDK_ClassLoaders02.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/JDK_ClassLoaders02.java index 6117b44ad81c..b694631cf4f2 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/JDK_ClassLoaders02.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/JDK_ClassLoaders02.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.lang; +package jdk.graal.compiler.jtt.lang; import java.net.URLClassLoader; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/LambdaEagerTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/LambdaEagerTest.java similarity index 92% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/LambdaEagerTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/LambdaEagerTest.java index 50219b5264f1..4038ee7ba251 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/LambdaEagerTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/LambdaEagerTest.java @@ -22,16 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.lang; +package jdk.graal.compiler.jtt.lang; -import static jdk.compiler.graal.core.common.GraalOptions.InlineEverything; +import static jdk.graal.compiler.core.common.GraalOptions.InlineEverything; import java.util.EnumSet; import java.util.function.IntBinaryOperator; -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.options.OptionValues; +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.options.OptionValues; import org.junit.Test; import jdk.vm.ci.code.InstalledCode; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Long_greater01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Long_greater01.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Long_greater01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Long_greater01.java index 7c614334a74b..e26c3315018a 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Long_greater01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Long_greater01.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.lang; +package jdk.graal.compiler.jtt.lang; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Long_greater02.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Long_greater02.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Long_greater02.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Long_greater02.java index de5dedd1aa56..6fac8d066610 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Long_greater02.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Long_greater02.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.lang; +package jdk.graal.compiler.jtt.lang; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public final class Long_greater02 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Long_greater03.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Long_greater03.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Long_greater03.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Long_greater03.java index 461ccfba8f73..5036d73188bc 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Long_greater03.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Long_greater03.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.lang; +package jdk.graal.compiler.jtt.lang; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public final class Long_greater03 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Long_greaterEqual01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Long_greaterEqual01.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Long_greaterEqual01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Long_greaterEqual01.java index 0acf9545de88..a07b2a32d4d7 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Long_greaterEqual01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Long_greaterEqual01.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.lang; +package jdk.graal.compiler.jtt.lang; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public final class Long_greaterEqual01 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Long_greaterEqual02.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Long_greaterEqual02.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Long_greaterEqual02.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Long_greaterEqual02.java index 43f7ae574214..c2222d09a254 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Long_greaterEqual02.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Long_greaterEqual02.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.lang; +package jdk.graal.compiler.jtt.lang; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public final class Long_greaterEqual02 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Long_greaterEqual03.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Long_greaterEqual03.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Long_greaterEqual03.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Long_greaterEqual03.java index c3a9e2be0640..863bec13e34c 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Long_greaterEqual03.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Long_greaterEqual03.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.lang; +package jdk.graal.compiler.jtt.lang; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public final class Long_greaterEqual03 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Long_less01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Long_less01.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Long_less01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Long_less01.java index bdef3dd0d5e7..b17772e67ed8 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Long_less01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Long_less01.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.lang; +package jdk.graal.compiler.jtt.lang; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public final class Long_less01 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Long_less02.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Long_less02.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Long_less02.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Long_less02.java index f0f2bda6fa5b..bf10d021bd73 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Long_less02.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Long_less02.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.lang; +package jdk.graal.compiler.jtt.lang; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public final class Long_less02 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Long_less03.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Long_less03.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Long_less03.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Long_less03.java index 321ec13bc3b7..da707a874118 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Long_less03.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Long_less03.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.lang; +package jdk.graal.compiler.jtt.lang; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public final class Long_less03 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Long_lessEqual01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Long_lessEqual01.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Long_lessEqual01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Long_lessEqual01.java index 95b6dacf8b04..5cc086a9e4d2 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Long_lessEqual01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Long_lessEqual01.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.lang; +package jdk.graal.compiler.jtt.lang; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public final class Long_lessEqual01 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Long_lessEqual02.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Long_lessEqual02.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Long_lessEqual02.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Long_lessEqual02.java index 1c3ea05533b2..6da96ac43493 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Long_lessEqual02.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Long_lessEqual02.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.lang; +package jdk.graal.compiler.jtt.lang; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public final class Long_lessEqual02 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Long_lessEqual03.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Long_lessEqual03.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Long_lessEqual03.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Long_lessEqual03.java index f29db6e3089f..6519875c8abf 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Long_lessEqual03.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Long_lessEqual03.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.lang; +package jdk.graal.compiler.jtt.lang; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public final class Long_lessEqual03 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Long_reverseBits.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Long_reverseBits.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Long_reverseBits.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Long_reverseBits.java index 849cf8c94bdf..2e9ae7958386 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Long_reverseBits.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Long_reverseBits.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.lang; +package jdk.graal.compiler.jtt.lang; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; public class Long_reverseBits extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Long_reverseBytes01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Long_reverseBytes01.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Long_reverseBytes01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Long_reverseBytes01.java index 9aca8e562629..1423907d28cd 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Long_reverseBytes01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Long_reverseBytes01.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.lang; +package jdk.graal.compiler.jtt.lang; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Long_reverseBytes02.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Long_reverseBytes02.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Long_reverseBytes02.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Long_reverseBytes02.java index 8ddbe5c00680..fba96cea55ac 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Long_reverseBytes02.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Long_reverseBytes02.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.lang; +package jdk.graal.compiler.jtt.lang; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Math_abs.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Math_abs.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Math_abs.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Math_abs.java index 4c5d6df511b4..e5c16b424a93 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Math_abs.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Math_abs.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.lang; +package jdk.graal.compiler.jtt.lang; -import jdk.compiler.graal.options.OptionValues; +import jdk.graal.compiler.options.OptionValues; import org.junit.Test; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Math_copySign.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Math_copySign.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Math_copySign.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Math_copySign.java index 4fe6a0f1c5a2..7da59a6aa84f 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Math_copySign.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Math_copySign.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.lang; +package jdk.graal.compiler.jtt.lang; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; public class Math_copySign extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Math_cos.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Math_cos.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Math_cos.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Math_cos.java index f0022f8c5739..af1695e7dfb9 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Math_cos.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Math_cos.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.lang; +package jdk.graal.compiler.jtt.lang; -import jdk.compiler.graal.options.OptionValues; +import jdk.graal.compiler.options.OptionValues; import org.junit.Test; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Math_exact.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Math_exact.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Math_exact.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Math_exact.java index 50a33716c626..3cb088a50b29 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Math_exact.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Math_exact.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.lang; +package jdk.graal.compiler.jtt.lang; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Math_exp.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Math_exp.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Math_exp.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Math_exp.java index 16d68633c126..b099e7c97761 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Math_exp.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Math_exp.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.lang; +package jdk.graal.compiler.jtt.lang; -import jdk.compiler.graal.options.OptionValues; +import jdk.graal.compiler.options.OptionValues; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Math_log.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Math_log.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Math_log.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Math_log.java index c68138f53b8b..a58eb6ea56c1 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Math_log.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Math_log.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.lang; +package jdk.graal.compiler.jtt.lang; -import jdk.compiler.graal.options.OptionValues; +import jdk.graal.compiler.options.OptionValues; import org.junit.Test; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Math_log10.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Math_log10.java similarity index 99% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Math_log10.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Math_log10.java index 3fa1c4c11a95..77b1cdcd8dcf 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Math_log10.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Math_log10.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.lang; +package jdk.graal.compiler.jtt.lang; import java.util.ArrayList; import java.util.Collection; @@ -36,7 +36,7 @@ import org.junit.runners.Parameterized.Parameter; import org.junit.runners.Parameterized.Parameters; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Math_minMax.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Math_minMax.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Math_minMax.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Math_minMax.java index 27bb78fde411..a9825d88df12 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Math_minMax.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Math_minMax.java @@ -23,13 +23,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.lang; +package jdk.graal.compiler.jtt.lang; import java.util.ArrayList; import java.util.Collection; import java.util.List; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; 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/jtt/lang/Math_pow.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Math_pow.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Math_pow.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Math_pow.java index 4fe094ca1774..3cc1f05c1d1d 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Math_pow.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Math_pow.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.lang; +package jdk.graal.compiler.jtt.lang; -import jdk.compiler.graal.jtt.JTTTest; -import jdk.compiler.graal.options.OptionValues; +import jdk.graal.compiler.jtt.JTTTest; +import jdk.graal.compiler.options.OptionValues; import org.junit.Test; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Math_round.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Math_round.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Math_round.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Math_round.java index bfe51b57b543..23d86a89ba3d 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Math_round.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Math_round.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.lang; +package jdk.graal.compiler.jtt.lang; import java.util.ArrayList; import java.util.Collection; @@ -33,7 +33,7 @@ import org.junit.runners.Parameterized.Parameter; import org.junit.runners.Parameterized.Parameters; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; @RunWith(Parameterized.class) public class Math_round extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Math_signum.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Math_signum.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Math_signum.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Math_signum.java index f3788ba62cb1..1390386858a3 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Math_signum.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Math_signum.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.lang; +package jdk.graal.compiler.jtt.lang; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; public class Math_signum extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Math_sin.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Math_sin.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Math_sin.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Math_sin.java index 9855279fe0af..7b2f8bdfc1ad 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Math_sin.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Math_sin.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.lang; +package jdk.graal.compiler.jtt.lang; -import jdk.compiler.graal.options.OptionValues; +import jdk.graal.compiler.options.OptionValues; import org.junit.Test; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Math_sqrt.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Math_sqrt.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Math_sqrt.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Math_sqrt.java index b653437f3baf..b1a8d2cb4859 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Math_sqrt.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Math_sqrt.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.lang; +package jdk.graal.compiler.jtt.lang; -import jdk.compiler.graal.options.OptionValues; +import jdk.graal.compiler.options.OptionValues; import org.junit.Test; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Math_tan.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Math_tan.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Math_tan.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Math_tan.java index 8afd4237462b..ab0c349974b9 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Math_tan.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Math_tan.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.lang; +package jdk.graal.compiler.jtt.lang; -import jdk.compiler.graal.options.OptionValues; +import jdk.graal.compiler.options.OptionValues; import org.junit.Test; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Object_clone01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Object_clone01.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Object_clone01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Object_clone01.java index 6b5741b803b4..97831723e1e4 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Object_clone01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Object_clone01.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.lang; +package jdk.graal.compiler.jtt.lang; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public class Object_clone01 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Object_clone02.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Object_clone02.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Object_clone02.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Object_clone02.java index 56b1b7fb2c38..b344fd7dfbda 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Object_clone02.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Object_clone02.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.lang; +package jdk.graal.compiler.jtt.lang; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public class Object_clone02 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Object_equals01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Object_equals01.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Object_equals01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Object_equals01.java index 13b4bb96bc0a..081ce02c4646 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Object_equals01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Object_equals01.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.lang; +package jdk.graal.compiler.jtt.lang; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public final class Object_equals01 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Object_getClass01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Object_getClass01.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Object_getClass01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Object_getClass01.java index 695c6d29eade..bdc4f7c9f944 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Object_getClass01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Object_getClass01.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.lang; +package jdk.graal.compiler.jtt.lang; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public final class Object_getClass01 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Object_hashCode01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Object_hashCode01.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Object_hashCode01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Object_hashCode01.java index 5c6627089b18..f9483c2b1e9b 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Object_hashCode01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Object_hashCode01.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.lang; +package jdk.graal.compiler.jtt.lang; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public final class Object_hashCode01 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Object_hashCode02.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Object_hashCode02.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Object_hashCode02.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Object_hashCode02.java index c2ebc172fff2..f25c40daa325 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Object_hashCode02.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Object_hashCode02.java @@ -24,14 +24,14 @@ */ /* */ -package jdk.compiler.graal.jtt.lang; +package jdk.graal.compiler.jtt.lang; import java.time.DayOfWeek; import java.util.HashMap; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public final class Object_hashCode02 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Object_notify01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Object_notify01.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Object_notify01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Object_notify01.java index 5961c5dcffac..9dc82fe8623a 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Object_notify01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Object_notify01.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.lang; +package jdk.graal.compiler.jtt.lang; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public final class Object_notify01 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Object_notify02.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Object_notify02.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Object_notify02.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Object_notify02.java index 54f3dad61781..4d964afba32b 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Object_notify02.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Object_notify02.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.lang; +package jdk.graal.compiler.jtt.lang; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public final class Object_notify02 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Object_notifyAll01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Object_notifyAll01.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Object_notifyAll01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Object_notifyAll01.java index 726359997691..fc42a9ab4036 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Object_notifyAll01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Object_notifyAll01.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.lang; +package jdk.graal.compiler.jtt.lang; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public final class Object_notifyAll01 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Object_notifyAll02.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Object_notifyAll02.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Object_notifyAll02.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Object_notifyAll02.java index c267ad91115b..59ac2a077d85 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Object_notifyAll02.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Object_notifyAll02.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.lang; +package jdk.graal.compiler.jtt.lang; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public final class Object_notifyAll02 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Object_toString01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Object_toString01.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Object_toString01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Object_toString01.java index 57cc6415c5b4..2d55f2b363d4 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Object_toString01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Object_toString01.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.lang; +package jdk.graal.compiler.jtt.lang; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public class Object_toString01 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Object_toString02.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Object_toString02.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Object_toString02.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Object_toString02.java index fbbdb322268f..8a1c9e64c3a8 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Object_toString02.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Object_toString02.java @@ -27,11 +27,11 @@ */ /* */ -package jdk.compiler.graal.jtt.lang; +package jdk.graal.compiler.jtt.lang; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public class Object_toString02 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Object_wait01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Object_wait01.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Object_wait01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Object_wait01.java index 369ac17982c0..498f5901adc6 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Object_wait01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Object_wait01.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.lang; +package jdk.graal.compiler.jtt.lang; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public final class Object_wait01 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Object_wait02.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Object_wait02.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Object_wait02.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Object_wait02.java index f8ee6a88edbd..83fc87ce02df 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Object_wait02.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Object_wait02.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.lang; +package jdk.graal.compiler.jtt.lang; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public final class Object_wait02 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Object_wait03.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Object_wait03.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Object_wait03.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Object_wait03.java index 528a4498375d..0b1beb6921be 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Object_wait03.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/Object_wait03.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.lang; +package jdk.graal.compiler.jtt.lang; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public final class Object_wait03 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/ProcessEnvironment_init.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/ProcessEnvironment_init.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/ProcessEnvironment_init.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/ProcessEnvironment_init.java index b5f9080c91fb..459ca6f58c7f 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/ProcessEnvironment_init.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/ProcessEnvironment_init.java @@ -24,7 +24,7 @@ */ /* */ -package jdk.compiler.graal.jtt.lang; +package jdk.graal.compiler.jtt.lang; import java.util.Collections; import java.util.HashMap; @@ -32,7 +32,7 @@ import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public final class ProcessEnvironment_init extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/StringCoding_Scale.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/StringCoding_Scale.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/StringCoding_Scale.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/StringCoding_Scale.java index 54514b9b01be..64df6526aa96 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/StringCoding_Scale.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/StringCoding_Scale.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.lang; +package jdk.graal.compiler.jtt.lang; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public class StringCoding_Scale extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/String_intern01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/String_intern01.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/String_intern01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/String_intern01.java index 3e21a4c3de48..894e5cfcafa6 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/String_intern01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/String_intern01.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.lang; +package jdk.graal.compiler.jtt.lang; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/String_intern02.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/String_intern02.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/String_intern02.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/String_intern02.java index 7964f861ffab..cfbfb8c7a0f1 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/String_intern02.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/String_intern02.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.lang; +package jdk.graal.compiler.jtt.lang; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/String_intern03.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/String_intern03.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/String_intern03.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/String_intern03.java index 416f98df7ae0..9ac89c48cd06 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/String_intern03.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/String_intern03.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.lang; +package jdk.graal.compiler.jtt.lang; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/String_valueOf01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/String_valueOf01.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/String_valueOf01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/String_valueOf01.java index 15f80395aa0b..83b363e5f426 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/String_valueOf01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/String_valueOf01.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.lang; +package jdk.graal.compiler.jtt.lang; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/System_identityHashCode01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/System_identityHashCode01.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/System_identityHashCode01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/System_identityHashCode01.java index 773a4d9318b1..e83de6e95fe4 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/System_identityHashCode01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/System_identityHashCode01.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.lang; +package jdk.graal.compiler.jtt.lang; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/UnaryMath.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/UnaryMath.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/UnaryMath.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/UnaryMath.java index 0edfc464c053..5fc61533c61a 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/UnaryMath.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/lang/UnaryMath.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.lang; +package jdk.graal.compiler.jtt.lang; -import jdk.compiler.graal.jtt.JTTTest; -import jdk.compiler.graal.options.OptionValues; +import jdk.graal.compiler.jtt.JTTTest; +import jdk.graal.compiler.options.OptionValues; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/DegeneratedLoop.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/loop/DegeneratedLoop.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/DegeneratedLoop.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/loop/DegeneratedLoop.java index 7dad848dbf2a..83c91a71f4ef 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/DegeneratedLoop.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/loop/DegeneratedLoop.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.loop; +package jdk.graal.compiler.jtt.loop; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/Loop01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/loop/Loop01.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/Loop01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/loop/Loop01.java index 817f994fa107..49675876d560 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/Loop01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/loop/Loop01.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.loop; +package jdk.graal.compiler.jtt.loop; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/Loop02.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/loop/Loop02.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/Loop02.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/loop/Loop02.java index bb2259acf677..8ca89adcaf66 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/Loop02.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/loop/Loop02.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.loop; +package jdk.graal.compiler.jtt.loop; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/Loop03.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/loop/Loop03.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/Loop03.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/loop/Loop03.java index 34cfe3823372..dff36d7cf3f2 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/Loop03.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/loop/Loop03.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.loop; +package jdk.graal.compiler.jtt.loop; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/Loop04.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/loop/Loop04.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/Loop04.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/loop/Loop04.java index 8d553a90f701..342695dba1f3 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/Loop04.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/loop/Loop04.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.loop; +package jdk.graal.compiler.jtt.loop; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/Loop05.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/loop/Loop05.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/Loop05.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/loop/Loop05.java index 2e5518a09986..d9284985a59f 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/Loop05.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/loop/Loop05.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.loop; +package jdk.graal.compiler.jtt.loop; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/Loop06.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/loop/Loop06.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/Loop06.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/loop/Loop06.java index 5de456e99e2d..aa6d54259c81 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/Loop06.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/loop/Loop06.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.loop; +package jdk.graal.compiler.jtt.loop; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/Loop07.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/loop/Loop07.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/Loop07.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/loop/Loop07.java index dd51434ac5df..d47b12784d4a 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/Loop07.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/loop/Loop07.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.loop; +package jdk.graal.compiler.jtt.loop; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public class Loop07 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/Loop07_2.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/loop/Loop07_2.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/Loop07_2.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/loop/Loop07_2.java index a6cba61baba3..ed6f9bbecd61 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/Loop07_2.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/loop/Loop07_2.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.loop; +package jdk.graal.compiler.jtt.loop; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public class Loop07_2 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/Loop08.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/loop/Loop08.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/Loop08.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/loop/Loop08.java index d0f78260369f..68d895fd63b9 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/Loop08.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/loop/Loop08.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.loop; +package jdk.graal.compiler.jtt.loop; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/Loop09.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/loop/Loop09.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/Loop09.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/loop/Loop09.java index 2ae2e73390da..6ae82b00b76b 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/Loop09.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/loop/Loop09.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.loop; +package jdk.graal.compiler.jtt.loop; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/Loop09_2.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/loop/Loop09_2.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/Loop09_2.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/loop/Loop09_2.java index 7a30870e200c..533da49425c0 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/Loop09_2.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/loop/Loop09_2.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.loop; +package jdk.graal.compiler.jtt.loop; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/Loop11.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/loop/Loop11.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/Loop11.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/loop/Loop11.java index c88d0f751c9d..6f16f901101b 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/Loop11.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/loop/Loop11.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.loop; +package jdk.graal.compiler.jtt.loop; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/Loop12.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/loop/Loop12.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/Loop12.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/loop/Loop12.java index 76a0ade04d94..a5c3ef6648ce 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/Loop12.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/loop/Loop12.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.loop; +package jdk.graal.compiler.jtt.loop; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/Loop13.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/loop/Loop13.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/Loop13.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/loop/Loop13.java index 826aea22d0a5..dce256e06166 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/Loop13.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/loop/Loop13.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.loop; +package jdk.graal.compiler.jtt.loop; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/Loop14.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/loop/Loop14.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/Loop14.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/loop/Loop14.java index ea265f58fb96..2b4d4ad07af8 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/Loop14.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/loop/Loop14.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.loop; +package jdk.graal.compiler.jtt.loop; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/Loop15.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/loop/Loop15.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/Loop15.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/loop/Loop15.java index 6553bc24726b..f85ca27ca006 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/Loop15.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/loop/Loop15.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.loop; +package jdk.graal.compiler.jtt.loop; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public class Loop15 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/Loop16.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/loop/Loop16.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/Loop16.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/loop/Loop16.java index 06c038dd26cd..4519284ee029 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/Loop16.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/loop/Loop16.java @@ -23,11 +23,11 @@ * questions. */ // Checkstyle: stop -package jdk.compiler.graal.jtt.loop; +package jdk.graal.compiler.jtt.loop; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* * Tests exiting 2 loops at the same time with escape-analysed values flowing out of loops diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/Loop17.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/loop/Loop17.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/Loop17.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/loop/Loop17.java index eb01f5807462..932c1bbb42a7 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/Loop17.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/loop/Loop17.java @@ -23,11 +23,11 @@ * questions. */ // Checkstyle: stop -package jdk.compiler.graal.jtt.loop; +package jdk.graal.compiler.jtt.loop; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* * Test around an object that escapes directly from inside a loop (no virtual phi on the loop) diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/LoopEscape.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/loop/LoopEscape.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/LoopEscape.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/loop/LoopEscape.java index 5525ebf9d700..24286181a7ef 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/LoopEscape.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/loop/LoopEscape.java @@ -23,11 +23,11 @@ * questions. */ // Checkstyle: stop -package jdk.compiler.graal.jtt.loop; +package jdk.graal.compiler.jtt.loop; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* * Test around an object that escapes directly from inside a loop (no virtual phi on the loop) diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/LoopInline.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/loop/LoopInline.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/LoopInline.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/loop/LoopInline.java index 0044cebfbd45..f733e8105009 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/LoopInline.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/loop/LoopInline.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.loop; +package jdk.graal.compiler.jtt.loop; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public class LoopInline extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/LoopLastIndexOf.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/loop/LoopLastIndexOf.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/LoopLastIndexOf.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/loop/LoopLastIndexOf.java index 469ed0a5180e..173b34853b91 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/LoopLastIndexOf.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/loop/LoopLastIndexOf.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.loop; +package jdk.graal.compiler.jtt.loop; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* * see java.lang.String.lastIndexOf(char[], int, int, char[], int ,int, int) diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/LoopNewInstance.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/loop/LoopNewInstance.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/LoopNewInstance.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/loop/LoopNewInstance.java index 5b4a0f3a7395..d31941e7dedd 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/LoopNewInstance.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/loop/LoopNewInstance.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.loop; +package jdk.graal.compiler.jtt.loop; import jdk.vm.ci.meta.ResolvedJavaMethod; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/LoopParseLong.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/loop/LoopParseLong.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/LoopParseLong.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/loop/LoopParseLong.java index 0c3344e64884..0290e91767a2 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/LoopParseLong.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/loop/LoopParseLong.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.loop; +package jdk.graal.compiler.jtt.loop; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public class LoopParseLong extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/LoopPhi.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/loop/LoopPhi.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/LoopPhi.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/loop/LoopPhi.java index ce30b33c6a08..d563a3051b21 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/LoopPhi.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/loop/LoopPhi.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.loop; +package jdk.graal.compiler.jtt.loop; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/LoopPhiResolutionTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/loop/LoopPhiResolutionTest.java similarity index 93% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/LoopPhiResolutionTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/loop/LoopPhiResolutionTest.java index c066fdc0ddff..ad78f4b47b50 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/LoopPhiResolutionTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/loop/LoopPhiResolutionTest.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.loop; +package jdk.graal.compiler.jtt.loop; import org.junit.Test; -import jdk.compiler.graal.api.directives.GraalDirectives; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.api.directives.GraalDirectives; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/LoopSpilling.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/loop/LoopSpilling.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/LoopSpilling.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/loop/LoopSpilling.java index 960bbb7f57ce..76a7cfd3b961 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/LoopSpilling.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/loop/LoopSpilling.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.loop; +package jdk.graal.compiler.jtt.loop; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public class LoopSpilling extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/LoopSwitch01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/loop/LoopSwitch01.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/LoopSwitch01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/loop/LoopSwitch01.java index 126d77526eff..5a4bd88d08b1 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/LoopSwitch01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/loop/LoopSwitch01.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.loop; +package jdk.graal.compiler.jtt.loop; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/LoopUnroll.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/loop/LoopUnroll.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/LoopUnroll.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/loop/LoopUnroll.java index 3bac5a2fc5cf..ece22a56c2d7 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/LoopUnroll.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/loop/LoopUnroll.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.loop; +package jdk.graal.compiler.jtt.loop; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/SpillLoopPhiVariableAtDefinition.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/loop/SpillLoopPhiVariableAtDefinition.java similarity index 93% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/SpillLoopPhiVariableAtDefinition.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/loop/SpillLoopPhiVariableAtDefinition.java index 355a7f81dc27..4c1cda42acf1 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/SpillLoopPhiVariableAtDefinition.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/loop/SpillLoopPhiVariableAtDefinition.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.loop; +package jdk.graal.compiler.jtt.loop; import org.junit.Test; -import jdk.compiler.graal.api.directives.GraalDirectives; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.api.directives.GraalDirectives; +import jdk.graal.compiler.jtt.JTTTest; public class SpillLoopPhiVariableAtDefinition extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/ArrayCompare01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/ArrayCompare01.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/ArrayCompare01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/ArrayCompare01.java index 8b592f4bf689..8b6a4bf19af5 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/ArrayCompare01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/ArrayCompare01.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.micro; +package jdk.graal.compiler.jtt.micro; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/ArrayCompare02.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/ArrayCompare02.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/ArrayCompare02.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/ArrayCompare02.java index 5a6e72bb920c..755344f91b3c 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/ArrayCompare02.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/ArrayCompare02.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.micro; +package jdk.graal.compiler.jtt.micro; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/BC_invokevirtual2.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/BC_invokevirtual2.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/BC_invokevirtual2.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/BC_invokevirtual2.java index 8c3d0a8a90ab..4cb13dcedd0f 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/BC_invokevirtual2.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/BC_invokevirtual2.java @@ -23,11 +23,11 @@ * questions. */ -package jdk.compiler.graal.jtt.micro; +package jdk.graal.compiler.jtt.micro; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/BigByteParams01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/BigByteParams01.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/BigByteParams01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/BigByteParams01.java index 76bb6d6d60e5..7e5f7dbfe1fc 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/BigByteParams01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/BigByteParams01.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.micro; +package jdk.graal.compiler.jtt.micro; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/BigDoubleParams02.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/BigDoubleParams02.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/BigDoubleParams02.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/BigDoubleParams02.java index 8d044b8b6573..122acfb5af04 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/BigDoubleParams02.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/BigDoubleParams02.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.micro; +package jdk.graal.compiler.jtt.micro; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/BigFloatParams01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/BigFloatParams01.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/BigFloatParams01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/BigFloatParams01.java index b26335ad9d07..f5b9f5e51373 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/BigFloatParams01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/BigFloatParams01.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.micro; +package jdk.graal.compiler.jtt.micro; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/BigFloatParams02.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/BigFloatParams02.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/BigFloatParams02.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/BigFloatParams02.java index 568e4e055630..98e9b478e22e 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/BigFloatParams02.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/BigFloatParams02.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.micro; +package jdk.graal.compiler.jtt.micro; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/BigIntParams01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/BigIntParams01.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/BigIntParams01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/BigIntParams01.java index d76c5b9c218a..25144cf41ac4 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/BigIntParams01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/BigIntParams01.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.micro; +package jdk.graal.compiler.jtt.micro; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/BigIntParams02.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/BigIntParams02.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/BigIntParams02.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/BigIntParams02.java index 8f33d2f21c6e..5fcc3d8205ab 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/BigIntParams02.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/BigIntParams02.java @@ -23,11 +23,11 @@ * questions. */ -package jdk.compiler.graal.jtt.micro; +package jdk.graal.compiler.jtt.micro; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/BigInterfaceParams01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/BigInterfaceParams01.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/BigInterfaceParams01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/BigInterfaceParams01.java index 9d15a2f94299..f499bb468262 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/BigInterfaceParams01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/BigInterfaceParams01.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.micro; +package jdk.graal.compiler.jtt.micro; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/BigLongParams02.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/BigLongParams02.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/BigLongParams02.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/BigLongParams02.java index 4295241e11be..a3a169e78155 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/BigLongParams02.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/BigLongParams02.java @@ -23,11 +23,11 @@ * questions. */ -package jdk.compiler.graal.jtt.micro; +package jdk.graal.compiler.jtt.micro; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/BigMixedParams01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/BigMixedParams01.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/BigMixedParams01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/BigMixedParams01.java index 742bbbd3184c..1adb1076895d 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/BigMixedParams01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/BigMixedParams01.java @@ -25,11 +25,11 @@ /* * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. */ -package jdk.compiler.graal.jtt.micro; +package jdk.graal.compiler.jtt.micro; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/BigMixedParams02.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/BigMixedParams02.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/BigMixedParams02.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/BigMixedParams02.java index 03f8b055b418..1c221e02ec44 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/BigMixedParams02.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/BigMixedParams02.java @@ -25,11 +25,11 @@ /* * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. */ -package jdk.compiler.graal.jtt.micro; +package jdk.graal.compiler.jtt.micro; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/BigMixedParams03.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/BigMixedParams03.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/BigMixedParams03.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/BigMixedParams03.java index 705b8643cbe4..67c167ab88a7 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/BigMixedParams03.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/BigMixedParams03.java @@ -25,11 +25,11 @@ /* * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. */ -package jdk.compiler.graal.jtt.micro; +package jdk.graal.compiler.jtt.micro; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/BigMixedParams04.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/BigMixedParams04.java similarity index 99% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/BigMixedParams04.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/BigMixedParams04.java index 5437ebd40e47..2d10ee87612e 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/BigMixedParams04.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/BigMixedParams04.java @@ -25,12 +25,12 @@ /* * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. */ -package jdk.compiler.graal.jtt.micro; +package jdk.graal.compiler.jtt.micro; import org.junit.Assert; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /** * Tests different alignment on the stack with extended parameters (index > 5). diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/BigObjectParams01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/BigObjectParams01.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/BigObjectParams01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/BigObjectParams01.java index f2744b79eb25..03c296802a86 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/BigObjectParams01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/BigObjectParams01.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.micro; +package jdk.graal.compiler.jtt.micro; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/BigObjectParams02.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/BigObjectParams02.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/BigObjectParams02.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/BigObjectParams02.java index 83873baa4c4d..6db51cb69b60 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/BigObjectParams02.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/BigObjectParams02.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.micro; +package jdk.graal.compiler.jtt.micro; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/BigParamsAlignment.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/BigParamsAlignment.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/BigParamsAlignment.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/BigParamsAlignment.java index 7888c1d37c4c..7f9b3e75d41b 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/BigParamsAlignment.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/BigParamsAlignment.java @@ -27,11 +27,11 @@ */ /* */ -package jdk.compiler.graal.jtt.micro; +package jdk.graal.compiler.jtt.micro; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public class BigParamsAlignment extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/BigShortParams01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/BigShortParams01.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/BigShortParams01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/BigShortParams01.java index 2bcf760fccc1..4b87f6c8f14b 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/BigShortParams01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/BigShortParams01.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.micro; +package jdk.graal.compiler.jtt.micro; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/BigVirtualParams01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/BigVirtualParams01.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/BigVirtualParams01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/BigVirtualParams01.java index 91cab8586a10..94890ed78e8f 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/BigVirtualParams01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/BigVirtualParams01.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.micro; +package jdk.graal.compiler.jtt.micro; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/Bubblesort.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/Bubblesort.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/Bubblesort.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/Bubblesort.java index a1ee9639334e..5e64119042a9 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/Bubblesort.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/Bubblesort.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.micro; +package jdk.graal.compiler.jtt.micro; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public class Bubblesort extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/ConstantLoadTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/ConstantLoadTest.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/ConstantLoadTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/ConstantLoadTest.java index 83fda8347d24..fc217eef0201 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/ConstantLoadTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/ConstantLoadTest.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.micro; +package jdk.graal.compiler.jtt.micro; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public class ConstantLoadTest extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/Fibonacci.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/Fibonacci.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/Fibonacci.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/Fibonacci.java index 7da99d7908a9..a00bbba8f5d3 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/Fibonacci.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/Fibonacci.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.micro; +package jdk.graal.compiler.jtt.micro; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/FloatingReads.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/FloatingReads.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/FloatingReads.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/FloatingReads.java index b757ba320ce5..938728143114 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/FloatingReads.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/FloatingReads.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.micro; +package jdk.graal.compiler.jtt.micro; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public class FloatingReads extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/InvokeInterface_01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/InvokeInterface_01.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/InvokeInterface_01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/InvokeInterface_01.java index a34840933a1c..c409b8deca41 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/InvokeInterface_01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/InvokeInterface_01.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.micro; +package jdk.graal.compiler.jtt.micro; import org.junit.Before; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/InvokeInterface_02.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/InvokeInterface_02.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/InvokeInterface_02.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/InvokeInterface_02.java index 5d8a472f3bb8..7ba498df5f17 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/InvokeInterface_02.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/InvokeInterface_02.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.micro; +package jdk.graal.compiler.jtt.micro; import org.junit.Before; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/InvokeInterface_03.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/InvokeInterface_03.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/InvokeInterface_03.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/InvokeInterface_03.java index 9fef41450811..5c747540cf07 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/InvokeInterface_03.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/InvokeInterface_03.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.micro; +package jdk.graal.compiler.jtt.micro; import org.junit.Before; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/InvokeInterface_04.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/InvokeInterface_04.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/InvokeInterface_04.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/InvokeInterface_04.java index 37ad583fb951..29a5aaa4ae80 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/InvokeInterface_04.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/InvokeInterface_04.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.micro; +package jdk.graal.compiler.jtt.micro; import org.junit.Before; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/InvokeVirtual_01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/InvokeVirtual_01.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/InvokeVirtual_01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/InvokeVirtual_01.java index 87a21a4c0e3d..6acbf87d47bb 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/InvokeVirtual_01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/InvokeVirtual_01.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.micro; +package jdk.graal.compiler.jtt.micro; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public class InvokeVirtual_01 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/InvokeVirtual_02.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/InvokeVirtual_02.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/InvokeVirtual_02.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/InvokeVirtual_02.java index c20660df9ff2..49924d5a71fb 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/InvokeVirtual_02.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/InvokeVirtual_02.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.micro; +package jdk.graal.compiler.jtt.micro; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; public class InvokeVirtual_02 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/Matrix01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/Matrix01.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/Matrix01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/Matrix01.java index 557f8648f3c8..57af27dea21d 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/Matrix01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/Matrix01.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.micro; +package jdk.graal.compiler.jtt.micro; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/ReferenceMap01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/ReferenceMap01.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/ReferenceMap01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/ReferenceMap01.java index 30dc95f46433..1eb98f4a4f6a 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/ReferenceMap01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/ReferenceMap01.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.micro; +package jdk.graal.compiler.jtt.micro; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/StrangeFrames.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/StrangeFrames.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/StrangeFrames.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/StrangeFrames.java index 4f6a248daa4e..8a26d308be35 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/StrangeFrames.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/StrangeFrames.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.micro; +package jdk.graal.compiler.jtt.micro; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/String_format01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/String_format01.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/String_format01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/String_format01.java index cc073b02966f..080adc435333 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/String_format01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/String_format01.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.micro; +package jdk.graal.compiler.jtt.micro; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/String_format02.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/String_format02.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/String_format02.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/String_format02.java index 9064103a521b..9bb49f304a1e 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/String_format02.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/String_format02.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.micro; +package jdk.graal.compiler.jtt.micro; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/VarArgs_String01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/VarArgs_String01.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/VarArgs_String01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/VarArgs_String01.java index 7c6baf2e07ed..7014419232c8 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/VarArgs_String01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/VarArgs_String01.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.micro; +package jdk.graal.compiler.jtt.micro; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/VarArgs_Unroll.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/VarArgs_Unroll.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/VarArgs_Unroll.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/VarArgs_Unroll.java index 75e78c7f7f10..a7d482176c32 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/VarArgs_Unroll.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/VarArgs_Unroll.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.micro; +package jdk.graal.compiler.jtt.micro; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/VarArgs_boolean01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/VarArgs_boolean01.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/VarArgs_boolean01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/VarArgs_boolean01.java index 936a8e965afc..81e29396b27c 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/VarArgs_boolean01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/VarArgs_boolean01.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.micro; +package jdk.graal.compiler.jtt.micro; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/VarArgs_byte01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/VarArgs_byte01.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/VarArgs_byte01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/VarArgs_byte01.java index 4a72aa8a30d5..d8ded0575314 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/VarArgs_byte01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/VarArgs_byte01.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.micro; +package jdk.graal.compiler.jtt.micro; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/VarArgs_char01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/VarArgs_char01.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/VarArgs_char01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/VarArgs_char01.java index 1c141e975aa2..a5497979414e 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/VarArgs_char01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/VarArgs_char01.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.micro; +package jdk.graal.compiler.jtt.micro; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/VarArgs_double01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/VarArgs_double01.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/VarArgs_double01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/VarArgs_double01.java index 4106559528cc..0ae9c7711724 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/VarArgs_double01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/VarArgs_double01.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.micro; +package jdk.graal.compiler.jtt.micro; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/VarArgs_float01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/VarArgs_float01.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/VarArgs_float01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/VarArgs_float01.java index 2d6a63464785..07df87cb2bde 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/VarArgs_float01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/VarArgs_float01.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.micro; +package jdk.graal.compiler.jtt.micro; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/VarArgs_int01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/VarArgs_int01.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/VarArgs_int01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/VarArgs_int01.java index 543093d8bdee..3a6063a38d02 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/VarArgs_int01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/VarArgs_int01.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.micro; +package jdk.graal.compiler.jtt.micro; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/VarArgs_long01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/VarArgs_long01.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/VarArgs_long01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/VarArgs_long01.java index 0ffd05e94979..6b2b495e9338 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/VarArgs_long01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/VarArgs_long01.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.micro; +package jdk.graal.compiler.jtt.micro; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/VarArgs_short01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/VarArgs_short01.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/VarArgs_short01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/VarArgs_short01.java index 9794b76412ce..05a027ce2379 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/VarArgs_short01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/micro/VarArgs_short01.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.micro; +package jdk.graal.compiler.jtt.micro; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/ABCE_01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/ABCE_01.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/ABCE_01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/ABCE_01.java index b6c9d4ced930..90875b6724c8 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/ABCE_01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/ABCE_01.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/ABCE_02.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/ABCE_02.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/ABCE_02.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/ABCE_02.java index 26f00eaeabcf..c3b001dc811d 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/ABCE_02.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/ABCE_02.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/ABCE_03.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/ABCE_03.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/ABCE_03.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/ABCE_03.java index 0687ccbb9aa5..6c39795d6d35 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/ABCE_03.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/ABCE_03.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/ArrayCopy01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/ArrayCopy01.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/ArrayCopy01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/ArrayCopy01.java index a56d4888f157..27daf32d0b68 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/ArrayCopy01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/ArrayCopy01.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* * Tests calls to the array copy method. diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/ArrayCopy02.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/ArrayCopy02.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/ArrayCopy02.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/ArrayCopy02.java index cfa5ce87392e..04e393769557 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/ArrayCopy02.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/ArrayCopy02.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Before; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/ArrayCopy03.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/ArrayCopy03.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/ArrayCopy03.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/ArrayCopy03.java index 12e2cc289078..db7aa3f25019 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/ArrayCopy03.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/ArrayCopy03.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Before; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/ArrayCopy04.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/ArrayCopy04.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/ArrayCopy04.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/ArrayCopy04.java index a08ff341b485..dfa98563ce77 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/ArrayCopy04.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/ArrayCopy04.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; import org.junit.Before; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* * Tests calls to the array copy method. diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/ArrayCopy05.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/ArrayCopy05.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/ArrayCopy05.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/ArrayCopy05.java index 89a33aded022..56b6025c7a28 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/ArrayCopy05.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/ArrayCopy05.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Before; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/ArrayCopy06.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/ArrayCopy06.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/ArrayCopy06.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/ArrayCopy06.java index a09debf129fa..f9a170fdec68 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/ArrayCopy06.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/ArrayCopy06.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Before; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/ArrayCopyGeneric.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/ArrayCopyGeneric.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/ArrayCopyGeneric.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/ArrayCopyGeneric.java index 399154e3665b..a21adda3af24 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/ArrayCopyGeneric.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/ArrayCopyGeneric.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/ArrayLength01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/ArrayLength01.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/ArrayLength01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/ArrayLength01.java index 19f44f5a1a77..433f58ccd6b2 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/ArrayLength01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/ArrayLength01.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/BC_idiv_16.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/BC_idiv_16.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/BC_idiv_16.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/BC_idiv_16.java index 801facecaf3e..31bfa8ee135d 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/BC_idiv_16.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/BC_idiv_16.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/BC_idiv_4.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/BC_idiv_4.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/BC_idiv_4.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/BC_idiv_4.java index 34293d15deed..b1454fa6c341 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/BC_idiv_4.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/BC_idiv_4.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/BC_imul_16.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/BC_imul_16.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/BC_imul_16.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/BC_imul_16.java index 0b9da5f3dde0..94c6630f3f7d 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/BC_imul_16.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/BC_imul_16.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/BC_imul_4.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/BC_imul_4.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/BC_imul_4.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/BC_imul_4.java index 5ad3d3a1000b..e3030107ccca 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/BC_imul_4.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/BC_imul_4.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/BC_ldiv_16.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/BC_ldiv_16.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/BC_ldiv_16.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/BC_ldiv_16.java index 721fd7334918..74f23b88996e 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/BC_ldiv_16.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/BC_ldiv_16.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/BC_ldiv_4.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/BC_ldiv_4.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/BC_ldiv_4.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/BC_ldiv_4.java index ea0fcc1eb297..d4ae7d54b1fa 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/BC_ldiv_4.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/BC_ldiv_4.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/BC_lmul_16.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/BC_lmul_16.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/BC_lmul_16.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/BC_lmul_16.java index 17bdebee5beb..fadb63969da0 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/BC_lmul_16.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/BC_lmul_16.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/BC_lmul_4.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/BC_lmul_4.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/BC_lmul_4.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/BC_lmul_4.java index 37a515e2f1ed..9a5024e88ada 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/BC_lmul_4.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/BC_lmul_4.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/BC_lshr_C16.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/BC_lshr_C16.java similarity index 94% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/BC_lshr_C16.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/BC_lshr_C16.java index ae18639162be..f1e2f9fa461d 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/BC_lshr_C16.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/BC_lshr_C16.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/BC_lshr_C24.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/BC_lshr_C24.java similarity index 94% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/BC_lshr_C24.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/BC_lshr_C24.java index 6dc3295a9d2e..56740d289c4e 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/BC_lshr_C24.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/BC_lshr_C24.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/BC_lshr_C32.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/BC_lshr_C32.java similarity index 94% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/BC_lshr_C32.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/BC_lshr_C32.java index aae836752244..a94aee679571 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/BC_lshr_C32.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/BC_lshr_C32.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/BlockSkip01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/BlockSkip01.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/BlockSkip01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/BlockSkip01.java index 69cf2dc46140..983bd8d80160 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/BlockSkip01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/BlockSkip01.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/BoxingIdentity.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/BoxingIdentity.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/BoxingIdentity.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/BoxingIdentity.java index 052d39a877f3..f4fe126b5fba 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/BoxingIdentity.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/BoxingIdentity.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; public class BoxingIdentity extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/CE_InstanceOf.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/CE_InstanceOf.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/CE_InstanceOf.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/CE_InstanceOf.java index f1064fa3b29e..4375e049ca29 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/CE_InstanceOf.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/CE_InstanceOf.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; import java.util.Arrays; import java.util.Collections; import java.util.List; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; public class CE_InstanceOf extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Cmov01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Cmov01.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Cmov01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Cmov01.java index 5f6f580277b1..9b98fbd4ff8d 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Cmov01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Cmov01.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Cmov02.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Cmov02.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Cmov02.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Cmov02.java index aa32c9b8be15..ea3ef4728413 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Cmov02.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Cmov02.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Conditional01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Conditional01.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Conditional01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Conditional01.java index b51c5f3e46b0..e7ab30926f22 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Conditional01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Conditional01.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; import java.util.Random; -import jdk.compiler.graal.jtt.JTTTest; -import jdk.compiler.graal.core.test.GraalCompilerTest; +import jdk.graal.compiler.jtt.JTTTest; +import jdk.graal.compiler.core.test.GraalCompilerTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/ConditionalElimination01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/ConditionalElimination01.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/ConditionalElimination01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/ConditionalElimination01.java index 83dc4912f905..5c861bec90c0 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/ConditionalElimination01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/ConditionalElimination01.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import jdk.vm.ci.meta.ResolvedJavaMethod; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/ConditionalElimination02.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/ConditionalElimination02.java similarity index 94% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/ConditionalElimination02.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/ConditionalElimination02.java index 471afa593485..b387bed2dd12 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/ConditionalElimination02.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/ConditionalElimination02.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; import java.util.EnumSet; -import jdk.compiler.graal.jtt.JTTTest; -import jdk.compiler.graal.phases.OptimisticOptimizations; +import jdk.graal.compiler.jtt.JTTTest; +import jdk.graal.compiler.phases.OptimisticOptimizations; import org.junit.Test; import jdk.vm.ci.meta.DeoptimizationReason; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/ConvertCompare.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/ConvertCompare.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/ConvertCompare.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/ConvertCompare.java index 7499eec9188d..ce2b1fffa9ba 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/ConvertCompare.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/ConvertCompare.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; public class ConvertCompare extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/DeadCode01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/DeadCode01.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/DeadCode01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/DeadCode01.java index fddd16fc87a2..c53ba7c2304d 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/DeadCode01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/DeadCode01.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/DeadCode02.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/DeadCode02.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/DeadCode02.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/DeadCode02.java index 2ae5cbd09e74..1175fdd0b485 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/DeadCode02.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/DeadCode02.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Fold_Cast01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Fold_Cast01.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Fold_Cast01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Fold_Cast01.java index ddaf747f4a7d..b157bf811c19 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Fold_Cast01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Fold_Cast01.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Fold_Convert01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Fold_Convert01.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Fold_Convert01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Fold_Convert01.java index 447f4acbbf4f..00ea789574ed 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Fold_Convert01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Fold_Convert01.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Fold_Convert02.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Fold_Convert02.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Fold_Convert02.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Fold_Convert02.java index 8b1a23f2b860..8cd9cb927304 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Fold_Convert02.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Fold_Convert02.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Fold_Convert03.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Fold_Convert03.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Fold_Convert03.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Fold_Convert03.java index 7a08493d6b72..1485d265e3d6 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Fold_Convert03.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Fold_Convert03.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* * Tests constant folding of float conversions diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Fold_Convert04.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Fold_Convert04.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Fold_Convert04.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Fold_Convert04.java index 039deebdb480..3b75e94a8665 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Fold_Convert04.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Fold_Convert04.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Fold_Double01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Fold_Double01.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Fold_Double01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Fold_Double01.java index cc6c94556105..f1cbe1ab6b1f 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Fold_Double01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Fold_Double01.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Fold_Double02.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Fold_Double02.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Fold_Double02.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Fold_Double02.java index fe709480453c..d4e402409724 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Fold_Double02.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Fold_Double02.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Fold_Double03.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Fold_Double03.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Fold_Double03.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Fold_Double03.java index f35a9dd0a633..2d43d55d8365 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Fold_Double03.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Fold_Double03.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Fold_Double04.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Fold_Double04.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Fold_Double04.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Fold_Double04.java index e885bbb38c13..dd4c3ec94441 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Fold_Double04.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Fold_Double04.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Fold_Float01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Fold_Float01.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Fold_Float01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Fold_Float01.java index d44a0266c862..c8eba4c30077 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Fold_Float01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Fold_Float01.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Fold_Float02.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Fold_Float02.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Fold_Float02.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Fold_Float02.java index b2c4c95241e5..b06affc4c1f0 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Fold_Float02.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Fold_Float02.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Fold_Float03.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Fold_Float03.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Fold_Float03.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Fold_Float03.java index a1ef6cab81db..47ac1eff2039 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Fold_Float03.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Fold_Float03.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Fold_InstanceOf01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Fold_InstanceOf01.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Fold_InstanceOf01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Fold_InstanceOf01.java index c0f582b89b8f..538587d770c2 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Fold_InstanceOf01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Fold_InstanceOf01.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Fold_Int01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Fold_Int01.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Fold_Int01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Fold_Int01.java index 6615fe2d0fe7..35e77b5429e6 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Fold_Int01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Fold_Int01.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Fold_Int02.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Fold_Int02.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Fold_Int02.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Fold_Int02.java index bdf279b39604..3d6b1302b0b7 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Fold_Int02.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Fold_Int02.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Fold_Long01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Fold_Long01.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Fold_Long01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Fold_Long01.java index 7fed50002404..595d5d4cbcd8 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Fold_Long01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Fold_Long01.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Fold_Long02.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Fold_Long02.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Fold_Long02.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Fold_Long02.java index 18ac383d09a9..915205bc6563 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Fold_Long02.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Fold_Long02.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Fold_Math01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Fold_Math01.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Fold_Math01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Fold_Math01.java index dfea4a6c8e57..6fb697a9e286 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Fold_Math01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Fold_Math01.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/GuardMovement.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/GuardMovement.java similarity index 91% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/GuardMovement.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/GuardMovement.java index ee8771552a15..ac840da9f702 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/GuardMovement.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/GuardMovement.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; import org.junit.Assert; import org.junit.Test; -import static jdk.compiler.graal.core.common.GraalOptions.MaximumInliningSize; -import jdk.compiler.graal.core.common.GraalOptions; -import jdk.compiler.graal.jtt.JTTTest; -import jdk.compiler.graal.options.OptionValues; +import static jdk.graal.compiler.core.common.GraalOptions.MaximumInliningSize; +import jdk.graal.compiler.core.common.GraalOptions; +import jdk.graal.compiler.jtt.JTTTest; +import jdk.graal.compiler.options.OptionValues; public class GuardMovement extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/IfNodeCanonicalizationsTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/IfNodeCanonicalizationsTest.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/IfNodeCanonicalizationsTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/IfNodeCanonicalizationsTest.java index f75c3cf3f3d0..d787f54d9970 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/IfNodeCanonicalizationsTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/IfNodeCanonicalizationsTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; import static org.junit.runners.Parameterized.Parameter; import static org.junit.runners.Parameterized.Parameters; @@ -33,10 +33,10 @@ import java.util.Collection; import java.util.List; -import jdk.compiler.graal.jtt.JTTTest; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext; -import jdk.compiler.graal.nodes.graphbuilderconf.InlineInvokePlugin; +import jdk.graal.compiler.jtt.JTTTest; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext; +import jdk.graal.compiler.nodes.graphbuilderconf.InlineInvokePlugin; 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/jtt/optimize/InferStamp01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/InferStamp01.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/InferStamp01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/InferStamp01.java index efae02f264d0..1daa3cffa7fa 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/InferStamp01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/InferStamp01.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /** diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Inline01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Inline01.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Inline01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Inline01.java index aaed8e638e1e..ba57ba802769 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Inline01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Inline01.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Inline02.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Inline02.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Inline02.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Inline02.java index e1f75d34a9fd..1aee888116ea 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Inline02.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Inline02.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/InstanceOf.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/InstanceOf.java similarity index 92% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/InstanceOf.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/InstanceOf.java index b3db6de41c8d..838841ea4b55 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/InstanceOf.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/InstanceOf.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; -import jdk.compiler.graal.jtt.JTTTest; -import jdk.compiler.graal.nodes.LogicNode; -import jdk.compiler.graal.nodes.java.InstanceOfNode; +import jdk.graal.compiler.jtt.JTTTest; +import jdk.graal.compiler.nodes.LogicNode; +import jdk.graal.compiler.nodes.java.InstanceOfNode; import org.junit.Test; /** diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/LLE_01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/LLE_01.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/LLE_01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/LLE_01.java index 9cf328b7fb9c..4d897c294c2c 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/LLE_01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/LLE_01.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/List_reorder_bug.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/List_reorder_bug.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/List_reorder_bug.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/List_reorder_bug.java index edfcb7d011f2..0696b8ab72cd 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/List_reorder_bug.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/List_reorder_bug.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Logic0.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Logic0.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Logic0.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Logic0.java index feffdb7f6468..9901f5d6bb82 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Logic0.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Logic0.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/LongToSomethingArray01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/LongToSomethingArray01.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/LongToSomethingArray01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/LongToSomethingArray01.java index fa5d87b4b8ae..40e6e4caa127 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/LongToSomethingArray01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/LongToSomethingArray01.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /** diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/NCE_01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/NCE_01.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/NCE_01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/NCE_01.java index 72b677898d78..925cf87fecdd 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/NCE_01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/NCE_01.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/NCE_02.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/NCE_02.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/NCE_02.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/NCE_02.java index bb33652fbad6..cb831afe88da 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/NCE_02.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/NCE_02.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* * Test case for null check elimination. diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/NCE_03.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/NCE_03.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/NCE_03.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/NCE_03.java index 924feee1d263..c7a13550e95b 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/NCE_03.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/NCE_03.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/NCE_04.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/NCE_04.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/NCE_04.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/NCE_04.java index b821e560f7b1..427886a5d556 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/NCE_04.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/NCE_04.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/NCE_FlowSensitive01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/NCE_FlowSensitive01.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/NCE_FlowSensitive01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/NCE_FlowSensitive01.java index 5f542ad06538..67972eb37e62 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/NCE_FlowSensitive01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/NCE_FlowSensitive01.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/NCE_FlowSensitive02.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/NCE_FlowSensitive02.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/NCE_FlowSensitive02.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/NCE_FlowSensitive02.java index 57e7a42e22f7..da8f7e5dfaa6 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/NCE_FlowSensitive02.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/NCE_FlowSensitive02.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/NCE_FlowSensitive03.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/NCE_FlowSensitive03.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/NCE_FlowSensitive03.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/NCE_FlowSensitive03.java index 6ffe6594c5e6..38357b22432c 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/NCE_FlowSensitive03.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/NCE_FlowSensitive03.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/NCE_FlowSensitive04.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/NCE_FlowSensitive04.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/NCE_FlowSensitive04.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/NCE_FlowSensitive04.java index 43a224bc34f3..f5f7b48b92e8 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/NCE_FlowSensitive04.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/NCE_FlowSensitive04.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/NCE_FlowSensitive05.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/NCE_FlowSensitive05.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/NCE_FlowSensitive05.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/NCE_FlowSensitive05.java index c2cd50055e65..ee5b844219a6 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/NCE_FlowSensitive05.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/NCE_FlowSensitive05.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; import java.io.ByteArrayOutputStream; import java.io.PrintStream; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Narrow_byte01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Narrow_byte01.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Narrow_byte01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Narrow_byte01.java index 73e025dc4f95..83e6870aaa55 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Narrow_byte01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Narrow_byte01.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Narrow_byte02.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Narrow_byte02.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Narrow_byte02.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Narrow_byte02.java index 7d41e8af2f0e..456a8e68ac3c 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Narrow_byte02.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Narrow_byte02.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Narrow_byte03.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Narrow_byte03.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Narrow_byte03.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Narrow_byte03.java index 3a5df5fc16cf..9e6916cc2935 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Narrow_byte03.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Narrow_byte03.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Narrow_byte04.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Narrow_byte04.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Narrow_byte04.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Narrow_byte04.java index 108a1690aa27..dde312023360 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Narrow_byte04.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Narrow_byte04.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Narrow_char01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Narrow_char01.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Narrow_char01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Narrow_char01.java index 8814db877371..c85c5fbae64f 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Narrow_char01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Narrow_char01.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Narrow_char02.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Narrow_char02.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Narrow_char02.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Narrow_char02.java index 80799ed96b36..975ec60c4dd6 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Narrow_char02.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Narrow_char02.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Narrow_char03.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Narrow_char03.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Narrow_char03.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Narrow_char03.java index dc494060a787..e8b7f4e1875d 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Narrow_char03.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Narrow_char03.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Narrow_short01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Narrow_short01.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Narrow_short01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Narrow_short01.java index e9bfce83036b..e160b25d1e78 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Narrow_short01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Narrow_short01.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Narrow_short02.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Narrow_short02.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Narrow_short02.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Narrow_short02.java index fb9cc9193ba0..2331783175a0 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Narrow_short02.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Narrow_short02.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Narrow_short03.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Narrow_short03.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Narrow_short03.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Narrow_short03.java index 18c943426482..3f474ed094f2 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Narrow_short03.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Narrow_short03.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/NestedLoop_EA.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/NestedLoop_EA.java similarity index 88% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/NestedLoop_EA.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/NestedLoop_EA.java index 67ea83528d67..4b46f1245089 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/NestedLoop_EA.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/NestedLoop_EA.java @@ -22,21 +22,21 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; import java.util.ListIterator; -import jdk.compiler.graal.jtt.JTTTest; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.virtual.CommitAllocationNode; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.phases.BasePhase; -import jdk.compiler.graal.phases.common.CanonicalizerPhase; -import jdk.compiler.graal.phases.common.inlining.InliningPhase; -import jdk.compiler.graal.phases.common.inlining.policy.GreedyInliningPolicy; -import jdk.compiler.graal.phases.tiers.HighTierContext; -import jdk.compiler.graal.phases.tiers.Suites; -import jdk.compiler.graal.virtual.phases.ea.PartialEscapePhase; +import jdk.graal.compiler.jtt.JTTTest; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.virtual.CommitAllocationNode; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.phases.BasePhase; +import jdk.graal.compiler.phases.common.CanonicalizerPhase; +import jdk.graal.compiler.phases.common.inlining.InliningPhase; +import jdk.graal.compiler.phases.common.inlining.policy.GreedyInliningPolicy; +import jdk.graal.compiler.phases.tiers.HighTierContext; +import jdk.graal.compiler.phases.tiers.Suites; +import jdk.graal.compiler.virtual.phases.ea.PartialEscapePhase; import org.junit.Assume; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Phi01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Phi01.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Phi01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Phi01.java index 6217a17f95c0..9c6f8500c318 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Phi01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Phi01.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Phi02.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Phi02.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Phi02.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Phi02.java index 2e43302e009d..36da1b8a9f41 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Phi02.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Phi02.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Phi03.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Phi03.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Phi03.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Phi03.java index e0947cf8cfc2..42935f96d338 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Phi03.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Phi03.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/ReassociateConstants.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/ReassociateConstants.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/ReassociateConstants.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/ReassociateConstants.java index 5cdbf9fd39e9..0568f28a94d5 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/ReassociateConstants.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/ReassociateConstants.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Reduce_Convert01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Reduce_Convert01.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Reduce_Convert01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Reduce_Convert01.java index aa15c576b70f..0cdc843d1f7c 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Reduce_Convert01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Reduce_Convert01.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Reduce_Double01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Reduce_Double01.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Reduce_Double01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Reduce_Double01.java index 34600b83c58e..c444fbe053f4 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Reduce_Double01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Reduce_Double01.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Reduce_Float01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Reduce_Float01.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Reduce_Float01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Reduce_Float01.java index 103a407e4330..5444736bf66b 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Reduce_Float01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Reduce_Float01.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Reduce_Int01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Reduce_Int01.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Reduce_Int01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Reduce_Int01.java index a04bf3859b45..bc32b064bd44 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Reduce_Int01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Reduce_Int01.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Reduce_Int02.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Reduce_Int02.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Reduce_Int02.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Reduce_Int02.java index 46e821aabd18..00a56eb6c0b1 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Reduce_Int02.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Reduce_Int02.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* * Tests constant folding of integer operations. diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Reduce_Int03.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Reduce_Int03.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Reduce_Int03.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Reduce_Int03.java index ee8030fb4f9b..7a8ee2bc91f8 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Reduce_Int03.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Reduce_Int03.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Reduce_Int04.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Reduce_Int04.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Reduce_Int04.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Reduce_Int04.java index 8e1d4118d27b..83b2f5536b3d 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Reduce_Int04.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Reduce_Int04.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Reduce_IntShift01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Reduce_IntShift01.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Reduce_IntShift01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Reduce_IntShift01.java index 4ebc5b29778b..4d9e981c0aa2 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Reduce_IntShift01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Reduce_IntShift01.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Reduce_IntShift02.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Reduce_IntShift02.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Reduce_IntShift02.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Reduce_IntShift02.java index fc54e4263e60..0455f4f98f9a 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Reduce_IntShift02.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Reduce_IntShift02.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* * Tests optimization of integer operations. diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Reduce_Long01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Reduce_Long01.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Reduce_Long01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Reduce_Long01.java index 75cd261ad6c4..b947063f8ecd 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Reduce_Long01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Reduce_Long01.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Reduce_Long02.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Reduce_Long02.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Reduce_Long02.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Reduce_Long02.java index 7a8400c1341b..c0e4ca568c7d 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Reduce_Long02.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Reduce_Long02.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Reduce_Long03.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Reduce_Long03.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Reduce_Long03.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Reduce_Long03.java index 410e0080c19b..9dd02376399b 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Reduce_Long03.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Reduce_Long03.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Reduce_Long04.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Reduce_Long04.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Reduce_Long04.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Reduce_Long04.java index 3c65b2117712..a46be19da72a 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Reduce_Long04.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Reduce_Long04.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Reduce_LongShift01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Reduce_LongShift01.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Reduce_LongShift01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Reduce_LongShift01.java index 84cba8b82464..656645c66eb3 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Reduce_LongShift01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Reduce_LongShift01.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Reduce_LongShift02.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Reduce_LongShift02.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Reduce_LongShift02.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Reduce_LongShift02.java index dacae7d4f347..ea3db79a5ab5 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Reduce_LongShift02.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Reduce_LongShift02.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/SchedulingBug_01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/SchedulingBug_01.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/SchedulingBug_01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/SchedulingBug_01.java index 02d1407fd57d..756a711f199a 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/SchedulingBug_01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/SchedulingBug_01.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/SignExtendShort.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/SignExtendShort.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/SignExtendShort.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/SignExtendShort.java index 810227756c99..3d31725dc5c9 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/SignExtendShort.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/SignExtendShort.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Switch01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Switch01.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Switch01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Switch01.java index 0c69fb8209e4..4a99b90f1411 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Switch01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Switch01.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Switch02.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Switch02.java similarity index 99% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Switch02.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Switch02.java index d5a3e9293d90..10431f7cce48 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Switch02.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/Switch02.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; import java.util.HashMap; import java.util.HashSet; import java.util.LinkedList; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/SwitchHashTableTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/SwitchHashTableTest.java similarity index 99% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/SwitchHashTableTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/SwitchHashTableTest.java index 2c7e75e7d658..9c0b90088903 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/SwitchHashTableTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/SwitchHashTableTest.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/TrichotomyFloats.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/TrichotomyFloats.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/TrichotomyFloats.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/TrichotomyFloats.java index 39a49bf7d7a6..d668166c8877 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/TrichotomyFloats.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/TrichotomyFloats.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameter; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/TrichotomyTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/TrichotomyTest.java similarity index 99% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/TrichotomyTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/TrichotomyTest.java index 4f6779fa6635..a9f48c91df50 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/TrichotomyTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/TrichotomyTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; @@ -30,15 +30,15 @@ import java.lang.annotation.Target; import java.util.List; -import jdk.compiler.graal.jtt.JTTTest; -import jdk.compiler.graal.nodes.IfNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.calc.ConditionalNode; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext; -import jdk.compiler.graal.nodes.graphbuilderconf.InlineInvokePlugin; -import jdk.compiler.graal.phases.common.CanonicalizerPhase; -import jdk.compiler.graal.phases.tiers.HighTierContext; +import jdk.graal.compiler.jtt.JTTTest; +import jdk.graal.compiler.nodes.IfNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.calc.ConditionalNode; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext; +import jdk.graal.compiler.nodes.graphbuilderconf.InlineInvokePlugin; +import jdk.graal.compiler.phases.common.CanonicalizerPhase; +import jdk.graal.compiler.phases.tiers.HighTierContext; import org.junit.Assert; import org.junit.Ignore; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/TypeCastElem.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/TypeCastElem.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/TypeCastElem.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/TypeCastElem.java index b4a4204b6b7f..dbe41de26129 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/TypeCastElem.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/TypeCastElem.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/UnsafeDeopt.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/UnsafeDeopt.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/UnsafeDeopt.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/UnsafeDeopt.java index 9d3af2f1f08c..619c0b8a2ece 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/UnsafeDeopt.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/UnsafeDeopt.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; import java.nio.ByteBuffer; -import jdk.compiler.graal.api.directives.GraalDirectives; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.api.directives.GraalDirectives; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; import org.junit.internal.AssumptionViolatedException; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/VN_Cast01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/VN_Cast01.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/VN_Cast01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/VN_Cast01.java index d04544e3307f..60665131e01d 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/VN_Cast01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/VN_Cast01.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/VN_Cast02.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/VN_Cast02.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/VN_Cast02.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/VN_Cast02.java index 028f9e04a04a..077ac36d1527 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/VN_Cast02.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/VN_Cast02.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/VN_Convert01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/VN_Convert01.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/VN_Convert01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/VN_Convert01.java index d428c863a0c7..45999444f294 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/VN_Convert01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/VN_Convert01.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/VN_Convert02.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/VN_Convert02.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/VN_Convert02.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/VN_Convert02.java index c333bc8b7b4b..4a470bd40dcf 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/VN_Convert02.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/VN_Convert02.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/VN_Double01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/VN_Double01.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/VN_Double01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/VN_Double01.java index 84316947346e..df4d164dcadc 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/VN_Double01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/VN_Double01.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/VN_Double02.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/VN_Double02.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/VN_Double02.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/VN_Double02.java index dfe5d55dae64..66154dab4b96 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/VN_Double02.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/VN_Double02.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/VN_Double03.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/VN_Double03.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/VN_Double03.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/VN_Double03.java index 5aa2bcff7273..c3ac23db87a2 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/VN_Double03.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/VN_Double03.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/VN_Field01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/VN_Field01.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/VN_Field01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/VN_Field01.java index 6853d8714786..b157f8f0b1cf 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/VN_Field01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/VN_Field01.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/VN_Field02.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/VN_Field02.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/VN_Field02.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/VN_Field02.java index a0298d4a76fc..3c8bb73a5371 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/VN_Field02.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/VN_Field02.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/VN_Float01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/VN_Float01.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/VN_Float01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/VN_Float01.java index 70da463ca69a..bc94a07317d7 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/VN_Float01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/VN_Float01.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* * Tests optimization of float operations. diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/VN_Float02.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/VN_Float02.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/VN_Float02.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/VN_Float02.java index 3f2ab9651f74..7e93ab71cac6 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/VN_Float02.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/VN_Float02.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/VN_InstanceOf01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/VN_InstanceOf01.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/VN_InstanceOf01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/VN_InstanceOf01.java index e42a06adabd2..374eed42b32c 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/VN_InstanceOf01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/VN_InstanceOf01.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/VN_InstanceOf02.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/VN_InstanceOf02.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/VN_InstanceOf02.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/VN_InstanceOf02.java index 24639b3300a1..f0243b0dc643 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/VN_InstanceOf02.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/VN_InstanceOf02.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* * Tests value numbering of instanceof operations. diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/VN_InstanceOf03.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/VN_InstanceOf03.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/VN_InstanceOf03.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/VN_InstanceOf03.java index 2bd44594df2e..4f2571c27ee1 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/VN_InstanceOf03.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/VN_InstanceOf03.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/VN_Int01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/VN_Int01.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/VN_Int01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/VN_Int01.java index c905950d950d..78f2eb5896c0 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/VN_Int01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/VN_Int01.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/VN_Int02.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/VN_Int02.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/VN_Int02.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/VN_Int02.java index 53beb86f6d8a..4ca305485b5f 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/VN_Int02.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/VN_Int02.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/VN_Int03.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/VN_Int03.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/VN_Int03.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/VN_Int03.java index 947d6f0f67cf..0a0751eec1e1 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/VN_Int03.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/VN_Int03.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/VN_Long01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/VN_Long01.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/VN_Long01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/VN_Long01.java index 63a933c945e8..76a1010989f9 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/VN_Long01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/VN_Long01.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/VN_Long02.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/VN_Long02.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/VN_Long02.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/VN_Long02.java index 5f977ba53003..4a587be5a2ea 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/VN_Long02.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/VN_Long02.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/VN_Long03.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/VN_Long03.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/VN_Long03.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/VN_Long03.java index 891e0a600b61..7e746a3de322 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/VN_Long03.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/VN_Long03.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; import org.junit.Test; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; /* * Tests value numbering of long operations. diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/VN_Loop01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/VN_Loop01.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/VN_Loop01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/VN_Loop01.java index c6e3c0b316cb..f3c47b6dcbed 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/VN_Loop01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/optimize/VN_Loop01.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.optimize; +package jdk.graal.compiler.jtt.optimize; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_get01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Array_get01.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_get01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Array_get01.java index 9292aa05146f..d1847d1fda1b 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_get01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Array_get01.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.reflect; +package jdk.graal.compiler.jtt.reflect; import java.lang.reflect.Array; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; public class Array_get01 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_get02.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Array_get02.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_get02.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Array_get02.java index 5845c8168003..a8bdc0f7122d 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_get02.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Array_get02.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.reflect; +package jdk.graal.compiler.jtt.reflect; import java.lang.reflect.Array; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; public class Array_get02 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_get03.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Array_get03.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_get03.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Array_get03.java index 3a041a99ee1b..3a8c3016f6a2 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_get03.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Array_get03.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.reflect; +package jdk.graal.compiler.jtt.reflect; import java.lang.reflect.Array; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; public class Array_get03 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_getBoolean01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Array_getBoolean01.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_getBoolean01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Array_getBoolean01.java index b64eeeb73cc8..054dc46dd4ed 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_getBoolean01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Array_getBoolean01.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.reflect; +package jdk.graal.compiler.jtt.reflect; import java.lang.reflect.Array; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; public class Array_getBoolean01 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_getByte01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Array_getByte01.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_getByte01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Array_getByte01.java index b5c3cc668eab..06cd5de2ab21 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_getByte01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Array_getByte01.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.reflect; +package jdk.graal.compiler.jtt.reflect; import java.lang.reflect.Array; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; public class Array_getByte01 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_getChar01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Array_getChar01.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_getChar01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Array_getChar01.java index ab41a5c094a0..e87321ba7938 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_getChar01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Array_getChar01.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.reflect; +package jdk.graal.compiler.jtt.reflect; import java.lang.reflect.Array; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; public class Array_getChar01 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_getDouble01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Array_getDouble01.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_getDouble01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Array_getDouble01.java index 7d9f6b1064e7..ff377cce13ed 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_getDouble01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Array_getDouble01.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.reflect; +package jdk.graal.compiler.jtt.reflect; import java.lang.reflect.Array; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; public class Array_getDouble01 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_getFloat01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Array_getFloat01.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_getFloat01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Array_getFloat01.java index 6ceb40046a0a..de5ee6eef398 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_getFloat01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Array_getFloat01.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.reflect; +package jdk.graal.compiler.jtt.reflect; import java.lang.reflect.Array; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; public class Array_getFloat01 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_getInt01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Array_getInt01.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_getInt01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Array_getInt01.java index e939c2ce8603..1053c7b6552c 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_getInt01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Array_getInt01.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.reflect; +package jdk.graal.compiler.jtt.reflect; import java.lang.reflect.Array; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; public class Array_getInt01 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_getLength01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Array_getLength01.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_getLength01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Array_getLength01.java index 3fe45aa45421..c359d38f939f 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_getLength01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Array_getLength01.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.reflect; +package jdk.graal.compiler.jtt.reflect; import java.lang.reflect.Array; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; public class Array_getLength01 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_getLong01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Array_getLong01.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_getLong01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Array_getLong01.java index e2f2069a6362..7615c9e4527b 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_getLong01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Array_getLong01.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.reflect; +package jdk.graal.compiler.jtt.reflect; import java.lang.reflect.Array; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; public class Array_getLong01 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_getShort01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Array_getShort01.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_getShort01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Array_getShort01.java index 897c465406de..ca087df8a830 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_getShort01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Array_getShort01.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.reflect; +package jdk.graal.compiler.jtt.reflect; import java.lang.reflect.Array; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; public class Array_getShort01 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_newInstance01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Array_newInstance01.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_newInstance01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Array_newInstance01.java index 23ede2f5c4eb..9763d71c7738 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_newInstance01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Array_newInstance01.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.reflect; +package jdk.graal.compiler.jtt.reflect; import java.lang.reflect.Array; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; public class Array_newInstance01 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_newInstance02.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Array_newInstance02.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_newInstance02.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Array_newInstance02.java index 72f08d0ede78..a797b8c341db 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_newInstance02.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Array_newInstance02.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.reflect; +package jdk.graal.compiler.jtt.reflect; import java.lang.reflect.Array; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; public class Array_newInstance02 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_newInstance03.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Array_newInstance03.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_newInstance03.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Array_newInstance03.java index 31e6cc1a96aa..b9485f4368e7 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_newInstance03.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Array_newInstance03.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.reflect; +package jdk.graal.compiler.jtt.reflect; import java.lang.reflect.Array; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; public class Array_newInstance03 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_newInstance04.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Array_newInstance04.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_newInstance04.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Array_newInstance04.java index d1ebad922f5b..f5e2069845d1 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_newInstance04.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Array_newInstance04.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.reflect; +package jdk.graal.compiler.jtt.reflect; import java.lang.reflect.Array; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; public class Array_newInstance04 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_newInstance05.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Array_newInstance05.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_newInstance05.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Array_newInstance05.java index da90e44ba06a..9beb549336b5 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_newInstance05.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Array_newInstance05.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.reflect; +package jdk.graal.compiler.jtt.reflect; import java.lang.reflect.Array; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; public class Array_newInstance05 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_newInstance06.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Array_newInstance06.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_newInstance06.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Array_newInstance06.java index 21265f76265f..e35f58f69187 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_newInstance06.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Array_newInstance06.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.reflect; +package jdk.graal.compiler.jtt.reflect; import java.lang.reflect.Array; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; public class Array_newInstance06 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_set01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Array_set01.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_set01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Array_set01.java index 5032280b0db9..a66ef33352d8 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_set01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Array_set01.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.reflect; +package jdk.graal.compiler.jtt.reflect; import java.lang.reflect.Array; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; public class Array_set01 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_set02.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Array_set02.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_set02.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Array_set02.java index 46d262359ecc..c04010d03c3d 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_set02.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Array_set02.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.reflect; +package jdk.graal.compiler.jtt.reflect; import java.lang.reflect.Array; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; public class Array_set02 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_set03.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Array_set03.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_set03.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Array_set03.java index 237fd2b00a07..d19eac8908bd 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_set03.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Array_set03.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.reflect; +package jdk.graal.compiler.jtt.reflect; import java.lang.reflect.Array; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; public class Array_set03 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_setBoolean01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Array_setBoolean01.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_setBoolean01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Array_setBoolean01.java index e9b7e523ed97..6ea621524961 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_setBoolean01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Array_setBoolean01.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.reflect; +package jdk.graal.compiler.jtt.reflect; import java.lang.reflect.Array; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; public class Array_setBoolean01 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_setByte01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Array_setByte01.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_setByte01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Array_setByte01.java index 20a715c755b7..b7557f705439 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_setByte01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Array_setByte01.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.reflect; +package jdk.graal.compiler.jtt.reflect; import java.lang.reflect.Array; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; public class Array_setByte01 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_setChar01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Array_setChar01.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_setChar01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Array_setChar01.java index 039f42d9c3bf..8f35630dce2a 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_setChar01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Array_setChar01.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.reflect; +package jdk.graal.compiler.jtt.reflect; import java.lang.reflect.Array; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; public class Array_setChar01 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_setDouble01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Array_setDouble01.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_setDouble01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Array_setDouble01.java index 7d111e40fffc..4aba81a07cc4 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_setDouble01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Array_setDouble01.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.reflect; +package jdk.graal.compiler.jtt.reflect; import java.lang.reflect.Array; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; public class Array_setDouble01 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_setFloat01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Array_setFloat01.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_setFloat01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Array_setFloat01.java index 79c29fba0046..619f7083f909 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_setFloat01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Array_setFloat01.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.reflect; +package jdk.graal.compiler.jtt.reflect; import java.lang.reflect.Array; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; public class Array_setFloat01 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_setInt01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Array_setInt01.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_setInt01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Array_setInt01.java index 792ab4e61f3b..59d1220e8ea5 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_setInt01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Array_setInt01.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.reflect; +package jdk.graal.compiler.jtt.reflect; import java.lang.reflect.Array; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; public class Array_setInt01 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_setLong01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Array_setLong01.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_setLong01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Array_setLong01.java index 82df7c46b464..fcc8307200ff 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_setLong01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Array_setLong01.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.reflect; +package jdk.graal.compiler.jtt.reflect; import java.lang.reflect.Array; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; public class Array_setLong01 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_setShort01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Array_setShort01.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_setShort01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Array_setShort01.java index a68fc2e8a55e..00a56d1f64b5 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_setShort01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Array_setShort01.java @@ -24,11 +24,11 @@ */ /* */ -package jdk.compiler.graal.jtt.reflect; +package jdk.graal.compiler.jtt.reflect; import java.lang.reflect.Array; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; public class Array_setShort01 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Class_getDeclaredField01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Class_getDeclaredField01.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Class_getDeclaredField01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Class_getDeclaredField01.java index 02cc98b4bf7c..e45e2a017385 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Class_getDeclaredField01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Class_getDeclaredField01.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.reflect; +package jdk.graal.compiler.jtt.reflect; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Class_getDeclaredMethod01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Class_getDeclaredMethod01.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Class_getDeclaredMethod01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Class_getDeclaredMethod01.java index 8251c5e843d1..b57814594cfe 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Class_getDeclaredMethod01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Class_getDeclaredMethod01.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.reflect; +package jdk.graal.compiler.jtt.reflect; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Class_getField01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Class_getField01.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Class_getField01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Class_getField01.java index c185c00365fb..7e96d646c7e0 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Class_getField01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Class_getField01.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.reflect; +package jdk.graal.compiler.jtt.reflect; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Class_getField02.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Class_getField02.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Class_getField02.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Class_getField02.java index ed7e4a7ccd7a..9e5bfc7cc9f6 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Class_getField02.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Class_getField02.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.reflect; +package jdk.graal.compiler.jtt.reflect; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Class_getMethod01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Class_getMethod01.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Class_getMethod01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Class_getMethod01.java index 82dfdc52894c..c9c7b1d2af6c 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Class_getMethod01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Class_getMethod01.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.reflect; +package jdk.graal.compiler.jtt.reflect; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Class_getMethod02.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Class_getMethod02.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Class_getMethod02.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Class_getMethod02.java index af9e31b6af3d..2e757216a26a 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Class_getMethod02.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Class_getMethod02.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.reflect; +package jdk.graal.compiler.jtt.reflect; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Class_newInstance01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Class_newInstance01.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Class_newInstance01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Class_newInstance01.java index 31fa1742c498..66789183229f 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Class_newInstance01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Class_newInstance01.java @@ -24,9 +24,9 @@ */ /* */ -package jdk.compiler.graal.jtt.reflect; +package jdk.graal.compiler.jtt.reflect; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; public final class Class_newInstance01 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Class_newInstance02.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Class_newInstance02.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Class_newInstance02.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Class_newInstance02.java index 6971fc4779fc..051ad942ccbb 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Class_newInstance02.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Class_newInstance02.java @@ -24,9 +24,9 @@ */ /* */ -package jdk.compiler.graal.jtt.reflect; +package jdk.graal.compiler.jtt.reflect; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; public final class Class_newInstance02 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Class_newInstance03.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Class_newInstance03.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Class_newInstance03.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Class_newInstance03.java index 6c6e22ab42c8..77d282cf6d80 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Class_newInstance03.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Class_newInstance03.java @@ -24,9 +24,9 @@ */ /* */ -package jdk.compiler.graal.jtt.reflect; +package jdk.graal.compiler.jtt.reflect; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; public class Class_newInstance03 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Class_newInstance06.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Class_newInstance06.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Class_newInstance06.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Class_newInstance06.java index 79dafb173dff..207ea2ec2342 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Class_newInstance06.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Class_newInstance06.java @@ -24,9 +24,9 @@ */ /* */ -package jdk.compiler.graal.jtt.reflect; +package jdk.graal.compiler.jtt.reflect; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; public final class Class_newInstance06 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Class_newInstance07.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Class_newInstance07.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Class_newInstance07.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Class_newInstance07.java index 0bceaa1beb4f..5c38c0d309ee 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Class_newInstance07.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Class_newInstance07.java @@ -24,9 +24,9 @@ */ /* */ -package jdk.compiler.graal.jtt.reflect; +package jdk.graal.compiler.jtt.reflect; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; public final class Class_newInstance07 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Field_get01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Field_get01.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Field_get01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Field_get01.java index 189a3418a5b6..0ecad25ef54e 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Field_get01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Field_get01.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.reflect; +package jdk.graal.compiler.jtt.reflect; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Field_get02.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Field_get02.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Field_get02.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Field_get02.java index eeb63bae35f7..94ad0deb2c71 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Field_get02.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Field_get02.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.reflect; +package jdk.graal.compiler.jtt.reflect; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Field_get03.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Field_get03.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Field_get03.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Field_get03.java index a0ffa61a268e..3901fc70f773 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Field_get03.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Field_get03.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.reflect; +package jdk.graal.compiler.jtt.reflect; import java.lang.reflect.Field; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Field_get04.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Field_get04.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Field_get04.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Field_get04.java index 5bb7531a1a64..2e82317b707c 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Field_get04.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Field_get04.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.reflect; +package jdk.graal.compiler.jtt.reflect; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Field_getType01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Field_getType01.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Field_getType01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Field_getType01.java index 1029f641c92e..ea48bf67d20b 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Field_getType01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Field_getType01.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.reflect; +package jdk.graal.compiler.jtt.reflect; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Field_set01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Field_set01.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Field_set01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Field_set01.java index bd20f683bd38..1cf6c786632b 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Field_set01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Field_set01.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.reflect; +package jdk.graal.compiler.jtt.reflect; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Field_set02.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Field_set02.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Field_set02.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Field_set02.java index 3e7c2dff53b9..09ea48607fb7 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Field_set02.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Field_set02.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.reflect; +package jdk.graal.compiler.jtt.reflect; -import jdk.compiler.graal.jtt.JTTTest; -import jdk.compiler.graal.debug.DebugOptions; -import jdk.compiler.graal.options.OptionValues; +import jdk.graal.compiler.jtt.JTTTest; +import jdk.graal.compiler.debug.DebugOptions; +import jdk.graal.compiler.options.OptionValues; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Field_set03.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Field_set03.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Field_set03.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Field_set03.java index 77706a9df400..79e9e6dd1eaf 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Field_set03.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Field_set03.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.reflect; +package jdk.graal.compiler.jtt.reflect; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Invoke_except01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Invoke_except01.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Invoke_except01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Invoke_except01.java index bdd6ae609814..2a5930a621de 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Invoke_except01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Invoke_except01.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.reflect; +package jdk.graal.compiler.jtt.reflect; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Invoke_main01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Invoke_main01.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Invoke_main01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Invoke_main01.java index 2388dd23afb4..4f683ab3d1ad 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Invoke_main01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Invoke_main01.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.reflect; +package jdk.graal.compiler.jtt.reflect; import java.lang.reflect.InvocationTargetException; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Invoke_main02.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Invoke_main02.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Invoke_main02.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Invoke_main02.java index c8c24ca6d5c2..d72a8ee67811 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Invoke_main02.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Invoke_main02.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.reflect; +package jdk.graal.compiler.jtt.reflect; import java.lang.reflect.InvocationTargetException; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Invoke_main03.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Invoke_main03.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Invoke_main03.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Invoke_main03.java index 1f7f43e3e0e0..d80812c1798d 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Invoke_main03.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Invoke_main03.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.reflect; +package jdk.graal.compiler.jtt.reflect; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Invoke_virtual01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Invoke_virtual01.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Invoke_virtual01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Invoke_virtual01.java index 411d6f1f72d2..3b96d277a937 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Invoke_virtual01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Invoke_virtual01.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.reflect; +package jdk.graal.compiler.jtt.reflect; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Method_getParameterTypes01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Method_getParameterTypes01.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Method_getParameterTypes01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Method_getParameterTypes01.java index fc2e188438e4..40409e4212be 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Method_getParameterTypes01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Method_getParameterTypes01.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.reflect; +package jdk.graal.compiler.jtt.reflect; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Method_getReturnType01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Method_getReturnType01.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Method_getReturnType01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Method_getReturnType01.java index da119df26f7a..723f7b296005 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Method_getReturnType01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/reflect/Method_getReturnType01.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.reflect; +package jdk.graal.compiler.jtt.reflect; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Monitor_contended01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/threads/Monitor_contended01.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Monitor_contended01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/threads/Monitor_contended01.java index b1cbfa5d051b..755a11aeb517 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Monitor_contended01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/threads/Monitor_contended01.java @@ -24,9 +24,9 @@ */ /* */ -package jdk.compiler.graal.jtt.threads; +package jdk.graal.compiler.jtt.threads; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TestRule; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Monitor_notowner01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/threads/Monitor_notowner01.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Monitor_notowner01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/threads/Monitor_notowner01.java index f321f413aa7d..3272d9faf4fa 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Monitor_notowner01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/threads/Monitor_notowner01.java @@ -24,9 +24,9 @@ */ /* */ -package jdk.compiler.graal.jtt.threads; +package jdk.graal.compiler.jtt.threads; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TestRule; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Monitorenter01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/threads/Monitorenter01.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Monitorenter01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/threads/Monitorenter01.java index 3d239ca94618..97368f889c0e 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Monitorenter01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/threads/Monitorenter01.java @@ -24,9 +24,9 @@ */ /* */ -package jdk.compiler.graal.jtt.threads; +package jdk.graal.compiler.jtt.threads; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TestRule; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Monitorenter02.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/threads/Monitorenter02.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Monitorenter02.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/threads/Monitorenter02.java index 2025e811f2fa..da1581ee5d1b 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Monitorenter02.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/threads/Monitorenter02.java @@ -24,9 +24,9 @@ */ /* */ -package jdk.compiler.graal.jtt.threads; +package jdk.graal.compiler.jtt.threads; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TestRule; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Object_wait01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/threads/Object_wait01.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Object_wait01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/threads/Object_wait01.java index b5e4c7b8938c..39b1904b8f7f 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Object_wait01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/threads/Object_wait01.java @@ -24,9 +24,9 @@ */ /* */ -package jdk.compiler.graal.jtt.threads; +package jdk.graal.compiler.jtt.threads; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TestRule; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Object_wait02.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/threads/Object_wait02.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Object_wait02.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/threads/Object_wait02.java index cfddecc3e753..6ccdf222af4b 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Object_wait02.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/threads/Object_wait02.java @@ -24,9 +24,9 @@ */ /* */ -package jdk.compiler.graal.jtt.threads; +package jdk.graal.compiler.jtt.threads; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TestRule; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Object_wait03.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/threads/Object_wait03.java similarity index 94% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Object_wait03.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/threads/Object_wait03.java index 71193bf4596c..17be435b6c9c 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Object_wait03.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/threads/Object_wait03.java @@ -24,12 +24,12 @@ */ /* */ -package jdk.compiler.graal.jtt.threads; +package jdk.graal.compiler.jtt.threads; -import jdk.compiler.graal.jtt.JTTTest; -import jdk.compiler.graal.core.common.CancellationBailoutException; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.nodes.Cancellable; +import jdk.graal.compiler.jtt.JTTTest; +import jdk.graal.compiler.core.common.CancellationBailoutException; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.nodes.Cancellable; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TestRule; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Object_wait04.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/threads/Object_wait04.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Object_wait04.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/threads/Object_wait04.java index 902954f7a3f1..e0dc85427507 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Object_wait04.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/threads/Object_wait04.java @@ -24,9 +24,9 @@ */ /* */ -package jdk.compiler.graal.jtt.threads; +package jdk.graal.compiler.jtt.threads; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TestRule; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/SynchronizedLoopExit01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/threads/SynchronizedLoopExit01.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/SynchronizedLoopExit01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/threads/SynchronizedLoopExit01.java index a88574a95c01..c8444c32fa93 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/SynchronizedLoopExit01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/threads/SynchronizedLoopExit01.java @@ -24,9 +24,9 @@ */ /* */ -package jdk.compiler.graal.jtt.threads; +package jdk.graal.compiler.jtt.threads; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TestRule; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/SynchronizedParserInlineTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/threads/SynchronizedParserInlineTest.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/SynchronizedParserInlineTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/threads/SynchronizedParserInlineTest.java index c3ed41a15bd6..fab90b9f8e66 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/SynchronizedParserInlineTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/threads/SynchronizedParserInlineTest.java @@ -24,9 +24,9 @@ */ /* */ -package jdk.compiler.graal.jtt.threads; +package jdk.graal.compiler.jtt.threads; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; public final class SynchronizedParserInlineTest extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/ThreadLocal01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/threads/ThreadLocal01.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/ThreadLocal01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/threads/ThreadLocal01.java index f16d9fd8f215..6c8fc2b9bbfe 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/ThreadLocal01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/threads/ThreadLocal01.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.threads; +package jdk.graal.compiler.jtt.threads; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/ThreadLocal02.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/threads/ThreadLocal02.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/ThreadLocal02.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/threads/ThreadLocal02.java index fbdcfa90d171..3d5f6dc28dae 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/ThreadLocal02.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/threads/ThreadLocal02.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.threads; +package jdk.graal.compiler.jtt.threads; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/ThreadLocal03.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/threads/ThreadLocal03.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/ThreadLocal03.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/threads/ThreadLocal03.java index d7af5e03d1aa..3d47d7c3af91 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/ThreadLocal03.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/threads/ThreadLocal03.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.threads; +package jdk.graal.compiler.jtt.threads; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Thread_currentThread01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/threads/Thread_currentThread01.java similarity index 94% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Thread_currentThread01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/threads/Thread_currentThread01.java index 9d794c620a4e..fe605d588504 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Thread_currentThread01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/threads/Thread_currentThread01.java @@ -24,9 +24,9 @@ */ /* */ -package jdk.compiler.graal.jtt.threads; +package jdk.graal.compiler.jtt.threads; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; public final class Thread_currentThread01 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Thread_getState01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/threads/Thread_getState01.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Thread_getState01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/threads/Thread_getState01.java index 65a3d8ba5eb9..d6125584c9e9 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Thread_getState01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/threads/Thread_getState01.java @@ -24,9 +24,9 @@ */ /* */ -package jdk.compiler.graal.jtt.threads; +package jdk.graal.compiler.jtt.threads; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; public final class Thread_getState01 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Thread_getState02.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/threads/Thread_getState02.java similarity index 94% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Thread_getState02.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/threads/Thread_getState02.java index fdf93835b706..6c364f8ee486 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Thread_getState02.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/threads/Thread_getState02.java @@ -24,9 +24,9 @@ */ /* */ -package jdk.compiler.graal.jtt.threads; +package jdk.graal.compiler.jtt.threads; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; public final class Thread_getState02 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Thread_holdsLock01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/threads/Thread_holdsLock01.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Thread_holdsLock01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/threads/Thread_holdsLock01.java index 4080febe084a..ac3364ac2ca0 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Thread_holdsLock01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/threads/Thread_holdsLock01.java @@ -24,9 +24,9 @@ */ /* */ -package jdk.compiler.graal.jtt.threads; +package jdk.graal.compiler.jtt.threads; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; public final class Thread_holdsLock01 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Thread_isAlive01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/threads/Thread_isAlive01.java similarity index 94% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Thread_isAlive01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/threads/Thread_isAlive01.java index aa20267d99a6..062273178044 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Thread_isAlive01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/threads/Thread_isAlive01.java @@ -24,9 +24,9 @@ */ /* */ -package jdk.compiler.graal.jtt.threads; +package jdk.graal.compiler.jtt.threads; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; public final class Thread_isAlive01 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Thread_isInterrupted01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/threads/Thread_isInterrupted01.java similarity index 94% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Thread_isInterrupted01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/threads/Thread_isInterrupted01.java index 8e65a540e4d7..b601bce27bf4 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Thread_isInterrupted01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/threads/Thread_isInterrupted01.java @@ -24,9 +24,9 @@ */ /* */ -package jdk.compiler.graal.jtt.threads; +package jdk.graal.compiler.jtt.threads; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; public final class Thread_isInterrupted01 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Thread_isInterrupted02.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/threads/Thread_isInterrupted02.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Thread_isInterrupted02.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/threads/Thread_isInterrupted02.java index 57c3102d5386..3ff8d9fbdb75 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Thread_isInterrupted02.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/threads/Thread_isInterrupted02.java @@ -26,9 +26,9 @@ /* */ -package jdk.compiler.graal.jtt.threads; +package jdk.graal.compiler.jtt.threads; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Assert; import org.junit.Rule; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Thread_isInterrupted03.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/threads/Thread_isInterrupted03.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Thread_isInterrupted03.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/threads/Thread_isInterrupted03.java index c142c00da856..3197f1206162 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Thread_isInterrupted03.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/threads/Thread_isInterrupted03.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.threads; +package jdk.graal.compiler.jtt.threads; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TestRule; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Thread_isInterrupted04.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/threads/Thread_isInterrupted04.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Thread_isInterrupted04.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/threads/Thread_isInterrupted04.java index c3d46fd2c017..fe240f08431d 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Thread_isInterrupted04.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/threads/Thread_isInterrupted04.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.threads; +package jdk.graal.compiler.jtt.threads; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Thread_isInterrupted05.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/threads/Thread_isInterrupted05.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Thread_isInterrupted05.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/threads/Thread_isInterrupted05.java index bca84d1680f1..708e0dfdb747 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Thread_isInterrupted05.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/threads/Thread_isInterrupted05.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.jtt.threads; +package jdk.graal.compiler.jtt.threads; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TestRule; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Thread_join01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/threads/Thread_join01.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Thread_join01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/threads/Thread_join01.java index 06f7de830b95..1652081e2897 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Thread_join01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/threads/Thread_join01.java @@ -24,9 +24,9 @@ */ /* */ -package jdk.compiler.graal.jtt.threads; +package jdk.graal.compiler.jtt.threads; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TestRule; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Thread_join02.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/threads/Thread_join02.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Thread_join02.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/threads/Thread_join02.java index a0c1d573f026..3604cc59fea5 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Thread_join02.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/threads/Thread_join02.java @@ -27,9 +27,9 @@ * This test sleeps the thread that is joined to, which should ensure that the joining thread * actually does wait for completeion. */ -package jdk.compiler.graal.jtt.threads; +package jdk.graal.compiler.jtt.threads; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TestRule; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Thread_join03.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/threads/Thread_join03.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Thread_join03.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/threads/Thread_join03.java index 62c4b3624d9c..73a4c8de4389 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Thread_join03.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/threads/Thread_join03.java @@ -27,9 +27,9 @@ * This test sleeps the joining thread, which should enure that the joinee is * terminated by the time the join occurs. */ -package jdk.compiler.graal.jtt.threads; +package jdk.graal.compiler.jtt.threads; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TestRule; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Thread_new01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/threads/Thread_new01.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Thread_new01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/threads/Thread_new01.java index e0b78a654803..cd133d20cbb0 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Thread_new01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/threads/Thread_new01.java @@ -24,9 +24,9 @@ */ /* */ -package jdk.compiler.graal.jtt.threads; +package jdk.graal.compiler.jtt.threads; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; public final class Thread_new01 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Thread_new02.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/threads/Thread_new02.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Thread_new02.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/threads/Thread_new02.java index 7c2a62cc5a1a..d6a506df900d 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Thread_new02.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/threads/Thread_new02.java @@ -24,9 +24,9 @@ */ /* */ -package jdk.compiler.graal.jtt.threads; +package jdk.graal.compiler.jtt.threads; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; public class Thread_new02 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Thread_setPriority01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/threads/Thread_setPriority01.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Thread_setPriority01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/threads/Thread_setPriority01.java index 725f9239e6a8..69fadfe38061 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Thread_setPriority01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/threads/Thread_setPriority01.java @@ -24,9 +24,9 @@ */ /* */ -package jdk.compiler.graal.jtt.threads; +package jdk.graal.compiler.jtt.threads; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; public final class Thread_setPriority01 extends JTTTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Thread_sleep01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/threads/Thread_sleep01.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Thread_sleep01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/threads/Thread_sleep01.java index db769a3d7118..9c2f59f558ef 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Thread_sleep01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/threads/Thread_sleep01.java @@ -24,9 +24,9 @@ */ /* */ -package jdk.compiler.graal.jtt.threads; +package jdk.graal.compiler.jtt.threads; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TestRule; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Thread_yield01.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/threads/Thread_yield01.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Thread_yield01.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/threads/Thread_yield01.java index c2744ca032c7..4fa85b76d107 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Thread_yield01.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/jtt/threads/Thread_yield01.java @@ -24,9 +24,9 @@ */ /* */ -package jdk.compiler.graal.jtt.threads; +package jdk.graal.compiler.jtt.threads; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TestRule; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/lir/jtt/ConstantStackCastTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/lir/jtt/ConstantStackCastTest.java similarity index 88% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/lir/jtt/ConstantStackCastTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/lir/jtt/ConstantStackCastTest.java index 62bb809f896d..5bf8f6f5b70c 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/lir/jtt/ConstantStackCastTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/lir/jtt/ConstantStackCastTest.java @@ -22,20 +22,20 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.jtt; +package jdk.graal.compiler.lir.jtt; -import static jdk.compiler.graal.lir.LIRValueUtil.asJavaConstant; -import static jdk.compiler.graal.lir.LIRValueUtil.isJavaConstant; +import static jdk.graal.compiler.lir.LIRValueUtil.asJavaConstant; +import static jdk.graal.compiler.lir.LIRValueUtil.isJavaConstant; import org.junit.Before; import org.junit.Test; -import jdk.compiler.graal.core.common.LIRKind; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.lir.ConstantValue; -import jdk.compiler.graal.lir.VirtualStackSlot; -import jdk.compiler.graal.lir.framemap.FrameMapBuilder; -import jdk.compiler.graal.lir.gen.LIRGeneratorTool; +import jdk.graal.compiler.core.common.LIRKind; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.lir.ConstantValue; +import jdk.graal.compiler.lir.VirtualStackSlot; +import jdk.graal.compiler.lir.framemap.FrameMapBuilder; +import jdk.graal.compiler.lir.gen.LIRGeneratorTool; import jdk.vm.ci.meta.JavaConstant; import jdk.vm.ci.meta.JavaKind; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/lir/jtt/LIRTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/lir/jtt/LIRTest.java similarity index 92% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/lir/jtt/LIRTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/lir/jtt/LIRTest.java index 158d8662d66e..16126795d15f 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/lir/jtt/LIRTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/lir/jtt/LIRTest.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.jtt; +package jdk.graal.compiler.lir.jtt; -import static jdk.compiler.graal.lir.LIRValueUtil.isVariable; -import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_IGNORED; -import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_IGNORED; +import static jdk.graal.compiler.lir.LIRValueUtil.isVariable; +import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_IGNORED; +import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_IGNORED; import java.lang.annotation.ElementType; import java.lang.annotation.RetentionPolicy; @@ -34,19 +34,19 @@ import java.lang.reflect.Modifier; import java.lang.reflect.Type; -import jdk.compiler.graal.api.replacements.SnippetReflectionProvider; -import jdk.compiler.graal.core.common.type.StampFactory; -import jdk.compiler.graal.graph.NodeClass; -import jdk.compiler.graal.graph.NodeInputList; -import jdk.compiler.graal.jtt.JTTTest; -import jdk.compiler.graal.nodeinfo.NodeInfo; -import jdk.compiler.graal.nodes.FixedWithNextNode; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext; -import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin; -import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins; -import jdk.compiler.graal.nodes.spi.LIRLowerable; -import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool; +import jdk.graal.compiler.api.replacements.SnippetReflectionProvider; +import jdk.graal.compiler.core.common.type.StampFactory; +import jdk.graal.compiler.graph.NodeClass; +import jdk.graal.compiler.graph.NodeInputList; +import jdk.graal.compiler.jtt.JTTTest; +import jdk.graal.compiler.nodeinfo.NodeInfo; +import jdk.graal.compiler.nodes.FixedWithNextNode; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext; +import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin; +import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins; +import jdk.graal.compiler.nodes.spi.LIRLowerable; +import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool; import jdk.vm.ci.meta.JavaKind; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/lir/jtt/LIRTestSpecification.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/lir/jtt/LIRTestSpecification.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/lir/jtt/LIRTestSpecification.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/lir/jtt/LIRTestSpecification.java index 7cbd66b8131e..b8443c344a6a 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/lir/jtt/LIRTestSpecification.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/lir/jtt/LIRTestSpecification.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.jtt; +package jdk.graal.compiler.lir.jtt; import java.util.HashMap; import org.graalvm.collections.EconomicMap; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.lir.gen.LIRGeneratorTool; -import jdk.compiler.graal.nodes.ValueNode; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.lir.gen.LIRGeneratorTool; +import jdk.graal.compiler.nodes.ValueNode; import jdk.vm.ci.meta.Value; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/lir/jtt/LIRTestTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/lir/jtt/LIRTestTest.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/lir/jtt/LIRTestTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/lir/jtt/LIRTestTest.java index 2e4c15e0afd4..0b41a7f9249c 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/lir/jtt/LIRTestTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/lir/jtt/LIRTestTest.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.jtt; +package jdk.graal.compiler.lir.jtt; import org.junit.Test; -import jdk.compiler.graal.lir.gen.LIRGeneratorTool; +import jdk.graal.compiler.lir.gen.LIRGeneratorTool; import jdk.vm.ci.meta.Value; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/lir/jtt/StackMoveTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/lir/jtt/StackMoveTest.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/lir/jtt/StackMoveTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/lir/jtt/StackMoveTest.java index 7ec2667b3e52..ec2287d3a94f 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/lir/jtt/StackMoveTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/lir/jtt/StackMoveTest.java @@ -22,16 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.jtt; +package jdk.graal.compiler.lir.jtt; import org.junit.Before; import org.junit.Test; -import jdk.compiler.graal.core.common.LIRKind; -import jdk.compiler.graal.lir.Variable; -import jdk.compiler.graal.lir.VirtualStackSlot; -import jdk.compiler.graal.lir.framemap.FrameMapBuilder; -import jdk.compiler.graal.lir.gen.LIRGeneratorTool; +import jdk.graal.compiler.core.common.LIRKind; +import jdk.graal.compiler.lir.Variable; +import jdk.graal.compiler.lir.VirtualStackSlot; +import jdk.graal.compiler.lir.framemap.FrameMapBuilder; +import jdk.graal.compiler.lir.gen.LIRGeneratorTool; import jdk.vm.ci.meta.JavaKind; import jdk.vm.ci.meta.PlatformKind; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/lir/jtt/StackStoreLoadTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/lir/jtt/StackStoreLoadTest.java similarity index 94% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/lir/jtt/StackStoreLoadTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/lir/jtt/StackStoreLoadTest.java index 0c81fab4f053..7e1a3c5ad56c 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/lir/jtt/StackStoreLoadTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/lir/jtt/StackStoreLoadTest.java @@ -23,16 +23,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.jtt; +package jdk.graal.compiler.lir.jtt; import org.junit.Before; import org.junit.Test; -import jdk.compiler.graal.core.common.LIRKind; -import jdk.compiler.graal.lir.Variable; -import jdk.compiler.graal.lir.VirtualStackSlot; -import jdk.compiler.graal.lir.framemap.FrameMapBuilder; -import jdk.compiler.graal.lir.gen.LIRGeneratorTool; +import jdk.graal.compiler.core.common.LIRKind; +import jdk.graal.compiler.lir.Variable; +import jdk.graal.compiler.lir.VirtualStackSlot; +import jdk.graal.compiler.lir.framemap.FrameMapBuilder; +import jdk.graal.compiler.lir.gen.LIRGeneratorTool; import jdk.vm.ci.meta.JavaKind; import jdk.vm.ci.meta.PlatformKind; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/lir/test/CompositeValueReplacementTest1.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/lir/test/CompositeValueReplacementTest1.java similarity index 88% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/lir/test/CompositeValueReplacementTest1.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/lir/test/CompositeValueReplacementTest1.java index 90584665bc97..38943a1d3170 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/lir/test/CompositeValueReplacementTest1.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/lir/test/CompositeValueReplacementTest1.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.test; +package jdk.graal.compiler.lir.test; -import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.COMPOSITE; -import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.REG; +import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.COMPOSITE; +import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.REG; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; @@ -33,15 +33,15 @@ import org.junit.Test; -import jdk.compiler.graal.core.common.LIRKind; -import jdk.compiler.graal.lir.CompositeValue; -import jdk.compiler.graal.lir.InstructionValueConsumer; -import jdk.compiler.graal.lir.InstructionValueProcedure; -import jdk.compiler.graal.lir.LIRInstruction; -import jdk.compiler.graal.lir.LIRInstruction.OperandFlag; -import jdk.compiler.graal.lir.LIRInstruction.OperandMode; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.core.common.LIRKind; +import jdk.graal.compiler.lir.CompositeValue; +import jdk.graal.compiler.lir.InstructionValueConsumer; +import jdk.graal.compiler.lir.InstructionValueProcedure; +import jdk.graal.compiler.lir.LIRInstruction; +import jdk.graal.compiler.lir.LIRInstruction.OperandFlag; +import jdk.graal.compiler.lir.LIRInstruction.OperandMode; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; import jdk.vm.ci.meta.Value; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/lir/test/GenericValueMapTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/lir/test/GenericValueMapTest.java similarity index 94% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/lir/test/GenericValueMapTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/lir/test/GenericValueMapTest.java index 903466af2e09..0308e35e197a 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/lir/test/GenericValueMapTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/lir/test/GenericValueMapTest.java @@ -22,16 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.test; +package jdk.graal.compiler.lir.test; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; import org.junit.Test; -import jdk.compiler.graal.core.common.LIRKind; -import jdk.compiler.graal.lir.Variable; -import jdk.compiler.graal.lir.util.GenericValueMap; +import jdk.graal.compiler.core.common.LIRKind; +import jdk.graal.compiler.lir.Variable; +import jdk.graal.compiler.lir.util.GenericValueMap; import jdk.vm.ci.code.Register; import jdk.vm.ci.code.Register.RegisterCategory; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/loop/test/LoopPartialUnrollTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/loop/test/LoopPartialUnrollTest.java similarity index 87% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/loop/test/LoopPartialUnrollTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/loop/test/LoopPartialUnrollTest.java index 52b746c18a1c..4b0da25c0b45 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/loop/test/LoopPartialUnrollTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/loop/test/LoopPartialUnrollTest.java @@ -22,42 +22,42 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.loop.test; +package jdk.graal.compiler.loop.test; -import static jdk.compiler.graal.api.directives.GraalDirectives.injectBranchProbability; -import static jdk.compiler.graal.api.directives.GraalDirectives.injectIterationCount; +import static jdk.graal.compiler.api.directives.GraalDirectives.injectBranchProbability; +import static jdk.graal.compiler.api.directives.GraalDirectives.injectIterationCount; import java.util.ListIterator; -import jdk.compiler.graal.api.directives.GraalDirectives; -import jdk.compiler.graal.core.common.CompilationIdentifier; -import jdk.compiler.graal.core.common.GraalOptions; -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.graph.iterators.NodeIterable; -import jdk.compiler.graal.loop.phases.LoopPartialUnrollPhase; -import jdk.compiler.graal.nodes.LoopBeginNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.loop.DefaultLoopPolicies; -import jdk.compiler.graal.nodes.loop.LoopEx; -import jdk.compiler.graal.nodes.loop.LoopFragmentInside; -import jdk.compiler.graal.nodes.loop.LoopsData; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.phases.BasePhase; -import jdk.compiler.graal.phases.OptimisticOptimizations; -import jdk.compiler.graal.phases.PhaseSuite; -import jdk.compiler.graal.phases.common.CanonicalizerPhase; -import jdk.compiler.graal.phases.common.ConditionalEliminationPhase; -import jdk.compiler.graal.phases.common.DeadCodeEliminationPhase; -import jdk.compiler.graal.phases.common.DeoptimizationGroupingPhase; -import jdk.compiler.graal.phases.common.FloatingReadPhase; -import jdk.compiler.graal.phases.common.FrameStateAssignmentPhase; -import jdk.compiler.graal.phases.common.GuardLoweringPhase; -import jdk.compiler.graal.phases.common.HighTierLoweringPhase; -import jdk.compiler.graal.phases.common.MidTierLoweringPhase; -import jdk.compiler.graal.phases.common.RemoveValueProxyPhase; -import jdk.compiler.graal.phases.tiers.MidTierContext; -import jdk.compiler.graal.phases.tiers.Suites; +import jdk.graal.compiler.api.directives.GraalDirectives; +import jdk.graal.compiler.core.common.CompilationIdentifier; +import jdk.graal.compiler.core.common.GraalOptions; +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.graph.iterators.NodeIterable; +import jdk.graal.compiler.loop.phases.LoopPartialUnrollPhase; +import jdk.graal.compiler.nodes.LoopBeginNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.loop.DefaultLoopPolicies; +import jdk.graal.compiler.nodes.loop.LoopEx; +import jdk.graal.compiler.nodes.loop.LoopFragmentInside; +import jdk.graal.compiler.nodes.loop.LoopsData; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.phases.BasePhase; +import jdk.graal.compiler.phases.OptimisticOptimizations; +import jdk.graal.compiler.phases.PhaseSuite; +import jdk.graal.compiler.phases.common.CanonicalizerPhase; +import jdk.graal.compiler.phases.common.ConditionalEliminationPhase; +import jdk.graal.compiler.phases.common.DeadCodeEliminationPhase; +import jdk.graal.compiler.phases.common.DeoptimizationGroupingPhase; +import jdk.graal.compiler.phases.common.FloatingReadPhase; +import jdk.graal.compiler.phases.common.FrameStateAssignmentPhase; +import jdk.graal.compiler.phases.common.GuardLoweringPhase; +import jdk.graal.compiler.phases.common.HighTierLoweringPhase; +import jdk.graal.compiler.phases.common.MidTierLoweringPhase; +import jdk.graal.compiler.phases.common.RemoveValueProxyPhase; +import jdk.graal.compiler.phases.tiers.MidTierContext; +import jdk.graal.compiler.phases.tiers.Suites; import org.junit.Ignore; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/loop/test/LoopsDataTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/loop/test/LoopsDataTest.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/loop/test/LoopsDataTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/loop/test/LoopsDataTest.java index b0e4ba3cc15a..3bf2d046d145 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/loop/test/LoopsDataTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/loop/test/LoopsDataTest.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.loop.test; +package jdk.graal.compiler.loop.test; import java.util.HashSet; import java.util.Set; -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.loop.LoopEx; -import jdk.compiler.graal.nodes.loop.LoopsData; +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.loop.LoopEx; +import jdk.graal.compiler.nodes.loop.LoopsData; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/AbstractObjectStampTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/AbstractObjectStampTest.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/AbstractObjectStampTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/AbstractObjectStampTest.java index f8ab97d03de9..6030af10131f 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/AbstractObjectStampTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/AbstractObjectStampTest.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.nodes.test; +package jdk.graal.compiler.nodes.test; -import jdk.compiler.graal.core.test.GraalCompilerTest; +import jdk.graal.compiler.core.test.GraalCompilerTest; import org.junit.Assert; -import jdk.compiler.graal.core.common.type.Stamp; -import jdk.compiler.graal.core.common.type.TypeReference; +import jdk.graal.compiler.core.common.type.Stamp; +import jdk.graal.compiler.core.common.type.TypeReference; public abstract class AbstractObjectStampTest extends GraalCompilerTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/AddNodeTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/AddNodeTest.java similarity index 92% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/AddNodeTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/AddNodeTest.java index 5cf6b981ef33..c509522cdc42 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/AddNodeTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/AddNodeTest.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.nodes.test; +package jdk.graal.compiler.nodes.test; -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.graph.NodeClass; -import jdk.compiler.graal.nodes.ConstantNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.calc.AddNode; +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.graph.NodeClass; +import jdk.graal.compiler.nodes.ConstantNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.calc.AddNode; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/AndNodeCanonicalizationTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/AndNodeCanonicalizationTest.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/AndNodeCanonicalizationTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/AndNodeCanonicalizationTest.java index 18e93deb946c..a88324263444 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/AndNodeCanonicalizationTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/AndNodeCanonicalizationTest.java @@ -23,10 +23,10 @@ * questions. */ -package jdk.compiler.graal.nodes.test; +package jdk.graal.compiler.nodes.test; -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.nodes.StructuredGraph; +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.nodes.StructuredGraph; import org.junit.Test; public class AndNodeCanonicalizationTest extends GraalCompilerTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/CompareZeroExtendWithConstantTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/CompareZeroExtendWithConstantTest.java similarity index 93% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/CompareZeroExtendWithConstantTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/CompareZeroExtendWithConstantTest.java index 58f10d8ea290..7c1e71fa2b66 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/CompareZeroExtendWithConstantTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/CompareZeroExtendWithConstantTest.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.nodes.test; +package jdk.graal.compiler.nodes.test; -import jdk.compiler.graal.api.directives.GraalDirectives; -import jdk.compiler.graal.core.test.GraalCompilerTest; +import jdk.graal.compiler.api.directives.GraalDirectives; +import jdk.graal.compiler.core.test.GraalCompilerTest; import org.junit.Test; public class CompareZeroExtendWithConstantTest extends GraalCompilerTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/ConstantNodeTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/ConstantNodeTest.java similarity index 92% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/ConstantNodeTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/ConstantNodeTest.java index ee931201ba9b..4af10d937cd8 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/ConstantNodeTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/ConstantNodeTest.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.nodes.test; +package jdk.graal.compiler.nodes.test; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import jdk.compiler.graal.nodeinfo.Verbosity; -import jdk.compiler.graal.nodes.ConstantNode; +import jdk.graal.compiler.nodeinfo.Verbosity; +import jdk.graal.compiler.nodes.ConstantNode; import org.junit.Test; public class ConstantNodeTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/ExceptionLivenessTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/ExceptionLivenessTest.java similarity index 87% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/ExceptionLivenessTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/ExceptionLivenessTest.java index 4a47d025d452..93529c7130a4 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/ExceptionLivenessTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/ExceptionLivenessTest.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.nodes.test; +package jdk.graal.compiler.nodes.test; -import static jdk.compiler.graal.java.BytecodeParserOptions.InlineDuringParsing; +import static jdk.graal.compiler.java.BytecodeParserOptions.InlineDuringParsing; -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.core.phases.HighTier; -import jdk.compiler.graal.options.OptionValues; +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.core.phases.HighTier; +import jdk.graal.compiler.options.OptionValues; import org.junit.Test; public class ExceptionLivenessTest extends GraalCompilerTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/FloatStampTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/FloatStampTest.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/FloatStampTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/FloatStampTest.java index 6dd570ddaf7f..c42f955b444e 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/FloatStampTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/FloatStampTest.java @@ -22,19 +22,19 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.nodes.test; +package jdk.graal.compiler.nodes.test; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import jdk.compiler.graal.core.common.type.ArithmeticOpTable; -import jdk.compiler.graal.core.common.type.FloatStamp; -import jdk.compiler.graal.core.common.type.Stamp; -import jdk.compiler.graal.core.common.type.StampFactory; -import jdk.compiler.graal.graph.test.GraphTest; -import jdk.compiler.graal.nodes.ConstantNode; -import jdk.compiler.graal.nodes.NodeView; +import jdk.graal.compiler.core.common.type.ArithmeticOpTable; +import jdk.graal.compiler.core.common.type.FloatStamp; +import jdk.graal.compiler.core.common.type.Stamp; +import jdk.graal.compiler.core.common.type.StampFactory; +import jdk.graal.compiler.graph.test.GraphTest; +import jdk.graal.compiler.nodes.ConstantNode; +import jdk.graal.compiler.nodes.NodeView; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/GraphStateTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/GraphStateTest.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/GraphStateTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/GraphStateTest.java index 728615d1e136..60a74fb92dc3 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/GraphStateTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/GraphStateTest.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.nodes.test; +package jdk.graal.compiler.nodes.test; -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.nodes.GraphState; -import jdk.compiler.graal.nodes.StructuredGraph; +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.nodes.GraphState; +import jdk.graal.compiler.nodes.StructuredGraph; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/IfNodeCanonicalizationTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/IfNodeCanonicalizationTest.java similarity index 87% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/IfNodeCanonicalizationTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/IfNodeCanonicalizationTest.java index b99da154ea6d..1a4061e2f6a9 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/IfNodeCanonicalizationTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/IfNodeCanonicalizationTest.java @@ -22,21 +22,21 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.nodes.test; - -import jdk.compiler.graal.api.directives.GraalDirectives; -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.loop.phases.ConvertDeoptimizeToGuardPhase; -import jdk.compiler.graal.nodes.IfNode; -import jdk.compiler.graal.nodes.LogicNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions; -import jdk.compiler.graal.nodes.calc.SubNode; -import jdk.compiler.graal.nodes.spi.CoreProviders; -import jdk.compiler.graal.nodes.spi.SimplifierTool; -import jdk.compiler.graal.phases.common.CanonicalizerPhase; -import jdk.compiler.graal.phases.common.IterativeConditionalEliminationPhase; +package jdk.graal.compiler.nodes.test; + +import jdk.graal.compiler.api.directives.GraalDirectives; +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.loop.phases.ConvertDeoptimizeToGuardPhase; +import jdk.graal.compiler.nodes.IfNode; +import jdk.graal.compiler.nodes.LogicNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.StructuredGraph.AllowAssumptions; +import jdk.graal.compiler.nodes.calc.SubNode; +import jdk.graal.compiler.nodes.spi.CoreProviders; +import jdk.graal.compiler.nodes.spi.SimplifierTool; +import jdk.graal.compiler.phases.common.CanonicalizerPhase; +import jdk.graal.compiler.phases.common.IterativeConditionalEliminationPhase; import org.junit.Assert; import org.junit.Ignore; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/IfNodeCanonicalizationTest2.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/IfNodeCanonicalizationTest2.java similarity index 93% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/IfNodeCanonicalizationTest2.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/IfNodeCanonicalizationTest2.java index b79d632b95a9..cbc35a7c958f 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/IfNodeCanonicalizationTest2.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/IfNodeCanonicalizationTest2.java @@ -24,14 +24,14 @@ * questions. */ -package jdk.compiler.graal.nodes.test; - -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.core.test.TestPhase; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.calc.ConditionalNode; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.phases.tiers.Suites; +package jdk.graal.compiler.nodes.test; + +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.core.test.TestPhase; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.calc.ConditionalNode; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.phases.tiers.Suites; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/InliningLogTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/InliningLogTest.java similarity index 87% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/InliningLogTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/InliningLogTest.java index 025e544d63e5..04ebb963ac0a 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/InliningLogTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/InliningLogTest.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.nodes.test; +package jdk.graal.compiler.nodes.test; -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.core.common.GraalOptions; -import jdk.compiler.graal.debug.TTY; -import jdk.compiler.graal.nodes.InliningLog; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.loop.LoopPolicies; -import jdk.compiler.graal.options.OptionValues; +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.core.common.GraalOptions; +import jdk.graal.compiler.debug.TTY; +import jdk.graal.compiler.nodes.InliningLog; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.loop.LoopPolicies; +import jdk.graal.compiler.options.OptionValues; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/IntegerShuffleBitsStampTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/IntegerShuffleBitsStampTest.java similarity index 91% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/IntegerShuffleBitsStampTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/IntegerShuffleBitsStampTest.java index 079f24b3a3a0..6b12465d2c94 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/IntegerShuffleBitsStampTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/IntegerShuffleBitsStampTest.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.nodes.test; +package jdk.graal.compiler.nodes.test; -import jdk.compiler.graal.core.common.type.ArithmeticOpTable.BinaryOp; -import jdk.compiler.graal.core.common.type.ArithmeticOpTable.BinaryOp.Compress; -import jdk.compiler.graal.core.common.type.ArithmeticOpTable.BinaryOp.Expand; -import jdk.compiler.graal.core.common.type.IntegerStamp; -import jdk.compiler.graal.core.common.type.Stamp; -import jdk.compiler.graal.core.common.type.StampFactory; -import jdk.compiler.graal.test.GraalTest; +import jdk.graal.compiler.core.common.type.ArithmeticOpTable.BinaryOp; +import jdk.graal.compiler.core.common.type.ArithmeticOpTable.BinaryOp.Compress; +import jdk.graal.compiler.core.common.type.ArithmeticOpTable.BinaryOp.Expand; +import jdk.graal.compiler.core.common.type.IntegerStamp; +import jdk.graal.compiler.core.common.type.Stamp; +import jdk.graal.compiler.core.common.type.StampFactory; +import jdk.graal.compiler.test.GraalTest; import org.junit.Test; import jdk.vm.ci.code.CodeUtil; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/IntegerStampFoldTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/IntegerStampFoldTest.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/IntegerStampFoldTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/IntegerStampFoldTest.java index 502170f49823..c0b61e5d1786 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/IntegerStampFoldTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/IntegerStampFoldTest.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.nodes.test; +package jdk.graal.compiler.nodes.test; import java.util.HashSet; -import jdk.compiler.graal.core.common.type.ArithmeticOpTable; -import jdk.compiler.graal.core.common.type.IntegerStamp; -import jdk.compiler.graal.test.GraalTest; +import jdk.graal.compiler.core.common.type.ArithmeticOpTable; +import jdk.graal.compiler.core.common.type.IntegerStamp; +import jdk.graal.compiler.test.GraalTest; import org.junit.Test; import jdk.vm.ci.meta.JavaConstant; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/IntegerStampMaskTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/IntegerStampMaskTest.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/IntegerStampMaskTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/IntegerStampMaskTest.java index daf2d94826a7..e05a86dd54b8 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/IntegerStampMaskTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/IntegerStampMaskTest.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.nodes.test; +package jdk.graal.compiler.nodes.test; -import jdk.compiler.graal.core.common.type.IntegerStamp; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.test.GraalTest; +import jdk.graal.compiler.core.common.type.IntegerStamp; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.test.GraalTest; import org.junit.Test; import jdk.vm.ci.code.CodeUtil; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/IntegerStampTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/IntegerStampTest.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/IntegerStampTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/IntegerStampTest.java index c4500b30f659..b5b0e01a5091 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/IntegerStampTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/IntegerStampTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.nodes.test; +package jdk.graal.compiler.nodes.test; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -33,22 +33,22 @@ import java.util.List; import java.util.stream.Stream; -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.core.common.type.ArithmeticOpTable; -import jdk.compiler.graal.core.common.type.ArithmeticOpTable.BinaryOp; -import jdk.compiler.graal.core.common.type.ArithmeticOpTable.IntegerConvertOp; -import jdk.compiler.graal.core.common.type.ArithmeticOpTable.ShiftOp; -import jdk.compiler.graal.core.common.type.IntegerStamp; -import jdk.compiler.graal.core.common.type.Stamp; -import jdk.compiler.graal.core.common.type.StampFactory; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.graph.test.GraphTest; -import jdk.compiler.graal.nodes.ConstantNode; -import jdk.compiler.graal.nodes.NodeView; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions; -import jdk.compiler.graal.options.OptionValues; +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.core.common.type.ArithmeticOpTable; +import jdk.graal.compiler.core.common.type.ArithmeticOpTable.BinaryOp; +import jdk.graal.compiler.core.common.type.ArithmeticOpTable.IntegerConvertOp; +import jdk.graal.compiler.core.common.type.ArithmeticOpTable.ShiftOp; +import jdk.graal.compiler.core.common.type.IntegerStamp; +import jdk.graal.compiler.core.common.type.Stamp; +import jdk.graal.compiler.core.common.type.StampFactory; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.graph.test.GraphTest; +import jdk.graal.compiler.nodes.ConstantNode; +import jdk.graal.compiler.nodes.NodeView; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.StructuredGraph.AllowAssumptions; +import jdk.graal.compiler.options.OptionValues; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/LongShuffleBitsStampTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/LongShuffleBitsStampTest.java similarity index 90% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/LongShuffleBitsStampTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/LongShuffleBitsStampTest.java index db20f345f311..f44a6895a4de 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/LongShuffleBitsStampTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/LongShuffleBitsStampTest.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.nodes.test; +package jdk.graal.compiler.nodes.test; -import jdk.compiler.graal.core.common.type.ArithmeticOpTable.BinaryOp; -import jdk.compiler.graal.core.common.type.ArithmeticOpTable.BinaryOp.Compress; -import jdk.compiler.graal.core.common.type.ArithmeticOpTable.BinaryOp.Expand; -import jdk.compiler.graal.core.common.type.IntegerStamp; -import jdk.compiler.graal.core.common.type.Stamp; -import jdk.compiler.graal.core.common.type.StampFactory; -import jdk.compiler.graal.test.GraalTest; +import jdk.graal.compiler.core.common.type.ArithmeticOpTable.BinaryOp; +import jdk.graal.compiler.core.common.type.ArithmeticOpTable.BinaryOp.Compress; +import jdk.graal.compiler.core.common.type.ArithmeticOpTable.BinaryOp.Expand; +import jdk.graal.compiler.core.common.type.IntegerStamp; +import jdk.graal.compiler.core.common.type.Stamp; +import jdk.graal.compiler.core.common.type.StampFactory; +import jdk.graal.compiler.test.GraalTest; import org.junit.Test; import jdk.vm.ci.meta.JavaKind; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/LoopLivenessTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/LoopLivenessTest.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/LoopLivenessTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/LoopLivenessTest.java index 94010c8b4519..393202d09448 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/LoopLivenessTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/LoopLivenessTest.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.nodes.test; +package jdk.graal.compiler.nodes.test; -import jdk.compiler.graal.core.test.GraalCompilerTest; +import jdk.graal.compiler.core.test.GraalCompilerTest; import org.junit.Test; -import jdk.compiler.graal.java.LargeLocalLiveness; -import jdk.compiler.graal.java.SmallLocalLiveness; +import jdk.graal.compiler.java.LargeLocalLiveness; +import jdk.graal.compiler.java.SmallLocalLiveness; public class LoopLivenessTest extends GraalCompilerTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/LoopPhiCanonicalizerTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/LoopPhiCanonicalizerTest.java similarity index 93% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/LoopPhiCanonicalizerTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/LoopPhiCanonicalizerTest.java index 09ca220d7aa3..456cda8ada3c 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/LoopPhiCanonicalizerTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/LoopPhiCanonicalizerTest.java @@ -22,18 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.nodes.test; +package jdk.graal.compiler.nodes.test; -import jdk.compiler.graal.api.directives.GraalDirectives; -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.graph.iterators.NodePredicate; -import jdk.compiler.graal.nodes.LoopBeginNode; -import jdk.compiler.graal.nodes.PhiNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions; -import jdk.compiler.graal.nodes.spi.CoreProviders; -import jdk.compiler.graal.phases.common.CanonicalizerPhase; -import jdk.compiler.graal.phases.util.GraphOrder; +import jdk.graal.compiler.api.directives.GraalDirectives; +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.graph.iterators.NodePredicate; +import jdk.graal.compiler.nodes.LoopBeginNode; +import jdk.graal.compiler.nodes.PhiNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.StructuredGraph.AllowAssumptions; +import jdk.graal.compiler.nodes.spi.CoreProviders; +import jdk.graal.compiler.phases.common.CanonicalizerPhase; +import jdk.graal.compiler.phases.util.GraphOrder; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/NarrowPreservesOrderTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/NarrowPreservesOrderTest.java similarity index 91% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/NarrowPreservesOrderTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/NarrowPreservesOrderTest.java index cb2f70d305db..52932280e323 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/NarrowPreservesOrderTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/NarrowPreservesOrderTest.java @@ -22,22 +22,22 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.nodes.test; +package jdk.graal.compiler.nodes.test; -import static jdk.compiler.graal.core.common.calc.CanonicalCondition.BT; -import static jdk.compiler.graal.core.common.calc.CanonicalCondition.LT; +import static jdk.graal.compiler.core.common.calc.CanonicalCondition.BT; +import static jdk.graal.compiler.core.common.calc.CanonicalCondition.LT; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import jdk.compiler.graal.core.common.NumUtil; -import jdk.compiler.graal.core.common.calc.CanonicalCondition; -import jdk.compiler.graal.core.common.type.IntegerStamp; -import jdk.compiler.graal.core.common.type.Stamp; -import jdk.compiler.graal.core.common.type.StampFactory; -import jdk.compiler.graal.core.common.type.StampPair; -import jdk.compiler.graal.graph.test.GraphTest; -import jdk.compiler.graal.nodes.ParameterNode; -import jdk.compiler.graal.nodes.calc.NarrowNode; +import jdk.graal.compiler.core.common.NumUtil; +import jdk.graal.compiler.core.common.calc.CanonicalCondition; +import jdk.graal.compiler.core.common.type.IntegerStamp; +import jdk.graal.compiler.core.common.type.Stamp; +import jdk.graal.compiler.core.common.type.StampFactory; +import jdk.graal.compiler.core.common.type.StampPair; +import jdk.graal.compiler.graph.test.GraphTest; +import jdk.graal.compiler.nodes.ParameterNode; +import jdk.graal.compiler.nodes.calc.NarrowNode; import org.junit.Test; import jdk.vm.ci.code.CodeUtil; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/NarrowTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/NarrowTest.java similarity index 92% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/NarrowTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/NarrowTest.java index 889c9b8d030f..457651b5824e 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/NarrowTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/NarrowTest.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.nodes.test; +package jdk.graal.compiler.nodes.test; -import jdk.compiler.graal.api.directives.GraalDirectives; -import jdk.compiler.graal.core.test.GraalCompilerTest; +import jdk.graal.compiler.api.directives.GraalDirectives; +import jdk.graal.compiler.core.test.GraalCompilerTest; import org.junit.Test; public class NarrowTest extends GraalCompilerTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/NegateNodeCanonicalizationTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/NegateNodeCanonicalizationTest.java similarity index 90% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/NegateNodeCanonicalizationTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/NegateNodeCanonicalizationTest.java index 28e68ea4fc5f..b3f8dd820b86 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/NegateNodeCanonicalizationTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/NegateNodeCanonicalizationTest.java @@ -22,19 +22,19 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.nodes.test; +package jdk.graal.compiler.nodes.test; import static org.junit.Assert.assertEquals; -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.core.common.type.ArithmeticOpTable; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.debug.DebugContext.Builder; -import jdk.compiler.graal.nodes.ConstantNode; -import jdk.compiler.graal.nodes.NodeView; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions; -import jdk.compiler.graal.options.OptionValues; +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.core.common.type.ArithmeticOpTable; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.debug.DebugContext.Builder; +import jdk.graal.compiler.nodes.ConstantNode; +import jdk.graal.compiler.nodes.NodeView; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.StructuredGraph.AllowAssumptions; +import jdk.graal.compiler.options.OptionValues; import org.junit.Before; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/ObjectStampJoinTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/ObjectStampJoinTest.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/ObjectStampJoinTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/ObjectStampJoinTest.java index d3003d903c14..3edc7fe542ae 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/ObjectStampJoinTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/ObjectStampJoinTest.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.nodes.test; +package jdk.graal.compiler.nodes.test; -import jdk.compiler.graal.core.common.type.ObjectStamp; -import jdk.compiler.graal.core.common.type.Stamp; -import jdk.compiler.graal.core.common.type.StampFactory; -import jdk.compiler.graal.core.common.type.TypeReference; -import jdk.compiler.graal.nodes.type.StampTool; +import jdk.graal.compiler.core.common.type.ObjectStamp; +import jdk.graal.compiler.core.common.type.Stamp; +import jdk.graal.compiler.core.common.type.StampFactory; +import jdk.graal.compiler.core.common.type.TypeReference; +import jdk.graal.compiler.nodes.type.StampTool; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/ObjectStampMeetTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/ObjectStampMeetTest.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/ObjectStampMeetTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/ObjectStampMeetTest.java index 9a5576faf9cb..17d698249d0f 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/ObjectStampMeetTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/ObjectStampMeetTest.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.nodes.test; +package jdk.graal.compiler.nodes.test; -import jdk.compiler.graal.core.common.type.ObjectStamp; -import jdk.compiler.graal.core.common.type.Stamp; -import jdk.compiler.graal.core.common.type.StampFactory; -import jdk.compiler.graal.core.common.type.TypeReference; +import jdk.graal.compiler.core.common.type.ObjectStamp; +import jdk.graal.compiler.core.common.type.Stamp; +import jdk.graal.compiler.core.common.type.StampFactory; +import jdk.graal.compiler.core.common.type.TypeReference; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/ObjectStampTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/ObjectStampTest.java similarity index 94% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/ObjectStampTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/ObjectStampTest.java index 2b70cd904477..5554f20e69a2 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/ObjectStampTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/ObjectStampTest.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.nodes.test; +package jdk.graal.compiler.nodes.test; -import jdk.compiler.graal.core.common.type.AbstractObjectStamp; -import jdk.compiler.graal.core.common.type.ObjectStamp; -import jdk.compiler.graal.core.common.type.Stamp; -import jdk.compiler.graal.core.common.type.StampFactory; -import jdk.compiler.graal.core.common.type.TypeReference; +import jdk.graal.compiler.core.common.type.AbstractObjectStamp; +import jdk.graal.compiler.core.common.type.ObjectStamp; +import jdk.graal.compiler.core.common.type.Stamp; +import jdk.graal.compiler.core.common.type.StampFactory; +import jdk.graal.compiler.core.common.type.TypeReference; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/OptimizationLogTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/OptimizationLogTest.java similarity index 91% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/OptimizationLogTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/OptimizationLogTest.java index 41ea10cd08d6..8e7c1b578e06 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/OptimizationLogTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/OptimizationLogTest.java @@ -22,29 +22,29 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.nodes.test; +package jdk.graal.compiler.nodes.test; import java.util.Optional; import java.util.function.Supplier; -import jdk.compiler.graal.core.test.GraalCompilerTest; +import jdk.graal.compiler.core.test.GraalCompilerTest; import org.graalvm.collections.EconomicMap; import org.graalvm.collections.EconomicSet; -import jdk.compiler.graal.core.common.GraalOptions; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.debug.DebugOptions; -import jdk.compiler.graal.nodes.GraphState; -import jdk.compiler.graal.nodes.OptimizationLog; -import jdk.compiler.graal.nodes.OptimizationLogImpl; -import jdk.compiler.graal.nodes.ReturnNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.calc.AddNode; -import jdk.compiler.graal.nodes.spi.CoreProviders; -import jdk.compiler.graal.options.OptionKey; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.phases.BasePhase; -import jdk.compiler.graal.phases.ClassTypeSequence; -import jdk.compiler.graal.phases.util.Providers; +import jdk.graal.compiler.core.common.GraalOptions; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.debug.DebugOptions; +import jdk.graal.compiler.nodes.GraphState; +import jdk.graal.compiler.nodes.OptimizationLog; +import jdk.graal.compiler.nodes.OptimizationLogImpl; +import jdk.graal.compiler.nodes.ReturnNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.calc.AddNode; +import jdk.graal.compiler.nodes.spi.CoreProviders; +import jdk.graal.compiler.options.OptionKey; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.phases.BasePhase; +import jdk.graal.compiler.phases.ClassTypeSequence; +import jdk.graal.compiler.phases.util.Providers; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/OrNodeCanonicalizationTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/OrNodeCanonicalizationTest.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/OrNodeCanonicalizationTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/OrNodeCanonicalizationTest.java index 89db2f3d2b33..3e6087ff5195 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/OrNodeCanonicalizationTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/OrNodeCanonicalizationTest.java @@ -23,10 +23,10 @@ * questions. */ -package jdk.compiler.graal.nodes.test; +package jdk.graal.compiler.nodes.test; -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.nodes.StructuredGraph; +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.nodes.StructuredGraph; import org.junit.Test; public class OrNodeCanonicalizationTest extends GraalCompilerTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/PrimitiveStampBoundaryTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/PrimitiveStampBoundaryTest.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/PrimitiveStampBoundaryTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/PrimitiveStampBoundaryTest.java index 554475a15f1f..943e2ef5620d 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/PrimitiveStampBoundaryTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/PrimitiveStampBoundaryTest.java @@ -22,23 +22,23 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.nodes.test; +package jdk.graal.compiler.nodes.test; import java.util.EnumSet; import java.util.HashSet; -import jdk.compiler.graal.core.common.calc.FloatConvert; -import jdk.compiler.graal.core.common.calc.FloatConvertCategory; -import jdk.compiler.graal.core.common.type.ArithmeticOpTable; -import jdk.compiler.graal.core.common.type.ArithmeticOpTable.BinaryOp; -import jdk.compiler.graal.core.common.type.ArithmeticOpTable.IntegerConvertOp; -import jdk.compiler.graal.core.common.type.ArithmeticOpTable.ShiftOp; -import jdk.compiler.graal.core.common.type.FloatStamp; -import jdk.compiler.graal.core.common.type.IntegerStamp; -import jdk.compiler.graal.core.common.type.PrimitiveStamp; -import jdk.compiler.graal.core.common.type.Stamp; -import jdk.compiler.graal.core.common.type.StampFactory; -import jdk.compiler.graal.test.GraalTest; +import jdk.graal.compiler.core.common.calc.FloatConvert; +import jdk.graal.compiler.core.common.calc.FloatConvertCategory; +import jdk.graal.compiler.core.common.type.ArithmeticOpTable; +import jdk.graal.compiler.core.common.type.ArithmeticOpTable.BinaryOp; +import jdk.graal.compiler.core.common.type.ArithmeticOpTable.IntegerConvertOp; +import jdk.graal.compiler.core.common.type.ArithmeticOpTable.ShiftOp; +import jdk.graal.compiler.core.common.type.FloatStamp; +import jdk.graal.compiler.core.common.type.IntegerStamp; +import jdk.graal.compiler.core.common.type.PrimitiveStamp; +import jdk.graal.compiler.core.common.type.Stamp; +import jdk.graal.compiler.core.common.type.StampFactory; +import jdk.graal.compiler.test.GraalTest; import org.junit.Test; import jdk.vm.ci.meta.Constant; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/ReinterpretStampDoubleToLongTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/ReinterpretStampDoubleToLongTest.java similarity index 89% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/ReinterpretStampDoubleToLongTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/ReinterpretStampDoubleToLongTest.java index a6e5296b454c..d75e83bf1668 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/ReinterpretStampDoubleToLongTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/ReinterpretStampDoubleToLongTest.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.nodes.test; +package jdk.graal.compiler.nodes.test; import java.util.ArrayList; import java.util.Collection; import java.util.List; -import jdk.compiler.graal.nodes.NodeView; -import jdk.compiler.graal.nodes.ValueNode; +import jdk.graal.compiler.nodes.NodeView; +import jdk.graal.compiler.nodes.ValueNode; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; @@ -37,11 +37,11 @@ import org.junit.runners.Parameterized.Parameter; import org.junit.runners.Parameterized.Parameters; -import jdk.compiler.graal.core.common.type.FloatStamp; -import jdk.compiler.graal.core.common.type.IntegerStamp; -import jdk.compiler.graal.core.common.type.StampPair; -import jdk.compiler.graal.nodes.ParameterNode; -import jdk.compiler.graal.nodes.calc.ReinterpretNode; +import jdk.graal.compiler.core.common.type.FloatStamp; +import jdk.graal.compiler.core.common.type.IntegerStamp; +import jdk.graal.compiler.core.common.type.StampPair; +import jdk.graal.compiler.nodes.ParameterNode; +import jdk.graal.compiler.nodes.calc.ReinterpretNode; import jdk.vm.ci.meta.JavaKind; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/ReinterpretStampFloatToIntTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/ReinterpretStampFloatToIntTest.java similarity index 89% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/ReinterpretStampFloatToIntTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/ReinterpretStampFloatToIntTest.java index b30decf5ffad..692fefc76eb2 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/ReinterpretStampFloatToIntTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/ReinterpretStampFloatToIntTest.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.nodes.test; +package jdk.graal.compiler.nodes.test; import java.util.ArrayList; import java.util.Collection; import java.util.List; -import jdk.compiler.graal.nodes.NodeView; -import jdk.compiler.graal.nodes.ValueNode; +import jdk.graal.compiler.nodes.NodeView; +import jdk.graal.compiler.nodes.ValueNode; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; @@ -37,11 +37,11 @@ import org.junit.runners.Parameterized.Parameter; import org.junit.runners.Parameterized.Parameters; -import jdk.compiler.graal.core.common.type.FloatStamp; -import jdk.compiler.graal.core.common.type.IntegerStamp; -import jdk.compiler.graal.core.common.type.StampPair; -import jdk.compiler.graal.nodes.ParameterNode; -import jdk.compiler.graal.nodes.calc.ReinterpretNode; +import jdk.graal.compiler.core.common.type.FloatStamp; +import jdk.graal.compiler.core.common.type.IntegerStamp; +import jdk.graal.compiler.core.common.type.StampPair; +import jdk.graal.compiler.nodes.ParameterNode; +import jdk.graal.compiler.nodes.calc.ReinterpretNode; import jdk.vm.ci.meta.JavaKind; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/ReinterpretStampIntToFloatTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/ReinterpretStampIntToFloatTest.java similarity index 87% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/ReinterpretStampIntToFloatTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/ReinterpretStampIntToFloatTest.java index 659b360edaf4..851681968b5a 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/ReinterpretStampIntToFloatTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/ReinterpretStampIntToFloatTest.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.nodes.test; +package jdk.graal.compiler.nodes.test; import java.util.ArrayList; import java.util.Collection; import java.util.List; -import jdk.compiler.graal.nodes.NodeView; -import jdk.compiler.graal.nodes.ValueNode; +import jdk.graal.compiler.nodes.NodeView; +import jdk.graal.compiler.nodes.ValueNode; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; @@ -37,12 +37,12 @@ import org.junit.runners.Parameterized.Parameter; import org.junit.runners.Parameterized.Parameters; -import jdk.compiler.graal.core.common.type.FloatStamp; -import jdk.compiler.graal.core.common.type.IntegerStamp; -import jdk.compiler.graal.core.common.type.StampFactory; -import jdk.compiler.graal.core.common.type.StampPair; -import jdk.compiler.graal.nodes.ParameterNode; -import jdk.compiler.graal.nodes.calc.ReinterpretNode; +import jdk.graal.compiler.core.common.type.FloatStamp; +import jdk.graal.compiler.core.common.type.IntegerStamp; +import jdk.graal.compiler.core.common.type.StampFactory; +import jdk.graal.compiler.core.common.type.StampPair; +import jdk.graal.compiler.nodes.ParameterNode; +import jdk.graal.compiler.nodes.calc.ReinterpretNode; import jdk.vm.ci.meta.JavaKind; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/ReinterpretStampLongToDoubleTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/ReinterpretStampLongToDoubleTest.java similarity index 87% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/ReinterpretStampLongToDoubleTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/ReinterpretStampLongToDoubleTest.java index 79aa2710c48e..80699192107d 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/ReinterpretStampLongToDoubleTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/ReinterpretStampLongToDoubleTest.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.nodes.test; +package jdk.graal.compiler.nodes.test; import java.util.ArrayList; import java.util.Collection; import java.util.List; -import jdk.compiler.graal.nodes.NodeView; -import jdk.compiler.graal.nodes.ValueNode; +import jdk.graal.compiler.nodes.NodeView; +import jdk.graal.compiler.nodes.ValueNode; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; @@ -37,12 +37,12 @@ import org.junit.runners.Parameterized.Parameter; import org.junit.runners.Parameterized.Parameters; -import jdk.compiler.graal.core.common.type.FloatStamp; -import jdk.compiler.graal.core.common.type.IntegerStamp; -import jdk.compiler.graal.core.common.type.StampFactory; -import jdk.compiler.graal.core.common.type.StampPair; -import jdk.compiler.graal.nodes.ParameterNode; -import jdk.compiler.graal.nodes.calc.ReinterpretNode; +import jdk.graal.compiler.core.common.type.FloatStamp; +import jdk.graal.compiler.core.common.type.IntegerStamp; +import jdk.graal.compiler.core.common.type.StampFactory; +import jdk.graal.compiler.core.common.type.StampPair; +import jdk.graal.compiler.nodes.ParameterNode; +import jdk.graal.compiler.nodes.calc.ReinterpretNode; import jdk.vm.ci.meta.JavaKind; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/ReinterpretStampTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/ReinterpretStampTest.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/ReinterpretStampTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/ReinterpretStampTest.java index 2724448f3a6e..a6dc5310fa51 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/ReinterpretStampTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/ReinterpretStampTest.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.nodes.test; +package jdk.graal.compiler.nodes.test; -import jdk.compiler.graal.nodes.calc.ReinterpretNode; +import jdk.graal.compiler.nodes.calc.ReinterpretNode; /** * Unit tests for the {@link ReinterpretNode#inferStamp} method. diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/ShortCircuitOrNodeTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/ShortCircuitOrNodeTest.java similarity index 93% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/ShortCircuitOrNodeTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/ShortCircuitOrNodeTest.java index 6efbc1e4b8ce..08a9d611742c 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/ShortCircuitOrNodeTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/ShortCircuitOrNodeTest.java @@ -22,25 +22,25 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.nodes.test; +package jdk.graal.compiler.nodes.test; import java.util.function.Function; -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.nodes.ConstantNode; -import jdk.compiler.graal.nodes.LogicNode; -import jdk.compiler.graal.nodes.ProfileData.BranchProbabilityData; -import jdk.compiler.graal.nodes.ShortCircuitOrNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.calc.ConditionalNode; -import jdk.compiler.graal.nodes.calc.IntegerEqualsNode; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext; -import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin; -import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins; -import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins.Registration; -import jdk.compiler.graal.phases.tiers.Suites; +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.nodes.ConstantNode; +import jdk.graal.compiler.nodes.LogicNode; +import jdk.graal.compiler.nodes.ProfileData.BranchProbabilityData; +import jdk.graal.compiler.nodes.ShortCircuitOrNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.StructuredGraph.AllowAssumptions; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.calc.ConditionalNode; +import jdk.graal.compiler.nodes.calc.IntegerEqualsNode; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext; +import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin; +import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins; +import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins.Registration; +import jdk.graal.compiler.phases.tiers.Suites; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/StampInverterTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/StampInverterTest.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/StampInverterTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/StampInverterTest.java index ea41ac090f6d..edfeb7b847d8 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/StampInverterTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/StampInverterTest.java @@ -22,17 +22,17 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.nodes.test; +package jdk.graal.compiler.nodes.test; import static org.junit.Assert.assertEquals; -import jdk.compiler.graal.core.common.type.ArithmeticOpTable; -import jdk.compiler.graal.core.common.type.IntegerStamp; -import jdk.compiler.graal.core.common.type.Stamp; -import jdk.compiler.graal.core.common.type.ArithmeticOpTable.IntegerConvertOp; -import jdk.compiler.graal.core.common.type.ArithmeticOpTable.IntegerConvertOp.SignExtend; -import jdk.compiler.graal.core.common.type.ArithmeticOpTable.IntegerConvertOp.ZeroExtend; -import jdk.compiler.graal.test.GraalTest; +import jdk.graal.compiler.core.common.type.ArithmeticOpTable; +import jdk.graal.compiler.core.common.type.IntegerStamp; +import jdk.graal.compiler.core.common.type.Stamp; +import jdk.graal.compiler.core.common.type.ArithmeticOpTable.IntegerConvertOp; +import jdk.graal.compiler.core.common.type.ArithmeticOpTable.IntegerConvertOp.SignExtend; +import jdk.graal.compiler.core.common.type.ArithmeticOpTable.IntegerConvertOp.ZeroExtend; +import jdk.graal.compiler.test.GraalTest; import org.junit.Test; import jdk.vm.ci.code.CodeUtil; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/StampToolTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/StampToolTest.java similarity index 86% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/StampToolTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/StampToolTest.java index f8c8f6ea579a..de09ae2dc0e2 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/StampToolTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/StampToolTest.java @@ -22,16 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.nodes.test; +package jdk.graal.compiler.nodes.test; -import static jdk.compiler.graal.nodes.type.StampTool.stampForTrailingZeros; -import static jdk.compiler.graal.test.GraalTest.assertFalse; -import static jdk.compiler.graal.test.GraalTest.assertTrue; +import static jdk.graal.compiler.nodes.type.StampTool.stampForTrailingZeros; +import static jdk.graal.compiler.test.GraalTest.assertFalse; +import static jdk.graal.compiler.test.GraalTest.assertTrue; -import jdk.compiler.graal.core.common.type.IntegerStamp; -import jdk.compiler.graal.core.common.type.Stamp; -import jdk.compiler.graal.graph.test.GraphTest; -import jdk.compiler.graal.nodes.type.StampTool; +import jdk.graal.compiler.core.common.type.IntegerStamp; +import jdk.graal.compiler.core.common.type.Stamp; +import jdk.graal.compiler.graph.test.GraphTest; +import jdk.graal.compiler.nodes.type.StampTool; import org.junit.Test; public class StampToolTest extends GraphTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/StaticFieldAccessTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/StaticFieldAccessTest.java similarity index 92% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/StaticFieldAccessTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/StaticFieldAccessTest.java index eb433a4482da..a2d049f3fd11 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/StaticFieldAccessTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/StaticFieldAccessTest.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.nodes.test; +package jdk.graal.compiler.nodes.test; import java.lang.reflect.Constructor; -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions; +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.nodes.StructuredGraph.AllowAssumptions; import org.junit.Test; public class StaticFieldAccessTest extends GraalCompilerTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/StructuredGraphTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/StructuredGraphTest.java similarity index 90% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/StructuredGraphTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/StructuredGraphTest.java index 3414141bf49a..7aa719d991a1 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/StructuredGraphTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/StructuredGraphTest.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.nodes.test; +package jdk.graal.compiler.nodes.test; -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.debug.DebugContext.Builder; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions; -import jdk.compiler.graal.options.OptionValues; +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.debug.DebugContext.Builder; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.StructuredGraph.AllowAssumptions; +import jdk.graal.compiler.options.OptionValues; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/SubCanonicalizationTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/SubCanonicalizationTest.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/SubCanonicalizationTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/SubCanonicalizationTest.java index 320db57788a7..1ff8d643cb80 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/SubCanonicalizationTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/SubCanonicalizationTest.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.nodes.test; +package jdk.graal.compiler.nodes.test; -import jdk.compiler.graal.core.test.GraalCompilerTest; +import jdk.graal.compiler.core.test.GraalCompilerTest; import org.junit.Test; public class SubCanonicalizationTest extends GraalCompilerTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/TruncateCanonicalizationTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/TruncateCanonicalizationTest.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/TruncateCanonicalizationTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/TruncateCanonicalizationTest.java index fb699cafc486..dfcb5b81a072 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/TruncateCanonicalizationTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/TruncateCanonicalizationTest.java @@ -24,10 +24,10 @@ * questions. */ -package jdk.compiler.graal.nodes.test; +package jdk.graal.compiler.nodes.test; -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.nodes.calc.RoundNode; +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.nodes.calc.RoundNode; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/XorNodeCanonicalizationTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/XorNodeCanonicalizationTest.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/XorNodeCanonicalizationTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/XorNodeCanonicalizationTest.java index e033f66eaf64..0abea954c8e7 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/XorNodeCanonicalizationTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/nodes/test/XorNodeCanonicalizationTest.java @@ -23,10 +23,10 @@ * questions. */ -package jdk.compiler.graal.nodes.test; +package jdk.graal.compiler.nodes.test; -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.nodes.StructuredGraph; +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.nodes.StructuredGraph; import org.junit.Test; public class XorNodeCanonicalizationTest extends GraalCompilerTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/options/test/NestedBooleanOptionKeyTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/options/test/NestedBooleanOptionKeyTest.java similarity index 89% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/options/test/NestedBooleanOptionKeyTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/options/test/NestedBooleanOptionKeyTest.java index 5c23abedd278..6f3201ae7fc9 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/options/test/NestedBooleanOptionKeyTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/options/test/NestedBooleanOptionKeyTest.java @@ -28,22 +28,22 @@ * @run junit jdk.vm.ci.options.test.NestedBooleanOptionKeyTest */ -package jdk.compiler.graal.options.test; - -import static jdk.compiler.graal.options.test.NestedBooleanOptionKeyTest.Options.NestedOption0; -import static jdk.compiler.graal.options.test.NestedBooleanOptionKeyTest.Options.NestedOption1; -import static jdk.compiler.graal.options.test.NestedBooleanOptionKeyTest.Options.NestedOption2; -import static jdk.compiler.graal.options.test.NestedBooleanOptionKeyTest.Options.Parent0; -import static jdk.compiler.graal.options.test.NestedBooleanOptionKeyTest.Options.Parent1; -import static jdk.compiler.graal.options.test.NestedBooleanOptionKeyTest.Options.Parent2; +package jdk.graal.compiler.options.test; + +import static jdk.graal.compiler.options.test.NestedBooleanOptionKeyTest.Options.NestedOption0; +import static jdk.graal.compiler.options.test.NestedBooleanOptionKeyTest.Options.NestedOption1; +import static jdk.graal.compiler.options.test.NestedBooleanOptionKeyTest.Options.NestedOption2; +import static jdk.graal.compiler.options.test.NestedBooleanOptionKeyTest.Options.Parent0; +import static jdk.graal.compiler.options.test.NestedBooleanOptionKeyTest.Options.Parent1; +import static jdk.graal.compiler.options.test.NestedBooleanOptionKeyTest.Options.Parent2; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import jdk.compiler.graal.options.NestedBooleanOptionKey; -import jdk.compiler.graal.options.OptionDescriptor; -import jdk.compiler.graal.options.OptionKey; -import jdk.compiler.graal.options.OptionType; -import jdk.compiler.graal.options.OptionValues; +import jdk.graal.compiler.options.NestedBooleanOptionKey; +import jdk.graal.compiler.options.OptionDescriptor; +import jdk.graal.compiler.options.OptionKey; +import jdk.graal.compiler.options.OptionType; +import jdk.graal.compiler.options.OptionValues; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/options/test/TestOptionKey.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/options/test/TestOptionKey.java similarity index 91% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/options/test/TestOptionKey.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/options/test/TestOptionKey.java index ea7110bacd71..6a297de9992c 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/options/test/TestOptionKey.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/options/test/TestOptionKey.java @@ -22,24 +22,24 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.options.test; - -import static jdk.compiler.graal.options.OptionValues.asMap; -import static jdk.compiler.graal.options.OptionValues.newOptionMap; -import static jdk.compiler.graal.options.OptionsParser.parseOptionValue; -import static jdk.compiler.graal.options.test.TestOptionKey.Options.MyDeprecatedOption; -import static jdk.compiler.graal.options.test.TestOptionKey.Options.MyOption; -import static jdk.compiler.graal.options.test.TestOptionKey.Options.MyOtherOption; -import static jdk.compiler.graal.options.test.TestOptionKey.Options.MyIntegerOption; -import static jdk.compiler.graal.options.test.TestOptionKey.Options.MyLongOption; -import static jdk.compiler.graal.options.test.TestOptionKey.Options.MyBooleanOption; -import static jdk.compiler.graal.options.test.TestOptionKey.Options.MyFloatOption; -import static jdk.compiler.graal.options.test.TestOptionKey.Options.MyDoubleOption; -import static jdk.compiler.graal.options.test.TestOptionKey.Options.MyMultiEnumOption; -import static jdk.compiler.graal.options.test.TestOptionKey.Options.MySecondOption; -import static jdk.compiler.graal.options.test.TestOptionKey.TestEnum.Value2; -import static jdk.compiler.graal.options.test.TestOptionKey.TestEnum.Value3; -import static jdk.compiler.graal.options.test.TestOptionKey.TestEnum.Value4; +package jdk.graal.compiler.options.test; + +import static jdk.graal.compiler.options.OptionValues.asMap; +import static jdk.graal.compiler.options.OptionValues.newOptionMap; +import static jdk.graal.compiler.options.OptionsParser.parseOptionValue; +import static jdk.graal.compiler.options.test.TestOptionKey.Options.MyDeprecatedOption; +import static jdk.graal.compiler.options.test.TestOptionKey.Options.MyOption; +import static jdk.graal.compiler.options.test.TestOptionKey.Options.MyOtherOption; +import static jdk.graal.compiler.options.test.TestOptionKey.Options.MyIntegerOption; +import static jdk.graal.compiler.options.test.TestOptionKey.Options.MyLongOption; +import static jdk.graal.compiler.options.test.TestOptionKey.Options.MyBooleanOption; +import static jdk.graal.compiler.options.test.TestOptionKey.Options.MyFloatOption; +import static jdk.graal.compiler.options.test.TestOptionKey.Options.MyDoubleOption; +import static jdk.graal.compiler.options.test.TestOptionKey.Options.MyMultiEnumOption; +import static jdk.graal.compiler.options.test.TestOptionKey.Options.MySecondOption; +import static jdk.graal.compiler.options.test.TestOptionKey.TestEnum.Value2; +import static jdk.graal.compiler.options.test.TestOptionKey.TestEnum.Value3; +import static jdk.graal.compiler.options.test.TestOptionKey.TestEnum.Value4; import static org.junit.Assert.assertEquals; import java.io.ByteArrayOutputStream; @@ -52,17 +52,17 @@ import org.graalvm.collections.EconomicMap; import org.graalvm.collections.EconomicSet; -import jdk.compiler.graal.options.EnumMultiOptionKey; -import jdk.compiler.graal.options.EnumOptionKey; -import jdk.compiler.graal.options.ModifiableOptionValues; -import jdk.compiler.graal.options.OptionDescriptor; -import jdk.compiler.graal.options.OptionDescriptors; -import jdk.compiler.graal.options.OptionDescriptorsMap; -import jdk.compiler.graal.options.OptionKey; -import jdk.compiler.graal.options.OptionStability; -import jdk.compiler.graal.options.OptionType; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.options.OptionsParser; +import jdk.graal.compiler.options.EnumMultiOptionKey; +import jdk.graal.compiler.options.EnumOptionKey; +import jdk.graal.compiler.options.ModifiableOptionValues; +import jdk.graal.compiler.options.OptionDescriptor; +import jdk.graal.compiler.options.OptionDescriptors; +import jdk.graal.compiler.options.OptionDescriptorsMap; +import jdk.graal.compiler.options.OptionKey; +import jdk.graal.compiler.options.OptionStability; +import jdk.graal.compiler.options.OptionType; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.options.OptionsParser; import org.junit.Assert; import org.junit.Assume; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/phases/common/test/StampFactoryTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/phases/common/test/StampFactoryTest.java similarity index 88% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/phases/common/test/StampFactoryTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/phases/common/test/StampFactoryTest.java index 8d60df90b85c..3837c0a383dc 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/phases/common/test/StampFactoryTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/phases/common/test/StampFactoryTest.java @@ -22,21 +22,21 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.phases.common.test; +package jdk.graal.compiler.phases.common.test; import java.lang.reflect.Method; -import jdk.compiler.graal.api.test.Graal; +import jdk.graal.compiler.api.test.Graal; import jdk.vm.ci.meta.JavaKind; import jdk.vm.ci.meta.MetaAccessProvider; import org.junit.Assert; import org.junit.Test; -import jdk.compiler.graal.core.common.type.Stamp; -import jdk.compiler.graal.core.common.type.StampFactory; -import jdk.compiler.graal.core.common.type.TypeReference; -import jdk.compiler.graal.runtime.RuntimeProvider; +import jdk.graal.compiler.core.common.type.Stamp; +import jdk.graal.compiler.core.common.type.StampFactory; +import jdk.graal.compiler.core.common.type.TypeReference; +import jdk.graal.compiler.runtime.RuntimeProvider; public class StampFactoryTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/ArrayCopyExceptionSeenTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/ArrayCopyExceptionSeenTest.java similarity index 86% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/ArrayCopyExceptionSeenTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/ArrayCopyExceptionSeenTest.java index 0d9cf1e243a4..071a33a4b710 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/ArrayCopyExceptionSeenTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/ArrayCopyExceptionSeenTest.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.replacements.test; +package jdk.graal.compiler.replacements.test; -import static jdk.compiler.graal.core.common.GraalOptions.StressInvokeWithExceptionNode; +import static jdk.graal.compiler.core.common.GraalOptions.StressInvokeWithExceptionNode; -import jdk.compiler.graal.api.directives.GraalDirectives; -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.nodes.spi.ProfileProvider; -import jdk.compiler.graal.options.OptionValues; +import jdk.graal.compiler.api.directives.GraalDirectives; +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.nodes.spi.ProfileProvider; +import jdk.graal.compiler.options.OptionValues; import org.junit.Test; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/ArrayEqualsConstantLengthTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/ArrayEqualsConstantLengthTest.java similarity index 94% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/ArrayEqualsConstantLengthTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/ArrayEqualsConstantLengthTest.java index e0b2dd16160c..f5f449b90c77 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/ArrayEqualsConstantLengthTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/ArrayEqualsConstantLengthTest.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.replacements.test; +package jdk.graal.compiler.replacements.test; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration; -import jdk.compiler.graal.replacements.ConstantBindingParameterPlugin; -import jdk.compiler.graal.replacements.nodes.ArrayEqualsNode; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration; +import jdk.graal.compiler.replacements.ConstantBindingParameterPlugin; +import jdk.graal.compiler.replacements.nodes.ArrayEqualsNode; import org.junit.Test; import java.util.Arrays; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/ArrayStoreBytecodeExceptionTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/ArrayStoreBytecodeExceptionTest.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/ArrayStoreBytecodeExceptionTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/ArrayStoreBytecodeExceptionTest.java index a72a4c8b484f..24adc28d84d5 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/ArrayStoreBytecodeExceptionTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/ArrayStoreBytecodeExceptionTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.replacements.test; +package jdk.graal.compiler.replacements.test; import java.util.ArrayList; import java.util.Collection; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/ArraysSubstitutionsTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/ArraysSubstitutionsTest.java similarity index 94% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/ArraysSubstitutionsTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/ArraysSubstitutionsTest.java index 3c6b502889b0..0b65b382c085 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/ArraysSubstitutionsTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/ArraysSubstitutionsTest.java @@ -22,18 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.replacements.test; +package jdk.graal.compiler.replacements.test; -import static jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions; +import static jdk.graal.compiler.nodes.StructuredGraph.AllowAssumptions; import java.util.Arrays; -import jdk.compiler.graal.nodes.ReturnNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.phases.OptimisticOptimizations; -import jdk.compiler.graal.phases.tiers.HighTierContext; -import jdk.compiler.graal.replacements.nodes.ArrayEqualsNode; -import jdk.compiler.graal.virtual.phases.ea.PartialEscapePhase; +import jdk.graal.compiler.nodes.ReturnNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.phases.OptimisticOptimizations; +import jdk.graal.compiler.phases.tiers.HighTierContext; +import jdk.graal.compiler.replacements.nodes.ArrayEqualsNode; +import jdk.graal.compiler.virtual.phases.ea.PartialEscapePhase; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/ArraysSubstitutionsTestBase.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/ArraysSubstitutionsTestBase.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/ArraysSubstitutionsTestBase.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/ArraysSubstitutionsTestBase.java index d1ad56f25f89..2e0ce944624e 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/ArraysSubstitutionsTestBase.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/ArraysSubstitutionsTestBase.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.replacements.test; +package jdk.graal.compiler.replacements.test; -import jdk.compiler.graal.replacements.StandardGraphBuilderPlugins; +import jdk.graal.compiler.replacements.StandardGraphBuilderPlugins; import java.util.Arrays; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/BitOpNodesTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/BitOpNodesTest.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/BitOpNodesTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/BitOpNodesTest.java index 24f839401cc2..68c02f812e81 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/BitOpNodesTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/BitOpNodesTest.java @@ -22,18 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.replacements.test; - -import jdk.compiler.graal.core.common.type.StampFactory; -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.nodes.NodeView; -import jdk.compiler.graal.nodes.ReturnNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.phases.common.CanonicalizerPhase; -import jdk.compiler.graal.phases.tiers.HighTierContext; -import jdk.compiler.graal.replacements.nodes.BitScanReverseNode; +package jdk.graal.compiler.replacements.test; + +import jdk.graal.compiler.core.common.type.StampFactory; +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.nodes.NodeView; +import jdk.graal.compiler.nodes.ReturnNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.StructuredGraph.AllowAssumptions; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.phases.common.CanonicalizerPhase; +import jdk.graal.compiler.phases.tiers.HighTierContext; +import jdk.graal.compiler.replacements.nodes.BitScanReverseNode; import org.junit.Assert; import org.junit.Assume; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/BytecodeExceptionTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/BytecodeExceptionTest.java similarity index 83% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/BytecodeExceptionTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/BytecodeExceptionTest.java index d0bc1970d672..b8e21ad15376 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/BytecodeExceptionTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/BytecodeExceptionTest.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.replacements.test; +package jdk.graal.compiler.replacements.test; -import static jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration.BytecodeExceptionMode.CheckAll; +import static jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.BytecodeExceptionMode.CheckAll; -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.extended.BytecodeExceptionNode; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration; -import jdk.compiler.graal.options.OptionValues; +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.extended.BytecodeExceptionNode; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration; +import jdk.graal.compiler.options.OptionValues; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/CharIsDigitTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/CharIsDigitTest.java similarity index 93% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/CharIsDigitTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/CharIsDigitTest.java index 95021ebc6e11..a3270a657235 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/CharIsDigitTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/CharIsDigitTest.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.replacements.test; +package jdk.graal.compiler.replacements.test; -import jdk.compiler.graal.core.test.GraalCompilerTest; +import jdk.graal.compiler.core.test.GraalCompilerTest; import org.junit.Test; public class CharIsDigitTest extends GraalCompilerTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/CheckIndexTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/CheckIndexTest.java similarity index 93% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/CheckIndexTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/CheckIndexTest.java index 3d7e30c98465..5d5018b4a6f7 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/CheckIndexTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/CheckIndexTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.replacements.test; +package jdk.graal.compiler.replacements.test; import java.lang.invoke.MethodHandles; import java.lang.invoke.VarHandle; @@ -31,15 +31,15 @@ import java.util.List; import java.util.Objects; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration.BytecodeExceptionMode; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext; -import jdk.compiler.graal.nodes.graphbuilderconf.InlineInvokePlugin; -import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin; -import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins; -import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins.Registration; -import jdk.compiler.graal.phases.OptimisticOptimizations; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.BytecodeExceptionMode; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext; +import jdk.graal.compiler.nodes.graphbuilderconf.InlineInvokePlugin; +import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin; +import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins; +import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins.Registration; +import jdk.graal.compiler.phases.OptimisticOptimizations; import org.junit.Assume; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/ClassCastBytecodeExceptionTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/ClassCastBytecodeExceptionTest.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/ClassCastBytecodeExceptionTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/ClassCastBytecodeExceptionTest.java index 213d2cef184c..d9fa2ec90c2a 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/ClassCastBytecodeExceptionTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/ClassCastBytecodeExceptionTest.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.replacements.test; +package jdk.graal.compiler.replacements.test; import java.util.ArrayList; import java.util.Collection; -import jdk.compiler.graal.api.directives.GraalDirectives; +import jdk.graal.compiler.api.directives.GraalDirectives; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/CompiledExceptionHandlerTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/CompiledExceptionHandlerTest.java similarity index 84% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/CompiledExceptionHandlerTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/CompiledExceptionHandlerTest.java index 5e0484567c5c..0eca4f5aefdd 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/CompiledExceptionHandlerTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/CompiledExceptionHandlerTest.java @@ -22,20 +22,20 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.replacements.test; +package jdk.graal.compiler.replacements.test; -import jdk.compiler.graal.core.phases.HighTier; -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.StructuredGraph.Builder; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext; -import jdk.compiler.graal.nodes.graphbuilderconf.InlineInvokePlugin.InlineInfo; -import jdk.compiler.graal.nodes.java.ExceptionObjectNode; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.phases.PhaseSuite; -import jdk.compiler.graal.phases.tiers.HighTierContext; -import jdk.compiler.graal.phases.tiers.Suites; +import jdk.graal.compiler.core.phases.HighTier; +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.StructuredGraph.Builder; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext; +import jdk.graal.compiler.nodes.graphbuilderconf.InlineInvokePlugin.InlineInfo; +import jdk.graal.compiler.nodes.java.ExceptionObjectNode; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.phases.PhaseSuite; +import jdk.graal.compiler.phases.tiers.HighTierContext; +import jdk.graal.compiler.phases.tiers.Suites; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/CompiledNullPointerExceptionTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/CompiledNullPointerExceptionTest.java similarity index 78% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/CompiledNullPointerExceptionTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/CompiledNullPointerExceptionTest.java index cdf3c48dab5e..227e836c9413 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/CompiledNullPointerExceptionTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/CompiledNullPointerExceptionTest.java @@ -22,23 +22,23 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.replacements.test; +package jdk.graal.compiler.replacements.test; -import static jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration.BytecodeExceptionMode.CheckAll; +import static jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.BytecodeExceptionMode.CheckAll; -import jdk.compiler.graal.core.phases.HighTier; -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.StructuredGraph.Builder; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.extended.BytecodeExceptionNode; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext; -import jdk.compiler.graal.nodes.graphbuilderconf.InlineInvokePlugin.InlineInfo; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.phases.PhaseSuite; -import jdk.compiler.graal.phases.tiers.HighTierContext; -import jdk.compiler.graal.phases.tiers.Suites; +import jdk.graal.compiler.core.phases.HighTier; +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.StructuredGraph.Builder; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.extended.BytecodeExceptionNode; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext; +import jdk.graal.compiler.nodes.graphbuilderconf.InlineInvokePlugin.InlineInfo; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.phases.PhaseSuite; +import jdk.graal.compiler.phases.tiers.HighTierContext; +import jdk.graal.compiler.phases.tiers.Suites; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/CountPositivesTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/CountPositivesTest.java similarity index 93% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/CountPositivesTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/CountPositivesTest.java index f4cce2314377..985f71df7a09 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/CountPositivesTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/CountPositivesTest.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.replacements.test; +package jdk.graal.compiler.replacements.test; import java.util.Collections; -import jdk.compiler.graal.core.common.CompilationIdentifier; -import jdk.compiler.graal.hotspot.test.HotSpotGraalCompilerTest; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.test.AddExports; +import jdk.graal.compiler.core.common.CompilationIdentifier; +import jdk.graal.compiler.hotspot.test.HotSpotGraalCompilerTest; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.test.AddExports; import org.junit.Test; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/DeoptimizeOnExceptionTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/DeoptimizeOnExceptionTest.java similarity index 93% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/DeoptimizeOnExceptionTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/DeoptimizeOnExceptionTest.java index d2459747ee55..bc8e07f03c02 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/DeoptimizeOnExceptionTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/DeoptimizeOnExceptionTest.java @@ -22,19 +22,19 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.replacements.test; +package jdk.graal.compiler.replacements.test; import java.util.Random; -import jdk.compiler.graal.api.directives.GraalDirectives; -import jdk.compiler.graal.api.test.ExportingClassLoader; -import jdk.compiler.graal.core.phases.HighTier; -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext; -import jdk.compiler.graal.nodes.graphbuilderconf.InlineInvokePlugin; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.phases.common.AbstractInliningPhase; +import jdk.graal.compiler.api.directives.GraalDirectives; +import jdk.graal.compiler.api.test.ExportingClassLoader; +import jdk.graal.compiler.core.phases.HighTier; +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext; +import jdk.graal.compiler.nodes.graphbuilderconf.InlineInvokePlugin; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.phases.common.AbstractInliningPhase; import org.junit.Assert; import org.junit.Test; import org.objectweb.asm.ClassWriter; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/DeoptimizeOnIntegerExactTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/DeoptimizeOnIntegerExactTest.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/DeoptimizeOnIntegerExactTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/DeoptimizeOnIntegerExactTest.java index 8bee7306f396..ee4d59b718bd 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/DeoptimizeOnIntegerExactTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/DeoptimizeOnIntegerExactTest.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.replacements.test; +package jdk.graal.compiler.replacements.test; import jdk.vm.ci.meta.SpeculationLog; -import jdk.compiler.graal.code.CompilationResult; -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.debug.DebugContext; +import jdk.graal.compiler.code.CompilationResult; +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.debug.DebugContext; import org.junit.Test; import jdk.vm.ci.code.InstalledCode; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/DeoptimizeOnVolatileReadTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/DeoptimizeOnVolatileReadTest.java similarity index 94% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/DeoptimizeOnVolatileReadTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/DeoptimizeOnVolatileReadTest.java index ec50b46d0e28..453850b3ec7a 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/DeoptimizeOnVolatileReadTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/DeoptimizeOnVolatileReadTest.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.replacements.test; +package jdk.graal.compiler.replacements.test; -import jdk.compiler.graal.api.directives.GraalDirectives; -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.phases.OptimisticOptimizations; +import jdk.graal.compiler.api.directives.GraalDirectives; +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.phases.OptimisticOptimizations; import org.junit.Test; import jdk.vm.ci.code.InstalledCode; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/DerivedOopTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/DerivedOopTest.java similarity index 92% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/DerivedOopTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/DerivedOopTest.java index beb17a1728bd..ab740c9de269 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/DerivedOopTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/DerivedOopTest.java @@ -22,23 +22,23 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.replacements.test; +package jdk.graal.compiler.replacements.test; import java.util.Objects; -import jdk.compiler.graal.api.directives.GraalDirectives; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.debug.DebugContext.Scope; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext; -import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin; -import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins; -import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins.Registration; -import jdk.compiler.graal.replacements.Snippets; -import jdk.compiler.graal.word.Word; -import jdk.compiler.graal.word.WordCastNode; +import jdk.graal.compiler.api.directives.GraalDirectives; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.debug.DebugContext.Scope; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext; +import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin; +import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins; +import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins.Registration; +import jdk.graal.compiler.replacements.Snippets; +import jdk.graal.compiler.word.Word; +import jdk.graal.compiler.word.WordCastNode; import org.junit.Assert; import org.junit.Rule; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/DynamicNewArrayTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/DynamicNewArrayTest.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/DynamicNewArrayTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/DynamicNewArrayTest.java index cfec18116b86..6f103add51c0 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/DynamicNewArrayTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/DynamicNewArrayTest.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.replacements.test; +package jdk.graal.compiler.replacements.test; import java.lang.reflect.Array; import org.junit.Test; -import jdk.compiler.graal.core.test.GraalCompilerTest; +import jdk.graal.compiler.core.test.GraalCompilerTest; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/EdgesTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/EdgesTest.java similarity index 82% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/EdgesTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/EdgesTest.java index bc7987a7807f..dac199c48103 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/EdgesTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/EdgesTest.java @@ -22,32 +22,32 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.replacements.test; +package jdk.graal.compiler.replacements.test; -import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0; -import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_0; +import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_0; +import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_0; import java.lang.reflect.Method; import org.junit.Assert; import org.junit.Test; -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.graph.Edges; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.graph.NodeClass; -import jdk.compiler.graal.graph.NodeInputList; -import jdk.compiler.graal.nodeinfo.NodeInfo; -import jdk.compiler.graal.nodes.ConstantNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.calc.FloatingNode; -import jdk.compiler.graal.nodes.java.InstanceOfNode; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.phases.common.inlining.InliningPhase; -import jdk.compiler.graal.phases.common.inlining.policy.InlineMethodSubstitutionsPolicy; -import jdk.compiler.graal.phases.tiers.HighTierContext; +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.graph.Edges; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.graph.NodeClass; +import jdk.graal.compiler.graph.NodeInputList; +import jdk.graal.compiler.nodeinfo.NodeInfo; +import jdk.graal.compiler.nodes.ConstantNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.StructuredGraph.AllowAssumptions; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.calc.FloatingNode; +import jdk.graal.compiler.nodes.java.InstanceOfNode; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.phases.common.inlining.InliningPhase; +import jdk.graal.compiler.phases.common.inlining.policy.InlineMethodSubstitutionsPolicy; +import jdk.graal.compiler.phases.tiers.HighTierContext; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/EncodeArrayTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/EncodeArrayTest.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/EncodeArrayTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/EncodeArrayTest.java index bbf33ec6a319..2369450f5be4 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/EncodeArrayTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/EncodeArrayTest.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.replacements.test; +package jdk.graal.compiler.replacements.test; -import jdk.compiler.graal.core.common.CompilationIdentifier; -import jdk.compiler.graal.hotspot.test.HotSpotGraalCompilerTest; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.test.AddExports; +import jdk.graal.compiler.core.common.CompilationIdentifier; +import jdk.graal.compiler.hotspot.test.HotSpotGraalCompilerTest; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.test.AddExports; import org.junit.Test; import jdk.vm.ci.code.InstalledCode; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/FloatArraysEqualsTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/FloatArraysEqualsTest.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/FloatArraysEqualsTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/FloatArraysEqualsTest.java index d45416a763b0..f84643d515a1 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/FloatArraysEqualsTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/FloatArraysEqualsTest.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.replacements.test; +package jdk.graal.compiler.replacements.test; import java.util.Arrays; -import jdk.compiler.graal.code.CompilationResult; -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.nodes.ConstantNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions; +import jdk.graal.compiler.code.CompilationResult; +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.nodes.ConstantNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.StructuredGraph.AllowAssumptions; import org.junit.Test; import jdk.vm.ci.code.InstalledCode; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/HalfFloatTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/HalfFloatTest.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/HalfFloatTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/HalfFloatTest.java index 9755cadbf007..b5b6a454f6e4 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/HalfFloatTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/HalfFloatTest.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.replacements.test; +package jdk.graal.compiler.replacements.test; -import static jdk.compiler.graal.serviceprovider.JavaVersionUtil.JAVA_SPEC; +import static jdk.graal.compiler.serviceprovider.JavaVersionUtil.JAVA_SPEC; import static org.junit.Assume.assumeTrue; -import jdk.compiler.graal.jtt.JTTTest; +import jdk.graal.compiler.jtt.JTTTest; import org.junit.Test; import jdk.vm.ci.code.InstalledCode; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/HasNegativesTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/HasNegativesTest.java similarity index 92% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/HasNegativesTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/HasNegativesTest.java index e3aa37503c98..2613f835cb74 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/HasNegativesTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/HasNegativesTest.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.replacements.test; +package jdk.graal.compiler.replacements.test; -import jdk.compiler.graal.core.common.CompilationIdentifier; -import jdk.compiler.graal.hotspot.test.HotSpotGraalCompilerTest; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.test.AddExports; +import jdk.graal.compiler.core.common.CompilationIdentifier; +import jdk.graal.compiler.hotspot.test.HotSpotGraalCompilerTest; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.test.AddExports; import org.junit.Test; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/IndexOobBytecodeExceptionTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/IndexOobBytecodeExceptionTest.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/IndexOobBytecodeExceptionTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/IndexOobBytecodeExceptionTest.java index 6f4b5afd0e7d..8c878f36a3f3 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/IndexOobBytecodeExceptionTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/IndexOobBytecodeExceptionTest.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.replacements.test; +package jdk.graal.compiler.replacements.test; import java.util.ArrayList; import java.util.Collection; -import jdk.compiler.graal.api.directives.GraalDirectives; +import jdk.graal.compiler.api.directives.GraalDirectives; 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/replacements/test/InstanceOfDynamicTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/InstanceOfDynamicTest.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/InstanceOfDynamicTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/InstanceOfDynamicTest.java index 966c5cf49f55..6794cb6ca64b 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/InstanceOfDynamicTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/InstanceOfDynamicTest.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.replacements.test; +package jdk.graal.compiler.replacements.test; import org.junit.Test; -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.nodes.java.InstanceOfDynamicNode; +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.nodes.java.InstanceOfDynamicNode; /** * Tests for {@link InstanceOfDynamicNode}. diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/InstanceOfTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/InstanceOfTest.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/InstanceOfTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/InstanceOfTest.java index 8ac06880f17e..19a8a7fd6cc0 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/InstanceOfTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/InstanceOfTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.replacements.test; +package jdk.graal.compiler.replacements.test; import java.util.Arrays; import java.util.HashMap; @@ -30,13 +30,13 @@ import java.util.Map; import java.util.TreeMap; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.nodes.IfNode; -import jdk.compiler.graal.nodes.ReturnNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions; -import jdk.compiler.graal.nodes.java.InstanceOfNode; -import jdk.compiler.graal.phases.common.AbstractInliningPhase; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.nodes.IfNode; +import jdk.graal.compiler.nodes.ReturnNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.StructuredGraph.AllowAssumptions; +import jdk.graal.compiler.nodes.java.InstanceOfNode; +import jdk.graal.compiler.phases.common.AbstractInliningPhase; import org.junit.Test; import jdk.vm.ci.code.site.Call; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/IntegerExactExceptionTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/IntegerExactExceptionTest.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/IntegerExactExceptionTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/IntegerExactExceptionTest.java index 362e785b70de..e70a9df8156b 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/IntegerExactExceptionTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/IntegerExactExceptionTest.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.replacements.test; +package jdk.graal.compiler.replacements.test; -import jdk.compiler.graal.core.test.GraalCompilerTest; +import jdk.graal.compiler.core.test.GraalCompilerTest; import org.junit.Test; import jdk.vm.ci.code.InstalledCode; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/IntegerExactFoldTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/IntegerExactFoldTest.java similarity index 93% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/IntegerExactFoldTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/IntegerExactFoldTest.java index f30307e2b49e..6f4dc93d3081 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/IntegerExactFoldTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/IntegerExactFoldTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.replacements.test; +package jdk.graal.compiler.replacements.test; import static org.junit.Assert.assertNotNull; @@ -30,25 +30,25 @@ import java.util.Collection; import java.util.List; -import jdk.compiler.graal.core.common.type.IntegerStamp; -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.nodes.NodeView; -import jdk.compiler.graal.nodes.ParameterNode; -import jdk.compiler.graal.nodes.PiNode; -import jdk.compiler.graal.nodes.ReturnNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.phases.common.CanonicalizerPhase; -import jdk.compiler.graal.phases.common.GuardLoweringPhase; -import jdk.compiler.graal.phases.common.HighTierLoweringPhase; -import jdk.compiler.graal.phases.tiers.HighTierContext; -import jdk.compiler.graal.phases.tiers.MidTierContext; -import jdk.compiler.graal.replacements.nodes.arithmetic.BinaryIntegerExactArithmeticSplitNode; -import jdk.compiler.graal.replacements.nodes.arithmetic.IntegerExactArithmeticNode; -import jdk.compiler.graal.replacements.nodes.arithmetic.IntegerExactArithmeticSplitNode; -import jdk.compiler.graal.replacements.nodes.arithmetic.IntegerNegExactSplitNode; +import jdk.graal.compiler.core.common.type.IntegerStamp; +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.nodes.NodeView; +import jdk.graal.compiler.nodes.ParameterNode; +import jdk.graal.compiler.nodes.PiNode; +import jdk.graal.compiler.nodes.ReturnNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.StructuredGraph.AllowAssumptions; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.phases.common.CanonicalizerPhase; +import jdk.graal.compiler.phases.common.GuardLoweringPhase; +import jdk.graal.compiler.phases.common.HighTierLoweringPhase; +import jdk.graal.compiler.phases.tiers.HighTierContext; +import jdk.graal.compiler.phases.tiers.MidTierContext; +import jdk.graal.compiler.replacements.nodes.arithmetic.BinaryIntegerExactArithmeticSplitNode; +import jdk.graal.compiler.replacements.nodes.arithmetic.IntegerExactArithmeticNode; +import jdk.graal.compiler.replacements.nodes.arithmetic.IntegerExactArithmeticSplitNode; +import jdk.graal.compiler.replacements.nodes.arithmetic.IntegerNegExactSplitNode; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/IntegerSubOverflowsTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/IntegerSubOverflowsTest.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/IntegerSubOverflowsTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/IntegerSubOverflowsTest.java index d81e0af1a1c0..fe22de6882fc 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/IntegerSubOverflowsTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/IntegerSubOverflowsTest.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.replacements.test; +package jdk.graal.compiler.replacements.test; -import jdk.compiler.graal.core.common.type.IntegerStamp; +import jdk.graal.compiler.core.common.type.IntegerStamp; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/InvokeTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/InvokeTest.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/InvokeTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/InvokeTest.java index f13f737eb85a..0f9fb9af4955 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/InvokeTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/InvokeTest.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.replacements.test; +package jdk.graal.compiler.replacements.test; import org.junit.Test; -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.phases.common.AbstractInliningPhase; +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.phases.common.AbstractInliningPhase; /** * Tests the implementation of the snippets for lowering the INVOKE* instructions. diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/InvokerSignatureMismatchTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/InvokerSignatureMismatchTest.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/InvokerSignatureMismatchTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/InvokerSignatureMismatchTest.java index ed2aff186422..74544061b711 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/InvokerSignatureMismatchTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/InvokerSignatureMismatchTest.java @@ -22,19 +22,19 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.replacements.test; +package jdk.graal.compiler.replacements.test; -import static jdk.compiler.graal.test.SubprocessUtil.getVMCommandLine; -import static jdk.compiler.graal.test.SubprocessUtil.withoutDebuggerArguments; +import static jdk.graal.compiler.test.SubprocessUtil.getVMCommandLine; +import static jdk.graal.compiler.test.SubprocessUtil.withoutDebuggerArguments; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; import java.util.List; -import jdk.compiler.graal.core.test.CustomizedBytecodePatternTest; -import jdk.compiler.graal.test.SubprocessUtil; -import jdk.compiler.graal.test.SubprocessUtil.Subprocess; +import jdk.graal.compiler.core.test.CustomizedBytecodePatternTest; +import jdk.graal.compiler.test.SubprocessUtil; +import jdk.graal.compiler.test.SubprocessUtil.Subprocess; import org.junit.Test; import org.objectweb.asm.ClassWriter; import org.objectweb.asm.MethodVisitor; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/MathMultiplyHighTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/MathMultiplyHighTest.java similarity index 89% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/MathMultiplyHighTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/MathMultiplyHighTest.java index defe514acece..532d5633e395 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/MathMultiplyHighTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/MathMultiplyHighTest.java @@ -23,14 +23,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.replacements.test; +package jdk.graal.compiler.replacements.test; -import jdk.compiler.graal.nodes.ConstantNode; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.calc.IntegerMulHighNode; -import jdk.compiler.graal.nodes.extended.OpaqueValueNode; -import jdk.compiler.graal.nodes.spi.SimplifierTool; -import jdk.compiler.graal.nodes.util.GraphUtil; +import jdk.graal.compiler.nodes.ConstantNode; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.calc.IntegerMulHighNode; +import jdk.graal.compiler.nodes.extended.OpaqueValueNode; +import jdk.graal.compiler.nodes.spi.SimplifierTool; +import jdk.graal.compiler.nodes.util.GraphUtil; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/MathRoundTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/MathRoundTest.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/MathRoundTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/MathRoundTest.java index 398ba769fe66..8d8c03178222 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/MathRoundTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/MathRoundTest.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.replacements.test; +package jdk.graal.compiler.replacements.test; -import jdk.compiler.graal.core.test.GraalCompilerTest; +import jdk.graal.compiler.core.test.GraalCompilerTest; import org.junit.Test; public class MathRoundTest extends GraalCompilerTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/MethodHandleImplTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/MethodHandleImplTest.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/MethodHandleImplTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/MethodHandleImplTest.java index 6f8b882407fd..708d355a0007 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/MethodHandleImplTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/MethodHandleImplTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.replacements.test; +package jdk.graal.compiler.replacements.test; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/MethodHandleMacroTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/MethodHandleMacroTest.java similarity index 86% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/MethodHandleMacroTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/MethodHandleMacroTest.java index e51e38647d3f..f05d7749f8a1 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/MethodHandleMacroTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/MethodHandleMacroTest.java @@ -22,23 +22,23 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.replacements.test; +package jdk.graal.compiler.replacements.test; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; import java.lang.invoke.MethodType; -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.graph.NodeClass; -import jdk.compiler.graal.nodeinfo.NodeInfo; -import jdk.compiler.graal.nodes.CallTargetNode; -import jdk.compiler.graal.nodes.Invoke; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext; -import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin; -import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins; -import jdk.compiler.graal.replacements.InlineDuringParsingPlugin; -import jdk.compiler.graal.replacements.nodes.MacroNode; +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.graph.NodeClass; +import jdk.graal.compiler.nodeinfo.NodeInfo; +import jdk.graal.compiler.nodes.CallTargetNode; +import jdk.graal.compiler.nodes.Invoke; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext; +import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin; +import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins; +import jdk.graal.compiler.replacements.InlineDuringParsingPlugin; +import jdk.graal.compiler.replacements.nodes.MacroNode; import org.junit.Test; import jdk.vm.ci.meta.JavaKind; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/MethodSubstitutionTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/MethodSubstitutionTest.java similarity index 90% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/MethodSubstitutionTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/MethodSubstitutionTest.java index 77a804e39bc4..1cda0275a175 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/MethodSubstitutionTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/MethodSubstitutionTest.java @@ -22,20 +22,20 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.replacements.test; +package jdk.graal.compiler.replacements.test; -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.nodes.Invoke; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions; -import jdk.compiler.graal.nodes.java.MethodCallTargetNode; -import jdk.compiler.graal.phases.common.DeadCodeEliminationPhase; -import jdk.compiler.graal.phases.common.HighTierLoweringPhase; -import jdk.compiler.graal.phases.common.MidTierLoweringPhase; -import jdk.compiler.graal.phases.tiers.HighTierContext; -import jdk.compiler.graal.replacements.nodes.MacroNode; +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.nodes.Invoke; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.StructuredGraph.AllowAssumptions; +import jdk.graal.compiler.nodes.java.MethodCallTargetNode; +import jdk.graal.compiler.phases.common.DeadCodeEliminationPhase; +import jdk.graal.compiler.phases.common.HighTierLoweringPhase; +import jdk.graal.compiler.phases.common.MidTierLoweringPhase; +import jdk.graal.compiler.phases.tiers.HighTierContext; +import jdk.graal.compiler.replacements.nodes.MacroNode; import jdk.vm.ci.code.InstalledCode; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/MonitorTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/MonitorTest.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/MonitorTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/MonitorTest.java index 78839e73131f..7df038b9510d 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/MonitorTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/MonitorTest.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.replacements.test; +package jdk.graal.compiler.replacements.test; -import jdk.compiler.graal.nodes.NodeView; +import jdk.graal.compiler.nodes.NodeView; import org.junit.Test; -import jdk.compiler.graal.api.directives.GraalDirectives; -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.replacements.BoxingSnippets; -import jdk.compiler.graal.virtual.phases.ea.PartialEscapePhase; +import jdk.graal.compiler.api.directives.GraalDirectives; +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.replacements.BoxingSnippets; +import jdk.graal.compiler.virtual.phases.ea.PartialEscapePhase; public class MonitorTest extends GraalCompilerTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/NestedExceptionHandlerTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/NestedExceptionHandlerTest.java similarity index 89% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/NestedExceptionHandlerTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/NestedExceptionHandlerTest.java index 19e7f0547df2..489655e27bd5 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/NestedExceptionHandlerTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/NestedExceptionHandlerTest.java @@ -22,17 +22,17 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.replacements.test; +package jdk.graal.compiler.replacements.test; -import static jdk.compiler.graal.core.common.GraalOptions.RemoveNeverExecutedCode; -import static jdk.compiler.graal.core.common.GraalOptions.UseExceptionProbability; -import static jdk.compiler.graal.core.common.GraalOptions.UseTypeCheckHints; +import static jdk.graal.compiler.core.common.GraalOptions.RemoveNeverExecutedCode; +import static jdk.graal.compiler.core.common.GraalOptions.UseExceptionProbability; +import static jdk.graal.compiler.core.common.GraalOptions.UseTypeCheckHints; -import jdk.compiler.graal.api.directives.GraalDirectives; -import jdk.compiler.graal.core.phases.HighTier; -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions; -import jdk.compiler.graal.options.OptionValues; +import jdk.graal.compiler.api.directives.GraalDirectives; +import jdk.graal.compiler.core.phases.HighTier; +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.nodes.StructuredGraph.AllowAssumptions; +import jdk.graal.compiler.options.OptionValues; import org.junit.Ignore; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/NewArrayTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/NewArrayTest.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/NewArrayTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/NewArrayTest.java index 4a878555da38..d1c2a99f8f80 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/NewArrayTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/NewArrayTest.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.replacements.test; +package jdk.graal.compiler.replacements.test; import org.junit.Assert; import org.junit.Test; -import jdk.compiler.graal.core.test.GraalCompilerTest; +import jdk.graal.compiler.core.test.GraalCompilerTest; /** * Tests the implementation of {@code [A]NEWARRAY}. diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/NewInstanceTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/NewInstanceTest.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/NewInstanceTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/NewInstanceTest.java index e21a640c1c4c..5c2a519dc882 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/NewInstanceTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/NewInstanceTest.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.replacements.test; +package jdk.graal.compiler.replacements.test; import java.util.HashMap; import org.junit.Assert; import org.junit.Test; -import jdk.compiler.graal.core.test.GraalCompilerTest; +import jdk.graal.compiler.core.test.GraalCompilerTest; /** * Tests the implementation of {@code NEW}. diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/NewMultiArrayTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/NewMultiArrayTest.java similarity index 93% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/NewMultiArrayTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/NewMultiArrayTest.java index 1670df1d9076..baff46aa7c97 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/NewMultiArrayTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/NewMultiArrayTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.replacements.test; +package jdk.graal.compiler.replacements.test; import java.lang.reflect.Array; import java.lang.reflect.InvocationTargetException; @@ -30,12 +30,12 @@ import org.junit.Test; -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.nodes.ConstantNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.java.NewMultiArrayNode; -import jdk.compiler.graal.options.OptionValues; +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.nodes.ConstantNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.java.NewMultiArrayNode; +import jdk.graal.compiler.options.OptionValues; import jdk.vm.ci.code.InstalledCode; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/NullBytecodeExceptionTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/NullBytecodeExceptionTest.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/NullBytecodeExceptionTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/NullBytecodeExceptionTest.java index 480feab10dec..8e3a579cac07 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/NullBytecodeExceptionTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/NullBytecodeExceptionTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.replacements.test; +package jdk.graal.compiler.replacements.test; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/ObjectAccessTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/ObjectAccessTest.java similarity index 94% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/ObjectAccessTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/ObjectAccessTest.java index 40bcb8c29a72..5606d4b6aff7 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/ObjectAccessTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/ObjectAccessTest.java @@ -22,21 +22,21 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.replacements.test; - -import jdk.compiler.graal.api.replacements.Snippet; -import jdk.compiler.graal.nodes.NamedLocationIdentity; -import jdk.compiler.graal.nodes.NodeView; -import jdk.compiler.graal.nodes.ReturnNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.calc.ConvertNode; -import jdk.compiler.graal.nodes.calc.SignExtendNode; -import jdk.compiler.graal.nodes.extended.JavaReadNode; -import jdk.compiler.graal.nodes.extended.JavaWriteNode; -import jdk.compiler.graal.nodes.memory.address.OffsetAddressNode; -import jdk.compiler.graal.word.ObjectAccess; +package jdk.graal.compiler.replacements.test; + +import jdk.graal.compiler.api.replacements.Snippet; +import jdk.graal.compiler.nodes.NamedLocationIdentity; +import jdk.graal.compiler.nodes.NodeView; +import jdk.graal.compiler.nodes.ReturnNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.StructuredGraph.AllowAssumptions; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.calc.ConvertNode; +import jdk.graal.compiler.nodes.calc.SignExtendNode; +import jdk.graal.compiler.nodes.extended.JavaReadNode; +import jdk.graal.compiler.nodes.extended.JavaWriteNode; +import jdk.graal.compiler.nodes.memory.address.OffsetAddressNode; +import jdk.graal.compiler.word.ObjectAccess; import org.graalvm.word.LocationIdentity; import org.graalvm.word.Pointer; import org.graalvm.word.WordFactory; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/PEGraphDecoderTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/PEGraphDecoderTest.java similarity index 85% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/PEGraphDecoderTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/PEGraphDecoderTest.java index 7a12987a8c4f..5d95cf731ae9 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/PEGraphDecoderTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/PEGraphDecoderTest.java @@ -22,40 +22,40 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.replacements.test; +package jdk.graal.compiler.replacements.test; -import static jdk.compiler.graal.nodes.graphbuilderconf.InlineInvokePlugin.InlineInfo.createStandardInlineInfo; +import static jdk.graal.compiler.nodes.graphbuilderconf.InlineInvokePlugin.InlineInfo.createStandardInlineInfo; import org.graalvm.collections.EconomicMap; import org.graalvm.collections.EconomicSet; -import jdk.compiler.graal.core.common.memory.BarrierType; -import jdk.compiler.graal.core.common.memory.MemoryOrderMode; -import jdk.compiler.graal.core.common.type.StampFactory; -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.debug.DebugOptions; -import jdk.compiler.graal.nodes.AbstractBeginNode; -import jdk.compiler.graal.nodes.CompanionObjectEncoder; -import jdk.compiler.graal.nodes.EncodedGraph; -import jdk.compiler.graal.nodes.InliningLog; -import jdk.compiler.graal.nodes.InvokeNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext; -import jdk.compiler.graal.nodes.graphbuilderconf.InlineInvokePlugin; -import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin; -import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins; -import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins.Registration; -import jdk.compiler.graal.nodes.memory.ReadNode; -import jdk.compiler.graal.nodes.memory.address.AddressNode; -import jdk.compiler.graal.nodes.memory.address.OffsetAddressNode; -import jdk.compiler.graal.nodes.spi.CoreProviders; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.phases.OptimisticOptimizations; -import jdk.compiler.graal.replacements.CachingPEGraphDecoder; -import jdk.compiler.graal.util.CollectionsUtil; +import jdk.graal.compiler.core.common.memory.BarrierType; +import jdk.graal.compiler.core.common.memory.MemoryOrderMode; +import jdk.graal.compiler.core.common.type.StampFactory; +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.debug.DebugOptions; +import jdk.graal.compiler.nodes.AbstractBeginNode; +import jdk.graal.compiler.nodes.CompanionObjectEncoder; +import jdk.graal.compiler.nodes.EncodedGraph; +import jdk.graal.compiler.nodes.InliningLog; +import jdk.graal.compiler.nodes.InvokeNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.StructuredGraph.AllowAssumptions; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext; +import jdk.graal.compiler.nodes.graphbuilderconf.InlineInvokePlugin; +import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin; +import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins; +import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins.Registration; +import jdk.graal.compiler.nodes.memory.ReadNode; +import jdk.graal.compiler.nodes.memory.address.AddressNode; +import jdk.graal.compiler.nodes.memory.address.OffsetAddressNode; +import jdk.graal.compiler.nodes.spi.CoreProviders; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.phases.OptimisticOptimizations; +import jdk.graal.compiler.replacements.CachingPEGraphDecoder; +import jdk.graal.compiler.util.CollectionsUtil; import org.graalvm.word.LocationIdentity; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/PointerTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/PointerTest.java similarity index 94% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/PointerTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/PointerTest.java index 5a8e0e833277..998c13d8e5b1 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/PointerTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/PointerTest.java @@ -22,24 +22,24 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.replacements.test; - -import jdk.compiler.graal.api.replacements.Snippet; -import jdk.compiler.graal.nodes.NamedLocationIdentity; -import jdk.compiler.graal.nodes.NodeView; -import jdk.compiler.graal.nodes.ReturnNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.calc.ConvertNode; -import jdk.compiler.graal.nodes.calc.SignExtendNode; -import jdk.compiler.graal.nodes.extended.JavaReadNode; -import jdk.compiler.graal.nodes.extended.JavaWriteNode; -import jdk.compiler.graal.nodes.memory.address.OffsetAddressNode; -import jdk.compiler.graal.phases.OptimisticOptimizations; -import jdk.compiler.graal.phases.tiers.HighTierContext; -import jdk.compiler.graal.word.Word; -import jdk.compiler.graal.word.WordCastNode; +package jdk.graal.compiler.replacements.test; + +import jdk.graal.compiler.api.replacements.Snippet; +import jdk.graal.compiler.nodes.NamedLocationIdentity; +import jdk.graal.compiler.nodes.NodeView; +import jdk.graal.compiler.nodes.ReturnNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.StructuredGraph.AllowAssumptions; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.calc.ConvertNode; +import jdk.graal.compiler.nodes.calc.SignExtendNode; +import jdk.graal.compiler.nodes.extended.JavaReadNode; +import jdk.graal.compiler.nodes.extended.JavaWriteNode; +import jdk.graal.compiler.nodes.memory.address.OffsetAddressNode; +import jdk.graal.compiler.phases.OptimisticOptimizations; +import jdk.graal.compiler.phases.tiers.HighTierContext; +import jdk.graal.compiler.word.Word; +import jdk.graal.compiler.word.WordCastNode; import org.graalvm.word.LocationIdentity; import org.graalvm.word.Pointer; import org.graalvm.word.WordFactory; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/PointerTrackingTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/PointerTrackingTest.java similarity index 89% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/PointerTrackingTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/PointerTrackingTest.java index fe22b33425b9..40ca7d348b54 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/PointerTrackingTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/PointerTrackingTest.java @@ -22,19 +22,19 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.replacements.test; - -import jdk.compiler.graal.api.directives.GraalDirectives; -import jdk.compiler.graal.debug.DebugCloseable; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext; -import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin; -import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins; -import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins.Registration; -import jdk.compiler.graal.replacements.Snippets; -import jdk.compiler.graal.word.WordCastNode; +package jdk.graal.compiler.replacements.test; + +import jdk.graal.compiler.api.directives.GraalDirectives; +import jdk.graal.compiler.debug.DebugCloseable; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext; +import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin; +import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins; +import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins.Registration; +import jdk.graal.compiler.replacements.Snippets; +import jdk.graal.compiler.word.WordCastNode; import org.junit.Test; import jdk.vm.ci.meta.JavaKind; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/ReplacementsTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/ReplacementsTest.java similarity index 92% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/ReplacementsTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/ReplacementsTest.java index a5830cf7279c..93697ffc3a57 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/ReplacementsTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/ReplacementsTest.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.replacements.test; +package jdk.graal.compiler.replacements.test; import java.lang.reflect.Executable; import java.lang.reflect.Field; -import jdk.compiler.graal.api.replacements.SnippetReflectionProvider; -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.replacements.ReplacementsImpl; -import jdk.compiler.graal.replacements.classfile.ClassfileBytecodeProvider; +import jdk.graal.compiler.api.replacements.SnippetReflectionProvider; +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.replacements.ReplacementsImpl; +import jdk.graal.compiler.replacements.classfile.ClassfileBytecodeProvider; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/SnippetsTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/SnippetsTest.java similarity index 79% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/SnippetsTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/SnippetsTest.java index 7584f58ef563..ef2a578dc044 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/SnippetsTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/SnippetsTest.java @@ -22,20 +22,20 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.replacements.test; +package jdk.graal.compiler.replacements.test; -import jdk.compiler.graal.java.GraphBuilderPhase; -import jdk.compiler.graal.java.GraphBuilderPhase.Instance; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.StructuredGraph.Builder; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration; -import jdk.compiler.graal.nodes.graphbuilderconf.IntrinsicContext; -import jdk.compiler.graal.phases.OptimisticOptimizations; -import jdk.compiler.graal.phases.PhaseSuite; -import jdk.compiler.graal.phases.tiers.HighTierContext; -import jdk.compiler.graal.phases.util.Providers; -import jdk.compiler.graal.replacements.ReplacementsImpl; -import jdk.compiler.graal.replacements.classfile.ClassfileBytecodeProvider; +import jdk.graal.compiler.java.GraphBuilderPhase; +import jdk.graal.compiler.java.GraphBuilderPhase.Instance; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.StructuredGraph.Builder; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration; +import jdk.graal.compiler.nodes.graphbuilderconf.IntrinsicContext; +import jdk.graal.compiler.phases.OptimisticOptimizations; +import jdk.graal.compiler.phases.PhaseSuite; +import jdk.graal.compiler.phases.tiers.HighTierContext; +import jdk.graal.compiler.phases.util.Providers; +import jdk.graal.compiler.replacements.ReplacementsImpl; +import jdk.graal.compiler.replacements.classfile.ClassfileBytecodeProvider; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/StandardMethodSubstitutionsTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/StandardMethodSubstitutionsTest.java similarity index 94% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/StandardMethodSubstitutionsTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/StandardMethodSubstitutionsTest.java index b34b2dd51984..dda3a611e50f 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/StandardMethodSubstitutionsTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/StandardMethodSubstitutionsTest.java @@ -22,21 +22,21 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.replacements.test; +package jdk.graal.compiler.replacements.test; import java.util.HashMap; -import jdk.compiler.graal.nodes.IfNode; -import jdk.compiler.graal.nodes.Invoke; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.calc.AbsNode; -import jdk.compiler.graal.nodes.calc.ReinterpretNode; -import jdk.compiler.graal.replacements.nodes.BitCountNode; -import jdk.compiler.graal.replacements.nodes.BitScanForwardNode; -import jdk.compiler.graal.replacements.nodes.BitScanReverseNode; -import jdk.compiler.graal.replacements.nodes.CountLeadingZerosNode; -import jdk.compiler.graal.replacements.nodes.CountTrailingZerosNode; -import jdk.compiler.graal.replacements.nodes.ReverseBytesNode; +import jdk.graal.compiler.nodes.IfNode; +import jdk.graal.compiler.nodes.Invoke; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.calc.AbsNode; +import jdk.graal.compiler.nodes.calc.ReinterpretNode; +import jdk.graal.compiler.replacements.nodes.BitCountNode; +import jdk.graal.compiler.replacements.nodes.BitScanForwardNode; +import jdk.graal.compiler.replacements.nodes.BitScanReverseNode; +import jdk.graal.compiler.replacements.nodes.CountLeadingZerosNode; +import jdk.graal.compiler.replacements.nodes.CountTrailingZerosNode; +import jdk.graal.compiler.replacements.nodes.ReverseBytesNode; import org.junit.Test; import jdk.vm.ci.code.InstalledCode; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/StringCompareToAVX512Test.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/StringCompareToAVX512Test.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/StringCompareToAVX512Test.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/StringCompareToAVX512Test.java index 37b0615169ed..b9fdbec9c167 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/StringCompareToAVX512Test.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/StringCompareToAVX512Test.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.replacements.test; +package jdk.graal.compiler.replacements.test; -import jdk.compiler.graal.core.test.GraalCompilerTest; +import jdk.graal.compiler.core.test.GraalCompilerTest; import org.junit.Test; // JDK-8228903 diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/StringCompareToTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/StringCompareToTest.java similarity index 91% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/StringCompareToTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/StringCompareToTest.java index 5d06b06407b0..e64e908d8be6 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/StringCompareToTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/StringCompareToTest.java @@ -22,18 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.replacements.test; +package jdk.graal.compiler.replacements.test; -import static jdk.compiler.graal.core.common.GraalOptions.RemoveNeverExecutedCode; +import static jdk.graal.compiler.core.common.GraalOptions.RemoveNeverExecutedCode; import java.util.List; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.nodes.Invoke; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.replacements.nodes.ArrayCompareToNode; -import jdk.compiler.graal.serviceprovider.GraalServices; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.nodes.Invoke; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.replacements.nodes.ArrayCompareToNode; +import jdk.graal.compiler.serviceprovider.GraalServices; import org.junit.Assert; import org.junit.Assume; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/StringCompressInflateTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/StringCompressInflateTest.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/StringCompressInflateTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/StringCompressInflateTest.java index 604b3b321dc3..d5c5d2d9239c 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/StringCompressInflateTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/StringCompressInflateTest.java @@ -22,21 +22,21 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.replacements.test; +package jdk.graal.compiler.replacements.test; import static org.junit.Assume.assumeTrue; import java.io.UnsupportedEncodingException; -import jdk.compiler.graal.core.common.CompilationIdentifier; -import jdk.compiler.graal.replacements.amd64.AMD64GraphBuilderPlugins; -import jdk.compiler.graal.hotspot.test.HotSpotGraalCompilerTest; -import jdk.compiler.graal.nodes.Invoke; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions; -import jdk.compiler.graal.replacements.StringLatin1InflateNode; -import jdk.compiler.graal.replacements.StringUTF16CompressNode; -import jdk.compiler.graal.test.AddExports; +import jdk.graal.compiler.core.common.CompilationIdentifier; +import jdk.graal.compiler.replacements.amd64.AMD64GraphBuilderPlugins; +import jdk.graal.compiler.hotspot.test.HotSpotGraalCompilerTest; +import jdk.graal.compiler.nodes.Invoke; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.StructuredGraph.AllowAssumptions; +import jdk.graal.compiler.replacements.StringLatin1InflateNode; +import jdk.graal.compiler.replacements.StringUTF16CompressNode; +import jdk.graal.compiler.test.AddExports; import org.junit.Assume; import org.junit.Before; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/StringEqualsConstantTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/StringEqualsConstantTest.java similarity index 90% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/StringEqualsConstantTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/StringEqualsConstantTest.java index bb7976e049be..d249c15f0221 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/StringEqualsConstantTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/StringEqualsConstantTest.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.replacements.test; +package jdk.graal.compiler.replacements.test; -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.nodes.ConstantNode; -import jdk.compiler.graal.nodes.FixedNode; -import jdk.compiler.graal.nodes.ReturnNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.ValueNode; +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.nodes.ConstantNode; +import jdk.graal.compiler.nodes.FixedNode; +import jdk.graal.compiler.nodes.ReturnNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.ValueNode; import jdk.vm.ci.meta.JavaConstant; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/StringEqualsTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/StringEqualsTest.java similarity index 94% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/StringEqualsTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/StringEqualsTest.java index e3397f22a39b..3259b8c6eb9b 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/StringEqualsTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/StringEqualsTest.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.replacements.test; +package jdk.graal.compiler.replacements.test; -import jdk.compiler.graal.replacements.nodes.ArrayEqualsNode; +import jdk.graal.compiler.replacements.nodes.ArrayEqualsNode; import org.junit.Test; /** diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/StringGetBytesTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/StringGetBytesTest.java similarity index 92% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/StringGetBytesTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/StringGetBytesTest.java index 65428792576f..2a550f9affc0 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/StringGetBytesTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/StringGetBytesTest.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.replacements.test; +package jdk.graal.compiler.replacements.test; import java.nio.charset.StandardCharsets; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.replacements.nodes.EncodeArrayNode; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.replacements.nodes.EncodeArrayNode; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/StringHashConstantTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/StringHashConstantTest.java similarity index 91% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/StringHashConstantTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/StringHashConstantTest.java index ae7477da28cd..99eb803c6fd9 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/StringHashConstantTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/StringHashConstantTest.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.replacements.test; +package jdk.graal.compiler.replacements.test; -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.nodes.ConstantNode; -import jdk.compiler.graal.nodes.FixedNode; -import jdk.compiler.graal.nodes.ReturnNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.ValueNode; +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.nodes.ConstantNode; +import jdk.graal.compiler.nodes.FixedNode; +import jdk.graal.compiler.nodes.ReturnNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.ValueNode; import jdk.vm.ci.meta.JavaConstant; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/StringIndexOfCharConstantBindingTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/StringIndexOfCharConstantBindingTest.java similarity index 88% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/StringIndexOfCharConstantBindingTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/StringIndexOfCharConstantBindingTest.java index 47e03c1c9ef9..6231b8bc462e 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/StringIndexOfCharConstantBindingTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/StringIndexOfCharConstantBindingTest.java @@ -22,16 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.replacements.test; +package jdk.graal.compiler.replacements.test; -import jdk.compiler.graal.core.common.GraalOptions; -import jdk.compiler.graal.nodes.FixedNode; -import jdk.compiler.graal.nodes.ReturnNode; -import jdk.compiler.graal.nodes.StartNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.replacements.ConstantBindingParameterPlugin; +import jdk.graal.compiler.core.common.GraalOptions; +import jdk.graal.compiler.nodes.FixedNode; +import jdk.graal.compiler.nodes.ReturnNode; +import jdk.graal.compiler.nodes.StartNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.replacements.ConstantBindingParameterPlugin; import org.junit.Test; import jdk.vm.ci.code.InstalledCode; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/StringIndexOfCharTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/StringIndexOfCharTest.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/StringIndexOfCharTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/StringIndexOfCharTest.java index 42f6db803734..c550ff06c468 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/StringIndexOfCharTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/StringIndexOfCharTest.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.replacements.test; +package jdk.graal.compiler.replacements.test; import java.util.ArrayList; import java.util.Collection; -import jdk.compiler.graal.core.test.GraalCompilerTest; +import jdk.graal.compiler.core.test.GraalCompilerTest; 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/replacements/test/StringIndexOfConstantTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/StringIndexOfConstantTest.java similarity index 92% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/StringIndexOfConstantTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/StringIndexOfConstantTest.java index 117ec245f415..4934d62c79c7 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/StringIndexOfConstantTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/StringIndexOfConstantTest.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.replacements.test; +package jdk.graal.compiler.replacements.test; import jdk.vm.ci.code.InstalledCode; import jdk.vm.ci.meta.ResolvedJavaMethod; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.replacements.ConstantBindingParameterPlugin; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.replacements.ConstantBindingParameterPlugin; import org.junit.Test; public class StringIndexOfConstantTest extends StringIndexOfTestBase { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/StringIndexOfDeoptimizeTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/StringIndexOfDeoptimizeTest.java similarity index 91% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/StringIndexOfDeoptimizeTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/StringIndexOfDeoptimizeTest.java index 459bfc260d80..452a3409bb1f 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/StringIndexOfDeoptimizeTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/StringIndexOfDeoptimizeTest.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.replacements.test; +package jdk.graal.compiler.replacements.test; -import jdk.compiler.graal.api.directives.GraalDirectives; -import jdk.compiler.graal.core.test.GraalCompilerTest; +import jdk.graal.compiler.api.directives.GraalDirectives; +import jdk.graal.compiler.core.test.GraalCompilerTest; import org.junit.Test; public class StringIndexOfDeoptimizeTest extends GraalCompilerTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/StringIndexOfTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/StringIndexOfTest.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/StringIndexOfTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/StringIndexOfTest.java index 1b593742e675..b0e598fc7606 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/StringIndexOfTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/StringIndexOfTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.replacements.test; +package jdk.graal.compiler.replacements.test; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/StringIndexOfTestBase.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/StringIndexOfTestBase.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/StringIndexOfTestBase.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/StringIndexOfTestBase.java index 7fe8f99c531c..32028188485d 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/StringIndexOfTestBase.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/StringIndexOfTestBase.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.replacements.test; +package jdk.graal.compiler.replacements.test; import java.util.ArrayList; import java.util.Collection; -import jdk.compiler.graal.core.test.GraalCompilerTest; +import jdk.graal.compiler.core.test.GraalCompilerTest; 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/replacements/test/StringIntrinsicRangeChecksTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/StringIntrinsicRangeChecksTest.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/StringIntrinsicRangeChecksTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/StringIntrinsicRangeChecksTest.java index b46b4f6d17d2..e1b453c4438e 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/StringIntrinsicRangeChecksTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/StringIntrinsicRangeChecksTest.java @@ -22,17 +22,17 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.replacements.test; +package jdk.graal.compiler.replacements.test; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; import java.lang.reflect.Method; import java.util.Arrays; -import jdk.compiler.graal.api.directives.GraalDirectives; -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration; -import jdk.compiler.graal.test.AddExports; +import jdk.graal.compiler.api.directives.GraalDirectives; +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration; +import jdk.graal.compiler.test.AddExports; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/StringSubstitutionTestBase.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/StringSubstitutionTestBase.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/StringSubstitutionTestBase.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/StringSubstitutionTestBase.java index c9367131f7cf..d9b22800bb42 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/StringSubstitutionTestBase.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/StringSubstitutionTestBase.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.replacements.test; +package jdk.graal.compiler.replacements.test; -import jdk.compiler.graal.nodes.Invoke; -import jdk.compiler.graal.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.Invoke; +import jdk.graal.compiler.nodes.StructuredGraph; import org.junit.Assert; import org.junit.Assume; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/StringSubstitutionsTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/StringSubstitutionsTest.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/StringSubstitutionsTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/StringSubstitutionsTest.java index fc302c66b993..43e1b5afb67b 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/StringSubstitutionsTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/StringSubstitutionsTest.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.replacements.test; +package jdk.graal.compiler.replacements.test; -import jdk.compiler.graal.nodes.Invoke; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.replacements.nodes.ArrayEqualsNode; +import jdk.graal.compiler.nodes.Invoke; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.replacements.nodes.ArrayEqualsNode; import org.junit.Test; import jdk.vm.ci.code.InstalledCode; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/SubstitutionNodeSourcePositionTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/SubstitutionNodeSourcePositionTest.java similarity index 85% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/SubstitutionNodeSourcePositionTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/SubstitutionNodeSourcePositionTest.java index 6ce8646f8edc..8b6fbf7cbd85 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/SubstitutionNodeSourcePositionTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/SubstitutionNodeSourcePositionTest.java @@ -22,22 +22,22 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.replacements.test; +package jdk.graal.compiler.replacements.test; -import static jdk.compiler.graal.core.GraalCompiler.compileGraph; -import static jdk.compiler.graal.core.common.GraalOptions.TrackNodeSourcePosition; +import static jdk.graal.compiler.core.GraalCompiler.compileGraph; +import static jdk.graal.compiler.core.common.GraalOptions.TrackNodeSourcePosition; import static org.junit.Assume.assumeTrue; import java.util.List; -import jdk.compiler.graal.api.directives.GraalDirectives; -import jdk.compiler.graal.code.CompilationResult; -import jdk.compiler.graal.code.SourceMapping; -import jdk.compiler.graal.graph.NodeSourcePosition; -import jdk.compiler.graal.lir.asm.CompilationResultBuilderFactory; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.phases.OptimisticOptimizations; +import jdk.graal.compiler.api.directives.GraalDirectives; +import jdk.graal.compiler.code.CompilationResult; +import jdk.graal.compiler.code.SourceMapping; +import jdk.graal.compiler.graph.NodeSourcePosition; +import jdk.graal.compiler.lir.asm.CompilationResultBuilderFactory; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.phases.OptimisticOptimizations; import org.junit.Assert; import org.junit.Test; @@ -64,10 +64,10 @@ public void testSnippetLowering() { // @formatter:off // Expect mappings of the form: - // at jdk.compiler.graal.hotspot.replacements.WriteBarrierSnippets.serialWriteBarrier(WriteBarrierSnippets.java:140) [bci: 18] - // at jdk.compiler.graal.hotspot.replacements.WriteBarrierSnippets.serialPreciseWriteBarrier(WriteBarrierSnippets.java:158) [bci: 5] Substitution - // at jdk.compiler.graal.hotspot.replacements.WriteBarrierSnippets.serialPreciseWriteBarrier(AddressNode$Address, WriteBarrierSnippets$Counters) [bci: -1] Substitution - // at jdk.compiler.graal.test.replacements.compiler.SubstitutionNodeSourcePositionTest.snippetLowering(SubstitutionNodeSourcePositionTest.java:99) [bci: 3] + // at jdk.graal.compiler.hotspot.replacements.WriteBarrierSnippets.serialWriteBarrier(WriteBarrierSnippets.java:140) [bci: 18] + // at jdk.graal.compiler.hotspot.replacements.WriteBarrierSnippets.serialPreciseWriteBarrier(WriteBarrierSnippets.java:158) [bci: 5] Substitution + // at jdk.graal.compiler.hotspot.replacements.WriteBarrierSnippets.serialPreciseWriteBarrier(AddressNode$Address, WriteBarrierSnippets$Counters) [bci: -1] Substitution + // at jdk.graal.compiler.test.replacements.compiler.SubstitutionNodeSourcePositionTest.snippetLowering(SubstitutionNodeSourcePositionTest.java:99) [bci: 3] // @formatter:on // // The precise snippet bytecodes don't matter, just ensure that some actually appear after @@ -84,8 +84,8 @@ public int methodPlugin(int i) { public void testMethodPlugin() { // @formatter:off // Expect mappings of the form: - // at jdk.compiler.graal.api.directives.GraalDirectives.blackhole(int) [bci: -1] - // at jdk.compiler.graal.test.replacements.compiler.SubstitutionNodeSourcePositionTest.methodPlugin(SubstitutionNodeSourcePositionTest.java:109) [bci: 1] + // at jdk.graal.compiler.api.directives.GraalDirectives.blackhole(int) [bci: -1] + // at jdk.graal.compiler.test.replacements.compiler.SubstitutionNodeSourcePositionTest.methodPlugin(SubstitutionNodeSourcePositionTest.java:109) [bci: 1] // @formatter:on checkMappings("methodPlugin", false, GraalDirectives.class, "blackhole"); } diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/SystemArrayCopyTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/SystemArrayCopyTest.java similarity index 92% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/SystemArrayCopyTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/SystemArrayCopyTest.java index e8b0d2cd28be..a4ac5feafb8f 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/SystemArrayCopyTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/SystemArrayCopyTest.java @@ -22,19 +22,19 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.replacements.test; +package jdk.graal.compiler.replacements.test; import jdk.vm.ci.code.InstalledCode; import jdk.vm.ci.meta.JavaConstant; import jdk.vm.ci.meta.JavaType; import jdk.vm.ci.meta.ResolvedJavaMethod; -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.nodes.ConstantNode; -import jdk.compiler.graal.nodes.ParameterNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.phases.PhaseSuite; -import jdk.compiler.graal.phases.tiers.HighTierContext; +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.nodes.ConstantNode; +import jdk.graal.compiler.nodes.ParameterNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.phases.PhaseSuite; +import jdk.graal.compiler.phases.tiers.HighTierContext; 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/replacements/test/TypeCheckTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/TypeCheckTest.java similarity index 92% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/TypeCheckTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/TypeCheckTest.java index fa3f052b79c4..f414f366c561 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/TypeCheckTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/TypeCheckTest.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.replacements.test; +package jdk.graal.compiler.replacements.test; -import jdk.compiler.graal.core.common.CompilationIdentifier; -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.options.OptionValues; +import jdk.graal.compiler.core.common.CompilationIdentifier; +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.options.OptionValues; import jdk.vm.ci.code.InstalledCode; import jdk.vm.ci.meta.JavaTypeProfile; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/UnsafeBooleanAccessTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/UnsafeBooleanAccessTest.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/UnsafeBooleanAccessTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/UnsafeBooleanAccessTest.java index 748295615350..cd348ca2b063 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/UnsafeBooleanAccessTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/UnsafeBooleanAccessTest.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.replacements.test; +package jdk.graal.compiler.replacements.test; import java.lang.reflect.Field; -import jdk.compiler.graal.core.test.GraalCompilerTest; +import jdk.graal.compiler.core.test.GraalCompilerTest; import org.junit.Test; public class UnsafeBooleanAccessTest extends GraalCompilerTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/UnsafeObjectReplacementsTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/UnsafeObjectReplacementsTest.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/UnsafeObjectReplacementsTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/UnsafeObjectReplacementsTest.java index a8224ba01079..0027661876a9 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/UnsafeObjectReplacementsTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/UnsafeObjectReplacementsTest.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.replacements.test; +package jdk.graal.compiler.replacements.test; import java.io.IOException; import java.lang.reflect.Method; -import jdk.compiler.graal.core.test.CustomizedBytecodePatternTest.CachedLoader; -import jdk.compiler.graal.test.AddExports; +import jdk.graal.compiler.core.test.CustomizedBytecodePatternTest.CachedLoader; +import jdk.graal.compiler.test.AddExports; import org.junit.Test; import org.objectweb.asm.ClassReader; import org.objectweb.asm.ClassVisitor; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/UnsafeReplacementsTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/UnsafeReplacementsTest.java similarity index 99% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/UnsafeReplacementsTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/UnsafeReplacementsTest.java index fed571145002..721795b36e43 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/UnsafeReplacementsTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/UnsafeReplacementsTest.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.replacements.test; +package jdk.graal.compiler.replacements.test; -import jdk.compiler.graal.test.AddExports; +import jdk.graal.compiler.test.AddExports; import org.junit.Test; @AddExports("java.base/jdk.internal.misc") diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/UnsafeSubstitutionsTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/UnsafeSubstitutionsTest.java similarity index 99% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/UnsafeSubstitutionsTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/UnsafeSubstitutionsTest.java index 0b34fd42d669..d1fcee9f0e89 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/UnsafeSubstitutionsTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/UnsafeSubstitutionsTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.replacements.test; +package jdk.graal.compiler.replacements.test; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/UnsignedIntegerTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/UnsignedIntegerTest.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/UnsignedIntegerTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/UnsignedIntegerTest.java index 0148a292d30f..09e8e32fe212 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/UnsignedIntegerTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/UnsignedIntegerTest.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.replacements.test; +package jdk.graal.compiler.replacements.test; import org.junit.Test; -import jdk.compiler.graal.core.test.GraalCompilerTest; +import jdk.graal.compiler.core.test.GraalCompilerTest; /** * Tests the unsigned operations on {@link Integer} and {@link Long}. diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/UnsignedMathTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/UnsignedMathTest.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/UnsignedMathTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/UnsignedMathTest.java index 40d65f1d14c4..685fe5f7e89e 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/UnsignedMathTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/UnsignedMathTest.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.replacements.test; +package jdk.graal.compiler.replacements.test; import org.junit.Test; -import jdk.compiler.graal.core.common.calc.UnsignedMath; -import jdk.compiler.graal.core.test.GraalCompilerTest; +import jdk.graal.compiler.core.common.calc.UnsignedMath; +import jdk.graal.compiler.core.test.GraalCompilerTest; /** * Tests the substitutions for the {@link UnsignedMath} class. diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/UnwindExceptionToCallerTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/UnwindExceptionToCallerTest.java similarity index 94% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/UnwindExceptionToCallerTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/UnwindExceptionToCallerTest.java index 680b781dc061..5d5c43877fc3 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/UnwindExceptionToCallerTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/UnwindExceptionToCallerTest.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.replacements.test; +package jdk.graal.compiler.replacements.test; import org.junit.Test; -import jdk.compiler.graal.core.test.GraalCompilerTest; +import jdk.graal.compiler.core.test.GraalCompilerTest; /** * Tests exception throwing from Graal compiled code. diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/VarHandleTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/VarHandleTest.java similarity index 91% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/VarHandleTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/VarHandleTest.java index 96ef5854c930..ab42db314e01 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/VarHandleTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/VarHandleTest.java @@ -22,25 +22,25 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.replacements.test; +package jdk.graal.compiler.replacements.test; import java.io.IOException; import java.lang.invoke.MethodHandles; import java.lang.invoke.VarHandle; import java.util.Objects; -import jdk.compiler.graal.core.test.SubprocessTest; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.nodes.StartNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.extended.MembarNode; -import jdk.compiler.graal.nodes.memory.MemoryKill; -import jdk.compiler.graal.nodes.memory.MultiMemoryKill; -import jdk.compiler.graal.nodes.memory.ReadNode; -import jdk.compiler.graal.nodes.memory.SingleMemoryKill; -import jdk.compiler.graal.nodes.memory.WriteNode; -import jdk.compiler.graal.phases.OptimisticOptimizations; +import jdk.graal.compiler.core.test.SubprocessTest; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.nodes.StartNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.extended.MembarNode; +import jdk.graal.compiler.nodes.memory.MemoryKill; +import jdk.graal.compiler.nodes.memory.MultiMemoryKill; +import jdk.graal.compiler.nodes.memory.ReadNode; +import jdk.graal.compiler.nodes.memory.SingleMemoryKill; +import jdk.graal.compiler.nodes.memory.WriteNode; +import jdk.graal.compiler.phases.OptimisticOptimizations; import org.graalvm.word.LocationIdentity; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/VectorizedHashCodeTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/VectorizedHashCodeTest.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/VectorizedHashCodeTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/VectorizedHashCodeTest.java index 22049e0318b1..a04a238d5172 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/VectorizedHashCodeTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/VectorizedHashCodeTest.java @@ -22,16 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.replacements.test; +package jdk.graal.compiler.replacements.test; import java.io.UnsupportedEncodingException; import java.util.HashSet; import java.util.Set; import java.util.function.Function; -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.replacements.amd64.AMD64GraphBuilderPlugins; -import jdk.compiler.graal.test.AddExports; +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.replacements.amd64.AMD64GraphBuilderPlugins; +import jdk.graal.compiler.test.AddExports; import org.junit.Test; import jdk.internal.util.ArraysSupport; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/WordTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/WordTest.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/WordTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/WordTest.java index c9f82e6e73eb..437902773be4 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/WordTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/WordTest.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.replacements.test; - -import jdk.compiler.graal.api.replacements.Snippet; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.StructuredGraph.Builder; -import jdk.compiler.graal.phases.PhaseSuite; -import jdk.compiler.graal.phases.tiers.HighTierContext; -import jdk.compiler.graal.word.Word; +package jdk.graal.compiler.replacements.test; + +import jdk.graal.compiler.api.replacements.Snippet; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.StructuredGraph.Builder; +import jdk.graal.compiler.phases.PhaseSuite; +import jdk.graal.compiler.phases.tiers.HighTierContext; +import jdk.graal.compiler.word.Word; import org.graalvm.word.Pointer; import org.graalvm.word.UnsignedWord; import org.graalvm.word.WordBase; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/classfile/ClassfileBytecodeProviderTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/classfile/ClassfileBytecodeProviderTest.java similarity index 83% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/classfile/ClassfileBytecodeProviderTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/classfile/ClassfileBytecodeProviderTest.java index 163121565f08..07e585e5b19a 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/classfile/ClassfileBytecodeProviderTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/replacements/test/classfile/ClassfileBytecodeProviderTest.java @@ -22,61 +22,61 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.replacements.test.classfile; - -import static jdk.compiler.graal.bytecode.Bytecodes.ALOAD; -import static jdk.compiler.graal.bytecode.Bytecodes.ANEWARRAY; -import static jdk.compiler.graal.bytecode.Bytecodes.ASTORE; -import static jdk.compiler.graal.bytecode.Bytecodes.BIPUSH; -import static jdk.compiler.graal.bytecode.Bytecodes.CHECKCAST; -import static jdk.compiler.graal.bytecode.Bytecodes.DLOAD; -import static jdk.compiler.graal.bytecode.Bytecodes.DSTORE; -import static jdk.compiler.graal.bytecode.Bytecodes.FLOAD; -import static jdk.compiler.graal.bytecode.Bytecodes.FSTORE; -import static jdk.compiler.graal.bytecode.Bytecodes.GETFIELD; -import static jdk.compiler.graal.bytecode.Bytecodes.GETSTATIC; -import static jdk.compiler.graal.bytecode.Bytecodes.GOTO; -import static jdk.compiler.graal.bytecode.Bytecodes.GOTO_W; -import static jdk.compiler.graal.bytecode.Bytecodes.IFEQ; -import static jdk.compiler.graal.bytecode.Bytecodes.IFGE; -import static jdk.compiler.graal.bytecode.Bytecodes.IFGT; -import static jdk.compiler.graal.bytecode.Bytecodes.IFLE; -import static jdk.compiler.graal.bytecode.Bytecodes.IFLT; -import static jdk.compiler.graal.bytecode.Bytecodes.IFNE; -import static jdk.compiler.graal.bytecode.Bytecodes.IFNONNULL; -import static jdk.compiler.graal.bytecode.Bytecodes.IFNULL; -import static jdk.compiler.graal.bytecode.Bytecodes.IF_ACMPEQ; -import static jdk.compiler.graal.bytecode.Bytecodes.IF_ACMPNE; -import static jdk.compiler.graal.bytecode.Bytecodes.IF_ICMPEQ; -import static jdk.compiler.graal.bytecode.Bytecodes.IF_ICMPGE; -import static jdk.compiler.graal.bytecode.Bytecodes.IF_ICMPGT; -import static jdk.compiler.graal.bytecode.Bytecodes.IF_ICMPLE; -import static jdk.compiler.graal.bytecode.Bytecodes.IF_ICMPLT; -import static jdk.compiler.graal.bytecode.Bytecodes.IF_ICMPNE; -import static jdk.compiler.graal.bytecode.Bytecodes.ILOAD; -import static jdk.compiler.graal.bytecode.Bytecodes.INSTANCEOF; -import static jdk.compiler.graal.bytecode.Bytecodes.INVOKEDYNAMIC; -import static jdk.compiler.graal.bytecode.Bytecodes.INVOKEINTERFACE; -import static jdk.compiler.graal.bytecode.Bytecodes.INVOKESPECIAL; -import static jdk.compiler.graal.bytecode.Bytecodes.INVOKESTATIC; -import static jdk.compiler.graal.bytecode.Bytecodes.INVOKEVIRTUAL; -import static jdk.compiler.graal.bytecode.Bytecodes.ISTORE; -import static jdk.compiler.graal.bytecode.Bytecodes.JSR; -import static jdk.compiler.graal.bytecode.Bytecodes.JSR_W; -import static jdk.compiler.graal.bytecode.Bytecodes.LDC; -import static jdk.compiler.graal.bytecode.Bytecodes.LDC2_W; -import static jdk.compiler.graal.bytecode.Bytecodes.LDC_W; -import static jdk.compiler.graal.bytecode.Bytecodes.LLOAD; -import static jdk.compiler.graal.bytecode.Bytecodes.LOOKUPSWITCH; -import static jdk.compiler.graal.bytecode.Bytecodes.LSTORE; -import static jdk.compiler.graal.bytecode.Bytecodes.MULTIANEWARRAY; -import static jdk.compiler.graal.bytecode.Bytecodes.NEW; -import static jdk.compiler.graal.bytecode.Bytecodes.NEWARRAY; -import static jdk.compiler.graal.bytecode.Bytecodes.PUTFIELD; -import static jdk.compiler.graal.bytecode.Bytecodes.PUTSTATIC; -import static jdk.compiler.graal.bytecode.Bytecodes.RET; -import static jdk.compiler.graal.bytecode.Bytecodes.SIPUSH; -import static jdk.compiler.graal.bytecode.Bytecodes.TABLESWITCH; +package jdk.graal.compiler.replacements.test.classfile; + +import static jdk.graal.compiler.bytecode.Bytecodes.ALOAD; +import static jdk.graal.compiler.bytecode.Bytecodes.ANEWARRAY; +import static jdk.graal.compiler.bytecode.Bytecodes.ASTORE; +import static jdk.graal.compiler.bytecode.Bytecodes.BIPUSH; +import static jdk.graal.compiler.bytecode.Bytecodes.CHECKCAST; +import static jdk.graal.compiler.bytecode.Bytecodes.DLOAD; +import static jdk.graal.compiler.bytecode.Bytecodes.DSTORE; +import static jdk.graal.compiler.bytecode.Bytecodes.FLOAD; +import static jdk.graal.compiler.bytecode.Bytecodes.FSTORE; +import static jdk.graal.compiler.bytecode.Bytecodes.GETFIELD; +import static jdk.graal.compiler.bytecode.Bytecodes.GETSTATIC; +import static jdk.graal.compiler.bytecode.Bytecodes.GOTO; +import static jdk.graal.compiler.bytecode.Bytecodes.GOTO_W; +import static jdk.graal.compiler.bytecode.Bytecodes.IFEQ; +import static jdk.graal.compiler.bytecode.Bytecodes.IFGE; +import static jdk.graal.compiler.bytecode.Bytecodes.IFGT; +import static jdk.graal.compiler.bytecode.Bytecodes.IFLE; +import static jdk.graal.compiler.bytecode.Bytecodes.IFLT; +import static jdk.graal.compiler.bytecode.Bytecodes.IFNE; +import static jdk.graal.compiler.bytecode.Bytecodes.IFNONNULL; +import static jdk.graal.compiler.bytecode.Bytecodes.IFNULL; +import static jdk.graal.compiler.bytecode.Bytecodes.IF_ACMPEQ; +import static jdk.graal.compiler.bytecode.Bytecodes.IF_ACMPNE; +import static jdk.graal.compiler.bytecode.Bytecodes.IF_ICMPEQ; +import static jdk.graal.compiler.bytecode.Bytecodes.IF_ICMPGE; +import static jdk.graal.compiler.bytecode.Bytecodes.IF_ICMPGT; +import static jdk.graal.compiler.bytecode.Bytecodes.IF_ICMPLE; +import static jdk.graal.compiler.bytecode.Bytecodes.IF_ICMPLT; +import static jdk.graal.compiler.bytecode.Bytecodes.IF_ICMPNE; +import static jdk.graal.compiler.bytecode.Bytecodes.ILOAD; +import static jdk.graal.compiler.bytecode.Bytecodes.INSTANCEOF; +import static jdk.graal.compiler.bytecode.Bytecodes.INVOKEDYNAMIC; +import static jdk.graal.compiler.bytecode.Bytecodes.INVOKEINTERFACE; +import static jdk.graal.compiler.bytecode.Bytecodes.INVOKESPECIAL; +import static jdk.graal.compiler.bytecode.Bytecodes.INVOKESTATIC; +import static jdk.graal.compiler.bytecode.Bytecodes.INVOKEVIRTUAL; +import static jdk.graal.compiler.bytecode.Bytecodes.ISTORE; +import static jdk.graal.compiler.bytecode.Bytecodes.JSR; +import static jdk.graal.compiler.bytecode.Bytecodes.JSR_W; +import static jdk.graal.compiler.bytecode.Bytecodes.LDC; +import static jdk.graal.compiler.bytecode.Bytecodes.LDC2_W; +import static jdk.graal.compiler.bytecode.Bytecodes.LDC_W; +import static jdk.graal.compiler.bytecode.Bytecodes.LLOAD; +import static jdk.graal.compiler.bytecode.Bytecodes.LOOKUPSWITCH; +import static jdk.graal.compiler.bytecode.Bytecodes.LSTORE; +import static jdk.graal.compiler.bytecode.Bytecodes.MULTIANEWARRAY; +import static jdk.graal.compiler.bytecode.Bytecodes.NEW; +import static jdk.graal.compiler.bytecode.Bytecodes.NEWARRAY; +import static jdk.graal.compiler.bytecode.Bytecodes.PUTFIELD; +import static jdk.graal.compiler.bytecode.Bytecodes.PUTSTATIC; +import static jdk.graal.compiler.bytecode.Bytecodes.RET; +import static jdk.graal.compiler.bytecode.Bytecodes.SIPUSH; +import static jdk.graal.compiler.bytecode.Bytecodes.TABLESWITCH; import java.io.File; import java.io.IOException; @@ -87,24 +87,24 @@ import java.util.zip.ZipEntry; import java.util.zip.ZipFile; -import jdk.compiler.graal.api.replacements.SnippetReflectionProvider; -import jdk.compiler.graal.api.test.Graal; -import jdk.compiler.graal.api.test.ModuleSupport; -import jdk.compiler.graal.bytecode.Bytecode; -import jdk.compiler.graal.bytecode.BytecodeDisassembler; -import jdk.compiler.graal.bytecode.BytecodeLookupSwitch; -import jdk.compiler.graal.bytecode.BytecodeStream; -import jdk.compiler.graal.bytecode.BytecodeSwitch; -import jdk.compiler.graal.bytecode.BytecodeTableSwitch; -import jdk.compiler.graal.bytecode.Bytecodes; -import jdk.compiler.graal.bytecode.ResolvedJavaMethodBytecode; -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.phases.VerifyPhase; -import jdk.compiler.graal.phases.util.Providers; -import jdk.compiler.graal.replacements.classfile.ClassfileBytecode; -import jdk.compiler.graal.replacements.classfile.ClassfileBytecodeProvider; -import jdk.compiler.graal.runtime.RuntimeProvider; -import jdk.compiler.graal.test.SubprocessUtil; +import jdk.graal.compiler.api.replacements.SnippetReflectionProvider; +import jdk.graal.compiler.api.test.Graal; +import jdk.graal.compiler.api.test.ModuleSupport; +import jdk.graal.compiler.bytecode.Bytecode; +import jdk.graal.compiler.bytecode.BytecodeDisassembler; +import jdk.graal.compiler.bytecode.BytecodeLookupSwitch; +import jdk.graal.compiler.bytecode.BytecodeStream; +import jdk.graal.compiler.bytecode.BytecodeSwitch; +import jdk.graal.compiler.bytecode.BytecodeTableSwitch; +import jdk.graal.compiler.bytecode.Bytecodes; +import jdk.graal.compiler.bytecode.ResolvedJavaMethodBytecode; +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.phases.VerifyPhase; +import jdk.graal.compiler.phases.util.Providers; +import jdk.graal.compiler.replacements.classfile.ClassfileBytecode; +import jdk.graal.compiler.replacements.classfile.ClassfileBytecodeProvider; +import jdk.graal.compiler.runtime.RuntimeProvider; +import jdk.graal.compiler.test.SubprocessUtil; import org.junit.Assert; import org.junit.Assume; import org.junit.Before; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/test/AddExports.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/test/AddExports.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/test/AddExports.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/test/AddExports.java index 1160ef391d4c..c8ca1f70f4e7 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/test/AddExports.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/test/AddExports.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.test; +package jdk.graal.compiler.test; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/test/AddJVM.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/test/AddJVM.java similarity index 99% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/test/AddJVM.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/test/AddJVM.java index d1092a40d64c..3630e4d32594 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/test/AddJVM.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/test/AddJVM.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.test; +package jdk.graal.compiler.test; import java.io.IOException; import java.io.PrintStream; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/test/AddModules.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/test/AddModules.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/test/AddModules.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/test/AddModules.java index 80cab14f313d..7ee5454fc8bd 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/test/AddModules.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/test/AddModules.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.test; +package jdk.graal.compiler.test; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/test/CommandLine.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/test/CommandLine.java similarity index 99% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/test/CommandLine.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/test/CommandLine.java index 8a6229e999cd..ab83e3be7e80 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/test/CommandLine.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/test/CommandLine.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.compiler.graal.test; +package jdk.graal.compiler.test; import java.io.IOException; import java.io.Reader; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/test/CountUppercase.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/test/CountUppercase.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/test/CountUppercase.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/test/CountUppercase.java index a8ee76a39b81..26a61c1f2d04 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/test/CountUppercase.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/test/CountUppercase.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.test; +package jdk.graal.compiler.test; /** * A simple program that sums up the upper case letters in some text. diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/test/GraalTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/test/GraalTest.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/test/GraalTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/test/GraalTest.java index 0bb0842e67fd..4560a33a8752 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/test/GraalTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/test/GraalTest.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.test; +package jdk.graal.compiler.test; -import static jdk.compiler.graal.debug.DebugContext.NO_DESCRIPTION; +import static jdk.graal.compiler.debug.DebugContext.NO_DESCRIPTION; import java.io.IOException; import java.io.PrintStream; @@ -45,16 +45,16 @@ import java.util.List; import java.util.concurrent.TimeUnit; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.debug.DebugContext.Builder; -import jdk.compiler.graal.debug.DebugDumpHandler; -import jdk.compiler.graal.debug.DebugHandlersFactory; -import jdk.compiler.graal.debug.GlobalMetrics; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.serviceprovider.GraalServices; -import jdk.compiler.graal.serviceprovider.GraalUnsafeAccess; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.debug.DebugContext.Builder; +import jdk.graal.compiler.debug.DebugDumpHandler; +import jdk.graal.compiler.debug.DebugHandlersFactory; +import jdk.graal.compiler.debug.GlobalMetrics; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.serviceprovider.GraalServices; +import jdk.graal.compiler.serviceprovider.GraalUnsafeAccess; import org.junit.After; import org.junit.Assert; import org.junit.AssumptionViolatedException; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/test/SubprocessUtil.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/test/SubprocessUtil.java similarity index 99% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/test/SubprocessUtil.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/test/SubprocessUtil.java index ce9fd0ff6fb7..1a4bc9f5737d 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/test/SubprocessUtil.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/test/SubprocessUtil.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.test; +package jdk.graal.compiler.test; import java.io.BufferedReader; import java.io.File; @@ -42,7 +42,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import jdk.compiler.graal.util.CollectionsUtil; +import jdk.graal.compiler.util.CollectionsUtil; import org.junit.Assume; /** diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/AOTSupportCompilationTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/AOTSupportCompilationTest.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/AOTSupportCompilationTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/AOTSupportCompilationTest.java index dd51d35be38a..a1955bbe834b 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/AOTSupportCompilationTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/AOTSupportCompilationTest.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; +package jdk.graal.compiler.truffle.test; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.java.MethodCallTargetNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.java.MethodCallTargetNode; import org.graalvm.polyglot.Context; import org.junit.Test; import org.openjdk.jmh.annotations.TearDown; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/AbstractSplittingStrategyTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/AbstractSplittingStrategyTest.java similarity index 99% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/AbstractSplittingStrategyTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/AbstractSplittingStrategyTest.java index 88a25348c7c3..f9f37972974e 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/AbstractSplittingStrategyTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/AbstractSplittingStrategyTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; +package jdk.graal.compiler.truffle.test; import java.lang.reflect.Field; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/AddExports.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/AddExports.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/AddExports.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/AddExports.java index b0a7d4638fb5..fa9e1f04debd 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/AddExports.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/AddExports.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; +package jdk.graal.compiler.truffle.test; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/AgnosticInliningPhaseTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/AgnosticInliningPhaseTest.java similarity index 91% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/AgnosticInliningPhaseTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/AgnosticInliningPhaseTest.java index ce97555ea78e..2f4cf6337c8e 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/AgnosticInliningPhaseTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/AgnosticInliningPhaseTest.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; +package jdk.graal.compiler.truffle.test; -import jdk.compiler.graal.core.common.CompilationIdentifier; -import jdk.compiler.graal.nodes.StructuredGraph; -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 jdk.graal.compiler.core.common.CompilationIdentifier; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.truffle.PartialEvaluator; +import jdk.graal.compiler.truffle.PostPartialEvaluationSuite; +import jdk.graal.compiler.truffle.TruffleCompilerImpl; +import jdk.graal.compiler.truffle.TruffleTierContext; +import jdk.graal.compiler.truffle.phases.inlining.AgnosticInliningPhase; import org.graalvm.polyglot.Context; import org.junit.Before; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/AllocationReporterPartialEvaluationTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/AllocationReporterPartialEvaluationTest.java similarity index 99% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/AllocationReporterPartialEvaluationTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/AllocationReporterPartialEvaluationTest.java index bede2236bf87..0123d9b20964 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/AllocationReporterPartialEvaluationTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/AllocationReporterPartialEvaluationTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; +package jdk.graal.compiler.truffle.test; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ArrayUtilsIndexOfWithMaskTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/ArrayUtilsIndexOfWithMaskTest.java similarity index 94% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ArrayUtilsIndexOfWithMaskTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/ArrayUtilsIndexOfWithMaskTest.java index c5a296f9e774..4de762f5eafd 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ArrayUtilsIndexOfWithMaskTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/ArrayUtilsIndexOfWithMaskTest.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; +package jdk.graal.compiler.truffle.test; import static com.oracle.truffle.api.test.ArrayUtilsTest.toByteArray; import static com.oracle.truffle.api.test.ArrayUtilsTest.toCharArray; -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins; -import jdk.compiler.graal.truffle.substitutions.TruffleInvocationPlugins; +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins; +import jdk.graal.compiler.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/ArrayUtilsRegionEqualsWithMaskConstantTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/ArrayUtilsRegionEqualsWithMaskConstantTest.java similarity index 93% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ArrayUtilsRegionEqualsWithMaskConstantTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/ArrayUtilsRegionEqualsWithMaskConstantTest.java index 24170f6ad61d..9ef0f14c8673 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ArrayUtilsRegionEqualsWithMaskConstantTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/ArrayUtilsRegionEqualsWithMaskConstantTest.java @@ -22,18 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; - -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.core.common.CompilationIdentifier; -import jdk.compiler.graal.graph.iterators.NodeIterable; -import jdk.compiler.graal.nodes.ReturnNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.ValueNode; -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.substitutions.TruffleInvocationPlugins; +package jdk.graal.compiler.truffle.test; + +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.core.common.CompilationIdentifier; +import jdk.graal.compiler.graph.iterators.NodeIterable; +import jdk.graal.compiler.nodes.ReturnNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.replacements.nodes.ArrayRegionEqualsNode; +import jdk.graal.compiler.truffle.substitutions.TruffleInvocationPlugins; import org.junit.Assert; import org.junit.Assume; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ArrayUtilsRegionEqualsWithMaskTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/ArrayUtilsRegionEqualsWithMaskTest.java similarity index 94% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ArrayUtilsRegionEqualsWithMaskTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/ArrayUtilsRegionEqualsWithMaskTest.java index d2e71ca10514..9639258e9e5d 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ArrayUtilsRegionEqualsWithMaskTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/ArrayUtilsRegionEqualsWithMaskTest.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; +package jdk.graal.compiler.truffle.test; import static com.oracle.truffle.api.test.ArrayUtilsTest.toByteArray; -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins; -import jdk.compiler.graal.truffle.substitutions.TruffleInvocationPlugins; +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins; +import jdk.graal.compiler.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.graal.compiler.test/src/jdk/graal/compiler/truffle/test/ArrayUtilsTest.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ArrayUtilsTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/ArrayUtilsTest.java index d9caba5d3a16..2c085efdb79e 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ArrayUtilsTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/ArrayUtilsTest.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; +package jdk.graal.compiler.truffle.test; import java.util.ArrayList; -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins; -import jdk.compiler.graal.truffle.substitutions.TruffleInvocationPlugins; +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins; +import jdk.graal.compiler.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/AssumedValuePartialEvaluationTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/AssumedValuePartialEvaluationTest.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/AssumedValuePartialEvaluationTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/AssumedValuePartialEvaluationTest.java index 5182461ea68f..d717dad4fb47 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/AssumedValuePartialEvaluationTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/AssumedValuePartialEvaluationTest.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; +package jdk.graal.compiler.truffle.test; -import jdk.compiler.graal.truffle.test.nodes.AbstractTestNode; -import jdk.compiler.graal.truffle.test.nodes.RootTestNode; -import jdk.compiler.graal.nodes.StructuredGraph; +import jdk.graal.compiler.truffle.test.nodes.AbstractTestNode; +import jdk.graal.compiler.truffle.test.nodes.RootTestNode; +import jdk.graal.compiler.nodes.StructuredGraph; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/AssumptionPartialEvaluationTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/AssumptionPartialEvaluationTest.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/AssumptionPartialEvaluationTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/AssumptionPartialEvaluationTest.java index b7d00808c70b..7739cdc3f581 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/AssumptionPartialEvaluationTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/AssumptionPartialEvaluationTest.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; +package jdk.graal.compiler.truffle.test; import java.lang.ref.WeakReference; -import jdk.compiler.graal.truffle.test.nodes.AbstractTestNode; -import jdk.compiler.graal.truffle.test.nodes.AssumptionCutsBranchTestNode; -import jdk.compiler.graal.truffle.test.nodes.ConstantWithAssumptionTestNode; -import jdk.compiler.graal.truffle.test.nodes.RootTestNode; +import jdk.graal.compiler.truffle.test.nodes.AbstractTestNode; +import jdk.graal.compiler.truffle.test.nodes.AssumptionCutsBranchTestNode; +import jdk.graal.compiler.truffle.test.nodes.ConstantWithAssumptionTestNode; +import jdk.graal.compiler.truffle.test.nodes.RootTestNode; 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/BailoutPartialEvaluationTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/BailoutPartialEvaluationTest.java similarity index 94% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/BailoutPartialEvaluationTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/BailoutPartialEvaluationTest.java index c6702e7d4d1c..7419ce7e156f 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/BailoutPartialEvaluationTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/BailoutPartialEvaluationTest.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; +package jdk.graal.compiler.truffle.test; -import jdk.compiler.graal.truffle.test.nodes.AbstractTestNode; -import jdk.compiler.graal.truffle.test.nodes.RootTestNode; +import jdk.graal.compiler.truffle.test.nodes.AbstractTestNode; +import jdk.graal.compiler.truffle.test.nodes.RootTestNode; import org.junit.Before; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/BeginNodeOptimizationTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/BeginNodeOptimizationTest.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/BeginNodeOptimizationTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/BeginNodeOptimizationTest.java index 5f35d77ada58..299ea814f9d4 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/BeginNodeOptimizationTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/BeginNodeOptimizationTest.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; +package jdk.graal.compiler.truffle.test; import java.util.function.Supplier; import java.util.stream.IntStream; -import jdk.compiler.graal.graph.Graph; -import jdk.compiler.graal.nodes.BeginNode; +import jdk.graal.compiler.graph.Graph; +import jdk.graal.compiler.nodes.BeginNode; import org.graalvm.polyglot.Context; import org.junit.Assert; import org.junit.Test; @@ -65,7 +65,7 @@ class Listener extends Graph.NodeEventListener { int beginCount; @Override - public void nodeAdded(jdk.compiler.graal.graph.Node node) { + public void nodeAdded(jdk.graal.compiler.graph.Node node) { if (node instanceof BeginNode) { beginCount++; } diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/BytecodeInterpreterPartialEvaluationTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/BytecodeInterpreterPartialEvaluationTest.java similarity index 99% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/BytecodeInterpreterPartialEvaluationTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/BytecodeInterpreterPartialEvaluationTest.java index f0f2ae8469cf..6ba6f3036267 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/BytecodeInterpreterPartialEvaluationTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/BytecodeInterpreterPartialEvaluationTest.java @@ -22,17 +22,17 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; +package jdk.graal.compiler.truffle.test; import java.util.ArrayList; import java.util.Formatter; import java.util.List; import java.util.Map; -import jdk.compiler.graal.debug.DebugOptions; -import jdk.compiler.graal.debug.MetricKey; -import jdk.compiler.graal.debug.TimerKey; -import jdk.compiler.graal.options.OptionValues; +import jdk.graal.compiler.debug.DebugOptions; +import jdk.graal.compiler.debug.MetricKey; +import jdk.graal.compiler.debug.TimerKey; +import jdk.graal.compiler.options.OptionValues; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/BytecodeOSRNodeTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/BytecodeOSRNodeTest.java similarity index 99% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/BytecodeOSRNodeTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/BytecodeOSRNodeTest.java index a3d59ef25f35..00395f8f38f8 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/BytecodeOSRNodeTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/BytecodeOSRNodeTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; +package jdk.graal.compiler.truffle.test; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -33,7 +33,7 @@ import com.oracle.truffle.runtime.OptimizedTruffleRuntime; import com.oracle.truffle.runtime.OptimizedCallTarget; -import jdk.compiler.graal.test.GraalTest; +import jdk.graal.compiler.test.GraalTest; import org.graalvm.polyglot.Context; import org.junit.Assert; import org.junit.Before; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/CachedLibraryCompilationTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/CachedLibraryCompilationTest.java similarity index 94% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/CachedLibraryCompilationTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/CachedLibraryCompilationTest.java index ee88098de1a9..581ab7ed5598 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/CachedLibraryCompilationTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/CachedLibraryCompilationTest.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; - -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.java.MethodCallTargetNode; -import jdk.compiler.graal.truffle.test.CachedLibraryCompilationTestFactory.FrameNodeGen; -import jdk.compiler.graal.truffle.test.CachedLibraryCompilationTestFactory.GuardNodeGen; -import jdk.compiler.graal.truffle.test.CachedLibraryCompilationTestFactory.NoGuardNodeGen; -import jdk.compiler.graal.truffle.test.CachedLibraryCompilationTestFactory.VarArgsLibraryNodeGen; +package jdk.graal.compiler.truffle.test; + +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.java.MethodCallTargetNode; +import jdk.graal.compiler.truffle.test.CachedLibraryCompilationTestFactory.FrameNodeGen; +import jdk.graal.compiler.truffle.test.CachedLibraryCompilationTestFactory.GuardNodeGen; +import jdk.graal.compiler.truffle.test.CachedLibraryCompilationTestFactory.NoGuardNodeGen; +import jdk.graal.compiler.truffle.test.CachedLibraryCompilationTestFactory.VarArgsLibraryNodeGen; import org.graalvm.polyglot.Context; import org.junit.After; import org.junit.Assert; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/CastExactPartialEvaluationTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/CastExactPartialEvaluationTest.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/CastExactPartialEvaluationTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/CastExactPartialEvaluationTest.java index 28eddb9db05b..89b89f68592f 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/CastExactPartialEvaluationTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/CastExactPartialEvaluationTest.java @@ -22,16 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; +package jdk.graal.compiler.truffle.test; import java.nio.BufferOverflowException; import java.nio.BufferUnderflowException; import java.nio.ByteBuffer; -import jdk.compiler.graal.truffle.test.nodes.AbstractTestNode; -import jdk.compiler.graal.truffle.test.nodes.RootTestNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.java.MethodCallTargetNode; +import jdk.graal.compiler.truffle.test.nodes.AbstractTestNode; +import jdk.graal.compiler.truffle.test.nodes.RootTestNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.java.MethodCallTargetNode; import org.junit.Assert; import org.junit.Assume; import org.junit.Before; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/CodeInvalidationTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/CodeInvalidationTest.java similarity index 99% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/CodeInvalidationTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/CodeInvalidationTest.java index f93407ec28db..0a6896905854 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/CodeInvalidationTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/CodeInvalidationTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; +package jdk.graal.compiler.truffle.test; import java.io.IOException; import java.util.concurrent.CountDownLatch; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/CompilationFinalPartialEvaluationTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/CompilationFinalPartialEvaluationTest.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/CompilationFinalPartialEvaluationTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/CompilationFinalPartialEvaluationTest.java index 19d2206bec81..41dbca270198 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/CompilationFinalPartialEvaluationTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/CompilationFinalPartialEvaluationTest.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; +package jdk.graal.compiler.truffle.test; import static com.oracle.truffle.api.CompilerAsserts.partialEvaluationConstant; -import jdk.compiler.graal.truffle.test.nodes.AbstractTestNode; -import jdk.compiler.graal.truffle.test.nodes.RootTestNode; +import jdk.graal.compiler.truffle.test.nodes.AbstractTestNode; +import jdk.graal.compiler.truffle.test.nodes.RootTestNode; import org.junit.Test; import com.oracle.truffle.api.CompilerAsserts; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/CompilationFinalWeakReferencePartialEvaluationTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/CompilationFinalWeakReferencePartialEvaluationTest.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/CompilationFinalWeakReferencePartialEvaluationTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/CompilationFinalWeakReferencePartialEvaluationTest.java index 3ff518e0da93..9f812f2d89c7 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/CompilationFinalWeakReferencePartialEvaluationTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/CompilationFinalWeakReferencePartialEvaluationTest.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; +package jdk.graal.compiler.truffle.test; import java.lang.ref.WeakReference; import java.util.function.IntSupplier; import java.util.stream.IntStream; -import jdk.compiler.graal.truffle.test.nodes.AbstractTestNode; -import jdk.compiler.graal.truffle.test.nodes.RootTestNode; +import jdk.graal.compiler.truffle.test.nodes.AbstractTestNode; +import jdk.graal.compiler.truffle.test.nodes.RootTestNode; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/CompilationMemoryTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/CompilationMemoryTest.java similarity index 99% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/CompilationMemoryTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/CompilationMemoryTest.java index 2abc24b60e94..5f56fcccdbe5 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/CompilationMemoryTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/CompilationMemoryTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; +package jdk.graal.compiler.truffle.test; import java.lang.ref.Reference; import java.lang.ref.WeakReference; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/CompilerAssertsTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/CompilerAssertsTest.java similarity index 91% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/CompilerAssertsTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/CompilerAssertsTest.java index 633ab8a29a99..ecc7c910e066 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/CompilerAssertsTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/CompilerAssertsTest.java @@ -22,16 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; - -import jdk.compiler.graal.truffle.test.nodes.AbstractTestNode; -import jdk.compiler.graal.truffle.test.nodes.ConstantTestNode; -import jdk.compiler.graal.truffle.test.nodes.NonConstantTestNode; -import jdk.compiler.graal.truffle.test.nodes.RootTestNode; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.graph.iterators.NodeIterable; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.extended.BoxNode; +package jdk.graal.compiler.truffle.test; + +import jdk.graal.compiler.truffle.test.nodes.AbstractTestNode; +import jdk.graal.compiler.truffle.test.nodes.ConstantTestNode; +import jdk.graal.compiler.truffle.test.nodes.NonConstantTestNode; +import jdk.graal.compiler.truffle.test.nodes.RootTestNode; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.graph.iterators.NodeIterable; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.extended.BoxNode; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/CompilerDirectivesTypeTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/CompilerDirectivesTypeTest.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/CompilerDirectivesTypeTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/CompilerDirectivesTypeTest.java index 01659823f1d1..506314d948cc 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/CompilerDirectivesTypeTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/CompilerDirectivesTypeTest.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; +package jdk.graal.compiler.truffle.test; -import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins; -import jdk.compiler.graal.serviceprovider.GraalServices; -import jdk.compiler.graal.truffle.substitutions.GraphBuilderInvocationPluginProvider; -import jdk.compiler.graal.truffle.substitutions.TruffleGraphBuilderPlugins; +import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins; +import jdk.graal.compiler.serviceprovider.GraalServices; +import jdk.graal.compiler.truffle.substitutions.GraphBuilderInvocationPluginProvider; +import jdk.graal.compiler.truffle.substitutions.TruffleGraphBuilderPlugins; import org.junit.Test; import com.oracle.truffle.api.CompilerDirectives; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/CompilerInitializationTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/CompilerInitializationTest.java similarity index 99% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/CompilerInitializationTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/CompilerInitializationTest.java index 29ae51b7c64c..c43075f0e7b2 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/CompilerInitializationTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/CompilerInitializationTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; +package jdk.graal.compiler.truffle.test; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/CompilerLoggingTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/CompilerLoggingTest.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/CompilerLoggingTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/CompilerLoggingTest.java index b1cb14035b2e..a696c4826921 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/CompilerLoggingTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/CompilerLoggingTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; +package jdk.graal.compiler.truffle.test; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -35,8 +35,8 @@ import com.oracle.truffle.api.TruffleOptions; import com.oracle.truffle.api.frame.VirtualFrame; -import jdk.compiler.graal.debug.TTY; -import jdk.compiler.graal.truffle.TruffleCompilerImpl; +import jdk.graal.compiler.debug.TTY; +import jdk.graal.compiler.truffle.TruffleCompilerImpl; import org.graalvm.polyglot.Context; import org.junit.Assert; import org.junit.Assume; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/CompilerOptionTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/CompilerOptionTest.java similarity index 99% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/CompilerOptionTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/CompilerOptionTest.java index 8f110eafab3f..d9dbd9a7c177 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/CompilerOptionTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/CompilerOptionTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; +package jdk.graal.compiler.truffle.test; import static org.junit.Assert.assertTrue; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ConditionAnchoringTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/ConditionAnchoringTest.java similarity index 80% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ConditionAnchoringTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/ConditionAnchoringTest.java index d26b14b986b7..409a0bba97d3 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ConditionAnchoringTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/ConditionAnchoringTest.java @@ -22,40 +22,40 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; +package jdk.graal.compiler.truffle.test; -import static jdk.compiler.graal.graph.test.matchers.NodeIterableCount.hasCount; -import static jdk.compiler.graal.graph.test.matchers.NodeIterableIsEmpty.isEmpty; -import static jdk.compiler.graal.nodes.graphbuilderconf.InlineInvokePlugin.InlineInfo.createStandardInlineInfo; +import static jdk.graal.compiler.graph.test.matchers.NodeIterableCount.hasCount; +import static jdk.graal.compiler.graph.test.matchers.NodeIterableIsEmpty.isEmpty; +import static jdk.graal.compiler.nodes.graphbuilderconf.InlineInvokePlugin.InlineInfo.createStandardInlineInfo; import static org.hamcrest.core.IsInstanceOf.instanceOf; import static org.junit.Assert.assertThat; import java.lang.reflect.Field; -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.graph.iterators.NodeIterable; -import jdk.compiler.graal.nodes.BeginNode; -import jdk.compiler.graal.nodes.ConditionAnchorNode; -import jdk.compiler.graal.nodes.IfNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.extended.RawLoadNode; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext; -import jdk.compiler.graal.nodes.graphbuilderconf.InlineInvokePlugin; -import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins; -import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins.Registration; -import jdk.compiler.graal.nodes.memory.FloatingReadNode; -import jdk.compiler.graal.nodes.memory.ReadNode; -import jdk.compiler.graal.nodes.spi.CoreProviders; -import jdk.compiler.graal.phases.common.CanonicalizerPhase; -import jdk.compiler.graal.phases.common.ConditionalEliminationPhase; -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.nodes.ObjectLocationIdentity; -import jdk.compiler.graal.truffle.substitutions.TruffleGraphBuilderPlugins; +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.graph.iterators.NodeIterable; +import jdk.graal.compiler.nodes.BeginNode; +import jdk.graal.compiler.nodes.ConditionAnchorNode; +import jdk.graal.compiler.nodes.IfNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.StructuredGraph.AllowAssumptions; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.extended.RawLoadNode; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext; +import jdk.graal.compiler.nodes.graphbuilderconf.InlineInvokePlugin; +import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins; +import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins.Registration; +import jdk.graal.compiler.nodes.memory.FloatingReadNode; +import jdk.graal.compiler.nodes.memory.ReadNode; +import jdk.graal.compiler.nodes.spi.CoreProviders; +import jdk.graal.compiler.phases.common.CanonicalizerPhase; +import jdk.graal.compiler.phases.common.ConditionalEliminationPhase; +import jdk.graal.compiler.phases.common.FloatingReadPhase; +import jdk.graal.compiler.phases.common.HighTierLoweringPhase; +import jdk.graal.compiler.phases.common.LoweringPhase; +import jdk.graal.compiler.truffle.nodes.ObjectLocationIdentity; +import jdk.graal.compiler.truffle.substitutions.TruffleGraphBuilderPlugins; import org.junit.Test; import jdk.vm.ci.meta.JavaKind; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ContextLookupCompilationTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/ContextLookupCompilationTest.java similarity index 99% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ContextLookupCompilationTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/ContextLookupCompilationTest.java index dfc700a17a96..4fd0031e4f68 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ContextLookupCompilationTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/ContextLookupCompilationTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; +package jdk.graal.compiler.truffle.test; import static org.junit.Assert.assertSame; @@ -35,9 +35,9 @@ import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; -import jdk.compiler.graal.nodes.FieldLocationIdentity; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.memory.ReadNode; +import jdk.graal.compiler.nodes.FieldLocationIdentity; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.memory.ReadNode; import org.graalvm.polyglot.Context; import org.graalvm.polyglot.Engine; import org.graalvm.word.LocationIdentity; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ControlFlowExceptionPartialEvaluationTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/ControlFlowExceptionPartialEvaluationTest.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ControlFlowExceptionPartialEvaluationTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/ControlFlowExceptionPartialEvaluationTest.java index 0f4113a0dd99..b8083d621a04 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ControlFlowExceptionPartialEvaluationTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/ControlFlowExceptionPartialEvaluationTest.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; +package jdk.graal.compiler.truffle.test; -import jdk.compiler.graal.truffle.test.nodes.AbstractTestNode; -import jdk.compiler.graal.truffle.test.nodes.RootTestNode; +import jdk.graal.compiler.truffle.test.nodes.AbstractTestNode; +import jdk.graal.compiler.truffle.test.nodes.RootTestNode; import org.graalvm.polyglot.Context; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/DFAPartialEvaluationTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/DFAPartialEvaluationTest.java similarity index 99% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/DFAPartialEvaluationTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/DFAPartialEvaluationTest.java index eb3b5be45147..4564326f5e90 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/DFAPartialEvaluationTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/DFAPartialEvaluationTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; +package jdk.graal.compiler.truffle.test; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/DefaultLoomTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/DefaultLoomTest.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/DefaultLoomTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/DefaultLoomTest.java index a48770b04a40..c11e42994021 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/DefaultLoomTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/DefaultLoomTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; +package jdk.graal.compiler.truffle.test; import java.io.IOException; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/DeoptInvalidateListener.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/DeoptInvalidateListener.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/DeoptInvalidateListener.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/DeoptInvalidateListener.java index d710a63eb271..742a153e1f1c 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/DeoptInvalidateListener.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/DeoptInvalidateListener.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; +package jdk.graal.compiler.truffle.test; import com.oracle.truffle.api.frame.Frame; import com.oracle.truffle.runtime.AbstractGraalTruffleRuntimeListener; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/DynamicObjectPartialEvaluationTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/DynamicObjectPartialEvaluationTest.java similarity index 91% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/DynamicObjectPartialEvaluationTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/DynamicObjectPartialEvaluationTest.java index 18eb1078cbfb..c2a5e5be7992 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/DynamicObjectPartialEvaluationTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/DynamicObjectPartialEvaluationTest.java @@ -22,20 +22,20 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; - -import jdk.compiler.graal.truffle.test.nodes.AbstractTestNode; -import jdk.compiler.graal.truffle.test.nodes.RootTestNode; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.nodes.NamedLocationIdentity; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.extended.GuardedUnsafeLoadNode; -import jdk.compiler.graal.nodes.extended.RawLoadNode; -import jdk.compiler.graal.nodes.extended.RawStoreNode; -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.nodes.ObjectLocationIdentity; +package jdk.graal.compiler.truffle.test; + +import jdk.graal.compiler.truffle.test.nodes.AbstractTestNode; +import jdk.graal.compiler.truffle.test.nodes.RootTestNode; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.nodes.NamedLocationIdentity; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.extended.GuardedUnsafeLoadNode; +import jdk.graal.compiler.nodes.extended.RawLoadNode; +import jdk.graal.compiler.nodes.extended.RawStoreNode; +import jdk.graal.compiler.nodes.extended.UnsafeAccessNode; +import jdk.graal.compiler.nodes.java.LoadFieldNode; +import jdk.graal.compiler.nodes.java.StoreFieldNode; +import jdk.graal.compiler.truffle.nodes.ObjectLocationIdentity; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/EncodedGraphCacheTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/EncodedGraphCacheTest.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/EncodedGraphCacheTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/EncodedGraphCacheTest.java index 25a089c62c86..5ff39efeaeee 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/EncodedGraphCacheTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/EncodedGraphCacheTest.java @@ -22,21 +22,21 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; +package jdk.graal.compiler.truffle.test; import java.lang.reflect.Method; import java.util.function.BiFunction; import java.util.function.Consumer; import java.util.function.Supplier; -import jdk.compiler.graal.truffle.test.nodes.AbstractTestNode; -import jdk.compiler.graal.truffle.test.nodes.RootTestNode; +import jdk.graal.compiler.truffle.test.nodes.AbstractTestNode; +import jdk.graal.compiler.truffle.test.nodes.RootTestNode; import org.graalvm.collections.EconomicMap; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.nodes.EncodedGraph; -import jdk.compiler.graal.truffle.PartialEvaluator; -import jdk.compiler.graal.truffle.TruffleCompilation; -import jdk.compiler.graal.truffle.TruffleCompilerImpl; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.nodes.EncodedGraph; +import jdk.graal.compiler.truffle.PartialEvaluator; +import jdk.graal.compiler.truffle.TruffleCompilation; +import jdk.graal.compiler.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/EngineModeTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/EngineModeTest.java similarity index 99% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/EngineModeTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/EngineModeTest.java index 342a0ad5e7d2..08377fba913a 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/EngineModeTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/EngineModeTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; +package jdk.graal.compiler.truffle.test; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/EnumPartialEvaluationTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/EnumPartialEvaluationTest.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/EnumPartialEvaluationTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/EnumPartialEvaluationTest.java index 8fff9c0401ce..985d51a7cd63 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/EnumPartialEvaluationTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/EnumPartialEvaluationTest.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; +package jdk.graal.compiler.truffle.test; -import jdk.compiler.graal.truffle.test.nodes.AbstractTestNode; -import jdk.compiler.graal.truffle.test.nodes.RootTestNode; +import jdk.graal.compiler.truffle.test.nodes.AbstractTestNode; +import jdk.graal.compiler.truffle.test.nodes.RootTestNode; import org.junit.Ignore; 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.graal.compiler.test/src/jdk/graal/compiler/truffle/test/ExactMathTest.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ExactMathTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/ExactMathTest.java index c051180dcb0f..41057d7b7a89 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ExactMathTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/ExactMathTest.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; +package jdk.graal.compiler.truffle.test; -import jdk.compiler.graal.nodes.calc.RoundNode; -import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins; -import jdk.compiler.graal.truffle.substitutions.TruffleGraphBuilderPlugins; +import jdk.graal.compiler.nodes.calc.RoundNode; +import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins; +import jdk.graal.compiler.truffle.substitutions.TruffleGraphBuilderPlugins; import org.junit.Assert; import org.junit.Assume; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ExceptionActionTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/ExceptionActionTest.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ExceptionActionTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/ExceptionActionTest.java index e84d99da0c13..604e6be2c493 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ExceptionActionTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/ExceptionActionTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; +package jdk.graal.compiler.truffle.test; import java.io.File; import java.io.IOException; @@ -40,8 +40,8 @@ import com.oracle.truffle.runtime.OptimizedTruffleRuntime; import com.oracle.truffle.runtime.OptimizedCallTarget; -import jdk.compiler.graal.truffle.test.nodes.AbstractTestNode; -import jdk.compiler.graal.truffle.test.nodes.RootTestNode; +import jdk.graal.compiler.truffle.test.nodes.AbstractTestNode; +import jdk.graal.compiler.truffle.test.nodes.RootTestNode; import org.graalvm.polyglot.Context; import org.junit.Assert; import org.junit.BeforeClass; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ExecutionListenerCompilerTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/ExecutionListenerCompilerTest.java similarity index 99% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ExecutionListenerCompilerTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/ExecutionListenerCompilerTest.java index 938d8e701b37..38d6ee74f8ad 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ExecutionListenerCompilerTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/ExecutionListenerCompilerTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; +package jdk.graal.compiler.truffle.test; import java.util.function.Consumer; import java.util.function.Supplier; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ExitDuringCompilationTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/ExitDuringCompilationTest.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ExitDuringCompilationTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/ExitDuringCompilationTest.java index 1e6495869779..a943cd088122 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ExitDuringCompilationTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/ExitDuringCompilationTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; +package jdk.graal.compiler.truffle.test; import com.oracle.truffle.api.nodes.RootNode; import com.oracle.truffle.api.test.SubprocessTestUtils; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ExplodeLoopBlockDuplicationTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/ExplodeLoopBlockDuplicationTest.java similarity index 99% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ExplodeLoopBlockDuplicationTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/ExplodeLoopBlockDuplicationTest.java index 3d6b41d9976d..a0420a0b6b69 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ExplodeLoopBlockDuplicationTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/ExplodeLoopBlockDuplicationTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; +package jdk.graal.compiler.truffle.test; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/FinalBitSetCompilationTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/FinalBitSetCompilationTest.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/FinalBitSetCompilationTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/FinalBitSetCompilationTest.java index 8f11a48f0d1c..cf1502065aca 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/FinalBitSetCompilationTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/FinalBitSetCompilationTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; +package jdk.graal.compiler.truffle.test; import java.util.Arrays; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/FlushEngineQueueTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/FlushEngineQueueTest.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/FlushEngineQueueTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/FlushEngineQueueTest.java index 1ee5d2b0a4ca..2892d90cd8ee 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/FlushEngineQueueTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/FlushEngineQueueTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; +package jdk.graal.compiler.truffle.test; import static org.junit.Assert.assertNotEquals; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/FrameAccessVerificationTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/FrameAccessVerificationTest.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/FrameAccessVerificationTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/FrameAccessVerificationTest.java index 5e2c9e568247..1ff9c7b3cd3f 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/FrameAccessVerificationTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/FrameAccessVerificationTest.java @@ -23,21 +23,21 @@ * questions. */ -package jdk.compiler.graal.truffle.test; +package jdk.graal.compiler.truffle.test; import java.util.function.Consumer; -import jdk.compiler.graal.nodes.DeoptimizeNode; -import jdk.compiler.graal.nodes.FixedGuardNode; -import jdk.compiler.graal.nodes.ReturnNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.calc.NarrowNode; -import jdk.compiler.graal.nodes.calc.ReinterpretNode; -import jdk.compiler.graal.nodes.calc.SignExtendNode; -import jdk.compiler.graal.nodes.calc.ZeroExtendNode; -import jdk.compiler.graal.nodes.java.AbstractNewObjectNode; -import jdk.compiler.graal.nodes.java.ExceptionObjectNode; -import jdk.compiler.graal.nodes.virtual.AllocatedObjectNode; +import jdk.graal.compiler.nodes.DeoptimizeNode; +import jdk.graal.compiler.nodes.FixedGuardNode; +import jdk.graal.compiler.nodes.ReturnNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.calc.NarrowNode; +import jdk.graal.compiler.nodes.calc.ReinterpretNode; +import jdk.graal.compiler.nodes.calc.SignExtendNode; +import jdk.graal.compiler.nodes.calc.ZeroExtendNode; +import jdk.graal.compiler.nodes.java.AbstractNewObjectNode; +import jdk.graal.compiler.nodes.java.ExceptionObjectNode; +import jdk.graal.compiler.nodes.virtual.AllocatedObjectNode; import org.junit.Assert; import org.junit.Assume; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/FrameDescriptorTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/FrameDescriptorTest.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/FrameDescriptorTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/FrameDescriptorTest.java index 80b9773599a3..e62835cb563c 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/FrameDescriptorTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/FrameDescriptorTest.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; +package jdk.graal.compiler.truffle.test; -import jdk.compiler.graal.nodes.ConstantNode; -import jdk.compiler.graal.nodes.ReturnNode; -import jdk.compiler.graal.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.ConstantNode; +import jdk.graal.compiler.nodes.ReturnNode; +import jdk.graal.compiler.nodes.StructuredGraph; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/FrameHostReadsTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/FrameHostReadsTest.java similarity index 93% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/FrameHostReadsTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/FrameHostReadsTest.java index b5c34bd21510..1a9a94a0bbc1 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/FrameHostReadsTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/FrameHostReadsTest.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; +package jdk.graal.compiler.truffle.test; -import jdk.compiler.graal.api.directives.GraalDirectives; -import jdk.compiler.graal.nodes.FieldLocationIdentity; -import jdk.compiler.graal.nodes.NamedLocationIdentity; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.memory.ReadNode; +import jdk.graal.compiler.api.directives.GraalDirectives; +import jdk.graal.compiler.nodes.FieldLocationIdentity; +import jdk.graal.compiler.nodes.NamedLocationIdentity; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.memory.ReadNode; import org.graalvm.word.LocationIdentity; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/GR35581Test.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/GR35581Test.java similarity index 99% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/GR35581Test.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/GR35581Test.java index ef05fdd0deb2..5961b6143f54 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/GR35581Test.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/GR35581Test.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; +package jdk.graal.compiler.truffle.test; import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutionException; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/GR36613Test.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/GR36613Test.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/GR36613Test.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/GR36613Test.java index 042ab9a231e3..df9b234beede 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/GR36613Test.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/GR36613Test.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; +package jdk.graal.compiler.truffle.test; import org.graalvm.polyglot.Context; import org.graalvm.polyglot.Engine; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/GenerateInlineCompilationTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/GenerateInlineCompilationTest.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/GenerateInlineCompilationTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/GenerateInlineCompilationTest.java index 160c6a41d28e..39f4a9630f54 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/GenerateInlineCompilationTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/GenerateInlineCompilationTest.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; +package jdk.graal.compiler.truffle.test; -import jdk.compiler.graal.nodes.ReturnNode; -import jdk.compiler.graal.truffle.test.GenerateInlineCompilationTestFactory.CustomNodeGen; -import jdk.compiler.graal.truffle.test.GenerateInlineCompilationTestFactory.TestChildrenNodeGen; -import jdk.compiler.graal.truffle.test.GenerateInlineCompilationTestFactory.TestDimensionsRootNodeGen; -import jdk.compiler.graal.truffle.test.GenerateInlineCompilationTestFactory.UseProfilesNodeGen; +import jdk.graal.compiler.nodes.ReturnNode; +import jdk.graal.compiler.truffle.test.GenerateInlineCompilationTestFactory.CustomNodeGen; +import jdk.graal.compiler.truffle.test.GenerateInlineCompilationTestFactory.TestChildrenNodeGen; +import jdk.graal.compiler.truffle.test.GenerateInlineCompilationTestFactory.TestDimensionsRootNodeGen; +import jdk.graal.compiler.truffle.test.GenerateInlineCompilationTestFactory.UseProfilesNodeGen; import org.junit.Test; import com.oracle.truffle.api.CompilerAsserts; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/GetRootNodeCompilationTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/GetRootNodeCompilationTest.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/GetRootNodeCompilationTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/GetRootNodeCompilationTest.java index 9faf9b9f8938..3b86d51ad072 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/GetRootNodeCompilationTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/GetRootNodeCompilationTest.java @@ -22,18 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; +package jdk.graal.compiler.truffle.test; -import static jdk.compiler.graal.replacements.PEGraphDecoder.Options.MaximumLoopExplosionCount; +import static jdk.graal.compiler.replacements.PEGraphDecoder.Options.MaximumLoopExplosionCount; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; import java.lang.reflect.Method; import java.util.function.Supplier; -import jdk.compiler.graal.core.common.PermanentBailoutException; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.options.OptionValues; +import jdk.graal.compiler.core.common.PermanentBailoutException; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.options.OptionValues; import org.graalvm.polyglot.Context; import org.junit.Assert; import org.junit.Before; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/GraalTruffleRuntimeListenerTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/GraalTruffleRuntimeListenerTest.java similarity index 99% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/GraalTruffleRuntimeListenerTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/GraalTruffleRuntimeListenerTest.java index 6c214e308671..5c08849c731d 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/GraalTruffleRuntimeListenerTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/GraalTruffleRuntimeListenerTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; +package jdk.graal.compiler.truffle.test; import static org.junit.Assert.assertEquals; @@ -45,7 +45,7 @@ import com.oracle.truffle.runtime.OptimizedTruffleRuntimeListener; import com.oracle.truffle.runtime.OptimizedCallTarget; -import jdk.compiler.graal.truffle.test.nodes.RootTestNode; +import jdk.graal.compiler.truffle.test.nodes.RootTestNode; import org.graalvm.polyglot.Context; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/HashCodeIntrinsicTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/HashCodeIntrinsicTest.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/HashCodeIntrinsicTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/HashCodeIntrinsicTest.java index f7ee6cbfe90a..709dcea379b8 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/HashCodeIntrinsicTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/HashCodeIntrinsicTest.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; +package jdk.graal.compiler.truffle.test; -import jdk.compiler.graal.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.StructuredGraph; import org.graalvm.polyglot.Context; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/HostInliningBytecodeInterpreterExampleTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/HostInliningBytecodeInterpreterExampleTest.java similarity index 92% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/HostInliningBytecodeInterpreterExampleTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/HostInliningBytecodeInterpreterExampleTest.java index 9f5a8cfd7324..9c14be21cf9a 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/HostInliningBytecodeInterpreterExampleTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/HostInliningBytecodeInterpreterExampleTest.java @@ -22,18 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; - -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.nodes.InvokeNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext; -import jdk.compiler.graal.nodes.graphbuilderconf.InlineInvokePlugin.InlineInfo; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.phases.BasePhase; -import jdk.compiler.graal.phases.common.CanonicalizerPhase; -import jdk.compiler.graal.phases.tiers.HighTierContext; +package jdk.graal.compiler.truffle.test; + +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.nodes.InvokeNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext; +import jdk.graal.compiler.nodes.graphbuilderconf.InlineInvokePlugin.InlineInfo; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.phases.BasePhase; +import jdk.graal.compiler.phases.common.CanonicalizerPhase; +import jdk.graal.compiler.phases.tiers.HighTierContext; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/HostInliningBytecodeInterpreterTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/HostInliningBytecodeInterpreterTest.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/HostInliningBytecodeInterpreterTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/HostInliningBytecodeInterpreterTest.java index d1abf49ddbb2..f73a9a58914c 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/HostInliningBytecodeInterpreterTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/HostInliningBytecodeInterpreterTest.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; - -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.nodes.InvokeNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.util.GraphUtil; -import jdk.compiler.graal.options.OptionValues; +package jdk.graal.compiler.truffle.test; + +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.nodes.InvokeNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.util.GraphUtil; +import jdk.graal.compiler.options.OptionValues; import org.junit.Test; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/HostInliningTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/HostInliningTest.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/HostInliningTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/HostInliningTest.java index dd3a5c833cb4..1dfaeee1788e 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/HostInliningTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/HostInliningTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; +package jdk.graal.compiler.truffle.test; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; @@ -36,27 +36,27 @@ import java.util.Map; import org.graalvm.collections.EconomicMap; -import jdk.compiler.graal.api.directives.GraalDirectives; -import jdk.compiler.graal.core.phases.HighTier; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.loop.phases.ConvertDeoptimizeToGuardPhase; -import jdk.compiler.graal.nodes.ConstantNode; -import jdk.compiler.graal.nodes.Invoke; -import jdk.compiler.graal.nodes.InvokeNode; -import jdk.compiler.graal.nodes.InvokeWithExceptionNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext; -import jdk.compiler.graal.nodes.graphbuilderconf.InlineInvokePlugin.InlineInfo; -import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin; -import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin.Receiver; -import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins; -import jdk.compiler.graal.options.OptionKey; -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.host.HostInliningPhase; -import jdk.compiler.graal.truffle.test.HostInliningTestFactory.IfNodeGen; +import jdk.graal.compiler.api.directives.GraalDirectives; +import jdk.graal.compiler.core.phases.HighTier; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.loop.phases.ConvertDeoptimizeToGuardPhase; +import jdk.graal.compiler.nodes.ConstantNode; +import jdk.graal.compiler.nodes.Invoke; +import jdk.graal.compiler.nodes.InvokeNode; +import jdk.graal.compiler.nodes.InvokeWithExceptionNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext; +import jdk.graal.compiler.nodes.graphbuilderconf.InlineInvokePlugin.InlineInfo; +import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin; +import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin.Receiver; +import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins; +import jdk.graal.compiler.options.OptionKey; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.phases.common.CanonicalizerPhase; +import jdk.graal.compiler.phases.tiers.HighTierContext; +import jdk.graal.compiler.truffle.host.HostInliningPhase; +import jdk.graal.compiler.truffle.test.HostInliningTestFactory.IfNodeGen; import org.graalvm.polyglot.Context; import org.junit.Assert; import org.junit.BeforeClass; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/IndirectCallSiteTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/IndirectCallSiteTest.java similarity index 99% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/IndirectCallSiteTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/IndirectCallSiteTest.java index 2f8c492f5544..1389e52c9ed7 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/IndirectCallSiteTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/IndirectCallSiteTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; +package jdk.graal.compiler.truffle.test; import org.junit.Assert; import org.junit.Before; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/InstrumentBranchesPhaseTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/InstrumentBranchesPhaseTest.java similarity index 94% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/InstrumentBranchesPhaseTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/InstrumentBranchesPhaseTest.java index f2495ce3dc11..138b41ec3e7d 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/InstrumentBranchesPhaseTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/InstrumentBranchesPhaseTest.java @@ -22,16 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; +package jdk.graal.compiler.truffle.test; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -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.PartialEvaluator; -import jdk.compiler.graal.truffle.phases.InstrumentPhase; +import jdk.graal.compiler.api.directives.GraalDirectives; +import jdk.graal.compiler.truffle.test.nodes.AbstractTestNode; +import jdk.graal.compiler.truffle.test.nodes.RootTestNode; +import jdk.graal.compiler.truffle.PartialEvaluator; +import jdk.graal.compiler.truffle.phases.InstrumentPhase; import org.graalvm.polyglot.Context; import org.junit.Assert; import org.junit.Before; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/InstrumentationCompilerTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/InstrumentationCompilerTest.java similarity index 99% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/InstrumentationCompilerTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/InstrumentationCompilerTest.java index 35871f52fb75..8bf6bc91d3c9 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/InstrumentationCompilerTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/InstrumentationCompilerTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; +package jdk.graal.compiler.truffle.test; import static org.junit.Assert.assertNotNull; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/LanguageContextFreedTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/LanguageContextFreedTest.java similarity index 99% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/LanguageContextFreedTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/LanguageContextFreedTest.java index 26077a963362..dab12531497d 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/LanguageContextFreedTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/LanguageContextFreedTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; +package jdk.graal.compiler.truffle.test; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/LazyClassLoadingTargetNegativeTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/LazyClassLoadingTargetNegativeTest.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/LazyClassLoadingTargetNegativeTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/LazyClassLoadingTargetNegativeTest.java index 70971da18d6c..ea084fe8e4f6 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/LazyClassLoadingTargetNegativeTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/LazyClassLoadingTargetNegativeTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; +package jdk.graal.compiler.truffle.test; import org.graalvm.polyglot.Engine; import org.junit.Test; @@ -36,7 +36,7 @@ * Graal should not be initialized unless there is an actual call targets created. */ /* - * This test is used indirectly by jdk.compiler.graal.truffle.test.LazyInitializationTest. + * This test is used indirectly by jdk.graal.compiler.truffle.test.LazyInitializationTest. */ public class LazyClassLoadingTargetNegativeTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/LazyClassLoadingTargetPositiveTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/LazyClassLoadingTargetPositiveTest.java similarity index 94% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/LazyClassLoadingTargetPositiveTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/LazyClassLoadingTargetPositiveTest.java index 81cdf739481c..6f87f344bfd1 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/LazyClassLoadingTargetPositiveTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/LazyClassLoadingTargetPositiveTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; +package jdk.graal.compiler.truffle.test; import org.graalvm.polyglot.Context; import org.junit.Test; @@ -32,7 +32,7 @@ * Graal should not be initialized unless there is an actual call targets created. */ /* - * This test is used indirectly by jdk.compiler.graal.truffle.test.LazyInitializationTest. + * This test is used indirectly by jdk.graal.compiler.truffle.test.LazyInitializationTest. */ public class LazyClassLoadingTargetPositiveTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/LazyClassLoadingTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/LazyClassLoadingTest.java similarity index 87% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/LazyClassLoadingTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/LazyClassLoadingTest.java index 12705d35133f..e38481f366ba 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/LazyClassLoadingTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/LazyClassLoadingTest.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; +package jdk.graal.compiler.truffle.test; import static com.oracle.truffle.runtime.OptimizedRuntimeOptions.CompileImmediately; -import static jdk.compiler.graal.test.SubprocessUtil.getVMCommandLine; -import static jdk.compiler.graal.test.SubprocessUtil.withoutDebuggerArguments; +import static jdk.graal.compiler.test.SubprocessUtil.getVMCommandLine; +import static jdk.graal.compiler.test.SubprocessUtil.withoutDebuggerArguments; import java.io.IOException; import java.util.ArrayList; @@ -37,23 +37,23 @@ import java.util.regex.Pattern; import java.util.stream.Collectors; -import jdk.compiler.graal.core.CompilerThreadFactory; -import jdk.compiler.graal.core.GraalCompilerOptions; -import jdk.compiler.graal.core.common.util.Util; -import jdk.compiler.graal.debug.Assertions; -import jdk.compiler.graal.hotspot.CommunityCompilerConfigurationFactory; -import jdk.compiler.graal.hotspot.CompilerConfigurationFactory; -import jdk.compiler.graal.hotspot.EconomyCompilerConfigurationFactory; -import jdk.compiler.graal.hotspot.HotSpotGraalVMEventListener; -import jdk.compiler.graal.nodes.Cancellable; -import jdk.compiler.graal.options.OptionDescriptor; -import jdk.compiler.graal.options.OptionDescriptors; -import jdk.compiler.graal.options.OptionKey; -import jdk.compiler.graal.options.OptionStability; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.options.OptionsParser; -import jdk.compiler.graal.test.SubprocessUtil; -import jdk.compiler.graal.test.SubprocessUtil.Subprocess; +import jdk.graal.compiler.core.CompilerThreadFactory; +import jdk.graal.compiler.core.GraalCompilerOptions; +import jdk.graal.compiler.core.common.util.Util; +import jdk.graal.compiler.debug.Assertions; +import jdk.graal.compiler.hotspot.CommunityCompilerConfigurationFactory; +import jdk.graal.compiler.hotspot.CompilerConfigurationFactory; +import jdk.graal.compiler.hotspot.EconomyCompilerConfigurationFactory; +import jdk.graal.compiler.hotspot.HotSpotGraalVMEventListener; +import jdk.graal.compiler.nodes.Cancellable; +import jdk.graal.compiler.options.OptionDescriptor; +import jdk.graal.compiler.options.OptionDescriptors; +import jdk.graal.compiler.options.OptionKey; +import jdk.graal.compiler.options.OptionStability; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.options.OptionsParser; +import jdk.graal.compiler.test.SubprocessUtil; +import jdk.graal.compiler.test.SubprocessUtil.Subprocess; import org.junit.Assert; import org.junit.Assume; import org.junit.Test; @@ -77,9 +77,9 @@ public class LazyClassLoadingTest extends TestWithPolyglotOptions { public LazyClassLoadingTest() { hotSpotVMEventListener = forNameOrNull("jdk.vm.ci.hotspot.services.HotSpotVMEventListener"); - hotSpotGraalCompilerFactoryOptions = forNameOrNull("jdk.compiler.graal.hotspot.HotSpotGraalCompilerFactory$Options"); - hotSpotGraalJVMCIServiceLocatorShared = forNameOrNull("jdk.compiler.graal.hotspot.HotSpotGraalJVMCIServiceLocator$Shared"); - jvmciVersionCheck = forNameOrNull("jdk.compiler.graal.hotspot.JVMCIVersionCheck"); + hotSpotGraalCompilerFactoryOptions = forNameOrNull("jdk.graal.compiler.hotspot.HotSpotGraalCompilerFactory$Options"); + hotSpotGraalJVMCIServiceLocatorShared = forNameOrNull("jdk.graal.compiler.hotspot.HotSpotGraalJVMCIServiceLocator$Shared"); + jvmciVersionCheck = forNameOrNull("jdk.graal.compiler.hotspot.JVMCIVersionCheck"); } private static Class forNameOrNull(String name) { @@ -170,13 +170,13 @@ private static String extractClass(String line) { } private static boolean isGraalClass(String className) { - if (className.startsWith("jdk.compiler.graal.truffle.") || className.startsWith("jdk.compiler.graal.serviceprovider.")) { + if (className.startsWith("jdk.graal.compiler.truffle.") || className.startsWith("jdk.graal.compiler.serviceprovider.")) { // Ignore classes in the com.oracle.graal.truffle package, they are all allowed. // Also ignore classes in the Graal service provider package, as they might not be // lazily loaded. return false; } else { - return className.startsWith("jdk.compiler.graal."); + return className.startsWith("jdk.graal.compiler."); } } @@ -257,7 +257,7 @@ private boolean isGraalClassAllowed(Class cls) { return true; } - if (JVMCICompilerFactory.class.isAssignableFrom(cls) || cls.getName().startsWith("jdk.compiler.graal.hotspot.IsGraalPredicate")) { + if (JVMCICompilerFactory.class.isAssignableFrom(cls) || cls.getName().startsWith("jdk.graal.compiler.hotspot.IsGraalPredicate")) { // The compiler factories have to be loaded and instantiated by the JVMCI. return true; } @@ -272,7 +272,7 @@ private boolean isGraalClassAllowed(Class cls) { } if (cls == Assertions.class || cls == OptionsParser.class || cls == OptionValues.class || - cls.getName().equals("jdk.compiler.graal.hotspot.HotSpotGraalOptionValues")) { + cls.getName().equals("jdk.graal.compiler.hotspot.HotSpotGraalOptionValues")) { // Classes implementing Graal option loading return true; } @@ -282,7 +282,7 @@ private boolean isGraalClassAllowed(Class cls) { return true; } - if (cls.getName().equals("jdk.compiler.graal.hotspot.HotSpotGraalMBean")) { + if (cls.getName().equals("jdk.graal.compiler.hotspot.HotSpotGraalMBean")) { // MBean is OK and fast return true; } @@ -292,7 +292,7 @@ private boolean isGraalClassAllowed(Class cls) { return true; } - // No other class from the jdk.compiler.graal. package should be loaded. + // No other class from the jdk.graal.compiler. package should be loaded. return false; } } diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/LibraryCompilationTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/LibraryCompilationTest.java similarity index 99% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/LibraryCompilationTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/LibraryCompilationTest.java index b7627d414afb..562ae69cfa03 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/LibraryCompilationTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/LibraryCompilationTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; +package jdk.graal.compiler.truffle.test; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/LibraryInheritanceCompilationTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/LibraryInheritanceCompilationTest.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/LibraryInheritanceCompilationTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/LibraryInheritanceCompilationTest.java index d5231ae5f646..b41418ff964f 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/LibraryInheritanceCompilationTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/LibraryInheritanceCompilationTest.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; +package jdk.graal.compiler.truffle.test; -import jdk.compiler.graal.truffle.test.LibraryInheritanceCompilationTestFactory.CompilationConstantRootNodeGen; +import jdk.graal.compiler.truffle.test.LibraryInheritanceCompilationTestFactory.CompilationConstantRootNodeGen; import org.junit.Test; import com.oracle.truffle.api.CompilerDirectives; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/LibrarySplittingStrategyTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/LibrarySplittingStrategyTest.java similarity index 99% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/LibrarySplittingStrategyTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/LibrarySplittingStrategyTest.java index 8464900546ac..acc71011b7bc 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/LibrarySplittingStrategyTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/LibrarySplittingStrategyTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; +package jdk.graal.compiler.truffle.test; import org.junit.Before; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/LoomUtils.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/LoomUtils.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/LoomUtils.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/LoomUtils.java index a59cb8cacc07..f6a63ac9d5fa 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/LoomUtils.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/LoomUtils.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; +package jdk.graal.compiler.truffle.test; public class LoomUtils { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/LoopNodeOSRTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/LoopNodeOSRTest.java similarity index 99% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/LoopNodeOSRTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/LoopNodeOSRTest.java index bc8f078a55df..4ab1c79551f3 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/LoopNodeOSRTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/LoopNodeOSRTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; +package jdk.graal.compiler.truffle.test; import java.util.stream.IntStream; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/LoopNodePartialEvaluationTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/LoopNodePartialEvaluationTest.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/LoopNodePartialEvaluationTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/LoopNodePartialEvaluationTest.java index 2906251bec5a..b95bdcd9ce4b 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/LoopNodePartialEvaluationTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/LoopNodePartialEvaluationTest.java @@ -22,16 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; +package jdk.graal.compiler.truffle.test; import java.util.List; import java.util.stream.Stream; -import jdk.compiler.graal.nodes.IfNode; -import jdk.compiler.graal.nodes.LoopBeginNode; -import jdk.compiler.graal.nodes.ProfileData.ProfileSource; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.cfg.ControlFlowGraph; +import jdk.graal.compiler.nodes.IfNode; +import jdk.graal.compiler.nodes.LoopBeginNode; +import jdk.graal.compiler.nodes.ProfileData.ProfileSource; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.cfg.ControlFlowGraph; 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/MaterializedFrameTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/MaterializedFrameTest.java similarity index 92% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/MaterializedFrameTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/MaterializedFrameTest.java index 71cb1243d7e8..7e02fb56355d 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/MaterializedFrameTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/MaterializedFrameTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; +package jdk.graal.compiler.truffle.test; import static org.hamcrest.CoreMatchers.either; import static org.hamcrest.CoreMatchers.equalTo; @@ -30,12 +30,12 @@ import static org.hamcrest.CoreMatchers.not; import static org.junit.Assert.assertThat; -import jdk.compiler.graal.api.directives.GraalDirectives; -import jdk.compiler.graal.graph.iterators.NodeIterable; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.calc.IsNullNode; -import jdk.compiler.graal.nodes.java.LoadFieldNode; -import jdk.compiler.graal.nodes.java.MethodCallTargetNode; +import jdk.graal.compiler.api.directives.GraalDirectives; +import jdk.graal.compiler.graph.iterators.NodeIterable; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.calc.IsNullNode; +import jdk.graal.compiler.nodes.java.LoadFieldNode; +import jdk.graal.compiler.nodes.java.MethodCallTargetNode; import org.junit.Test; import com.oracle.truffle.api.CompilerDirectives; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/MergeExplodeProxyTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/MergeExplodeProxyTest.java similarity index 99% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/MergeExplodeProxyTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/MergeExplodeProxyTest.java index 40553707583d..9526c3f62cd8 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/MergeExplodeProxyTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/MergeExplodeProxyTest.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; +package jdk.graal.compiler.truffle.test; -import jdk.compiler.graal.api.directives.GraalDirectives; -import jdk.compiler.graal.nodes.ProxyNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.phases.util.GraphOrder; +import jdk.graal.compiler.api.directives.GraalDirectives; +import jdk.graal.compiler.nodes.ProxyNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.phases.util.GraphOrder; import org.junit.Assert; import org.junit.Ignore; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/MultiTierAssumptionInvalidationTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/MultiTierAssumptionInvalidationTest.java similarity index 99% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/MultiTierAssumptionInvalidationTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/MultiTierAssumptionInvalidationTest.java index da525585082c..ed08b46d02cb 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/MultiTierAssumptionInvalidationTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/MultiTierAssumptionInvalidationTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; +package jdk.graal.compiler.truffle.test; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/MultiTierCompilationTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/MultiTierCompilationTest.java similarity index 99% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/MultiTierCompilationTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/MultiTierCompilationTest.java index 9cd7fb5b534d..3a3139da5289 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/MultiTierCompilationTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/MultiTierCompilationTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; +package jdk.graal.compiler.truffle.test; import static com.oracle.truffle.runtime.OptimizedRuntimeOptions.FirstTierCompilationThreshold; import static com.oracle.truffle.runtime.OptimizedRuntimeOptions.LastTierCompilationThreshold; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/NodeLibraryCompilerTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/NodeLibraryCompilerTest.java similarity index 99% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/NodeLibraryCompilerTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/NodeLibraryCompilerTest.java index d232c46c1dfb..a9b887cabb7a 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/NodeLibraryCompilerTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/NodeLibraryCompilerTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; +package jdk.graal.compiler.truffle.test; import org.graalvm.polyglot.Context; import org.graalvm.polyglot.Engine; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/NodeLibrarySLCompilerTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/NodeLibrarySLCompilerTest.java similarity index 99% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/NodeLibrarySLCompilerTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/NodeLibrarySLCompilerTest.java index 85e7969d1b61..a5ec39e326cc 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/NodeLibrarySLCompilerTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/NodeLibrarySLCompilerTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; +package jdk.graal.compiler.truffle.test; import java.io.IOException; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/NodeLimitTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/NodeLimitTest.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/NodeLimitTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/NodeLimitTest.java index b48b09f87e04..a1e51eda525f 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/NodeLimitTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/NodeLimitTest.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; +package jdk.graal.compiler.truffle.test; import java.util.function.Function; import java.util.function.Supplier; -import jdk.compiler.graal.core.common.PermanentBailoutException; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.phases.contract.NodeCostUtil; +import jdk.graal.compiler.core.common.PermanentBailoutException; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.phases.contract.NodeCostUtil; import org.graalvm.polyglot.Context; import org.junit.Assert; import org.junit.Assume; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/NodeSplittingStrategyTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/NodeSplittingStrategyTest.java similarity index 99% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/NodeSplittingStrategyTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/NodeSplittingStrategyTest.java index 0300d6117ec4..34698fee9cc7 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/NodeSplittingStrategyTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/NodeSplittingStrategyTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; +package jdk.graal.compiler.truffle.test; import org.graalvm.polyglot.Context; import org.junit.Assert; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/OSRCancelTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/OSRCancelTest.java similarity index 99% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/OSRCancelTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/OSRCancelTest.java index 4e1f13ab6765..612731527a0e 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/OSRCancelTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/OSRCancelTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; +package jdk.graal.compiler.truffle.test; import static org.junit.Assert.assertTrue; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ObjectsRequireNonNullPartialEvaluationTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/ObjectsRequireNonNullPartialEvaluationTest.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ObjectsRequireNonNullPartialEvaluationTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/ObjectsRequireNonNullPartialEvaluationTest.java index e54ab622aeb6..607e574018d3 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ObjectsRequireNonNullPartialEvaluationTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/ObjectsRequireNonNullPartialEvaluationTest.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; +package jdk.graal.compiler.truffle.test; import java.util.Objects; -import jdk.compiler.graal.truffle.test.nodes.AbstractTestNode; -import jdk.compiler.graal.truffle.test.nodes.RootTestNode; -import jdk.compiler.graal.truffle.test.ObjectsRequireNonNullPartialEvaluationTest.TestClass.InnerClass; +import jdk.graal.compiler.truffle.test.nodes.AbstractTestNode; +import jdk.graal.compiler.truffle.test.nodes.RootTestNode; +import jdk.graal.compiler.truffle.test.ObjectsRequireNonNullPartialEvaluationTest.TestClass.InnerClass; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/OptimizedBlockNodeTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/OptimizedBlockNodeTest.java similarity index 99% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/OptimizedBlockNodeTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/OptimizedBlockNodeTest.java index d147a6809d02..d14f8f7e3e32 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/OptimizedBlockNodeTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/OptimizedBlockNodeTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; +package jdk.graal.compiler.truffle.test; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -38,7 +38,7 @@ import java.util.concurrent.Callable; import com.oracle.truffle.sl.runtime.SLStrings; -import jdk.compiler.graal.test.SubprocessUtil; +import jdk.graal.compiler.test.SubprocessUtil; import org.graalvm.polyglot.Context; import org.graalvm.polyglot.Value; import org.junit.After; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/OptimizedCallTargetTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/OptimizedCallTargetTest.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/OptimizedCallTargetTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/OptimizedCallTargetTest.java index 1516ea4c6b61..65e11b885ea1 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/OptimizedCallTargetTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/OptimizedCallTargetTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; +package jdk.graal.compiler.truffle.test; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -36,9 +36,9 @@ import java.util.stream.Collectors; import java.util.stream.IntStream; -import jdk.compiler.graal.truffle.test.nodes.AbstractTestNode; -import jdk.compiler.graal.truffle.test.nodes.ConstantTestNode; -import jdk.compiler.graal.truffle.test.nodes.RootTestNode; +import jdk.graal.compiler.truffle.test.nodes.AbstractTestNode; +import jdk.graal.compiler.truffle.test.nodes.ConstantTestNode; +import jdk.graal.compiler.truffle.test.nodes.RootTestNode; import org.junit.Assert; import org.junit.Ignore; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/OptimizedLoomTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/OptimizedLoomTest.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/OptimizedLoomTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/OptimizedLoomTest.java index db665add4eef..84b41433bf05 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/OptimizedLoomTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/OptimizedLoomTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; +package jdk.graal.compiler.truffle.test; import static org.junit.Assert.assertTrue; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/OptimizedOSRLoopNodeTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/OptimizedOSRLoopNodeTest.java similarity index 99% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/OptimizedOSRLoopNodeTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/OptimizedOSRLoopNodeTest.java index 3ececee62417..749eb5cd6018 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/OptimizedOSRLoopNodeTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/OptimizedOSRLoopNodeTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; +package jdk.graal.compiler.truffle.test; import static com.oracle.truffle.runtime.OptimizedRuntimeOptions.MinInvokeThreshold; import static com.oracle.truffle.runtime.OptimizedRuntimeOptions.OSRCompilationThreshold; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/OverrideOptionsTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/OverrideOptionsTest.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/OverrideOptionsTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/OverrideOptionsTest.java index c32afc4a0f36..15f7920b49f9 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/OverrideOptionsTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/OverrideOptionsTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; +package jdk.graal.compiler.truffle.test; import org.graalvm.options.OptionValues; import org.graalvm.polyglot.Context; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/PartialEvaluationTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/PartialEvaluationTest.java similarity index 93% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/PartialEvaluationTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/PartialEvaluationTest.java index 796bd9c649e9..e9660abd9ddf 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/PartialEvaluationTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/PartialEvaluationTest.java @@ -22,35 +22,35 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; +package jdk.graal.compiler.truffle.test; -import static jdk.compiler.graal.core.common.CompilationRequestIdentifier.asCompilationRequest; -import static jdk.compiler.graal.debug.DebugOptions.DumpOnError; +import static jdk.graal.compiler.core.common.CompilationRequestIdentifier.asCompilationRequest; +import static jdk.graal.compiler.debug.DebugOptions.DumpOnError; import java.util.Set; import java.util.function.Supplier; -import jdk.compiler.graal.code.CompilationResult; -import jdk.compiler.graal.core.common.CompilationIdentifier; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.graph.Graph; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.nodes.ConstantNode; -import jdk.compiler.graal.nodes.DynamicDeoptimizeNode; -import jdk.compiler.graal.nodes.FrameState; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.java.MethodCallTargetNode; -import jdk.compiler.graal.options.OptionValues; -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.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 jdk.graal.compiler.code.CompilationResult; +import jdk.graal.compiler.core.common.CompilationIdentifier; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.graph.Graph; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.nodes.ConstantNode; +import jdk.graal.compiler.nodes.DynamicDeoptimizeNode; +import jdk.graal.compiler.nodes.FrameState; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.java.MethodCallTargetNode; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.phases.PhaseSuite; +import jdk.graal.compiler.phases.common.DeadCodeEliminationPhase; +import jdk.graal.compiler.phases.tiers.HighTierContext; +import jdk.graal.compiler.truffle.PartialEvaluator; +import jdk.graal.compiler.truffle.PerformanceInformationHandler; +import jdk.graal.compiler.truffle.TruffleCompilation; +import jdk.graal.compiler.truffle.TruffleCompilerImpl; +import jdk.graal.compiler.truffle.TruffleDebugJavaMethod; +import jdk.graal.compiler.truffle.TruffleTierContext; +import jdk.graal.compiler.truffle.phases.TruffleTier; import org.junit.Assert; import com.oracle.truffle.api.CallTarget; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/PerformanceWarningTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/PerformanceWarningTest.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/PerformanceWarningTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/PerformanceWarningTest.java index 2d471f24dfc8..6afacbe42f5c 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/PerformanceWarningTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/PerformanceWarningTest.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; +package jdk.graal.compiler.truffle.test; import java.io.ByteArrayOutputStream; -import jdk.compiler.graal.debug.DebugCloseable; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.debug.DebugContext.Builder; -import jdk.compiler.graal.truffle.TruffleCompilation; -import jdk.compiler.graal.truffle.TruffleCompilerImpl; +import jdk.graal.compiler.debug.DebugCloseable; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.debug.DebugContext.Builder; +import jdk.graal.compiler.truffle.TruffleCompilation; +import jdk.graal.compiler.truffle.TruffleCompilerImpl; import org.graalvm.polyglot.Context; import org.junit.Assert; import org.junit.Before; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/PhiStampInferencePartialEvaluationTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/PhiStampInferencePartialEvaluationTest.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/PhiStampInferencePartialEvaluationTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/PhiStampInferencePartialEvaluationTest.java index 1950149f6bbd..84a51af98d6c 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/PhiStampInferencePartialEvaluationTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/PhiStampInferencePartialEvaluationTest.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; +package jdk.graal.compiler.truffle.test; import java.util.function.Supplier; -import jdk.compiler.graal.truffle.test.nodes.AbstractTestNode; -import jdk.compiler.graal.truffle.test.nodes.RootTestNode; +import jdk.graal.compiler.truffle.test.nodes.AbstractTestNode; +import jdk.graal.compiler.truffle.test.nodes.RootTestNode; import org.junit.Test; import com.oracle.truffle.api.RootCallTarget; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/PhiTransformTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/PhiTransformTest.java similarity index 90% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/PhiTransformTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/PhiTransformTest.java index e77caded135e..1d2e23cf420c 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/PhiTransformTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/PhiTransformTest.java @@ -23,27 +23,27 @@ * questions. */ -package jdk.compiler.graal.truffle.test; +package jdk.graal.compiler.truffle.test; import java.util.ListIterator; -import jdk.compiler.graal.api.directives.GraalDirectives; -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.nodes.NodeView; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions; -import jdk.compiler.graal.nodes.calc.NarrowNode; -import jdk.compiler.graal.nodes.calc.ReinterpretNode; -import jdk.compiler.graal.nodes.calc.SignExtendNode; -import jdk.compiler.graal.nodes.calc.ZeroExtendNode; -import jdk.compiler.graal.nodes.spi.CoreProviders; -import jdk.compiler.graal.options.OptionValues; -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.nodes.AnyExtendNode; -import jdk.compiler.graal.truffle.phases.PhiTransformPhase; -import jdk.compiler.graal.virtual.phases.ea.PartialEscapePhase; +import jdk.graal.compiler.api.directives.GraalDirectives; +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.nodes.NodeView; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.StructuredGraph.AllowAssumptions; +import jdk.graal.compiler.nodes.calc.NarrowNode; +import jdk.graal.compiler.nodes.calc.ReinterpretNode; +import jdk.graal.compiler.nodes.calc.SignExtendNode; +import jdk.graal.compiler.nodes.calc.ZeroExtendNode; +import jdk.graal.compiler.nodes.spi.CoreProviders; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.phases.BasePhase; +import jdk.graal.compiler.phases.tiers.HighTierContext; +import jdk.graal.compiler.phases.tiers.Suites; +import jdk.graal.compiler.truffle.nodes.AnyExtendNode; +import jdk.graal.compiler.truffle.phases.PhiTransformPhase; +import jdk.graal.compiler.virtual.phases.ea.PartialEscapePhase; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/PolyglotEngineOptionsTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/PolyglotEngineOptionsTest.java similarity index 99% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/PolyglotEngineOptionsTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/PolyglotEngineOptionsTest.java index 3f1a4cf2c14e..abaa16416f9c 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/PolyglotEngineOptionsTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/PolyglotEngineOptionsTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; +package jdk.graal.compiler.truffle.test; import com.oracle.truffle.sl.runtime.SLStrings; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/PolyglotHostObjectPartialEvaluationTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/PolyglotHostObjectPartialEvaluationTest.java similarity index 99% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/PolyglotHostObjectPartialEvaluationTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/PolyglotHostObjectPartialEvaluationTest.java index 0ca2547fb680..b57f4931b442 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/PolyglotHostObjectPartialEvaluationTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/PolyglotHostObjectPartialEvaluationTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; +package jdk.graal.compiler.truffle.test; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.interop.InteropLibrary; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/PropagateHotnessToLexicalSingleCallerTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/PropagateHotnessToLexicalSingleCallerTest.java similarity index 99% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/PropagateHotnessToLexicalSingleCallerTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/PropagateHotnessToLexicalSingleCallerTest.java index 0c6e44adafbe..18a3adcc095e 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/PropagateHotnessToLexicalSingleCallerTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/PropagateHotnessToLexicalSingleCallerTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; +package jdk.graal.compiler.truffle.test; import java.util.function.Function; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ResourceLimitsCompilationTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/ResourceLimitsCompilationTest.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ResourceLimitsCompilationTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/ResourceLimitsCompilationTest.java index 36ce1067fe48..c69e968a6616 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ResourceLimitsCompilationTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/ResourceLimitsCompilationTest.java @@ -22,21 +22,21 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; +package jdk.graal.compiler.truffle.test; import java.util.concurrent.Semaphore; import java.util.function.Predicate; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.graph.NodeClass; -import jdk.compiler.graal.nodes.InvokeWithExceptionNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.calc.AddNode; -import jdk.compiler.graal.nodes.java.AtomicReadAndAddNode; -import jdk.compiler.graal.nodes.java.LoweredAtomicReadAndAddNode; -import jdk.compiler.graal.nodes.java.MethodCallTargetNode; -import jdk.compiler.graal.nodes.memory.ReadNode; -import jdk.compiler.graal.nodes.memory.WriteNode; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.graph.NodeClass; +import jdk.graal.compiler.nodes.InvokeWithExceptionNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.calc.AddNode; +import jdk.graal.compiler.nodes.java.AtomicReadAndAddNode; +import jdk.graal.compiler.nodes.java.LoweredAtomicReadAndAddNode; +import jdk.graal.compiler.nodes.java.MethodCallTargetNode; +import jdk.graal.compiler.nodes.memory.ReadNode; +import jdk.graal.compiler.nodes.memory.WriteNode; import org.graalvm.polyglot.Context; import org.graalvm.polyglot.Engine; import org.graalvm.polyglot.ResourceLimits; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/RewriteDuringCompilationTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/RewriteDuringCompilationTest.java similarity index 99% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/RewriteDuringCompilationTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/RewriteDuringCompilationTest.java index f6b6fa513f2a..600213ed1c1d 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/RewriteDuringCompilationTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/RewriteDuringCompilationTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; +package jdk.graal.compiler.truffle.test; import java.io.IOException; import java.util.ArrayList; @@ -36,7 +36,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; -import jdk.compiler.graal.core.test.GraalCompilerTest; +import jdk.graal.compiler.core.test.GraalCompilerTest; import org.graalvm.polyglot.Context; import org.graalvm.polyglot.Source; import org.junit.Assert; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/SLCompileImmediatelyTestSuite.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/SLCompileImmediatelyTestSuite.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/SLCompileImmediatelyTestSuite.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/SLCompileImmediatelyTestSuite.java index e0decf3a5ffc..46738c60da46 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/SLCompileImmediatelyTestSuite.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/SLCompileImmediatelyTestSuite.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; +package jdk.graal.compiler.truffle.test; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/SLTruffleGraalTestSuite.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/SLTruffleGraalTestSuite.java similarity index 81% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/SLTruffleGraalTestSuite.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/SLTruffleGraalTestSuite.java index a24cf0f0323b..85cd857676f5 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/SLTruffleGraalTestSuite.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/SLTruffleGraalTestSuite.java @@ -22,19 +22,19 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; +package jdk.graal.compiler.truffle.test; -import jdk.compiler.graal.truffle.test.builtins.SLAssertFalseBuiltinFactory; -import jdk.compiler.graal.truffle.test.builtins.SLAssertTrueBuiltinFactory; -import jdk.compiler.graal.truffle.test.builtins.SLCallFunctionsWithBuiltinFactory; -import jdk.compiler.graal.truffle.test.builtins.SLCallUntilOptimizedBuiltinFactory; -import jdk.compiler.graal.truffle.test.builtins.SLDeoptimizeWhenCompiledBuiltinFactory; -import jdk.compiler.graal.truffle.test.builtins.SLDisableSplittingBuiltinFactory; -import jdk.compiler.graal.truffle.test.builtins.SLGetOptionBuiltinFactory; -import jdk.compiler.graal.truffle.test.builtins.SLIsCompilationConstantBuiltinFactory; -import jdk.compiler.graal.truffle.test.builtins.SLIsOptimizedBuiltinFactory; -import jdk.compiler.graal.truffle.test.builtins.SLTestTruffleBoundary01BuiltinFactory; -import jdk.compiler.graal.truffle.test.builtins.SLWaitForOptimizationBuiltinFactory; +import jdk.graal.compiler.truffle.test.builtins.SLAssertFalseBuiltinFactory; +import jdk.graal.compiler.truffle.test.builtins.SLAssertTrueBuiltinFactory; +import jdk.graal.compiler.truffle.test.builtins.SLCallFunctionsWithBuiltinFactory; +import jdk.graal.compiler.truffle.test.builtins.SLCallUntilOptimizedBuiltinFactory; +import jdk.graal.compiler.truffle.test.builtins.SLDeoptimizeWhenCompiledBuiltinFactory; +import jdk.graal.compiler.truffle.test.builtins.SLDisableSplittingBuiltinFactory; +import jdk.graal.compiler.truffle.test.builtins.SLGetOptionBuiltinFactory; +import jdk.graal.compiler.truffle.test.builtins.SLIsCompilationConstantBuiltinFactory; +import jdk.graal.compiler.truffle.test.builtins.SLIsOptimizedBuiltinFactory; +import jdk.graal.compiler.truffle.test.builtins.SLTestTruffleBoundary01BuiltinFactory; +import jdk.graal.compiler.truffle.test.builtins.SLWaitForOptimizationBuiltinFactory; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/SafepointRethrowDeoptPETest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/SafepointRethrowDeoptPETest.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/SafepointRethrowDeoptPETest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/SafepointRethrowDeoptPETest.java index ab5871e0edd7..283aee438e23 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/SafepointRethrowDeoptPETest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/SafepointRethrowDeoptPETest.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; +package jdk.graal.compiler.truffle.test; import java.util.concurrent.CountDownLatch; -import jdk.compiler.graal.core.test.GraalCompilerTest; -import jdk.compiler.graal.core.common.GraalOptions; +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.core.common.GraalOptions; import org.junit.Assert; import org.junit.Assume; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/SimplePartialEvaluationTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/SimplePartialEvaluationTest.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/SimplePartialEvaluationTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/SimplePartialEvaluationTest.java index 16e9f29ccd5b..afb86427801e 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/SimplePartialEvaluationTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/SimplePartialEvaluationTest.java @@ -22,44 +22,44 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; +package jdk.graal.compiler.truffle.test; import com.oracle.truffle.api.CompilerAsserts; -import jdk.compiler.graal.truffle.test.nodes.AbstractTestNode; -import jdk.compiler.graal.truffle.test.nodes.AddTestNode; -import jdk.compiler.graal.truffle.test.nodes.BlockTestNode; -import jdk.compiler.graal.truffle.test.nodes.ConstantTestNode; -import jdk.compiler.graal.truffle.test.nodes.ExplodeLoopUntilReturnNode; -import jdk.compiler.graal.truffle.test.nodes.ExplodeLoopUntilReturnWithThrowNode; -import jdk.compiler.graal.truffle.test.nodes.InliningNullCheckNode1; -import jdk.compiler.graal.truffle.test.nodes.InliningNullCheckNode2; -import jdk.compiler.graal.truffle.test.nodes.LambdaTestNode; -import jdk.compiler.graal.truffle.test.nodes.LoadLocalTestNode; -import jdk.compiler.graal.truffle.test.nodes.LoopTestNode; -import jdk.compiler.graal.truffle.test.nodes.NeverPartOfCompilationTestNode; -import jdk.compiler.graal.truffle.test.nodes.ObjectEqualsNode; -import jdk.compiler.graal.truffle.test.nodes.ObjectHashCodeNode; -import jdk.compiler.graal.truffle.test.nodes.PartialIntrinsicNode; -import jdk.compiler.graal.truffle.test.nodes.RecursionTestNode; -import jdk.compiler.graal.truffle.test.nodes.RootTestNode; -import jdk.compiler.graal.truffle.test.nodes.StoreLocalTestNode; -import jdk.compiler.graal.truffle.test.nodes.StringEqualsNode; -import jdk.compiler.graal.truffle.test.nodes.StringHashCodeFinalNode; -import jdk.compiler.graal.truffle.test.nodes.StringHashCodeNonFinalNode; -import jdk.compiler.graal.truffle.test.nodes.SynchronizedExceptionMergeNode; -import jdk.compiler.graal.truffle.test.nodes.UnrollLoopUntilReturnNode; -import jdk.compiler.graal.truffle.test.nodes.UnrollLoopUntilReturnWithThrowNode; -import jdk.compiler.graal.truffle.test.nodes.explosion.LoopExplosionPhiNode; -import jdk.compiler.graal.truffle.test.nodes.explosion.NestedExplodedLoopTestNode; -import jdk.compiler.graal.truffle.test.nodes.explosion.TwoMergesExplodedLoopTestNode; -import jdk.compiler.graal.truffle.test.nodes.explosion.UnrollingTestNode; -import jdk.compiler.graal.core.common.GraalBailoutException; -import jdk.compiler.graal.core.common.GraalOptions; -import jdk.compiler.graal.core.common.PermanentBailoutException; -import jdk.compiler.graal.debug.TTY; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.replacements.PEGraphDecoder; +import jdk.graal.compiler.truffle.test.nodes.AbstractTestNode; +import jdk.graal.compiler.truffle.test.nodes.AddTestNode; +import jdk.graal.compiler.truffle.test.nodes.BlockTestNode; +import jdk.graal.compiler.truffle.test.nodes.ConstantTestNode; +import jdk.graal.compiler.truffle.test.nodes.ExplodeLoopUntilReturnNode; +import jdk.graal.compiler.truffle.test.nodes.ExplodeLoopUntilReturnWithThrowNode; +import jdk.graal.compiler.truffle.test.nodes.InliningNullCheckNode1; +import jdk.graal.compiler.truffle.test.nodes.InliningNullCheckNode2; +import jdk.graal.compiler.truffle.test.nodes.LambdaTestNode; +import jdk.graal.compiler.truffle.test.nodes.LoadLocalTestNode; +import jdk.graal.compiler.truffle.test.nodes.LoopTestNode; +import jdk.graal.compiler.truffle.test.nodes.NeverPartOfCompilationTestNode; +import jdk.graal.compiler.truffle.test.nodes.ObjectEqualsNode; +import jdk.graal.compiler.truffle.test.nodes.ObjectHashCodeNode; +import jdk.graal.compiler.truffle.test.nodes.PartialIntrinsicNode; +import jdk.graal.compiler.truffle.test.nodes.RecursionTestNode; +import jdk.graal.compiler.truffle.test.nodes.RootTestNode; +import jdk.graal.compiler.truffle.test.nodes.StoreLocalTestNode; +import jdk.graal.compiler.truffle.test.nodes.StringEqualsNode; +import jdk.graal.compiler.truffle.test.nodes.StringHashCodeFinalNode; +import jdk.graal.compiler.truffle.test.nodes.StringHashCodeNonFinalNode; +import jdk.graal.compiler.truffle.test.nodes.SynchronizedExceptionMergeNode; +import jdk.graal.compiler.truffle.test.nodes.UnrollLoopUntilReturnNode; +import jdk.graal.compiler.truffle.test.nodes.UnrollLoopUntilReturnWithThrowNode; +import jdk.graal.compiler.truffle.test.nodes.explosion.LoopExplosionPhiNode; +import jdk.graal.compiler.truffle.test.nodes.explosion.NestedExplodedLoopTestNode; +import jdk.graal.compiler.truffle.test.nodes.explosion.TwoMergesExplodedLoopTestNode; +import jdk.graal.compiler.truffle.test.nodes.explosion.UnrollingTestNode; +import jdk.graal.compiler.core.common.GraalBailoutException; +import jdk.graal.compiler.core.common.GraalOptions; +import jdk.graal.compiler.core.common.PermanentBailoutException; +import jdk.graal.compiler.debug.TTY; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.replacements.PEGraphDecoder; import org.graalvm.polyglot.Context; import org.junit.Assert; import org.junit.Before; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/StaticObjectCompilationTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/StaticObjectCompilationTest.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/StaticObjectCompilationTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/StaticObjectCompilationTest.java index 8640a8c6a9cb..c63b358b4d69 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/StaticObjectCompilationTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/StaticObjectCompilationTest.java @@ -22,21 +22,21 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; +package jdk.graal.compiler.truffle.test; import java.io.Closeable; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.calc.AddNode; -import jdk.compiler.graal.nodes.calc.LeftShiftNode; -import jdk.compiler.graal.nodes.extended.RawLoadNode; -import jdk.compiler.graal.nodes.extended.RawStoreNode; -import jdk.compiler.graal.nodes.java.InstanceOfNode; -import jdk.compiler.graal.nodes.java.LoadFieldNode; -import jdk.compiler.graal.nodes.java.MethodCallTargetNode; -import jdk.compiler.graal.nodes.java.StoreFieldNode; -import jdk.compiler.graal.nodes.virtual.VirtualArrayNode; -import jdk.compiler.graal.nodes.virtual.VirtualInstanceNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.calc.AddNode; +import jdk.graal.compiler.nodes.calc.LeftShiftNode; +import jdk.graal.compiler.nodes.extended.RawLoadNode; +import jdk.graal.compiler.nodes.extended.RawStoreNode; +import jdk.graal.compiler.nodes.java.InstanceOfNode; +import jdk.graal.compiler.nodes.java.LoadFieldNode; +import jdk.graal.compiler.nodes.java.MethodCallTargetNode; +import jdk.graal.compiler.nodes.java.StoreFieldNode; +import jdk.graal.compiler.nodes.virtual.VirtualArrayNode; +import jdk.graal.compiler.nodes.virtual.VirtualInstanceNode; import org.graalvm.polyglot.Context; import org.junit.AfterClass; import org.junit.Assert; @@ -268,15 +268,15 @@ private static void assertNoInvokes(StructuredGraph graph) { } } - private static void assertNoNodes(StructuredGraph graph, Class nodeClass) { - for (jdk.compiler.graal.graph.Node node : graph.getNodes()) { + private static void assertNoNodes(StructuredGraph graph, Class nodeClass) { + for (jdk.graal.compiler.graph.Node node : graph.getNodes()) { if (nodeClass.isAssignableFrom(node.getClass())) { Assert.fail("Found invalid node of type: " + nodeClass.getName()); } } } - private static void assertCount(StructuredGraph graph, Class nodeClass, int expected) { + private static void assertCount(StructuredGraph graph, Class nodeClass, int expected) { Assert.assertEquals(expected, graph.getNodes().filter(nodeClass).count()); } diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/StringNodeInliningCompilationTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/StringNodeInliningCompilationTest.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/StringNodeInliningCompilationTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/StringNodeInliningCompilationTest.java index 3437a966bba5..134e4f31d0b8 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/StringNodeInliningCompilationTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/StringNodeInliningCompilationTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; +package jdk.graal.compiler.truffle.test; import static org.junit.Assume.assumeFalse; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/TestWithPolyglotOptions.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/TestWithPolyglotOptions.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/TestWithPolyglotOptions.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/TestWithPolyglotOptions.java index 1b64e2dbee90..4044e69b96b3 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/TestWithPolyglotOptions.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/TestWithPolyglotOptions.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; +package jdk.graal.compiler.truffle.test; import org.graalvm.polyglot.Context; import org.graalvm.polyglot.Context.Builder; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/TestWithSynchronousCompiling.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/TestWithSynchronousCompiling.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/TestWithSynchronousCompiling.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/TestWithSynchronousCompiling.java index 6b74d217e383..0edbcbc87492 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/TestWithSynchronousCompiling.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/TestWithSynchronousCompiling.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; +package jdk.graal.compiler.truffle.test; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ThreadsActivationCompilationTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/ThreadsActivationCompilationTest.java similarity index 99% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ThreadsActivationCompilationTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/ThreadsActivationCompilationTest.java index d992a67a77b0..7ac6d75defc7 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ThreadsActivationCompilationTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/ThreadsActivationCompilationTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; +package jdk.graal.compiler.truffle.test; import static org.junit.Assert.assertTrue; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/TraceCompilationTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/TraceCompilationTest.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/TraceCompilationTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/TraceCompilationTest.java index a7d3aac1ba6f..824435f78b52 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/TraceCompilationTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/TraceCompilationTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; +package jdk.graal.compiler.truffle.test; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -43,9 +43,9 @@ import com.oracle.truffle.api.test.SubprocessTestUtils; import com.oracle.truffle.runtime.OptimizedCallTarget; -import jdk.compiler.graal.truffle.test.nodes.AbstractTestNode; -import jdk.compiler.graal.truffle.test.nodes.RootTestNode; -import jdk.compiler.graal.serviceprovider.GraalServices; +import jdk.graal.compiler.truffle.test.nodes.AbstractTestNode; +import jdk.graal.compiler.truffle.test.nodes.RootTestNode; +import jdk.graal.compiler.serviceprovider.GraalServices; 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/TransferToInterpreterTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/TransferToInterpreterTest.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/TransferToInterpreterTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/TransferToInterpreterTest.java index 475afa0460df..6d33bfb5363f 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/TransferToInterpreterTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/TransferToInterpreterTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; +package jdk.graal.compiler.truffle.test; import org.junit.Assert; import org.junit.Before; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/TruffleBoundaryExceptionsTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/TruffleBoundaryExceptionsTest.java similarity index 99% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/TruffleBoundaryExceptionsTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/TruffleBoundaryExceptionsTest.java index 6ad1e2b84583..248272581d4a 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/TruffleBoundaryExceptionsTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/TruffleBoundaryExceptionsTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; +package jdk.graal.compiler.truffle.test; import static com.oracle.truffle.runtime.OptimizedRuntimeOptions.SingleTierCompilationThreshold; import static org.junit.Assert.assertEquals; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/TruffleBoundaryInliningTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/TruffleBoundaryInliningTest.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/TruffleBoundaryInliningTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/TruffleBoundaryInliningTest.java index d3b27929b475..9c1e4c86dfd5 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/TruffleBoundaryInliningTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/TruffleBoundaryInliningTest.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; +package jdk.graal.compiler.truffle.test; import java.util.Iterator; -import jdk.compiler.graal.nodes.Invoke; -import jdk.compiler.graal.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.Invoke; +import jdk.graal.compiler.nodes.StructuredGraph; import org.junit.Test; import com.oracle.truffle.api.CompilerAsserts; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/TruffleCompilerImplTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/TruffleCompilerImplTest.java similarity index 92% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/TruffleCompilerImplTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/TruffleCompilerImplTest.java index 0ad0fbe9504c..ae2bd904e7f9 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/TruffleCompilerImplTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/TruffleCompilerImplTest.java @@ -22,17 +22,17 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; +package jdk.graal.compiler.truffle.test; import java.util.concurrent.atomic.AtomicBoolean; -import jdk.compiler.graal.core.test.GraalCompilerTest; -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.KnownTruffleTypes; -import jdk.compiler.graal.truffle.TruffleCompilation; -import jdk.compiler.graal.truffle.TruffleCompilerImpl; +import jdk.graal.compiler.core.test.GraalCompilerTest; +import jdk.graal.compiler.core.common.CompilationIdentifier; +import jdk.graal.compiler.core.target.Backend; +import jdk.graal.compiler.phases.util.Providers; +import jdk.graal.compiler.truffle.KnownTruffleTypes; +import jdk.graal.compiler.truffle.TruffleCompilation; +import jdk.graal.compiler.truffle.TruffleCompilerImpl; import org.graalvm.polyglot.Context; import org.junit.After; import org.junit.Assume; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/TruffleContextCompilationTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/TruffleContextCompilationTest.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/TruffleContextCompilationTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/TruffleContextCompilationTest.java index 5289528025ac..f70f61f3e00f 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/TruffleContextCompilationTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/TruffleContextCompilationTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; +package jdk.graal.compiler.truffle.test; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/TruffleDirectCallNodeTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/TruffleDirectCallNodeTest.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/TruffleDirectCallNodeTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/TruffleDirectCallNodeTest.java index 9ce8dec08fd0..3fe8c1f89fec 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/TruffleDirectCallNodeTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/TruffleDirectCallNodeTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; +package jdk.graal.compiler.truffle.test; import static org.junit.Assert.assertNotSame; import static org.junit.Assert.assertSame; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/TruffleEnsureVirtualizedTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/TruffleEnsureVirtualizedTest.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/TruffleEnsureVirtualizedTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/TruffleEnsureVirtualizedTest.java index b870c30faa93..a8d3ca656eae 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/TruffleEnsureVirtualizedTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/TruffleEnsureVirtualizedTest.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; +package jdk.graal.compiler.truffle.test; -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.graal.compiler.api.directives.GraalDirectives; +import jdk.graal.compiler.truffle.test.nodes.AbstractTestNode; +import jdk.graal.compiler.truffle.test.nodes.RootTestNode; import org.graalvm.polyglot.Context; import org.junit.Assert; import org.junit.Before; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/TruffleExceptionPartialEvaluationTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/TruffleExceptionPartialEvaluationTest.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/TruffleExceptionPartialEvaluationTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/TruffleExceptionPartialEvaluationTest.java index 193be03b1bb9..99779a4c8fd4 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/TruffleExceptionPartialEvaluationTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/TruffleExceptionPartialEvaluationTest.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; +package jdk.graal.compiler.truffle.test; -import jdk.compiler.graal.truffle.test.nodes.AbstractTestNode; -import jdk.compiler.graal.truffle.test.nodes.RootTestNode; +import jdk.graal.compiler.truffle.test.nodes.AbstractTestNode; +import jdk.graal.compiler.truffle.test.nodes.RootTestNode; import org.junit.Test; import com.oracle.truffle.api.CallTarget; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/TruffleHostInliningTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/TruffleHostInliningTest.java similarity index 99% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/TruffleHostInliningTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/TruffleHostInliningTest.java index 3fe58ca5e007..e4e0aa788e80 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/TruffleHostInliningTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/TruffleHostInliningTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; +package jdk.graal.compiler.truffle.test; import java.io.File; import java.io.IOException; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/TruffleLoggerPartialEvaluationTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/TruffleLoggerPartialEvaluationTest.java similarity index 90% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/TruffleLoggerPartialEvaluationTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/TruffleLoggerPartialEvaluationTest.java index a451fbea60d8..8599e2d08f93 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/TruffleLoggerPartialEvaluationTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/TruffleLoggerPartialEvaluationTest.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; +package jdk.graal.compiler.truffle.test; import com.oracle.truffle.api.frame.FrameDescriptor; import java.util.logging.Level; -import jdk.compiler.graal.truffle.test.nodes.IsLoggableNode; -import jdk.compiler.graal.truffle.test.nodes.LoggingNode; -import jdk.compiler.graal.truffle.test.nodes.RootTestNode; +import jdk.graal.compiler.truffle.test.nodes.IsLoggableNode; +import jdk.graal.compiler.truffle.test.nodes.LoggingNode; +import jdk.graal.compiler.truffle.test.nodes.RootTestNode; import org.junit.Test; public class TruffleLoggerPartialEvaluationTest extends PartialEvaluationTest { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/TruffleOptionsByClassLoaderTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/TruffleOptionsByClassLoaderTest.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/TruffleOptionsByClassLoaderTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/TruffleOptionsByClassLoaderTest.java index 3a3a04539ecb..e88dda2ba205 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/TruffleOptionsByClassLoaderTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/TruffleOptionsByClassLoaderTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; +package jdk.graal.compiler.truffle.test; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/TruffleReturnBoxedParameterTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/TruffleReturnBoxedParameterTest.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/TruffleReturnBoxedParameterTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/TruffleReturnBoxedParameterTest.java index 28416a8be845..3039edf70687 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/TruffleReturnBoxedParameterTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/TruffleReturnBoxedParameterTest.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; +package jdk.graal.compiler.truffle.test; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.extended.ForeignCallNode; -import jdk.compiler.graal.truffle.test.TruffleReturnBoxedParameterTestFactory.IntNodeFactory; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.extended.ForeignCallNode; +import jdk.graal.compiler.truffle.test.TruffleReturnBoxedParameterTestFactory.IntNodeFactory; import org.junit.Test; import com.oracle.truffle.api.dsl.GenerateNodeFactory; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/TruffleRuntimeTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/TruffleRuntimeTest.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/TruffleRuntimeTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/TruffleRuntimeTest.java index 6c9c4436e948..23ef9b7ad6ff 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/TruffleRuntimeTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/TruffleRuntimeTest.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; +package jdk.graal.compiler.truffle.test; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; -import jdk.compiler.graal.api.test.Graal; -import jdk.compiler.graal.runtime.RuntimeProvider; +import jdk.graal.compiler.api.test.Graal; +import jdk.graal.compiler.runtime.RuntimeProvider; import org.junit.Test; import com.oracle.truffle.api.Truffle; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/TruffleShutdownHookTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/TruffleShutdownHookTest.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/TruffleShutdownHookTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/TruffleShutdownHookTest.java index 4ee74b0b54dc..366cda4dd9dc 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/TruffleShutdownHookTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/TruffleShutdownHookTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; +package jdk.graal.compiler.truffle.test; import java.io.IOException; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/TruffleToTruffleCallExceptionHandlerTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/TruffleToTruffleCallExceptionHandlerTest.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/TruffleToTruffleCallExceptionHandlerTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/TruffleToTruffleCallExceptionHandlerTest.java index add853e74f47..6754b4d49fe5 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/TruffleToTruffleCallExceptionHandlerTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/TruffleToTruffleCallExceptionHandlerTest.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; +package jdk.graal.compiler.truffle.test; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.UnwindNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.UnwindNode; 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/TruffleValueTypeTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/TruffleValueTypeTest.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/TruffleValueTypeTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/TruffleValueTypeTest.java index 5e340b12a08d..9ddc5a839bf8 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/TruffleValueTypeTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/TruffleValueTypeTest.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; - -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.nodes.ReturnNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.spi.VirtualizableAllocation; -import jdk.compiler.graal.nodes.virtual.CommitAllocationNode; -import jdk.compiler.graal.virtual.phases.ea.PartialEscapePhase; +package jdk.graal.compiler.truffle.test; + +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.nodes.ReturnNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.spi.VirtualizableAllocation; +import jdk.graal.compiler.nodes.virtual.CommitAllocationNode; +import jdk.graal.compiler.virtual.phases.ea.PartialEscapePhase; import org.graalvm.polyglot.Context; import org.junit.Assert; import org.junit.Before; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/UnrollLoopBlockDuplicationTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/UnrollLoopBlockDuplicationTest.java similarity index 99% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/UnrollLoopBlockDuplicationTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/UnrollLoopBlockDuplicationTest.java index ccdabead7f7e..2cf90333fc6b 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/UnrollLoopBlockDuplicationTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/UnrollLoopBlockDuplicationTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; +package jdk.graal.compiler.truffle.test; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/VarHandlePartialEvaluationTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/VarHandlePartialEvaluationTest.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/VarHandlePartialEvaluationTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/VarHandlePartialEvaluationTest.java index 7532d89335d7..570efda4fac1 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/VarHandlePartialEvaluationTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/VarHandlePartialEvaluationTest.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; +package jdk.graal.compiler.truffle.test; import java.lang.invoke.MethodHandles; import java.lang.invoke.VarHandle; import java.nio.ByteBuffer; import java.nio.ByteOrder; -import jdk.compiler.graal.truffle.test.nodes.AbstractTestNode; -import jdk.compiler.graal.truffle.test.nodes.RootTestNode; +import jdk.graal.compiler.truffle.test.nodes.AbstractTestNode; +import jdk.graal.compiler.truffle.test.nodes.RootTestNode; import org.junit.Assert; import org.junit.Assume; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/builtins/SLAssertFalseBuiltin.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/builtins/SLAssertFalseBuiltin.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/builtins/SLAssertFalseBuiltin.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/builtins/SLAssertFalseBuiltin.java index 98bf1aac578f..9c05091bc5a6 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/builtins/SLAssertFalseBuiltin.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/builtins/SLAssertFalseBuiltin.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test.builtins; +package jdk.graal.compiler.truffle.test.builtins; import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.dsl.Cached; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/builtins/SLAssertTrueBuiltin.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/builtins/SLAssertTrueBuiltin.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/builtins/SLAssertTrueBuiltin.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/builtins/SLAssertTrueBuiltin.java index 163267cd0180..7330e01c2506 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/builtins/SLAssertTrueBuiltin.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/builtins/SLAssertTrueBuiltin.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test.builtins; +package jdk.graal.compiler.truffle.test.builtins; import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.dsl.Cached; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/builtins/SLAssertionError.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/builtins/SLAssertionError.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/builtins/SLAssertionError.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/builtins/SLAssertionError.java index 1212faea154d..87baeada467d 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/builtins/SLAssertionError.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/builtins/SLAssertionError.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test.builtins; +package jdk.graal.compiler.truffle.test.builtins; import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.sl.SLException; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/builtins/SLCallFunctionsWithBuiltin.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/builtins/SLCallFunctionsWithBuiltin.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/builtins/SLCallFunctionsWithBuiltin.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/builtins/SLCallFunctionsWithBuiltin.java index 625b1c0a9c22..845af6f5c9c3 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/builtins/SLCallFunctionsWithBuiltin.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/builtins/SLCallFunctionsWithBuiltin.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test.builtins; +package jdk.graal.compiler.truffle.test.builtins; import com.oracle.truffle.api.Truffle; import com.oracle.truffle.api.dsl.Cached; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/builtins/SLCallUntilOptimizedBuiltin.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/builtins/SLCallUntilOptimizedBuiltin.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/builtins/SLCallUntilOptimizedBuiltin.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/builtins/SLCallUntilOptimizedBuiltin.java index 1bd6537b3fe7..21fbbe07e16a 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/builtins/SLCallUntilOptimizedBuiltin.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/builtins/SLCallUntilOptimizedBuiltin.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test.builtins; +package jdk.graal.compiler.truffle.test.builtins; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.Truffle; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/builtins/SLDeoptimizeWhenCompiledBuiltin.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/builtins/SLDeoptimizeWhenCompiledBuiltin.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/builtins/SLDeoptimizeWhenCompiledBuiltin.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/builtins/SLDeoptimizeWhenCompiledBuiltin.java index b24845ffefed..a681fa79f07b 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/builtins/SLDeoptimizeWhenCompiledBuiltin.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/builtins/SLDeoptimizeWhenCompiledBuiltin.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test.builtins; +package jdk.graal.compiler.truffle.test.builtins; import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/builtins/SLDisableSplittingBuiltin.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/builtins/SLDisableSplittingBuiltin.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/builtins/SLDisableSplittingBuiltin.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/builtins/SLDisableSplittingBuiltin.java index 808ede290078..4a210a4e015b 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/builtins/SLDisableSplittingBuiltin.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/builtins/SLDisableSplittingBuiltin.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test.builtins; +package jdk.graal.compiler.truffle.test.builtins; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.Truffle; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/builtins/SLGetOptionBuiltin.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/builtins/SLGetOptionBuiltin.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/builtins/SLGetOptionBuiltin.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/builtins/SLGetOptionBuiltin.java index 36a6c9406304..1e15fb9dc4f7 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/builtins/SLGetOptionBuiltin.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/builtins/SLGetOptionBuiltin.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test.builtins; +package jdk.graal.compiler.truffle.test.builtins; import org.graalvm.options.OptionDescriptor; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/builtins/SLGraalRuntimeBuiltin.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/builtins/SLGraalRuntimeBuiltin.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/builtins/SLGraalRuntimeBuiltin.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/builtins/SLGraalRuntimeBuiltin.java index 3e7213a62d35..3c57e6401426 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/builtins/SLGraalRuntimeBuiltin.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/builtins/SLGraalRuntimeBuiltin.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test.builtins; +package jdk.graal.compiler.truffle.test.builtins; import java.util.HashSet; import java.util.Set; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/builtins/SLIsCompilationConstantBuiltin.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/builtins/SLIsCompilationConstantBuiltin.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/builtins/SLIsCompilationConstantBuiltin.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/builtins/SLIsCompilationConstantBuiltin.java index 0c123c81c2b7..7df5e0c6ef79 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/builtins/SLIsCompilationConstantBuiltin.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/builtins/SLIsCompilationConstantBuiltin.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test.builtins; +package jdk.graal.compiler.truffle.test.builtins; import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.dsl.Specialization; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/builtins/SLIsOptimizedBuiltin.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/builtins/SLIsOptimizedBuiltin.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/builtins/SLIsOptimizedBuiltin.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/builtins/SLIsOptimizedBuiltin.java index 0bdf1ba50908..b891e57e6a69 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/builtins/SLIsOptimizedBuiltin.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/builtins/SLIsOptimizedBuiltin.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test.builtins; +package jdk.graal.compiler.truffle.test.builtins; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.Specialization; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/builtins/SLTestTruffleBoundary01Builtin.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/builtins/SLTestTruffleBoundary01Builtin.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/builtins/SLTestTruffleBoundary01Builtin.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/builtins/SLTestTruffleBoundary01Builtin.java index 5d9a1f7e5562..c50a7e4a4d84 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/builtins/SLTestTruffleBoundary01Builtin.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/builtins/SLTestTruffleBoundary01Builtin.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test.builtins; +package jdk.graal.compiler.truffle.test.builtins; import java.util.concurrent.Callable; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/builtins/SLWaitForOptimizationBuiltin.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/builtins/SLWaitForOptimizationBuiltin.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/builtins/SLWaitForOptimizationBuiltin.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/builtins/SLWaitForOptimizationBuiltin.java index 86bd74685545..41bac8a15a2b 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/builtins/SLWaitForOptimizationBuiltin.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/builtins/SLWaitForOptimizationBuiltin.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test.builtins; +package jdk.graal.compiler.truffle.test.builtins; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeoutException; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/collection/BTreeQueueTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/collection/BTreeQueueTest.java similarity index 99% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/collection/BTreeQueueTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/collection/BTreeQueueTest.java index 03ca2d1f5d5d..5d72498f7892 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/collection/BTreeQueueTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/collection/BTreeQueueTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test.collection; +package jdk.graal.compiler.truffle.test.collection; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/collection/DelegatingBlockingQueueTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/collection/DelegatingBlockingQueueTest.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/collection/DelegatingBlockingQueueTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/collection/DelegatingBlockingQueueTest.java index 1eed570a70b9..bf76019a9025 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/collection/DelegatingBlockingQueueTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/collection/DelegatingBlockingQueueTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test.collection; +package jdk.graal.compiler.truffle.test.collection; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/inlining/InlineOnlyTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/inlining/InlineOnlyTest.java similarity index 99% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/inlining/InlineOnlyTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/inlining/InlineOnlyTest.java index 9fa7bafb51b8..731cd8f74026 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/inlining/InlineOnlyTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/inlining/InlineOnlyTest.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.compiler.graal.truffle.test.inlining; +package jdk.graal.compiler.truffle.test.inlining; import org.graalvm.polyglot.Context; import org.junit.Assert; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/inlining/InliningTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/inlining/InliningTest.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/inlining/InliningTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/inlining/InliningTest.java index ff8283a8a820..93a4027283b4 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/inlining/InliningTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/inlining/InliningTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test.inlining; +package jdk.graal.compiler.truffle.test.inlining; import org.graalvm.polyglot.Context; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/libgraal/JNIExceptionWrapperTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/libgraal/JNIExceptionWrapperTest.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/libgraal/JNIExceptionWrapperTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/libgraal/JNIExceptionWrapperTest.java index 444e20f4cb8a..f9b5a0f4a18a 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/libgraal/JNIExceptionWrapperTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/libgraal/JNIExceptionWrapperTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test.libgraal; +package jdk.graal.compiler.truffle.test.libgraal; import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertTrue; @@ -33,11 +33,11 @@ import java.util.regex.Pattern; import java.util.stream.Collectors; -import jdk.compiler.graal.core.CompilationWrapper; -import jdk.compiler.graal.core.GraalCompilerOptions; -import jdk.compiler.graal.test.SubprocessUtil; -import jdk.compiler.graal.truffle.TruffleCompilerImpl; -import jdk.compiler.graal.truffle.test.TestWithPolyglotOptions; +import jdk.graal.compiler.core.CompilationWrapper; +import jdk.graal.compiler.core.GraalCompilerOptions; +import jdk.graal.compiler.test.SubprocessUtil; +import jdk.graal.compiler.truffle.TruffleCompilerImpl; +import jdk.graal.compiler.truffle.test.TestWithPolyglotOptions; import org.junit.Test; import com.oracle.truffle.api.nodes.RootNode; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/AbstractTestNode.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/nodes/AbstractTestNode.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/AbstractTestNode.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/nodes/AbstractTestNode.java index 822161d277ae..b20f36356bea 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/AbstractTestNode.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/nodes/AbstractTestNode.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test.nodes; +package jdk.graal.compiler.truffle.test.nodes; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.Node; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/AddTestNode.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/nodes/AddTestNode.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/AddTestNode.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/nodes/AddTestNode.java index fa69a9ac63ab..6349c68274d9 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/AddTestNode.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/nodes/AddTestNode.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test.nodes; +package jdk.graal.compiler.truffle.test.nodes; -import jdk.compiler.graal.api.directives.GraalDirectives; +import jdk.graal.compiler.api.directives.GraalDirectives; import com.oracle.truffle.api.frame.VirtualFrame; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/AssumptionCutsBranchTestNode.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/nodes/AssumptionCutsBranchTestNode.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/AssumptionCutsBranchTestNode.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/nodes/AssumptionCutsBranchTestNode.java index 4860d52e24b8..8c90d0db9093 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/AssumptionCutsBranchTestNode.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/nodes/AssumptionCutsBranchTestNode.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test.nodes; +package jdk.graal.compiler.truffle.test.nodes; import com.oracle.truffle.api.Assumption; import com.oracle.truffle.api.CompilerAsserts; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/BlockTestNode.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/nodes/BlockTestNode.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/BlockTestNode.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/nodes/BlockTestNode.java index 1be20b527f32..b588d99ab411 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/BlockTestNode.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/nodes/BlockTestNode.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test.nodes; +package jdk.graal.compiler.truffle.test.nodes; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.ExplodeLoop; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/ConstantTestNode.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/nodes/ConstantTestNode.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/ConstantTestNode.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/nodes/ConstantTestNode.java index f2a053daa647..03c56747a322 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/ConstantTestNode.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/nodes/ConstantTestNode.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test.nodes; +package jdk.graal.compiler.truffle.test.nodes; import com.oracle.truffle.api.frame.VirtualFrame; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/ConstantWithAssumptionTestNode.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/nodes/ConstantWithAssumptionTestNode.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/ConstantWithAssumptionTestNode.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/nodes/ConstantWithAssumptionTestNode.java index add49e71c2f8..12cfc27214b8 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/ConstantWithAssumptionTestNode.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/nodes/ConstantWithAssumptionTestNode.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test.nodes; +package jdk.graal.compiler.truffle.test.nodes; import com.oracle.truffle.api.Assumption; import com.oracle.truffle.api.frame.VirtualFrame; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/ExplodeLoopUntilReturnNode.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/nodes/ExplodeLoopUntilReturnNode.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/ExplodeLoopUntilReturnNode.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/nodes/ExplodeLoopUntilReturnNode.java index ecfac260181e..8f0beefd6255 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/ExplodeLoopUntilReturnNode.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/nodes/ExplodeLoopUntilReturnNode.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test.nodes; +package jdk.graal.compiler.truffle.test.nodes; import java.util.function.IntSupplier; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/ExplodeLoopUntilReturnWithThrowNode.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/nodes/ExplodeLoopUntilReturnWithThrowNode.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/ExplodeLoopUntilReturnWithThrowNode.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/nodes/ExplodeLoopUntilReturnWithThrowNode.java index 3dbd25498885..0bd9c42800f0 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/ExplodeLoopUntilReturnWithThrowNode.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/nodes/ExplodeLoopUntilReturnWithThrowNode.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test.nodes; +package jdk.graal.compiler.truffle.test.nodes; import com.oracle.truffle.api.CompilerDirectives.CompilationFinal; import com.oracle.truffle.api.frame.VirtualFrame; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/InliningNullCheckNode1.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/nodes/InliningNullCheckNode1.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/InliningNullCheckNode1.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/nodes/InliningNullCheckNode1.java index 6df992f795a2..e46716c94249 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/InliningNullCheckNode1.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/nodes/InliningNullCheckNode1.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test.nodes; +package jdk.graal.compiler.truffle.test.nodes; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/InliningNullCheckNode2.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/nodes/InliningNullCheckNode2.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/InliningNullCheckNode2.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/nodes/InliningNullCheckNode2.java index c0c39da41590..7739c048afba 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/InliningNullCheckNode2.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/nodes/InliningNullCheckNode2.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test.nodes; +package jdk.graal.compiler.truffle.test.nodes; import com.oracle.truffle.api.CompilerAsserts; import com.oracle.truffle.api.frame.VirtualFrame; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/IsLoggableNode.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/nodes/IsLoggableNode.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/IsLoggableNode.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/nodes/IsLoggableNode.java index 3b179f8778f1..fb7f85351cc2 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/IsLoggableNode.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/nodes/IsLoggableNode.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test.nodes; +package jdk.graal.compiler.truffle.test.nodes; import com.oracle.truffle.api.TruffleLogger; import com.oracle.truffle.api.frame.VirtualFrame; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/LambdaTestNode.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/nodes/LambdaTestNode.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/LambdaTestNode.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/nodes/LambdaTestNode.java index 7af62132cadf..9f2d5378cf49 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/LambdaTestNode.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/nodes/LambdaTestNode.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test.nodes; +package jdk.graal.compiler.truffle.test.nodes; import java.util.function.Supplier; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/LoadLocalTestNode.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/nodes/LoadLocalTestNode.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/LoadLocalTestNode.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/nodes/LoadLocalTestNode.java index 0f090ca19966..b92dd0813cde 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/LoadLocalTestNode.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/nodes/LoadLocalTestNode.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test.nodes; +package jdk.graal.compiler.truffle.test.nodes; import com.oracle.truffle.api.frame.FrameSlotTypeException; import com.oracle.truffle.api.frame.VirtualFrame; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/LoggingNode.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/nodes/LoggingNode.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/LoggingNode.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/nodes/LoggingNode.java index a6e48a8eb56b..cd176c677c52 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/LoggingNode.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/nodes/LoggingNode.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test.nodes; +package jdk.graal.compiler.truffle.test.nodes; import com.oracle.truffle.api.TruffleLogger; import com.oracle.truffle.api.frame.VirtualFrame; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/LoopTestNode.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/nodes/LoopTestNode.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/LoopTestNode.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/nodes/LoopTestNode.java index 794b5aa63e7d..a852ea76aa05 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/LoopTestNode.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/nodes/LoopTestNode.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test.nodes; +package jdk.graal.compiler.truffle.test.nodes; import com.oracle.truffle.api.frame.VirtualFrame; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/NeverPartOfCompilationTestNode.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/nodes/NeverPartOfCompilationTestNode.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/NeverPartOfCompilationTestNode.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/nodes/NeverPartOfCompilationTestNode.java index b140f5e4a10e..941995b74d66 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/NeverPartOfCompilationTestNode.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/nodes/NeverPartOfCompilationTestNode.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test.nodes; +package jdk.graal.compiler.truffle.test.nodes; import com.oracle.truffle.api.CompilerAsserts; import com.oracle.truffle.api.frame.VirtualFrame; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/NonConstantTestNode.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/nodes/NonConstantTestNode.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/NonConstantTestNode.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/nodes/NonConstantTestNode.java index b26df1f1a2f0..ea2686cac771 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/NonConstantTestNode.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/nodes/NonConstantTestNode.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test.nodes; +package jdk.graal.compiler.truffle.test.nodes; import com.oracle.truffle.api.frame.VirtualFrame; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/ObjectEqualsNode.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/nodes/ObjectEqualsNode.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/ObjectEqualsNode.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/nodes/ObjectEqualsNode.java index b80679893f4d..f646bed5dc8e 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/ObjectEqualsNode.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/nodes/ObjectEqualsNode.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test.nodes; +package jdk.graal.compiler.truffle.test.nodes; import com.oracle.truffle.api.CompilerDirectives.CompilationFinal; import com.oracle.truffle.api.frame.VirtualFrame; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/ObjectHashCodeNode.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/nodes/ObjectHashCodeNode.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/ObjectHashCodeNode.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/nodes/ObjectHashCodeNode.java index 54fec4daa2f6..32709192e236 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/ObjectHashCodeNode.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/nodes/ObjectHashCodeNode.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test.nodes; +package jdk.graal.compiler.truffle.test.nodes; import com.oracle.truffle.api.CompilerDirectives.CompilationFinal; import com.oracle.truffle.api.frame.VirtualFrame; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/PartialIntrinsicNode.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/nodes/PartialIntrinsicNode.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/PartialIntrinsicNode.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/nodes/PartialIntrinsicNode.java index b814aa261362..5da81e7d7e3c 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/PartialIntrinsicNode.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/nodes/PartialIntrinsicNode.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test.nodes; +package jdk.graal.compiler.truffle.test.nodes; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/RecursionTestNode.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/nodes/RecursionTestNode.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/RecursionTestNode.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/nodes/RecursionTestNode.java index 67b5950ac7a4..4ef2e0ed3f61 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/RecursionTestNode.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/nodes/RecursionTestNode.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test.nodes; +package jdk.graal.compiler.truffle.test.nodes; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/RootTestNode.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/nodes/RootTestNode.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/RootTestNode.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/nodes/RootTestNode.java index 577e88574f32..510b6094c61b 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/RootTestNode.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/nodes/RootTestNode.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test.nodes; +package jdk.graal.compiler.truffle.test.nodes; -import jdk.compiler.graal.api.directives.GraalDirectives; +import jdk.graal.compiler.api.directives.GraalDirectives; import com.oracle.truffle.api.frame.FrameDescriptor; import com.oracle.truffle.api.frame.VirtualFrame; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/StoreLocalTestNode.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/nodes/StoreLocalTestNode.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/StoreLocalTestNode.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/nodes/StoreLocalTestNode.java index dad151f386b0..02ac25ddbf1e 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/StoreLocalTestNode.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/nodes/StoreLocalTestNode.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test.nodes; +package jdk.graal.compiler.truffle.test.nodes; import com.oracle.truffle.api.frame.FrameSlotKind; import com.oracle.truffle.api.frame.VirtualFrame; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/StringEqualsNode.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/nodes/StringEqualsNode.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/StringEqualsNode.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/nodes/StringEqualsNode.java index a9aeb13c2275..d4bf28630128 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/StringEqualsNode.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/nodes/StringEqualsNode.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test.nodes; +package jdk.graal.compiler.truffle.test.nodes; import com.oracle.truffle.api.CompilerDirectives.CompilationFinal; import com.oracle.truffle.api.frame.VirtualFrame; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/StringHashCodeFinalNode.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/nodes/StringHashCodeFinalNode.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/StringHashCodeFinalNode.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/nodes/StringHashCodeFinalNode.java index f05c316493fe..9f1f6641fd54 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/StringHashCodeFinalNode.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/nodes/StringHashCodeFinalNode.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test.nodes; +package jdk.graal.compiler.truffle.test.nodes; import com.oracle.truffle.api.CompilerDirectives.CompilationFinal; import com.oracle.truffle.api.frame.VirtualFrame; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/StringHashCodeNonFinalNode.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/nodes/StringHashCodeNonFinalNode.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/StringHashCodeNonFinalNode.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/nodes/StringHashCodeNonFinalNode.java index 1be340e01435..d40b4aa7b647 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/StringHashCodeNonFinalNode.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/nodes/StringHashCodeNonFinalNode.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test.nodes; +package jdk.graal.compiler.truffle.test.nodes; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/SynchronizedExceptionMergeNode.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/nodes/SynchronizedExceptionMergeNode.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/SynchronizedExceptionMergeNode.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/nodes/SynchronizedExceptionMergeNode.java index ca141505d735..602bcab9d7da 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/SynchronizedExceptionMergeNode.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/nodes/SynchronizedExceptionMergeNode.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test.nodes; +package jdk.graal.compiler.truffle.test.nodes; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.frame.VirtualFrame; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/TestNodeFactory.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/nodes/TestNodeFactory.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/TestNodeFactory.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/nodes/TestNodeFactory.java index 2d6a4a68a40b..6a8c75cf30cf 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/TestNodeFactory.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/nodes/TestNodeFactory.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test.nodes; +package jdk.graal.compiler.truffle.test.nodes; public class TestNodeFactory { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/UnrollLoopUntilReturnNode.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/nodes/UnrollLoopUntilReturnNode.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/UnrollLoopUntilReturnNode.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/nodes/UnrollLoopUntilReturnNode.java index b2f7ae4408b5..fd2c0cb37d28 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/UnrollLoopUntilReturnNode.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/nodes/UnrollLoopUntilReturnNode.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test.nodes; +package jdk.graal.compiler.truffle.test.nodes; import java.util.function.IntSupplier; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/UnrollLoopUntilReturnWithThrowNode.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/nodes/UnrollLoopUntilReturnWithThrowNode.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/UnrollLoopUntilReturnWithThrowNode.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/nodes/UnrollLoopUntilReturnWithThrowNode.java index d3734729662c..6fe77a83109b 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/UnrollLoopUntilReturnWithThrowNode.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/nodes/UnrollLoopUntilReturnWithThrowNode.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test.nodes; +package jdk.graal.compiler.truffle.test.nodes; import com.oracle.truffle.api.CompilerDirectives.CompilationFinal; import com.oracle.truffle.api.frame.VirtualFrame; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/explosion/LoopExplosionPhiNode.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/nodes/explosion/LoopExplosionPhiNode.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/explosion/LoopExplosionPhiNode.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/nodes/explosion/LoopExplosionPhiNode.java index 7af7e28164bb..33730a05ac92 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/explosion/LoopExplosionPhiNode.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/nodes/explosion/LoopExplosionPhiNode.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test.nodes.explosion; +package jdk.graal.compiler.truffle.test.nodes.explosion; -import jdk.compiler.graal.truffle.test.nodes.AbstractTestNode; +import jdk.graal.compiler.truffle.test.nodes.AbstractTestNode; import com.oracle.truffle.api.CompilerDirectives.CompilationFinal; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/explosion/NestedExplodedLoopTestNode.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/nodes/explosion/NestedExplodedLoopTestNode.java similarity index 93% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/explosion/NestedExplodedLoopTestNode.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/nodes/explosion/NestedExplodedLoopTestNode.java index 51a4e8a12bf2..ba40c83c9ef6 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/explosion/NestedExplodedLoopTestNode.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/nodes/explosion/NestedExplodedLoopTestNode.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test.nodes.explosion; +package jdk.graal.compiler.truffle.test.nodes.explosion; -import jdk.compiler.graal.truffle.test.nodes.AbstractTestNode; +import jdk.graal.compiler.truffle.test.nodes.AbstractTestNode; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.ExplodeLoop; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/explosion/TwoMergesExplodedLoopTestNode.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/nodes/explosion/TwoMergesExplodedLoopTestNode.java similarity index 94% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/explosion/TwoMergesExplodedLoopTestNode.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/nodes/explosion/TwoMergesExplodedLoopTestNode.java index 2e5865813ef7..b5a1a2666995 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/explosion/TwoMergesExplodedLoopTestNode.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/nodes/explosion/TwoMergesExplodedLoopTestNode.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test.nodes.explosion; +package jdk.graal.compiler.truffle.test.nodes.explosion; -import jdk.compiler.graal.truffle.test.nodes.AbstractTestNode; +import jdk.graal.compiler.truffle.test.nodes.AbstractTestNode; import com.oracle.truffle.api.CompilerAsserts; import com.oracle.truffle.api.frame.VirtualFrame; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/explosion/UnrollingTestNode.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/nodes/explosion/UnrollingTestNode.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/explosion/UnrollingTestNode.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/nodes/explosion/UnrollingTestNode.java index 563dc260761f..d2b2197599b9 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/explosion/UnrollingTestNode.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/nodes/explosion/UnrollingTestNode.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test.nodes.explosion; +package jdk.graal.compiler.truffle.test.nodes.explosion; -import jdk.compiler.graal.api.directives.GraalDirectives; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.debug.BlackholeNode; -import jdk.compiler.graal.truffle.test.nodes.AbstractTestNode; +import jdk.graal.compiler.api.directives.GraalDirectives; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.debug.BlackholeNode; +import jdk.graal.compiler.truffle.test.nodes.AbstractTestNode; import com.oracle.truffle.api.CompilerAsserts; import com.oracle.truffle.api.CompilerDirectives; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringConstantFoldingTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/strings/TStringConstantFoldingTest.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringConstantFoldingTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/strings/TStringConstantFoldingTest.java index 878275f32ba2..ffca341dfc48 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringConstantFoldingTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/strings/TStringConstantFoldingTest.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test.strings; +package jdk.graal.compiler.truffle.test.strings; import static com.oracle.truffle.api.strings.TruffleString.Encoding.UTF_16; import static com.oracle.truffle.api.strings.TruffleString.Encoding.UTF_8; -import jdk.compiler.graal.core.common.GraalOptions; -import jdk.compiler.graal.nodes.ReturnNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.truffle.test.PartialEvaluationTest; +import jdk.graal.compiler.core.common.GraalOptions; +import jdk.graal.compiler.nodes.ReturnNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.truffle.test.PartialEvaluationTest; import org.junit.Assert; import org.junit.Assume; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCalcStringAttributesBMPTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/strings/TStringOpsCalcStringAttributesBMPTest.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCalcStringAttributesBMPTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/strings/TStringOpsCalcStringAttributesBMPTest.java index 32925be9fbc9..f93b7fc4d24f 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCalcStringAttributesBMPTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/strings/TStringOpsCalcStringAttributesBMPTest.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test.strings; +package jdk.graal.compiler.truffle.test.strings; import java.util.ArrayList; import java.util.Arrays; -import jdk.compiler.graal.replacements.nodes.CalcStringAttributesNode; +import jdk.graal.compiler.replacements.nodes.CalcStringAttributesNode; 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/strings/TStringOpsCalcStringAttributesLatin1Test.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/strings/TStringOpsCalcStringAttributesLatin1Test.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCalcStringAttributesLatin1Test.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/strings/TStringOpsCalcStringAttributesLatin1Test.java index 3d662c2a0df9..3c01198c81bb 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCalcStringAttributesLatin1Test.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/strings/TStringOpsCalcStringAttributesLatin1Test.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test.strings; +package jdk.graal.compiler.truffle.test.strings; import java.util.ArrayList; import java.util.Arrays; -import jdk.compiler.graal.replacements.nodes.CalcStringAttributesNode; +import jdk.graal.compiler.replacements.nodes.CalcStringAttributesNode; 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/strings/TStringOpsCalcStringAttributesReturnValuesInSyncTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/strings/TStringOpsCalcStringAttributesReturnValuesInSyncTest.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCalcStringAttributesReturnValuesInSyncTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/strings/TStringOpsCalcStringAttributesReturnValuesInSyncTest.java index d4f9ee568b27..b7d700104088 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCalcStringAttributesReturnValuesInSyncTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/strings/TStringOpsCalcStringAttributesReturnValuesInSyncTest.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test.strings; +package jdk.graal.compiler.truffle.test.strings; import java.lang.reflect.Field; -import jdk.compiler.graal.lir.gen.LIRGeneratorTool; +import jdk.graal.compiler.lir.gen.LIRGeneratorTool; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCalcStringAttributesUTF16Test.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/strings/TStringOpsCalcStringAttributesUTF16Test.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCalcStringAttributesUTF16Test.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/strings/TStringOpsCalcStringAttributesUTF16Test.java index 26f2ae7c0eab..154fcee68f16 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCalcStringAttributesUTF16Test.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/strings/TStringOpsCalcStringAttributesUTF16Test.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test.strings; +package jdk.graal.compiler.truffle.test.strings; import static java.lang.Character.MAX_CODE_POINT; import static java.lang.Character.MAX_HIGH_SURROGATE; @@ -33,7 +33,7 @@ import java.util.ArrayList; import java.util.Arrays; -import jdk.compiler.graal.replacements.nodes.CalcStringAttributesNode; +import jdk.graal.compiler.replacements.nodes.CalcStringAttributesNode; 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/strings/TStringOpsCalcStringAttributesUTF32Test.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/strings/TStringOpsCalcStringAttributesUTF32Test.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCalcStringAttributesUTF32Test.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/strings/TStringOpsCalcStringAttributesUTF32Test.java index 7cba2151c2ac..10d2483844d6 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCalcStringAttributesUTF32Test.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/strings/TStringOpsCalcStringAttributesUTF32Test.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test.strings; +package jdk.graal.compiler.truffle.test.strings; import static java.lang.Character.MAX_CODE_POINT; import static java.lang.Character.MAX_HIGH_SURROGATE; @@ -33,7 +33,7 @@ import java.util.ArrayList; import java.util.Arrays; -import jdk.compiler.graal.replacements.nodes.CalcStringAttributesNode; +import jdk.graal.compiler.replacements.nodes.CalcStringAttributesNode; 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/strings/TStringOpsCalcStringAttributesUTF8Test.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/strings/TStringOpsCalcStringAttributesUTF8Test.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCalcStringAttributesUTF8Test.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/strings/TStringOpsCalcStringAttributesUTF8Test.java index 547163d5b21f..65515c603787 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCalcStringAttributesUTF8Test.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/strings/TStringOpsCalcStringAttributesUTF8Test.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test.strings; +package jdk.graal.compiler.truffle.test.strings; import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.Arrays; -import jdk.compiler.graal.replacements.nodes.CalcStringAttributesNode; +import jdk.graal.compiler.replacements.nodes.CalcStringAttributesNode; 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/strings/TStringOpsCompareConstantStrideTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/strings/TStringOpsCompareConstantStrideTest.java similarity index 92% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCompareConstantStrideTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/strings/TStringOpsCompareConstantStrideTest.java index b5979d39977f..a415ebfe0a5e 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCompareConstantStrideTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/strings/TStringOpsCompareConstantStrideTest.java @@ -22,16 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test.strings; +package jdk.graal.compiler.truffle.test.strings; import static org.junit.runners.Parameterized.Parameters; import java.util.List; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.replacements.nodes.ArrayRegionCompareToNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.replacements.nodes.ArrayRegionCompareToNode; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCompareConstantTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/strings/TStringOpsCompareConstantTest.java similarity index 92% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCompareConstantTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/strings/TStringOpsCompareConstantTest.java index 70049659488d..a91d6ac3a8e5 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCompareConstantTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/strings/TStringOpsCompareConstantTest.java @@ -22,16 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test.strings; +package jdk.graal.compiler.truffle.test.strings; import java.util.List; import java.util.stream.Collectors; -import jdk.compiler.graal.core.common.CompilationIdentifier; -import jdk.compiler.graal.core.common.GraalOptions; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration; -import jdk.compiler.graal.options.OptionValues; +import jdk.graal.compiler.core.common.CompilationIdentifier; +import jdk.graal.compiler.core.common.GraalOptions; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration; +import jdk.graal.compiler.options.OptionValues; 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/strings/TStringOpsCompareTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/strings/TStringOpsCompareTest.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCompareTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/strings/TStringOpsCompareTest.java index 1d37e0ec39bc..888fdacff53f 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCompareTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/strings/TStringOpsCompareTest.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test.strings; +package jdk.graal.compiler.truffle.test.strings; import java.util.ArrayList; import java.util.List; -import jdk.compiler.graal.replacements.nodes.ArrayRegionCompareToNode; +import jdk.graal.compiler.replacements.nodes.ArrayRegionCompareToNode; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCopyConstantStrideTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/strings/TStringOpsCopyConstantStrideTest.java similarity index 92% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCopyConstantStrideTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/strings/TStringOpsCopyConstantStrideTest.java index 96e83d20da84..cd86f5c9068a 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCopyConstantStrideTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/strings/TStringOpsCopyConstantStrideTest.java @@ -22,16 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test.strings; +package jdk.graal.compiler.truffle.test.strings; import static org.junit.runners.Parameterized.Parameters; import java.util.List; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.replacements.nodes.ArrayCopyWithConversionsNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.replacements.nodes.ArrayCopyWithConversionsNode; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCopyReturnValueTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/strings/TStringOpsCopyReturnValueTest.java similarity index 95% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCopyReturnValueTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/strings/TStringOpsCopyReturnValueTest.java index 3452620afaa2..32868bf51482 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCopyReturnValueTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/strings/TStringOpsCopyReturnValueTest.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test.strings; +package jdk.graal.compiler.truffle.test.strings; import java.lang.reflect.InvocationTargetException; -import jdk.compiler.graal.replacements.nodes.ArrayCopyWithConversionsNode; +import jdk.graal.compiler.replacements.nodes.ArrayCopyWithConversionsNode; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCopyTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/strings/TStringOpsCopyTest.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCopyTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/strings/TStringOpsCopyTest.java index d8b6c0d803f6..f70b630f8497 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCopyTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/strings/TStringOpsCopyTest.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test.strings; +package jdk.graal.compiler.truffle.test.strings; import java.util.ArrayList; import java.util.List; -import jdk.compiler.graal.replacements.nodes.ArrayCopyWithConversionsNode; +import jdk.graal.compiler.replacements.nodes.ArrayCopyWithConversionsNode; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsIndexOfAnyConstantTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/strings/TStringOpsIndexOfAnyConstantTest.java similarity index 94% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsIndexOfAnyConstantTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/strings/TStringOpsIndexOfAnyConstantTest.java index 9fff4d9ce91c..25167c59404c 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsIndexOfAnyConstantTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/strings/TStringOpsIndexOfAnyConstantTest.java @@ -22,18 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test.strings; +package jdk.graal.compiler.truffle.test.strings; import static org.junit.runners.Parameterized.Parameters; import java.util.List; import java.util.stream.Collectors; -import jdk.compiler.graal.core.common.CompilationIdentifier; -import jdk.compiler.graal.core.common.GraalOptions; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration; -import jdk.compiler.graal.options.OptionValues; +import jdk.graal.compiler.core.common.CompilationIdentifier; +import jdk.graal.compiler.core.common.GraalOptions; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration; +import jdk.graal.compiler.options.OptionValues; 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/strings/TStringOpsIndexOfAnyRangeTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/strings/TStringOpsIndexOfAnyRangeTest.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsIndexOfAnyRangeTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/strings/TStringOpsIndexOfAnyRangeTest.java index 68d4568c4737..aed21f8f69aa 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsIndexOfAnyRangeTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/strings/TStringOpsIndexOfAnyRangeTest.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test.strings; +package jdk.graal.compiler.truffle.test.strings; import java.util.ArrayList; import java.util.List; -import jdk.compiler.graal.replacements.nodes.ArrayIndexOfNode; +import jdk.graal.compiler.replacements.nodes.ArrayIndexOfNode; 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/strings/TStringOpsIndexOfAnyTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/strings/TStringOpsIndexOfAnyTest.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsIndexOfAnyTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/strings/TStringOpsIndexOfAnyTest.java index e18f4c047ec5..3e08a5a94ac4 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsIndexOfAnyTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/strings/TStringOpsIndexOfAnyTest.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test.strings; +package jdk.graal.compiler.truffle.test.strings; import java.util.ArrayList; import java.util.List; -import jdk.compiler.graal.replacements.nodes.ArrayIndexOfNode; +import jdk.graal.compiler.replacements.nodes.ArrayIndexOfNode; 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/strings/TStringOpsIndexOfTableTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/strings/TStringOpsIndexOfTableTest.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsIndexOfTableTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/strings/TStringOpsIndexOfTableTest.java index 43a7d4a840dc..af52d767cab7 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsIndexOfTableTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/strings/TStringOpsIndexOfTableTest.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test.strings; +package jdk.graal.compiler.truffle.test.strings; import java.util.ArrayList; import java.util.List; -import jdk.compiler.graal.replacements.nodes.ArrayIndexOfNode; +import jdk.graal.compiler.replacements.nodes.ArrayIndexOfNode; 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/strings/TStringOpsIndexOfTwoConsecutiveConstantTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/strings/TStringOpsIndexOfTwoConsecutiveConstantTest.java similarity index 92% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsIndexOfTwoConsecutiveConstantTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/strings/TStringOpsIndexOfTwoConsecutiveConstantTest.java index dc50bc03997a..659ce1386ef2 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsIndexOfTwoConsecutiveConstantTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/strings/TStringOpsIndexOfTwoConsecutiveConstantTest.java @@ -22,16 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test.strings; +package jdk.graal.compiler.truffle.test.strings; import java.util.List; import java.util.stream.Collectors; -import jdk.compiler.graal.core.common.CompilationIdentifier; -import jdk.compiler.graal.core.common.GraalOptions; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration; -import jdk.compiler.graal.options.OptionValues; +import jdk.graal.compiler.core.common.CompilationIdentifier; +import jdk.graal.compiler.core.common.GraalOptions; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration; +import jdk.graal.compiler.options.OptionValues; 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/strings/TStringOpsIndexOfTwoConsecutiveTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/strings/TStringOpsIndexOfTwoConsecutiveTest.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsIndexOfTwoConsecutiveTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/strings/TStringOpsIndexOfTwoConsecutiveTest.java index 280d2f2d5254..27d6a3d93513 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsIndexOfTwoConsecutiveTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/strings/TStringOpsIndexOfTwoConsecutiveTest.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test.strings; +package jdk.graal.compiler.truffle.test.strings; import java.util.ArrayList; import java.util.List; -import jdk.compiler.graal.replacements.nodes.ArrayIndexOfNode; +import jdk.graal.compiler.replacements.nodes.ArrayIndexOfNode; 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/strings/TStringOpsRegionEqualsConstantLengthTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/strings/TStringOpsRegionEqualsConstantLengthTest.java similarity index 89% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsRegionEqualsConstantLengthTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/strings/TStringOpsRegionEqualsConstantLengthTest.java index 018b5d7ba4e5..0fed0adbcc62 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsRegionEqualsConstantLengthTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/strings/TStringOpsRegionEqualsConstantLengthTest.java @@ -22,20 +22,20 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test.strings; +package jdk.graal.compiler.truffle.test.strings; import java.util.List; import java.util.stream.Collectors; -import jdk.compiler.graal.core.common.Stride; -import jdk.compiler.graal.lir.amd64.AMD64ArrayEqualsOp; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext; -import jdk.compiler.graal.nodes.graphbuilderconf.InlineInvokePlugin; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.replacements.nodes.ArrayRegionEqualsNode; +import jdk.graal.compiler.core.common.Stride; +import jdk.graal.compiler.lir.amd64.AMD64ArrayEqualsOp; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext; +import jdk.graal.compiler.nodes.graphbuilderconf.InlineInvokePlugin; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.replacements.nodes.ArrayRegionEqualsNode; import org.junit.Assert; import org.junit.Assume; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsRegionEqualsConstantStrideTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/strings/TStringOpsRegionEqualsConstantStrideTest.java similarity index 92% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsRegionEqualsConstantStrideTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/strings/TStringOpsRegionEqualsConstantStrideTest.java index 5fac830023b3..c4f3fefafbfe 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsRegionEqualsConstantStrideTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/strings/TStringOpsRegionEqualsConstantStrideTest.java @@ -22,16 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test.strings; +package jdk.graal.compiler.truffle.test.strings; import static org.junit.runners.Parameterized.Parameters; import java.util.List; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.replacements.nodes.ArrayRegionEqualsNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.replacements.nodes.ArrayRegionEqualsNode; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsRegionEqualsConstantTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/strings/TStringOpsRegionEqualsConstantTest.java similarity index 92% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsRegionEqualsConstantTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/strings/TStringOpsRegionEqualsConstantTest.java index 82d14585d66e..77080f3399cc 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsRegionEqualsConstantTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/strings/TStringOpsRegionEqualsConstantTest.java @@ -22,16 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test.strings; +package jdk.graal.compiler.truffle.test.strings; import java.util.List; import java.util.stream.Collectors; -import jdk.compiler.graal.core.common.CompilationIdentifier; -import jdk.compiler.graal.core.common.GraalOptions; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration; -import jdk.compiler.graal.options.OptionValues; +import jdk.graal.compiler.core.common.CompilationIdentifier; +import jdk.graal.compiler.core.common.GraalOptions; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration; +import jdk.graal.compiler.options.OptionValues; 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/strings/TStringOpsRegionEqualsTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/strings/TStringOpsRegionEqualsTest.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsRegionEqualsTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/strings/TStringOpsRegionEqualsTest.java index f9474e8d82c3..71f7d463600a 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsRegionEqualsTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/strings/TStringOpsRegionEqualsTest.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test.strings; +package jdk.graal.compiler.truffle.test.strings; import java.util.ArrayList; import java.util.List; -import jdk.compiler.graal.replacements.nodes.ArrayRegionEqualsNode; +import jdk.graal.compiler.replacements.nodes.ArrayRegionEqualsNode; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/strings/TStringOpsTest.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/strings/TStringOpsTest.java index 6cdbf0d94389..7bbbc3e72c8a 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/strings/TStringOpsTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test.strings; +package jdk.graal.compiler.truffle.test.strings; import java.lang.reflect.Constructor; import java.lang.reflect.Field; @@ -31,10 +31,10 @@ import java.nio.ByteBuffer; import java.util.Arrays; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.replacements.nodes.CalcStringAttributesNode; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.replacements.nodes.CalcStringAttributesNode; import org.junit.Assert; import jdk.vm.ci.amd64.AMD64; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/strings/TStringTest.java similarity index 90% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/strings/TStringTest.java index c78ecf374a3f..070384768e04 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/strings/TStringTest.java @@ -22,22 +22,22 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test.strings; +package jdk.graal.compiler.truffle.test.strings; import java.nio.ByteOrder; -import jdk.compiler.graal.asm.amd64.AVXKind; -import jdk.compiler.graal.replacements.test.MethodSubstitutionTest; -import jdk.compiler.graal.hotspot.HotSpotBackend; -import jdk.compiler.graal.lir.amd64.AMD64ComplexVectorOp; -import jdk.compiler.graal.nodes.FixedNode; -import jdk.compiler.graal.nodes.ReturnNode; -import jdk.compiler.graal.nodes.StartNode; -import jdk.compiler.graal.nodes.StructuredGraph; -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.substitutions.TruffleInvocationPlugins; +import jdk.graal.compiler.asm.amd64.AVXKind; +import jdk.graal.compiler.replacements.test.MethodSubstitutionTest; +import jdk.graal.compiler.hotspot.HotSpotBackend; +import jdk.graal.compiler.lir.amd64.AMD64ComplexVectorOp; +import jdk.graal.compiler.nodes.FixedNode; +import jdk.graal.compiler.nodes.ReturnNode; +import jdk.graal.compiler.nodes.StartNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration; +import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins; +import jdk.graal.compiler.replacements.ConstantBindingParameterPlugin; +import jdk.graal.compiler.truffle.substitutions.TruffleInvocationPlugins; import jdk.vm.ci.aarch64.AArch64; import jdk.vm.ci.amd64.AMD64; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/VectorizedMismatchTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/strings/VectorizedMismatchTest.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/VectorizedMismatchTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/strings/VectorizedMismatchTest.java index f272fbf6bdb4..8d598c08a87e 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/VectorizedMismatchTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/strings/VectorizedMismatchTest.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test.strings; +package jdk.graal.compiler.truffle.test.strings; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.replacements.nodes.VectorizedMismatchNode; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.replacements.nodes.VectorizedMismatchNode; 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/tregex/TRegexCompilerTestDummyLanguage.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/tregex/TRegexCompilerTestDummyLanguage.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/tregex/TRegexCompilerTestDummyLanguage.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/tregex/TRegexCompilerTestDummyLanguage.java index de6ae566eb19..7d06bc6fb9c7 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/tregex/TRegexCompilerTestDummyLanguage.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/tregex/TRegexCompilerTestDummyLanguage.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test.tregex; +package jdk.graal.compiler.truffle.test.tregex; import com.oracle.truffle.api.CallTarget; import com.oracle.truffle.api.CompilerDirectives; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/tregex/TRegexTStringVirtualizationTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/tregex/TRegexTStringVirtualizationTest.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/tregex/TRegexTStringVirtualizationTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/tregex/TRegexTStringVirtualizationTest.java index 8e31ab66ec3f..cc967cdd890e 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/tregex/TRegexTStringVirtualizationTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/truffle/test/tregex/TRegexTStringVirtualizationTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test.tregex; +package jdk.graal.compiler.truffle.test.tregex; import static com.oracle.truffle.api.strings.TruffleString.Encoding.UTF_8; @@ -30,11 +30,11 @@ import java.nio.Buffer; import java.nio.ByteBuffer; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.virtual.CommitAllocationNode; -import jdk.compiler.graal.truffle.test.PartialEvaluationTest; -import jdk.compiler.graal.truffle.test.tregex.TRegexTStringVirtualizationTestFactory.MatchBooleanManagedNodeGen; -import jdk.compiler.graal.truffle.test.tregex.TRegexTStringVirtualizationTestFactory.MatchBooleanNativeNodeGen; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.virtual.CommitAllocationNode; +import jdk.graal.compiler.truffle.test.PartialEvaluationTest; +import jdk.graal.compiler.truffle.test.tregex.TRegexTStringVirtualizationTestFactory.MatchBooleanManagedNodeGen; +import jdk.graal.compiler.truffle.test.tregex.TRegexTStringVirtualizationTestFactory.MatchBooleanNativeNodeGen; import org.graalvm.polyglot.Context; import org.junit.Assert; import org.junit.Before; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/util/test/AddModulesTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/util/test/AddModulesTest.java similarity index 96% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/util/test/AddModulesTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/util/test/AddModulesTest.java index 27407aa06b32..fdb4b9de1f4f 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/util/test/AddModulesTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/util/test/AddModulesTest.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.util.test; +package jdk.graal.compiler.util.test; -import jdk.compiler.graal.test.AddModules; +import jdk.graal.compiler.test.AddModules; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/util/test/CollectionSizeTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/util/test/CollectionSizeTest.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/util/test/CollectionSizeTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/util/test/CollectionSizeTest.java index 0f818cdbd1ba..87b213a94c0b 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/util/test/CollectionSizeTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/util/test/CollectionSizeTest.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.util.test; +package jdk.graal.compiler.util.test; import static org.junit.Assert.assertEquals; import org.graalvm.collections.EconomicMap; import org.graalvm.collections.Equivalence; -import jdk.compiler.graal.test.AddExports; +import jdk.graal.compiler.test.AddExports; import org.junit.Test; @AddExports("java.base/jdk.internal.module") diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/util/test/CollectionUtilTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/util/test/CollectionUtilTest.java similarity index 98% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/util/test/CollectionUtilTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/util/test/CollectionUtilTest.java index 4357b45d31da..c3be846007a2 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/util/test/CollectionUtilTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/util/test/CollectionUtilTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.util.test; +package jdk.graal.compiler.util.test; import java.util.ArrayList; import java.util.Arrays; @@ -32,7 +32,7 @@ import java.util.NoSuchElementException; import org.graalvm.collections.Pair; -import jdk.compiler.graal.util.CollectionsUtil; +import jdk.graal.compiler.util.CollectionsUtil; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/util/test/JSONParserTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/util/test/JSONParserTest.java similarity index 97% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/util/test/JSONParserTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/util/test/JSONParserTest.java index 5466081f660f..f7c21d410785 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/util/test/JSONParserTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/util/test/JSONParserTest.java @@ -22,16 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.util.test; +package jdk.graal.compiler.util.test; import java.io.IOException; import java.io.StringReader; import java.util.List; import org.graalvm.collections.EconomicMap; -import jdk.compiler.graal.util.json.JSONFormatter; -import jdk.compiler.graal.util.json.JSONParser; -import jdk.compiler.graal.util.json.JSONParserException; +import jdk.graal.compiler.util.json.JSONFormatter; +import jdk.graal.compiler.util.json.JSONParser; +import jdk.graal.compiler.util.json.JSONParserException; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/util/test/ObjectSizeEstimate.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/util/test/ObjectSizeEstimate.java similarity index 99% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/util/test/ObjectSizeEstimate.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/util/test/ObjectSizeEstimate.java index 4982366242c8..bd1dd93785d4 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/util/test/ObjectSizeEstimate.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/util/test/ObjectSizeEstimate.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.util.test; +package jdk.graal.compiler.util.test; import java.lang.reflect.Field; import java.lang.reflect.Modifier; @@ -45,7 +45,7 @@ * * This utility uses reflection and relies on {@link Modules} to open up classes. As such, the * caller must ensure this class has access to {@link Modules} (e.g., - * {@code --add-exports=java.base/jdk.internal.module=jdk.compiler.graal}). + * {@code --add-exports=java.base/jdk.internal.module=jdk.graal.compiler}). */ public final class ObjectSizeEstimate { diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/util/test/OptionsEncoderTest.java b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/util/test/OptionsEncoderTest.java similarity index 94% rename from compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/util/test/OptionsEncoderTest.java rename to compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/util/test/OptionsEncoderTest.java index 4082311a3091..5538b7030fde 100644 --- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/util/test/OptionsEncoderTest.java +++ b/compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/util/test/OptionsEncoderTest.java @@ -22,17 +22,17 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.util.test; +package jdk.graal.compiler.util.test; -import static jdk.compiler.graal.util.OptionsEncoder.decode; -import static jdk.compiler.graal.util.OptionsEncoder.encode; +import static jdk.graal.compiler.util.OptionsEncoder.decode; +import static jdk.graal.compiler.util.OptionsEncoder.encode; import static org.junit.Assert.assertEquals; import java.lang.annotation.ElementType; import java.util.Collections; import java.util.Map; -import jdk.compiler.graal.util.TypedDataOutputStream; +import jdk.graal.compiler.util.TypedDataOutputStream; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.compiler.graal.test/src/sl/TestCompilationThreshold.sl b/compiler/src/jdk.graal.compiler.test/src/sl/TestCompilationThreshold.sl similarity index 100% rename from compiler/src/jdk.compiler.graal.test/src/sl/TestCompilationThreshold.sl rename to compiler/src/jdk.graal.compiler.test/src/sl/TestCompilationThreshold.sl diff --git a/compiler/src/jdk.compiler.graal.test/src/sl/TestDeoptInInlinedFunction.output b/compiler/src/jdk.graal.compiler.test/src/sl/TestDeoptInInlinedFunction.output similarity index 100% rename from compiler/src/jdk.compiler.graal.test/src/sl/TestDeoptInInlinedFunction.output rename to compiler/src/jdk.graal.compiler.test/src/sl/TestDeoptInInlinedFunction.output diff --git a/compiler/src/jdk.compiler.graal.test/src/sl/TestOSR.sl b/compiler/src/jdk.graal.compiler.test/src/sl/TestOSR.sl similarity index 100% rename from compiler/src/jdk.compiler.graal.test/src/sl/TestOSR.sl rename to compiler/src/jdk.graal.compiler.test/src/sl/TestOSR.sl diff --git a/compiler/src/jdk.compiler.graal.test/src/sl/TestTruffleBoundary01.sl b/compiler/src/jdk.graal.compiler.test/src/sl/TestTruffleBoundary01.sl similarity index 100% rename from compiler/src/jdk.compiler.graal.test/src/sl/TestTruffleBoundary01.sl rename to compiler/src/jdk.graal.compiler.test/src/sl/TestTruffleBoundary01.sl diff --git a/compiler/src/jdk.compiler.graal.test/src/sl/disabled/TestIsCompilationConstant1.sl b/compiler/src/jdk.graal.compiler.test/src/sl/disabled/TestIsCompilationConstant1.sl similarity index 100% rename from compiler/src/jdk.compiler.graal.test/src/sl/disabled/TestIsCompilationConstant1.sl rename to compiler/src/jdk.graal.compiler.test/src/sl/disabled/TestIsCompilationConstant1.sl diff --git a/compiler/src/jdk.compiler.graal.truffle.test.jdk21/src/jdk/compiler/graal/truffle/test/LoomUtils.java b/compiler/src/jdk.graal.compiler.truffle.test.jdk21/src/jdk/graal/compiler/truffle/test/LoomUtils.java similarity index 97% rename from compiler/src/jdk.compiler.graal.truffle.test.jdk21/src/jdk/compiler/graal/truffle/test/LoomUtils.java rename to compiler/src/jdk.graal.compiler.truffle.test.jdk21/src/jdk/graal/compiler/truffle/test/LoomUtils.java index 55cceaab2496..77e206c10906 100644 --- a/compiler/src/jdk.compiler.graal.truffle.test.jdk21/src/jdk/compiler/graal/truffle/test/LoomUtils.java +++ b/compiler/src/jdk.graal.compiler.truffle.test.jdk21/src/jdk/graal/compiler/truffle/test/LoomUtils.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.truffle.test; +package jdk.graal.compiler.truffle.test; public class LoomUtils { diff --git a/compiler/src/jdk.compiler.graal.virtual.bench/.checkstyle.exclude b/compiler/src/jdk.graal.compiler.virtual.bench/.checkstyle.exclude similarity index 100% rename from compiler/src/jdk.compiler.graal.virtual.bench/.checkstyle.exclude rename to compiler/src/jdk.graal.compiler.virtual.bench/.checkstyle.exclude diff --git a/compiler/src/jdk.compiler.graal.virtual.bench/src/jdk/compiler/graal/virtual/bench/PartialEscapeBench.java b/compiler/src/jdk.graal.compiler.virtual.bench/src/jdk/graal/compiler/virtual/bench/PartialEscapeBench.java similarity index 95% rename from compiler/src/jdk.compiler.graal.virtual.bench/src/jdk/compiler/graal/virtual/bench/PartialEscapeBench.java rename to compiler/src/jdk.graal.compiler.virtual.bench/src/jdk/graal/compiler/virtual/bench/PartialEscapeBench.java index c61dc6e06609..b27175fca88d 100644 --- a/compiler/src/jdk.compiler.graal.virtual.bench/src/jdk/compiler/graal/virtual/bench/PartialEscapeBench.java +++ b/compiler/src/jdk.graal.compiler.virtual.bench/src/jdk/graal/compiler/virtual/bench/PartialEscapeBench.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.virtual.bench; +package jdk.graal.compiler.virtual.bench; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.Scope; import org.openjdk.jmh.annotations.State; import org.openjdk.jmh.annotations.Warmup; -import jdk.compiler.graal.microbenchmarks.graal.GraalBenchmark; +import jdk.graal.compiler.microbenchmarks.graal.GraalBenchmark; public class PartialEscapeBench extends GraalBenchmark { diff --git a/compiler/src/jdk.compiler.graal/.checkstyle_checks.xml b/compiler/src/jdk.graal.compiler/.checkstyle_checks.xml similarity index 100% rename from compiler/src/jdk.compiler.graal/.checkstyle_checks.xml rename to compiler/src/jdk.graal.compiler/.checkstyle_checks.xml diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/api/directives/GraalDirectives.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/api/directives/GraalDirectives.java similarity index 99% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/api/directives/GraalDirectives.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/api/directives/GraalDirectives.java index baa05acad675..5c891325dde1 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/api/directives/GraalDirectives.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/api/directives/GraalDirectives.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.api.directives; +package jdk.graal.compiler.api.directives; import jdk.vm.ci.meta.DeoptimizationAction; import jdk.vm.ci.meta.DeoptimizationReason; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/api/replacements/Fold.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/api/replacements/Fold.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/api/replacements/Fold.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/api/replacements/Fold.java index a676f8d2a0f7..d3efff459148 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/api/replacements/Fold.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/api/replacements/Fold.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.api.replacements; +package jdk.graal.compiler.api.replacements; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/api/replacements/Snippet.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/api/replacements/Snippet.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/api/replacements/Snippet.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/api/replacements/Snippet.java index 27dfd88d2f7e..f69ad8bb6e9f 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/api/replacements/Snippet.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/api/replacements/Snippet.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.api.replacements; +package jdk.graal.compiler.api.replacements; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/api/replacements/SnippetReflectionProvider.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/api/replacements/SnippetReflectionProvider.java similarity index 99% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/api/replacements/SnippetReflectionProvider.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/api/replacements/SnippetReflectionProvider.java index 0753bd3371ee..7d00b9584ed8 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/api/replacements/SnippetReflectionProvider.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/api/replacements/SnippetReflectionProvider.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.api.replacements; +package jdk.graal.compiler.api.replacements; import java.lang.reflect.Executable; import java.lang.reflect.Field; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/api/replacements/SnippetTemplateCache.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/api/replacements/SnippetTemplateCache.java similarity index 96% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/api/replacements/SnippetTemplateCache.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/api/replacements/SnippetTemplateCache.java index 74dd7e7c605b..9e0c2d214b11 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/api/replacements/SnippetTemplateCache.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/api/replacements/SnippetTemplateCache.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.api.replacements; +package jdk.graal.compiler.api.replacements; /** * Marker interface for classes that cache snippet templates. diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/api/runtime/GraalJVMCICompiler.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/api/runtime/GraalJVMCICompiler.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/api/runtime/GraalJVMCICompiler.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/api/runtime/GraalJVMCICompiler.java index 9589bf83f8ec..5dfc1a12999e 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/api/runtime/GraalJVMCICompiler.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/api/runtime/GraalJVMCICompiler.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.api.runtime; +package jdk.graal.compiler.api.runtime; import jdk.vm.ci.runtime.JVMCICompiler; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/api/runtime/GraalRuntime.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/api/runtime/GraalRuntime.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/api/runtime/GraalRuntime.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/api/runtime/GraalRuntime.java index 6049472b4543..0db10e880cce 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/api/runtime/GraalRuntime.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/api/runtime/GraalRuntime.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.api.runtime; +package jdk.graal.compiler.api.runtime; import jdk.vm.ci.common.JVMCIError; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/asm/AbstractAddress.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/asm/AbstractAddress.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/asm/AbstractAddress.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/asm/AbstractAddress.java index 4c2a644e99e7..ea74c8e97011 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/asm/AbstractAddress.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/asm/AbstractAddress.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.asm; +package jdk.graal.compiler.asm; /** * Abstract base class that represents a platform specific address. diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/asm/AsmOptions.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/asm/AsmOptions.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/asm/AsmOptions.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/asm/AsmOptions.java index dbec4ac40eb1..cfee8c11fcd6 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/asm/AsmOptions.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/asm/AsmOptions.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.asm; +package jdk.graal.compiler.asm; public class AsmOptions { diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/asm/Assembler.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/asm/Assembler.java similarity index 99% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/asm/Assembler.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/asm/Assembler.java index 44f01146560f..846393895a0f 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/asm/Assembler.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/asm/Assembler.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.asm; +package jdk.graal.compiler.asm; import java.util.ArrayDeque; import java.util.EnumSet; import java.util.function.Consumer; -import jdk.compiler.graal.debug.GraalError; +import jdk.graal.compiler.debug.GraalError; import jdk.vm.ci.code.Register; import jdk.vm.ci.code.StackSlot; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/asm/BranchTargetOutOfBoundsException.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/asm/BranchTargetOutOfBoundsException.java similarity index 94% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/asm/BranchTargetOutOfBoundsException.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/asm/BranchTargetOutOfBoundsException.java index 631b54ead948..0ababc960c2e 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/asm/BranchTargetOutOfBoundsException.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/asm/BranchTargetOutOfBoundsException.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.asm; +package jdk.graal.compiler.asm; -import jdk.compiler.graal.core.common.GraalBailoutException; +import jdk.graal.compiler.core.common.GraalBailoutException; @SuppressWarnings("serial") public class BranchTargetOutOfBoundsException extends GraalBailoutException { diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/asm/Buffer.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/asm/Buffer.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/asm/Buffer.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/asm/Buffer.java index c77125f1f028..9c94b9e266f2 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/asm/Buffer.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/asm/Buffer.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.asm; +package jdk.graal.compiler.asm; import java.nio.ByteBuffer; import java.nio.ByteOrder; import java.util.Arrays; -import jdk.compiler.graal.core.common.NumUtil; +import jdk.graal.compiler.core.common.NumUtil; /** * Code buffer management for the assembler. diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/asm/Label.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/asm/Label.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/asm/Label.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/asm/Label.java index 4d1bdbe722ea..23c9452204e8 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/asm/Label.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/asm/Label.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.asm; +package jdk.graal.compiler.asm; import java.util.ArrayList; -import jdk.compiler.graal.debug.GraalError; +import jdk.graal.compiler.debug.GraalError; /** * This class represents a label within assembly code. diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/asm/VectorSize.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/asm/VectorSize.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/asm/VectorSize.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/asm/VectorSize.java index f320d080704d..3769b83f34de 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/asm/VectorSize.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/asm/VectorSize.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.asm; +package jdk.graal.compiler.asm; /** * Size of vector in SIMD instructions. diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/asm/aarch64/AArch64ASIMDAssembler.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/asm/aarch64/AArch64ASIMDAssembler.java similarity index 99% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/asm/aarch64/AArch64ASIMDAssembler.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/asm/aarch64/AArch64ASIMDAssembler.java index 75372cb9374f..10b3730835b2 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/asm/aarch64/AArch64ASIMDAssembler.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/asm/aarch64/AArch64ASIMDAssembler.java @@ -22,25 +22,25 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.asm.aarch64; +package jdk.graal.compiler.asm.aarch64; import static jdk.vm.ci.aarch64.AArch64.CPU; import static jdk.vm.ci.aarch64.AArch64.SIMD; import static jdk.vm.ci.aarch64.AArch64.zr; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.LoadFlag; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.rd; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.rn; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.rs1; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.rs2; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.rs3; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.LoadFlag; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.rd; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.rn; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.rs1; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.rs2; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.rs3; import java.util.Arrays; import java.util.HashMap; import java.util.Map; -import jdk.compiler.graal.core.common.NumUtil; -import jdk.compiler.graal.core.common.Stride; -import jdk.compiler.graal.debug.GraalError; +import jdk.graal.compiler.core.common.NumUtil; +import jdk.graal.compiler.core.common.Stride; +import jdk.graal.compiler.debug.GraalError; import jdk.vm.ci.aarch64.AArch64; import jdk.vm.ci.aarch64.AArch64Kind; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/asm/aarch64/AArch64ASIMDMacroAssembler.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/asm/aarch64/AArch64ASIMDMacroAssembler.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/asm/aarch64/AArch64ASIMDMacroAssembler.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/asm/aarch64/AArch64ASIMDMacroAssembler.java index e2f94ee384de..cb407ac8825d 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/asm/aarch64/AArch64ASIMDMacroAssembler.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/asm/aarch64/AArch64ASIMDMacroAssembler.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.asm.aarch64; +package jdk.graal.compiler.asm.aarch64; import static jdk.vm.ci.aarch64.AArch64.CPU; import static jdk.vm.ci.aarch64.AArch64.SIMD; -import jdk.compiler.graal.core.common.NumUtil; -import jdk.compiler.graal.debug.GraalError; +import jdk.graal.compiler.core.common.NumUtil; +import jdk.graal.compiler.debug.GraalError; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/asm/aarch64/AArch64Address.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/asm/aarch64/AArch64Address.java similarity index 99% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/asm/aarch64/AArch64Address.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/asm/aarch64/AArch64Address.java index df789faf2bf1..8fb7bafd6127 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/asm/aarch64/AArch64Address.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/asm/aarch64/AArch64Address.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.asm.aarch64; +package jdk.graal.compiler.asm.aarch64; import static jdk.vm.ci.aarch64.AArch64.sp; import static jdk.vm.ci.aarch64.AArch64.zr; -import jdk.compiler.graal.asm.AbstractAddress; -import jdk.compiler.graal.core.common.NumUtil; -import jdk.compiler.graal.debug.GraalError; +import jdk.graal.compiler.asm.AbstractAddress; +import jdk.graal.compiler.core.common.NumUtil; +import jdk.graal.compiler.debug.GraalError; import jdk.vm.ci.aarch64.AArch64; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/asm/aarch64/AArch64Assembler.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/asm/aarch64/AArch64Assembler.java similarity index 94% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/asm/aarch64/AArch64Assembler.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/asm/aarch64/AArch64Assembler.java index d4aee523d0c0..b59d68e8b85a 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/asm/aarch64/AArch64Assembler.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/asm/aarch64/AArch64Assembler.java @@ -23,7 +23,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.asm.aarch64; +package jdk.graal.compiler.asm.aarch64; import static jdk.vm.ci.aarch64.AArch64.CPU; import static jdk.vm.ci.aarch64.AArch64.SIMD; @@ -31,149 +31,149 @@ import static jdk.vm.ci.aarch64.AArch64.r0; import static jdk.vm.ci.aarch64.AArch64.sp; import static jdk.vm.ci.aarch64.AArch64.zr; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Asserts.verifyRegistersF; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Asserts.verifyRegistersFF; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Asserts.verifyRegistersR; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Asserts.verifyRegistersRP; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Asserts.verifyRegistersRRR; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Asserts.verifyRegistersRRRZ; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Asserts.verifyRegistersRZP; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Asserts.verifyRegistersZ; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Asserts.verifyRegistersZP; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Asserts.verifyRegistersZRP; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Asserts.verifySizeAndRegistersF; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Asserts.verifySizeAndRegistersFF; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Asserts.verifySizeAndRegistersFFF; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Asserts.verifySizeAndRegistersFFFF; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Asserts.verifySizeAndRegistersFZ; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Asserts.verifySizeAndRegistersPP; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Asserts.verifySizeAndRegistersPPZ; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Asserts.verifySizeAndRegistersPR; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Asserts.verifySizeAndRegistersPZ; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Asserts.verifySizeAndRegistersR; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Asserts.verifySizeAndRegistersRF; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Asserts.verifySizeAndRegistersRR; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Asserts.verifySizeAndRegistersRRR; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Asserts.verifySizeAndRegistersRZR; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Asserts.verifySizeAndRegistersRZZ; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Asserts.verifySizeAndRegistersZP; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Asserts.verifySizeAndRegistersZZ; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Asserts.verifySizeAndRegistersZZZ; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Asserts.verifySizeRegistersZPZ; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Asserts.verifySizesAndRegistersFZ; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Asserts.verifySizesAndRegistersRF; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Instruction.ADC; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Instruction.ADCS; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Instruction.ADD; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Instruction.ADDS; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Instruction.ADR; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Instruction.ADRP; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Instruction.AND; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Instruction.ANDS; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Instruction.ASRV; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Instruction.BFM; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Instruction.BIC; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Instruction.BICS; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Instruction.BLR; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Instruction.BR; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Instruction.BRK; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Instruction.CAS; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Instruction.CCMP; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Instruction.CLREX; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Instruction.CLS; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Instruction.CLZ; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Instruction.CSEL; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Instruction.CSINC; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Instruction.CSNEG; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Instruction.DC; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Instruction.DMB; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Instruction.DSB; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Instruction.EON; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Instruction.EOR; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Instruction.EXTR; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Instruction.FABS; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Instruction.FADD; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Instruction.FCCMP; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Instruction.FCMP; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Instruction.FCMPZERO; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Instruction.FCSEL; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Instruction.FCVT2D; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Instruction.FCVT2H; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Instruction.FCVT2S; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Instruction.FCVTAS; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Instruction.FCVTMS; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Instruction.FCVTZS; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Instruction.FDIV; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Instruction.FMADD; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Instruction.FMAX; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Instruction.FMIN; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Instruction.FMOV; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Instruction.FMSUB; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Instruction.FMUL; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Instruction.FNEG; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Instruction.FRINTM; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Instruction.FRINTN; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Instruction.FRINTP; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Instruction.FRINTZ; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Instruction.FSQRT; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Instruction.FSUB; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Instruction.HINT; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Instruction.HLT; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Instruction.ISB; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Instruction.LDADD; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Instruction.LDAR; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Instruction.LDAXR; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Instruction.LDP; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Instruction.LDR; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Instruction.LDRS; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Instruction.LDXR; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Instruction.LSLV; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Instruction.LSRV; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Instruction.MADD; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Instruction.MOVK; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Instruction.MOVN; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Instruction.MOVZ; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Instruction.MRS; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Instruction.MSUB; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Instruction.ORN; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Instruction.ORR; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Instruction.RBIT; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Instruction.RET; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Instruction.REVW; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Instruction.REVX; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Instruction.RORV; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Instruction.SBC; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Instruction.SBCS; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Instruction.SBFM; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Instruction.SCVTF; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Instruction.SDIV; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Instruction.STLR; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Instruction.STLXR; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Instruction.STP; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Instruction.STR; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Instruction.STXR; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Instruction.SUB; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Instruction.SUBS; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Instruction.SWP; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Instruction.TBNZ; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Instruction.TBZ; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Instruction.UBFM; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Instruction.UDIV; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.InstructionType.FP32; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.InstructionType.FP64; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.InstructionType.General32; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.InstructionType.General64; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.InstructionType.floatFromSize; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.InstructionType.generalFromSize; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Asserts.verifyRegistersF; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Asserts.verifyRegistersFF; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Asserts.verifyRegistersR; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Asserts.verifyRegistersRP; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Asserts.verifyRegistersRRR; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Asserts.verifyRegistersRRRZ; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Asserts.verifyRegistersRZP; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Asserts.verifyRegistersZ; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Asserts.verifyRegistersZP; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Asserts.verifyRegistersZRP; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Asserts.verifySizeAndRegistersF; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Asserts.verifySizeAndRegistersFF; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Asserts.verifySizeAndRegistersFFF; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Asserts.verifySizeAndRegistersFFFF; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Asserts.verifySizeAndRegistersFZ; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Asserts.verifySizeAndRegistersPP; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Asserts.verifySizeAndRegistersPPZ; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Asserts.verifySizeAndRegistersPR; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Asserts.verifySizeAndRegistersPZ; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Asserts.verifySizeAndRegistersR; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Asserts.verifySizeAndRegistersRF; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Asserts.verifySizeAndRegistersRR; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Asserts.verifySizeAndRegistersRRR; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Asserts.verifySizeAndRegistersRZR; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Asserts.verifySizeAndRegistersRZZ; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Asserts.verifySizeAndRegistersZP; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Asserts.verifySizeAndRegistersZZ; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Asserts.verifySizeAndRegistersZZZ; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Asserts.verifySizeRegistersZPZ; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Asserts.verifySizesAndRegistersFZ; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Asserts.verifySizesAndRegistersRF; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Instruction.ADC; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Instruction.ADCS; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Instruction.ADD; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Instruction.ADDS; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Instruction.ADR; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Instruction.ADRP; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Instruction.AND; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Instruction.ANDS; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Instruction.ASRV; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Instruction.BFM; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Instruction.BIC; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Instruction.BICS; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Instruction.BLR; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Instruction.BR; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Instruction.BRK; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Instruction.CAS; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Instruction.CCMP; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Instruction.CLREX; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Instruction.CLS; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Instruction.CLZ; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Instruction.CSEL; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Instruction.CSINC; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Instruction.CSNEG; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Instruction.DC; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Instruction.DMB; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Instruction.DSB; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Instruction.EON; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Instruction.EOR; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Instruction.EXTR; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Instruction.FABS; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Instruction.FADD; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Instruction.FCCMP; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Instruction.FCMP; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Instruction.FCMPZERO; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Instruction.FCSEL; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Instruction.FCVT2D; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Instruction.FCVT2H; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Instruction.FCVT2S; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Instruction.FCVTAS; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Instruction.FCVTMS; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Instruction.FCVTZS; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Instruction.FDIV; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Instruction.FMADD; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Instruction.FMAX; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Instruction.FMIN; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Instruction.FMOV; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Instruction.FMSUB; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Instruction.FMUL; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Instruction.FNEG; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Instruction.FRINTM; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Instruction.FRINTN; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Instruction.FRINTP; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Instruction.FRINTZ; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Instruction.FSQRT; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Instruction.FSUB; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Instruction.HINT; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Instruction.HLT; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Instruction.ISB; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Instruction.LDADD; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Instruction.LDAR; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Instruction.LDAXR; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Instruction.LDP; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Instruction.LDR; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Instruction.LDRS; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Instruction.LDXR; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Instruction.LSLV; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Instruction.LSRV; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Instruction.MADD; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Instruction.MOVK; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Instruction.MOVN; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Instruction.MOVZ; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Instruction.MRS; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Instruction.MSUB; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Instruction.ORN; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Instruction.ORR; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Instruction.RBIT; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Instruction.RET; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Instruction.REVW; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Instruction.REVX; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Instruction.RORV; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Instruction.SBC; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Instruction.SBCS; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Instruction.SBFM; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Instruction.SCVTF; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Instruction.SDIV; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Instruction.STLR; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Instruction.STLXR; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Instruction.STP; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Instruction.STR; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Instruction.STXR; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Instruction.SUB; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Instruction.SUBS; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Instruction.SWP; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Instruction.TBNZ; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Instruction.TBZ; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Instruction.UBFM; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Instruction.UDIV; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.InstructionType.FP32; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.InstructionType.FP64; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.InstructionType.General32; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.InstructionType.General64; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.InstructionType.floatFromSize; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.InstructionType.generalFromSize; import java.nio.ByteBuffer; import java.nio.ByteOrder; import java.util.Arrays; import java.util.EnumSet; -import jdk.compiler.graal.asm.Assembler; -import jdk.compiler.graal.core.common.NumUtil; -import jdk.compiler.graal.debug.GraalError; +import jdk.graal.compiler.asm.Assembler; +import jdk.graal.compiler.core.common.NumUtil; +import jdk.graal.compiler.debug.GraalError; import jdk.vm.ci.aarch64.AArch64; import jdk.vm.ci.aarch64.AArch64.CPUFeature; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/asm/aarch64/AArch64MacroAssembler.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/asm/aarch64/AArch64MacroAssembler.java similarity index 99% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/asm/aarch64/AArch64MacroAssembler.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/asm/aarch64/AArch64MacroAssembler.java index e11b63d54d72..5e9afae244fc 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/asm/aarch64/AArch64MacroAssembler.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/asm/aarch64/AArch64MacroAssembler.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.compiler.graal.asm.aarch64; +package jdk.graal.compiler.asm.aarch64; import static jdk.vm.ci.aarch64.AArch64.CPU; import static jdk.vm.ci.aarch64.AArch64.SIMD; @@ -31,18 +31,18 @@ import static jdk.vm.ci.aarch64.AArch64.rscratch2; import static jdk.vm.ci.aarch64.AArch64.sp; import static jdk.vm.ci.aarch64.AArch64.zr; -import static jdk.compiler.graal.asm.aarch64.AArch64Address.AddressingMode.IMMEDIATE_SIGNED_UNSCALED; -import static jdk.compiler.graal.asm.aarch64.AArch64Address.AddressingMode.IMMEDIATE_UNSIGNED_SCALED; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Instruction.LDP; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.Instruction.STP; - -import jdk.compiler.graal.asm.BranchTargetOutOfBoundsException; -import jdk.compiler.graal.asm.Label; -import jdk.compiler.graal.asm.aarch64.AArch64ASIMDAssembler.ASIMDSize; -import jdk.compiler.graal.asm.aarch64.AArch64Address.AddressingMode; -import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler.MovSequenceAnnotation.MovAction; -import jdk.compiler.graal.core.common.NumUtil; -import jdk.compiler.graal.debug.GraalError; +import static jdk.graal.compiler.asm.aarch64.AArch64Address.AddressingMode.IMMEDIATE_SIGNED_UNSCALED; +import static jdk.graal.compiler.asm.aarch64.AArch64Address.AddressingMode.IMMEDIATE_UNSIGNED_SCALED; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Instruction.LDP; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.Instruction.STP; + +import jdk.graal.compiler.asm.BranchTargetOutOfBoundsException; +import jdk.graal.compiler.asm.Label; +import jdk.graal.compiler.asm.aarch64.AArch64ASIMDAssembler.ASIMDSize; +import jdk.graal.compiler.asm.aarch64.AArch64Address.AddressingMode; +import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler.MovSequenceAnnotation.MovAction; +import jdk.graal.compiler.core.common.NumUtil; +import jdk.graal.compiler.debug.GraalError; import jdk.vm.ci.aarch64.AArch64; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/asm/aarch64/ASIMDKind.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/asm/aarch64/ASIMDKind.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/asm/aarch64/ASIMDKind.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/asm/aarch64/ASIMDKind.java index 2a2d98dae85e..51dc5e9de607 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/asm/aarch64/ASIMDKind.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/asm/aarch64/ASIMDKind.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.asm.aarch64; +package jdk.graal.compiler.asm.aarch64; -import jdk.compiler.graal.debug.GraalError; +import jdk.graal.compiler.debug.GraalError; import jdk.vm.ci.aarch64.AArch64Kind; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/asm/amd64/AMD64Address.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/asm/amd64/AMD64Address.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/asm/amd64/AMD64Address.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/asm/amd64/AMD64Address.java index bed682dda76c..4e0e55423bb8 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/asm/amd64/AMD64Address.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/asm/amd64/AMD64Address.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.asm.amd64; +package jdk.graal.compiler.asm.amd64; -import jdk.compiler.graal.asm.AbstractAddress; -import jdk.compiler.graal.core.common.Stride; +import jdk.graal.compiler.asm.AbstractAddress; +import jdk.graal.compiler.core.common.Stride; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/asm/amd64/AMD64Assembler.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/asm/amd64/AMD64Assembler.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/asm/amd64/AMD64Assembler.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/asm/amd64/AMD64Assembler.java index 9b455ab08954..34bfac1ce810 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/asm/amd64/AMD64Assembler.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/asm/amd64/AMD64Assembler.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.asm.amd64; +package jdk.graal.compiler.asm.amd64; import static jdk.vm.ci.amd64.AMD64.CPU; import static jdk.vm.ci.amd64.AMD64.MASK; @@ -39,54 +39,54 @@ import static jdk.vm.ci.amd64.AMD64.CPUFeature.F16C; import static jdk.vm.ci.amd64.AMD64.CPUFeature.GFNI; import static jdk.vm.ci.code.MemoryBarriers.STORE_LOAD; -import static jdk.compiler.graal.asm.amd64.AMD64Assembler.AMD64BinaryArithmetic.ADC; -import static jdk.compiler.graal.asm.amd64.AMD64Assembler.AMD64BinaryArithmetic.ADD; -import static jdk.compiler.graal.asm.amd64.AMD64Assembler.AMD64BinaryArithmetic.AND; -import static jdk.compiler.graal.asm.amd64.AMD64Assembler.AMD64BinaryArithmetic.CMP; -import static jdk.compiler.graal.asm.amd64.AMD64Assembler.AMD64BinaryArithmetic.OR; -import static jdk.compiler.graal.asm.amd64.AMD64Assembler.AMD64BinaryArithmetic.SBB; -import static jdk.compiler.graal.asm.amd64.AMD64Assembler.AMD64BinaryArithmetic.SUB; -import static jdk.compiler.graal.asm.amd64.AMD64Assembler.AMD64BinaryArithmetic.XOR; -import static jdk.compiler.graal.asm.amd64.AMD64Assembler.AMD64MOp.DEC; -import static jdk.compiler.graal.asm.amd64.AMD64Assembler.AMD64MOp.INC; -import static jdk.compiler.graal.asm.amd64.AMD64Assembler.AMD64MOp.MUL; -import static jdk.compiler.graal.asm.amd64.AMD64Assembler.AMD64MOp.NEG; -import static jdk.compiler.graal.asm.amd64.AMD64Assembler.AMD64MOp.NOT; -import static jdk.compiler.graal.asm.amd64.AMD64Assembler.AMD64RMIOp.SHA1RNDS4; -import static jdk.compiler.graal.asm.amd64.AMD64Assembler.AMD64RMOp.ADCX; -import static jdk.compiler.graal.asm.amd64.AMD64Assembler.AMD64RMOp.ADOX; -import static jdk.compiler.graal.asm.amd64.AMD64Assembler.AMD64RMOp.IMUL; -import static jdk.compiler.graal.asm.amd64.AMD64Assembler.AMD64RMOp.SHA1MSG1; -import static jdk.compiler.graal.asm.amd64.AMD64Assembler.AMD64RMOp.SHA1MSG2; -import static jdk.compiler.graal.asm.amd64.AMD64Assembler.AMD64RMOp.SHA1NEXTE; -import static jdk.compiler.graal.asm.amd64.AMD64Assembler.AMD64RMOp.SHA256MSG1; -import static jdk.compiler.graal.asm.amd64.AMD64Assembler.AMD64RMOp.SHA256MSG2; -import static jdk.compiler.graal.asm.amd64.AMD64Assembler.AMD64RMOp.SHA256RNDS2; -import static jdk.compiler.graal.asm.amd64.AMD64Assembler.AMD64Shift.RCL; -import static jdk.compiler.graal.asm.amd64.AMD64Assembler.AMD64Shift.RCR; -import static jdk.compiler.graal.asm.amd64.AMD64Assembler.AMD64Shift.ROL; -import static jdk.compiler.graal.asm.amd64.AMD64Assembler.AMD64Shift.ROR; -import static jdk.compiler.graal.asm.amd64.AMD64Assembler.VexGeneralPurposeRVMOp.MULX; -import static jdk.compiler.graal.asm.amd64.AMD64Assembler.VexMRIOp.VCVTPS2PH; -import static jdk.compiler.graal.asm.amd64.AMD64Assembler.VexRMIOp.RORXL; -import static jdk.compiler.graal.asm.amd64.AMD64Assembler.VexRMIOp.RORXQ; -import static jdk.compiler.graal.asm.amd64.AMD64Assembler.VexRMOp.VCVTPH2PS; -import static jdk.compiler.graal.asm.amd64.AMD64Assembler.VexRVMIOp.VGF2P8AFFINEQB; -import static jdk.compiler.graal.core.common.NumUtil.isByte; -import static jdk.compiler.graal.core.common.NumUtil.isInt; -import static jdk.compiler.graal.core.common.NumUtil.isShiftCount; -import static jdk.compiler.graal.core.common.NumUtil.isUByte; +import static jdk.graal.compiler.asm.amd64.AMD64Assembler.AMD64BinaryArithmetic.ADC; +import static jdk.graal.compiler.asm.amd64.AMD64Assembler.AMD64BinaryArithmetic.ADD; +import static jdk.graal.compiler.asm.amd64.AMD64Assembler.AMD64BinaryArithmetic.AND; +import static jdk.graal.compiler.asm.amd64.AMD64Assembler.AMD64BinaryArithmetic.CMP; +import static jdk.graal.compiler.asm.amd64.AMD64Assembler.AMD64BinaryArithmetic.OR; +import static jdk.graal.compiler.asm.amd64.AMD64Assembler.AMD64BinaryArithmetic.SBB; +import static jdk.graal.compiler.asm.amd64.AMD64Assembler.AMD64BinaryArithmetic.SUB; +import static jdk.graal.compiler.asm.amd64.AMD64Assembler.AMD64BinaryArithmetic.XOR; +import static jdk.graal.compiler.asm.amd64.AMD64Assembler.AMD64MOp.DEC; +import static jdk.graal.compiler.asm.amd64.AMD64Assembler.AMD64MOp.INC; +import static jdk.graal.compiler.asm.amd64.AMD64Assembler.AMD64MOp.MUL; +import static jdk.graal.compiler.asm.amd64.AMD64Assembler.AMD64MOp.NEG; +import static jdk.graal.compiler.asm.amd64.AMD64Assembler.AMD64MOp.NOT; +import static jdk.graal.compiler.asm.amd64.AMD64Assembler.AMD64RMIOp.SHA1RNDS4; +import static jdk.graal.compiler.asm.amd64.AMD64Assembler.AMD64RMOp.ADCX; +import static jdk.graal.compiler.asm.amd64.AMD64Assembler.AMD64RMOp.ADOX; +import static jdk.graal.compiler.asm.amd64.AMD64Assembler.AMD64RMOp.IMUL; +import static jdk.graal.compiler.asm.amd64.AMD64Assembler.AMD64RMOp.SHA1MSG1; +import static jdk.graal.compiler.asm.amd64.AMD64Assembler.AMD64RMOp.SHA1MSG2; +import static jdk.graal.compiler.asm.amd64.AMD64Assembler.AMD64RMOp.SHA1NEXTE; +import static jdk.graal.compiler.asm.amd64.AMD64Assembler.AMD64RMOp.SHA256MSG1; +import static jdk.graal.compiler.asm.amd64.AMD64Assembler.AMD64RMOp.SHA256MSG2; +import static jdk.graal.compiler.asm.amd64.AMD64Assembler.AMD64RMOp.SHA256RNDS2; +import static jdk.graal.compiler.asm.amd64.AMD64Assembler.AMD64Shift.RCL; +import static jdk.graal.compiler.asm.amd64.AMD64Assembler.AMD64Shift.RCR; +import static jdk.graal.compiler.asm.amd64.AMD64Assembler.AMD64Shift.ROL; +import static jdk.graal.compiler.asm.amd64.AMD64Assembler.AMD64Shift.ROR; +import static jdk.graal.compiler.asm.amd64.AMD64Assembler.VexGeneralPurposeRVMOp.MULX; +import static jdk.graal.compiler.asm.amd64.AMD64Assembler.VexMRIOp.VCVTPS2PH; +import static jdk.graal.compiler.asm.amd64.AMD64Assembler.VexRMIOp.RORXL; +import static jdk.graal.compiler.asm.amd64.AMD64Assembler.VexRMIOp.RORXQ; +import static jdk.graal.compiler.asm.amd64.AMD64Assembler.VexRMOp.VCVTPH2PS; +import static jdk.graal.compiler.asm.amd64.AMD64Assembler.VexRVMIOp.VGF2P8AFFINEQB; +import static jdk.graal.compiler.core.common.NumUtil.isByte; +import static jdk.graal.compiler.core.common.NumUtil.isInt; +import static jdk.graal.compiler.core.common.NumUtil.isShiftCount; +import static jdk.graal.compiler.core.common.NumUtil.isUByte; import java.util.EnumSet; -import jdk.compiler.graal.asm.Label; -import jdk.compiler.graal.core.common.Stride; -import jdk.compiler.graal.core.common.calc.Condition; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.options.Option; -import jdk.compiler.graal.options.OptionKey; -import jdk.compiler.graal.options.OptionType; -import jdk.compiler.graal.options.OptionValues; +import jdk.graal.compiler.asm.Label; +import jdk.graal.compiler.core.common.Stride; +import jdk.graal.compiler.core.common.calc.Condition; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.options.Option; +import jdk.graal.compiler.options.OptionKey; +import jdk.graal.compiler.options.OptionType; +import jdk.graal.compiler.options.OptionValues; import jdk.vm.ci.amd64.AMD64; import jdk.vm.ci.amd64.AMD64.CPUFeature; @@ -654,7 +654,7 @@ public final void emit(AMD64Assembler asm, OperandSize size, AMD64Address dst, i * * Note that when {@code src} is a memory address, we will choose {@code dst} as {@code nds} * even if {@link PreferredNDS#SRC} is specified, which implies an implicit dependency to - * {@code dst}. In {@link jdk.compiler.graal.lir.amd64.vector.AMD64VectorUnary.AVXConvertOp}, we + * {@code dst}. In {@link jdk.graal.compiler.lir.amd64.vector.AMD64VectorUnary.AVXConvertOp}, we * manually insert an {@code XOR} instruction for {@code dst}. */ private enum PreferredNDS { diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/asm/amd64/AMD64BaseAssembler.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/asm/amd64/AMD64BaseAssembler.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/asm/amd64/AMD64BaseAssembler.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/asm/amd64/AMD64BaseAssembler.java index f2a741239da2..a3714a04c054 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/asm/amd64/AMD64BaseAssembler.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/asm/amd64/AMD64BaseAssembler.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.asm.amd64; +package jdk.graal.compiler.asm.amd64; import static jdk.vm.ci.amd64.AMD64.MASK; import static jdk.vm.ci.amd64.AMD64.XMM; @@ -30,30 +30,30 @@ import static jdk.vm.ci.amd64.AMD64.r13; import static jdk.vm.ci.amd64.AMD64.rbp; import static jdk.vm.ci.amd64.AMD64.rsp; -import static jdk.compiler.graal.asm.amd64.AMD64BaseAssembler.EVEXPrefixConfig.B0; -import static jdk.compiler.graal.asm.amd64.AMD64BaseAssembler.EVEXPrefixConfig.B1; -import static jdk.compiler.graal.asm.amd64.AMD64BaseAssembler.EVEXPrefixConfig.Z0; -import static jdk.compiler.graal.asm.amd64.AMD64BaseAssembler.EVEXPrefixConfig.Z1; -import static jdk.compiler.graal.asm.amd64.AMD64BaseAssembler.VEXPrefixConfig.L128; -import static jdk.compiler.graal.asm.amd64.AMD64BaseAssembler.VEXPrefixConfig.L256; -import static jdk.compiler.graal.asm.amd64.AMD64BaseAssembler.VEXPrefixConfig.L512; -import static jdk.compiler.graal.asm.amd64.AMD64BaseAssembler.VEXPrefixConfig.LZ; -import static jdk.compiler.graal.asm.amd64.AMD64BaseAssembler.VEXPrefixConfig.M_0F; -import static jdk.compiler.graal.asm.amd64.AMD64BaseAssembler.VEXPrefixConfig.M_0F38; -import static jdk.compiler.graal.asm.amd64.AMD64BaseAssembler.VEXPrefixConfig.M_0F3A; -import static jdk.compiler.graal.asm.amd64.AMD64BaseAssembler.VEXPrefixConfig.P_; -import static jdk.compiler.graal.asm.amd64.AMD64BaseAssembler.VEXPrefixConfig.P_66; -import static jdk.compiler.graal.asm.amd64.AMD64BaseAssembler.VEXPrefixConfig.P_F2; -import static jdk.compiler.graal.asm.amd64.AMD64BaseAssembler.VEXPrefixConfig.P_F3; -import static jdk.compiler.graal.asm.amd64.AMD64BaseAssembler.VEXPrefixConfig.W0; -import static jdk.compiler.graal.asm.amd64.AMD64BaseAssembler.VEXPrefixConfig.W1; -import static jdk.compiler.graal.asm.amd64.AMD64BaseAssembler.VEXPrefixConfig.WIG; -import static jdk.compiler.graal.core.common.NumUtil.isByte; +import static jdk.graal.compiler.asm.amd64.AMD64BaseAssembler.EVEXPrefixConfig.B0; +import static jdk.graal.compiler.asm.amd64.AMD64BaseAssembler.EVEXPrefixConfig.B1; +import static jdk.graal.compiler.asm.amd64.AMD64BaseAssembler.EVEXPrefixConfig.Z0; +import static jdk.graal.compiler.asm.amd64.AMD64BaseAssembler.EVEXPrefixConfig.Z1; +import static jdk.graal.compiler.asm.amd64.AMD64BaseAssembler.VEXPrefixConfig.L128; +import static jdk.graal.compiler.asm.amd64.AMD64BaseAssembler.VEXPrefixConfig.L256; +import static jdk.graal.compiler.asm.amd64.AMD64BaseAssembler.VEXPrefixConfig.L512; +import static jdk.graal.compiler.asm.amd64.AMD64BaseAssembler.VEXPrefixConfig.LZ; +import static jdk.graal.compiler.asm.amd64.AMD64BaseAssembler.VEXPrefixConfig.M_0F; +import static jdk.graal.compiler.asm.amd64.AMD64BaseAssembler.VEXPrefixConfig.M_0F38; +import static jdk.graal.compiler.asm.amd64.AMD64BaseAssembler.VEXPrefixConfig.M_0F3A; +import static jdk.graal.compiler.asm.amd64.AMD64BaseAssembler.VEXPrefixConfig.P_; +import static jdk.graal.compiler.asm.amd64.AMD64BaseAssembler.VEXPrefixConfig.P_66; +import static jdk.graal.compiler.asm.amd64.AMD64BaseAssembler.VEXPrefixConfig.P_F2; +import static jdk.graal.compiler.asm.amd64.AMD64BaseAssembler.VEXPrefixConfig.P_F3; +import static jdk.graal.compiler.asm.amd64.AMD64BaseAssembler.VEXPrefixConfig.W0; +import static jdk.graal.compiler.asm.amd64.AMD64BaseAssembler.VEXPrefixConfig.W1; +import static jdk.graal.compiler.asm.amd64.AMD64BaseAssembler.VEXPrefixConfig.WIG; +import static jdk.graal.compiler.core.common.NumUtil.isByte; import org.graalvm.collections.EconomicSet; -import jdk.compiler.graal.asm.Assembler; -import jdk.compiler.graal.core.common.Stride; -import jdk.compiler.graal.debug.GraalError; +import jdk.graal.compiler.asm.Assembler; +import jdk.graal.compiler.core.common.Stride; +import jdk.graal.compiler.debug.GraalError; import jdk.vm.ci.amd64.AMD64; import jdk.vm.ci.amd64.AMD64.CPUFeature; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/asm/amd64/AMD64MacroAssembler.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/asm/amd64/AMD64MacroAssembler.java similarity index 99% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/asm/amd64/AMD64MacroAssembler.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/asm/amd64/AMD64MacroAssembler.java index c3e9c30da232..de338d8ee2e9 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/asm/amd64/AMD64MacroAssembler.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/asm/amd64/AMD64MacroAssembler.java @@ -22,18 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.asm.amd64; +package jdk.graal.compiler.asm.amd64; -import static jdk.compiler.graal.core.common.NumUtil.isByte; +import static jdk.graal.compiler.core.common.NumUtil.isByte; import java.util.function.IntConsumer; import java.util.function.Supplier; -import jdk.compiler.graal.asm.Label; -import jdk.compiler.graal.core.common.NumUtil; -import jdk.compiler.graal.core.common.Stride; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.options.OptionValues; +import jdk.graal.compiler.asm.Label; +import jdk.graal.compiler.core.common.NumUtil; +import jdk.graal.compiler.core.common.Stride; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.options.OptionValues; import jdk.vm.ci.amd64.AMD64; import jdk.vm.ci.amd64.AMD64.CPUFeature; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/asm/amd64/AVXKind.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/asm/amd64/AVXKind.java similarity index 93% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/asm/amd64/AVXKind.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/asm/amd64/AVXKind.java index a018993b15ef..a8cc94cec25c 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/asm/amd64/AVXKind.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/asm/amd64/AVXKind.java @@ -22,16 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.asm.amd64; +package jdk.graal.compiler.asm.amd64; -import static jdk.compiler.graal.asm.amd64.AVXKind.AVXSize.DWORD; -import static jdk.compiler.graal.asm.amd64.AVXKind.AVXSize.QWORD; -import static jdk.compiler.graal.asm.amd64.AVXKind.AVXSize.XMM; -import static jdk.compiler.graal.asm.amd64.AVXKind.AVXSize.YMM; -import static jdk.compiler.graal.asm.amd64.AVXKind.AVXSize.ZMM; +import static jdk.graal.compiler.asm.amd64.AVXKind.AVXSize.DWORD; +import static jdk.graal.compiler.asm.amd64.AVXKind.AVXSize.QWORD; +import static jdk.graal.compiler.asm.amd64.AVXKind.AVXSize.XMM; +import static jdk.graal.compiler.asm.amd64.AVXKind.AVXSize.YMM; +import static jdk.graal.compiler.asm.amd64.AVXKind.AVXSize.ZMM; -import jdk.compiler.graal.asm.VectorSize; -import jdk.compiler.graal.debug.GraalError; +import jdk.graal.compiler.asm.VectorSize; +import jdk.graal.compiler.debug.GraalError; import jdk.vm.ci.amd64.AMD64Kind; import jdk.vm.ci.meta.Value; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/bytecode/BridgeMethodUtils.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/bytecode/BridgeMethodUtils.java similarity index 94% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/bytecode/BridgeMethodUtils.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/bytecode/BridgeMethodUtils.java index bfc2cb45a92b..705758b75129 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/bytecode/BridgeMethodUtils.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/bytecode/BridgeMethodUtils.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.bytecode; +package jdk.graal.compiler.bytecode; -import static jdk.compiler.graal.bytecode.Bytecodes.ATHROW; -import static jdk.compiler.graal.bytecode.Bytecodes.INVOKEINTERFACE; -import static jdk.compiler.graal.bytecode.Bytecodes.INVOKESPECIAL; -import static jdk.compiler.graal.bytecode.Bytecodes.INVOKESTATIC; -import static jdk.compiler.graal.bytecode.Bytecodes.INVOKEVIRTUAL; +import static jdk.graal.compiler.bytecode.Bytecodes.ATHROW; +import static jdk.graal.compiler.bytecode.Bytecodes.INVOKEINTERFACE; +import static jdk.graal.compiler.bytecode.Bytecodes.INVOKESPECIAL; +import static jdk.graal.compiler.bytecode.Bytecodes.INVOKESTATIC; +import static jdk.graal.compiler.bytecode.Bytecodes.INVOKEVIRTUAL; import java.lang.annotation.Annotation; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/bytecode/Bytecode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/bytecode/Bytecode.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/bytecode/Bytecode.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/bytecode/Bytecode.java index 2d3bd0f289dd..8018dd212195 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/bytecode/Bytecode.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/bytecode/Bytecode.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.bytecode; +package jdk.graal.compiler.bytecode; import jdk.vm.ci.meta.ConstantPool; import jdk.vm.ci.meta.ExceptionHandler; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/bytecode/BytecodeDisassembler.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/bytecode/BytecodeDisassembler.java similarity index 85% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/bytecode/BytecodeDisassembler.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/bytecode/BytecodeDisassembler.java index a290d00d0e43..84ea4c2216d5 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/bytecode/BytecodeDisassembler.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/bytecode/BytecodeDisassembler.java @@ -22,64 +22,64 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.bytecode; +package jdk.graal.compiler.bytecode; -import static jdk.compiler.graal.bytecode.Bytecodes.ALOAD; -import static jdk.compiler.graal.bytecode.Bytecodes.ANEWARRAY; -import static jdk.compiler.graal.bytecode.Bytecodes.ASTORE; -import static jdk.compiler.graal.bytecode.Bytecodes.BIPUSH; -import static jdk.compiler.graal.bytecode.Bytecodes.CHECKCAST; -import static jdk.compiler.graal.bytecode.Bytecodes.DLOAD; -import static jdk.compiler.graal.bytecode.Bytecodes.DSTORE; -import static jdk.compiler.graal.bytecode.Bytecodes.FLOAD; -import static jdk.compiler.graal.bytecode.Bytecodes.FSTORE; -import static jdk.compiler.graal.bytecode.Bytecodes.GETFIELD; -import static jdk.compiler.graal.bytecode.Bytecodes.GETSTATIC; -import static jdk.compiler.graal.bytecode.Bytecodes.GOTO; -import static jdk.compiler.graal.bytecode.Bytecodes.GOTO_W; -import static jdk.compiler.graal.bytecode.Bytecodes.IFEQ; -import static jdk.compiler.graal.bytecode.Bytecodes.IFGE; -import static jdk.compiler.graal.bytecode.Bytecodes.IFGT; -import static jdk.compiler.graal.bytecode.Bytecodes.IFLE; -import static jdk.compiler.graal.bytecode.Bytecodes.IFLT; -import static jdk.compiler.graal.bytecode.Bytecodes.IFNE; -import static jdk.compiler.graal.bytecode.Bytecodes.IFNONNULL; -import static jdk.compiler.graal.bytecode.Bytecodes.IFNULL; -import static jdk.compiler.graal.bytecode.Bytecodes.IF_ACMPEQ; -import static jdk.compiler.graal.bytecode.Bytecodes.IF_ACMPNE; -import static jdk.compiler.graal.bytecode.Bytecodes.IF_ICMPEQ; -import static jdk.compiler.graal.bytecode.Bytecodes.IF_ICMPGE; -import static jdk.compiler.graal.bytecode.Bytecodes.IF_ICMPGT; -import static jdk.compiler.graal.bytecode.Bytecodes.IF_ICMPLE; -import static jdk.compiler.graal.bytecode.Bytecodes.IF_ICMPLT; -import static jdk.compiler.graal.bytecode.Bytecodes.IF_ICMPNE; -import static jdk.compiler.graal.bytecode.Bytecodes.ILOAD; -import static jdk.compiler.graal.bytecode.Bytecodes.INSTANCEOF; -import static jdk.compiler.graal.bytecode.Bytecodes.INVOKEDYNAMIC; -import static jdk.compiler.graal.bytecode.Bytecodes.INVOKEINTERFACE; -import static jdk.compiler.graal.bytecode.Bytecodes.INVOKESPECIAL; -import static jdk.compiler.graal.bytecode.Bytecodes.INVOKESTATIC; -import static jdk.compiler.graal.bytecode.Bytecodes.INVOKEVIRTUAL; -import static jdk.compiler.graal.bytecode.Bytecodes.ISTORE; -import static jdk.compiler.graal.bytecode.Bytecodes.JSR; -import static jdk.compiler.graal.bytecode.Bytecodes.JSR_W; -import static jdk.compiler.graal.bytecode.Bytecodes.LDC; -import static jdk.compiler.graal.bytecode.Bytecodes.LDC2_W; -import static jdk.compiler.graal.bytecode.Bytecodes.LDC_W; -import static jdk.compiler.graal.bytecode.Bytecodes.LLOAD; -import static jdk.compiler.graal.bytecode.Bytecodes.LOOKUPSWITCH; -import static jdk.compiler.graal.bytecode.Bytecodes.LSTORE; -import static jdk.compiler.graal.bytecode.Bytecodes.MULTIANEWARRAY; -import static jdk.compiler.graal.bytecode.Bytecodes.NEW; -import static jdk.compiler.graal.bytecode.Bytecodes.NEWARRAY; -import static jdk.compiler.graal.bytecode.Bytecodes.PUTFIELD; -import static jdk.compiler.graal.bytecode.Bytecodes.PUTSTATIC; -import static jdk.compiler.graal.bytecode.Bytecodes.RET; -import static jdk.compiler.graal.bytecode.Bytecodes.SIPUSH; -import static jdk.compiler.graal.bytecode.Bytecodes.TABLESWITCH; +import static jdk.graal.compiler.bytecode.Bytecodes.ALOAD; +import static jdk.graal.compiler.bytecode.Bytecodes.ANEWARRAY; +import static jdk.graal.compiler.bytecode.Bytecodes.ASTORE; +import static jdk.graal.compiler.bytecode.Bytecodes.BIPUSH; +import static jdk.graal.compiler.bytecode.Bytecodes.CHECKCAST; +import static jdk.graal.compiler.bytecode.Bytecodes.DLOAD; +import static jdk.graal.compiler.bytecode.Bytecodes.DSTORE; +import static jdk.graal.compiler.bytecode.Bytecodes.FLOAD; +import static jdk.graal.compiler.bytecode.Bytecodes.FSTORE; +import static jdk.graal.compiler.bytecode.Bytecodes.GETFIELD; +import static jdk.graal.compiler.bytecode.Bytecodes.GETSTATIC; +import static jdk.graal.compiler.bytecode.Bytecodes.GOTO; +import static jdk.graal.compiler.bytecode.Bytecodes.GOTO_W; +import static jdk.graal.compiler.bytecode.Bytecodes.IFEQ; +import static jdk.graal.compiler.bytecode.Bytecodes.IFGE; +import static jdk.graal.compiler.bytecode.Bytecodes.IFGT; +import static jdk.graal.compiler.bytecode.Bytecodes.IFLE; +import static jdk.graal.compiler.bytecode.Bytecodes.IFLT; +import static jdk.graal.compiler.bytecode.Bytecodes.IFNE; +import static jdk.graal.compiler.bytecode.Bytecodes.IFNONNULL; +import static jdk.graal.compiler.bytecode.Bytecodes.IFNULL; +import static jdk.graal.compiler.bytecode.Bytecodes.IF_ACMPEQ; +import static jdk.graal.compiler.bytecode.Bytecodes.IF_ACMPNE; +import static jdk.graal.compiler.bytecode.Bytecodes.IF_ICMPEQ; +import static jdk.graal.compiler.bytecode.Bytecodes.IF_ICMPGE; +import static jdk.graal.compiler.bytecode.Bytecodes.IF_ICMPGT; +import static jdk.graal.compiler.bytecode.Bytecodes.IF_ICMPLE; +import static jdk.graal.compiler.bytecode.Bytecodes.IF_ICMPLT; +import static jdk.graal.compiler.bytecode.Bytecodes.IF_ICMPNE; +import static jdk.graal.compiler.bytecode.Bytecodes.ILOAD; +import static jdk.graal.compiler.bytecode.Bytecodes.INSTANCEOF; +import static jdk.graal.compiler.bytecode.Bytecodes.INVOKEDYNAMIC; +import static jdk.graal.compiler.bytecode.Bytecodes.INVOKEINTERFACE; +import static jdk.graal.compiler.bytecode.Bytecodes.INVOKESPECIAL; +import static jdk.graal.compiler.bytecode.Bytecodes.INVOKESTATIC; +import static jdk.graal.compiler.bytecode.Bytecodes.INVOKEVIRTUAL; +import static jdk.graal.compiler.bytecode.Bytecodes.ISTORE; +import static jdk.graal.compiler.bytecode.Bytecodes.JSR; +import static jdk.graal.compiler.bytecode.Bytecodes.JSR_W; +import static jdk.graal.compiler.bytecode.Bytecodes.LDC; +import static jdk.graal.compiler.bytecode.Bytecodes.LDC2_W; +import static jdk.graal.compiler.bytecode.Bytecodes.LDC_W; +import static jdk.graal.compiler.bytecode.Bytecodes.LLOAD; +import static jdk.graal.compiler.bytecode.Bytecodes.LOOKUPSWITCH; +import static jdk.graal.compiler.bytecode.Bytecodes.LSTORE; +import static jdk.graal.compiler.bytecode.Bytecodes.MULTIANEWARRAY; +import static jdk.graal.compiler.bytecode.Bytecodes.NEW; +import static jdk.graal.compiler.bytecode.Bytecodes.NEWARRAY; +import static jdk.graal.compiler.bytecode.Bytecodes.PUTFIELD; +import static jdk.graal.compiler.bytecode.Bytecodes.PUTSTATIC; +import static jdk.graal.compiler.bytecode.Bytecodes.RET; +import static jdk.graal.compiler.bytecode.Bytecodes.SIPUSH; +import static jdk.graal.compiler.bytecode.Bytecodes.TABLESWITCH; import org.graalvm.collections.EconomicMap; -import jdk.compiler.graal.serviceprovider.GraalServices; +import jdk.graal.compiler.serviceprovider.GraalServices; import jdk.vm.ci.meta.ConstantPool; import jdk.vm.ci.meta.JavaConstant; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/bytecode/BytecodeLookupSwitch.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/bytecode/BytecodeLookupSwitch.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/bytecode/BytecodeLookupSwitch.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/bytecode/BytecodeLookupSwitch.java index f4dddb592b41..d22be101d71e 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/bytecode/BytecodeLookupSwitch.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/bytecode/BytecodeLookupSwitch.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.bytecode; +package jdk.graal.compiler.bytecode; /** * A utility for processing {@link Bytecodes#LOOKUPSWITCH} bytecodes. diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/bytecode/BytecodeProvider.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/bytecode/BytecodeProvider.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/bytecode/BytecodeProvider.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/bytecode/BytecodeProvider.java index 716175bf39d3..eaeed04b52b8 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/bytecode/BytecodeProvider.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/bytecode/BytecodeProvider.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.bytecode; +package jdk.graal.compiler.bytecode; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/bytecode/BytecodeStream.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/bytecode/BytecodeStream.java similarity index 99% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/bytecode/BytecodeStream.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/bytecode/BytecodeStream.java index b5b09e205f21..a893a78eed86 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/bytecode/BytecodeStream.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/bytecode/BytecodeStream.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.bytecode; +package jdk.graal.compiler.bytecode; /** * A utility class that makes iterating over bytecodes and reading operands simpler and less error diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/bytecode/BytecodeSwitch.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/bytecode/BytecodeSwitch.java similarity index 99% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/bytecode/BytecodeSwitch.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/bytecode/BytecodeSwitch.java index 17a48b935914..35a23d8027fa 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/bytecode/BytecodeSwitch.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/bytecode/BytecodeSwitch.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.bytecode; +package jdk.graal.compiler.bytecode; /** * An abstract class that provides the state and methods common to {@link Bytecodes#LOOKUPSWITCH} diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/bytecode/BytecodeTableSwitch.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/bytecode/BytecodeTableSwitch.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/bytecode/BytecodeTableSwitch.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/bytecode/BytecodeTableSwitch.java index 8c47277cad29..51643c1c6013 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/bytecode/BytecodeTableSwitch.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/bytecode/BytecodeTableSwitch.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.bytecode; +package jdk.graal.compiler.bytecode; /** * A utility for processing {@link Bytecodes#TABLESWITCH} bytecodes. diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/bytecode/Bytecodes.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/bytecode/Bytecodes.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/bytecode/Bytecodes.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/bytecode/Bytecodes.java index 8354a4bdd27c..347fa3928671 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/bytecode/Bytecodes.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/bytecode/Bytecodes.java @@ -22,19 +22,19 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.bytecode; +package jdk.graal.compiler.bytecode; -import static jdk.compiler.graal.bytecode.Bytecodes.Flags.ASSOCIATIVE; -import static jdk.compiler.graal.bytecode.Bytecodes.Flags.BRANCH; -import static jdk.compiler.graal.bytecode.Bytecodes.Flags.COMMUTATIVE; -import static jdk.compiler.graal.bytecode.Bytecodes.Flags.FALL_THROUGH; -import static jdk.compiler.graal.bytecode.Bytecodes.Flags.FIELD_READ; -import static jdk.compiler.graal.bytecode.Bytecodes.Flags.FIELD_WRITE; -import static jdk.compiler.graal.bytecode.Bytecodes.Flags.INVOKE; -import static jdk.compiler.graal.bytecode.Bytecodes.Flags.LOAD; -import static jdk.compiler.graal.bytecode.Bytecodes.Flags.STOP; -import static jdk.compiler.graal.bytecode.Bytecodes.Flags.STORE; -import static jdk.compiler.graal.bytecode.Bytecodes.Flags.TRAP; +import static jdk.graal.compiler.bytecode.Bytecodes.Flags.ASSOCIATIVE; +import static jdk.graal.compiler.bytecode.Bytecodes.Flags.BRANCH; +import static jdk.graal.compiler.bytecode.Bytecodes.Flags.COMMUTATIVE; +import static jdk.graal.compiler.bytecode.Bytecodes.Flags.FALL_THROUGH; +import static jdk.graal.compiler.bytecode.Bytecodes.Flags.FIELD_READ; +import static jdk.graal.compiler.bytecode.Bytecodes.Flags.FIELD_WRITE; +import static jdk.graal.compiler.bytecode.Bytecodes.Flags.INVOKE; +import static jdk.graal.compiler.bytecode.Bytecodes.Flags.LOAD; +import static jdk.graal.compiler.bytecode.Bytecodes.Flags.STOP; +import static jdk.graal.compiler.bytecode.Bytecodes.Flags.STORE; +import static jdk.graal.compiler.bytecode.Bytecodes.Flags.TRAP; import java.lang.reflect.Field; import java.lang.reflect.Modifier; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/bytecode/Bytes.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/bytecode/Bytes.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/bytecode/Bytes.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/bytecode/Bytes.java index e652f1a85a1b..1d4c98601afb 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/bytecode/Bytes.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/bytecode/Bytes.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.bytecode; +package jdk.graal.compiler.bytecode; /** * A collection of utility methods for dealing with bytes, particularly in byte arrays. diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/bytecode/OWNERS.toml b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/bytecode/OWNERS.toml similarity index 100% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/bytecode/OWNERS.toml rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/bytecode/OWNERS.toml diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/bytecode/ResolvedJavaMethodBytecode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/bytecode/ResolvedJavaMethodBytecode.java similarity index 99% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/bytecode/ResolvedJavaMethodBytecode.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/bytecode/ResolvedJavaMethodBytecode.java index e1d191893d3c..28627c8d3e9b 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/bytecode/ResolvedJavaMethodBytecode.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/bytecode/ResolvedJavaMethodBytecode.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.bytecode; +package jdk.graal.compiler.bytecode; import java.util.Objects; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/bytecode/ResolvedJavaMethodBytecodeProvider.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/bytecode/ResolvedJavaMethodBytecodeProvider.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/bytecode/ResolvedJavaMethodBytecodeProvider.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/bytecode/ResolvedJavaMethodBytecodeProvider.java index 60836a5cda3f..3bf898b791ab 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/bytecode/ResolvedJavaMethodBytecodeProvider.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/bytecode/ResolvedJavaMethodBytecodeProvider.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.bytecode; +package jdk.graal.compiler.bytecode; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/code/CompilationResult.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/code/CompilationResult.java similarity index 99% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/code/CompilationResult.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/code/CompilationResult.java index 7c9ee574b749..690a6f2fa11f 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/code/CompilationResult.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/code/CompilationResult.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.code; +package jdk.graal.compiler.code; import static java.util.Collections.emptyList; import static java.util.Collections.unmodifiableList; @@ -39,10 +39,10 @@ import org.graalvm.collections.EconomicSet; import org.graalvm.collections.Equivalence; -import jdk.compiler.graal.core.common.CompilationIdentifier; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.graph.NodeSourcePosition; -import jdk.compiler.graal.options.OptionValues; +import jdk.graal.compiler.core.common.CompilationIdentifier; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.graph.NodeSourcePosition; +import jdk.graal.compiler.options.OptionValues; import jdk.vm.ci.code.DebugInfo; import jdk.vm.ci.code.StackSlot; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/code/DataSection.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/code/DataSection.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/code/DataSection.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/code/DataSection.java index d57a35f0ce62..6b5c2a10cb2d 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/code/DataSection.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/code/DataSection.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.code; +package jdk.graal.compiler.code; import static jdk.vm.ci.meta.MetaUtil.identityHashCodeString; @@ -33,11 +33,11 @@ import java.util.Objects; import java.util.function.BiConsumer; -import jdk.compiler.graal.code.DataSection.Data; -import jdk.compiler.graal.options.Option; -import jdk.compiler.graal.options.OptionKey; -import jdk.compiler.graal.options.OptionType; -import jdk.compiler.graal.options.OptionValues; +import jdk.graal.compiler.code.DataSection.Data; +import jdk.graal.compiler.options.Option; +import jdk.graal.compiler.options.OptionKey; +import jdk.graal.compiler.options.OptionType; +import jdk.graal.compiler.options.OptionValues; import jdk.vm.ci.code.site.DataSectionReference; import jdk.vm.ci.meta.SerializableConstant; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/code/DisassemblerProvider.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/code/DisassemblerProvider.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/code/DisassemblerProvider.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/code/DisassemblerProvider.java index ed3235a0396d..53418b03cdf7 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/code/DisassemblerProvider.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/code/DisassemblerProvider.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.code; +package jdk.graal.compiler.code; import jdk.vm.ci.code.CodeCacheProvider; import jdk.vm.ci.code.InstalledCode; -import jdk.compiler.graal.options.OptionValues; +import jdk.graal.compiler.options.OptionValues; /** * Interface providing capability for disassembling machine code. diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/code/HexCodeFile.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/code/HexCodeFile.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/code/HexCodeFile.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/code/HexCodeFile.java index 51d5c5fb5c1a..0c1bc66ca30e 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/code/HexCodeFile.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/code/HexCodeFile.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.code; +package jdk.graal.compiler.code; -import static jdk.compiler.graal.code.CompilationResult.JumpTable.EntryFormat.OFFSET_ONLY; -import static jdk.compiler.graal.code.CompilationResult.JumpTable.EntryFormat.VALUE_AND_OFFSET; +import static jdk.graal.compiler.code.CompilationResult.JumpTable.EntryFormat.OFFSET_ONLY; +import static jdk.graal.compiler.code.CompilationResult.JumpTable.EntryFormat.VALUE_AND_OFFSET; import java.io.ByteArrayOutputStream; import java.io.OutputStream; @@ -37,10 +37,10 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import jdk.compiler.graal.code.CompilationResult.CodeAnnotation; -import jdk.compiler.graal.code.CompilationResult.CodeComment; -import jdk.compiler.graal.code.CompilationResult.JumpTable; -import jdk.compiler.graal.code.CompilationResult.JumpTable.EntryFormat; +import jdk.graal.compiler.code.CompilationResult.CodeAnnotation; +import jdk.graal.compiler.code.CompilationResult.CodeComment; +import jdk.graal.compiler.code.CompilationResult.JumpTable; +import jdk.graal.compiler.code.CompilationResult.JumpTable.EntryFormat; /** * A HexCodeFile is a textual format for representing a chunk of machine code along with extra diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/code/HexCodeFileDisassemblerProvider.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/code/HexCodeFileDisassemblerProvider.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/code/HexCodeFileDisassemblerProvider.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/code/HexCodeFileDisassemblerProvider.java index b4dcf49e5b5a..c6d525bd64f8 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/code/HexCodeFileDisassemblerProvider.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/code/HexCodeFileDisassemblerProvider.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.code; +package jdk.graal.compiler.code; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; import java.lang.reflect.Method; import java.util.Arrays; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.serviceprovider.ServiceProvider; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.serviceprovider.ServiceProvider; import jdk.vm.ci.code.CodeCacheProvider; import jdk.vm.ci.code.CodeUtil; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/code/ObjdumpDisassemblerProvider.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/code/ObjdumpDisassemblerProvider.java similarity index 96% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/code/ObjdumpDisassemblerProvider.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/code/ObjdumpDisassemblerProvider.java index 099c353d119e..37cbdb035670 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/code/ObjdumpDisassemblerProvider.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/code/ObjdumpDisassemblerProvider.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.code; +package jdk.graal.compiler.code; import java.io.BufferedReader; import java.io.File; @@ -35,13 +35,13 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import jdk.compiler.graal.code.CompilationResult.CodeAnnotation; -import jdk.compiler.graal.options.Option; -import jdk.compiler.graal.options.OptionKey; -import jdk.compiler.graal.options.OptionType; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.serviceprovider.ServiceProvider; -import jdk.compiler.graal.util.CollectionsUtil; +import jdk.graal.compiler.code.CompilationResult.CodeAnnotation; +import jdk.graal.compiler.options.Option; +import jdk.graal.compiler.options.OptionKey; +import jdk.graal.compiler.options.OptionType; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.serviceprovider.ServiceProvider; +import jdk.graal.compiler.util.CollectionsUtil; import jdk.vm.ci.code.CodeCacheProvider; import jdk.vm.ci.code.CodeUtil; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/code/SourceMapping.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/code/SourceMapping.java similarity index 96% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/code/SourceMapping.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/code/SourceMapping.java index bfa2a6fd4252..2e71adb47139 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/code/SourceMapping.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/code/SourceMapping.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.code; +package jdk.graal.compiler.code; import static jdk.vm.ci.meta.MetaUtil.identityHashCodeString; -import jdk.compiler.graal.graph.NodeSourcePosition; +import jdk.graal.compiler.graph.NodeSourcePosition; /** * This provides a mapping between a half-open range of PCs in the generated code and a diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/code/SourceStackTraceBailoutException.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/code/SourceStackTraceBailoutException.java similarity index 95% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/code/SourceStackTraceBailoutException.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/code/SourceStackTraceBailoutException.java index 099e418d27d4..cf212d981959 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/code/SourceStackTraceBailoutException.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/code/SourceStackTraceBailoutException.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.code; +package jdk.graal.compiler.code; -import jdk.compiler.graal.core.common.PermanentBailoutException; +import jdk.graal.compiler.core.common.PermanentBailoutException; /** * Represents a bailout exception with a stack trace in terms of the Java source being compiled diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/CompilationPrinter.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/CompilationPrinter.java similarity index 92% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/CompilationPrinter.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/CompilationPrinter.java index 5ad87e938eea..e8d68595788b 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/CompilationPrinter.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/CompilationPrinter.java @@ -22,17 +22,17 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core; +package jdk.graal.compiler.core; -import static jdk.compiler.graal.serviceprovider.GraalServices.getCurrentThreadAllocatedBytes; -import static jdk.compiler.graal.serviceprovider.GraalServices.isThreadAllocatedMemorySupported; +import static jdk.graal.compiler.serviceprovider.GraalServices.getCurrentThreadAllocatedBytes; +import static jdk.graal.compiler.serviceprovider.GraalServices.isThreadAllocatedMemorySupported; -import jdk.compiler.graal.code.CompilationResult; -import jdk.compiler.graal.core.common.CompilationIdentifier; -import jdk.compiler.graal.core.common.spi.ForeignCallSignature; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.debug.TTY; -import jdk.compiler.graal.options.OptionValues; +import jdk.graal.compiler.code.CompilationResult; +import jdk.graal.compiler.core.common.CompilationIdentifier; +import jdk.graal.compiler.core.common.spi.ForeignCallSignature; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.debug.TTY; +import jdk.graal.compiler.options.OptionValues; import jdk.vm.ci.code.InstalledCode; import jdk.vm.ci.meta.JavaMethod; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/CompilationWatchDog.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/CompilationWatchDog.java similarity index 96% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/CompilationWatchDog.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/CompilationWatchDog.java index 176f93ffe838..88a94fc826cb 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/CompilationWatchDog.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/CompilationWatchDog.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core; +package jdk.graal.compiler.core; import java.util.Arrays; import java.util.concurrent.ScheduledExecutorService; @@ -31,15 +31,15 @@ import java.util.concurrent.ThreadFactory; import java.util.concurrent.TimeUnit; -import jdk.compiler.graal.core.common.CompilationIdentifier; -import jdk.compiler.graal.core.common.util.Util; -import jdk.compiler.graal.debug.TTY; -import jdk.compiler.graal.options.Option; -import jdk.compiler.graal.options.OptionKey; -import jdk.compiler.graal.options.OptionType; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.serviceprovider.GraalServices; -import jdk.compiler.graal.serviceprovider.IsolateUtil; +import jdk.graal.compiler.core.common.CompilationIdentifier; +import jdk.graal.compiler.core.common.util.Util; +import jdk.graal.compiler.debug.TTY; +import jdk.graal.compiler.options.Option; +import jdk.graal.compiler.options.OptionKey; +import jdk.graal.compiler.options.OptionType; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.serviceprovider.GraalServices; +import jdk.graal.compiler.serviceprovider.IsolateUtil; import jdk.vm.ci.common.NativeImageReinitialize; import jdk.vm.ci.services.Services; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/CompilationWrapper.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/CompilationWrapper.java similarity index 95% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/CompilationWrapper.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/CompilationWrapper.java index 63a9ee32ab94..1a7dea1f6d23 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/CompilationWrapper.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/CompilationWrapper.java @@ -22,17 +22,17 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core; - -import static jdk.compiler.graal.core.CompilationWrapper.ExceptionAction.ExitVM; -import static jdk.compiler.graal.core.common.GraalOptions.TrackNodeSourcePosition; -import static jdk.compiler.graal.debug.DebugOptions.Count; -import static jdk.compiler.graal.debug.DebugOptions.Dump; -import static jdk.compiler.graal.debug.DebugOptions.DumpPath; -import static jdk.compiler.graal.debug.DebugOptions.MethodFilter; -import static jdk.compiler.graal.debug.DebugOptions.PrintBackendCFG; -import static jdk.compiler.graal.debug.DebugOptions.Time; -import static jdk.compiler.graal.debug.PathUtilities.getPath; +package jdk.graal.compiler.core; + +import static jdk.graal.compiler.core.CompilationWrapper.ExceptionAction.ExitVM; +import static jdk.graal.compiler.core.common.GraalOptions.TrackNodeSourcePosition; +import static jdk.graal.compiler.debug.DebugOptions.Count; +import static jdk.graal.compiler.debug.DebugOptions.Dump; +import static jdk.graal.compiler.debug.DebugOptions.DumpPath; +import static jdk.graal.compiler.debug.DebugOptions.MethodFilter; +import static jdk.graal.compiler.debug.DebugOptions.PrintBackendCFG; +import static jdk.graal.compiler.debug.DebugOptions.Time; +import static jdk.graal.compiler.debug.PathUtilities.getPath; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -41,13 +41,13 @@ import java.util.Formatter; import java.util.Map; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.debug.DebugOptions; -import jdk.compiler.graal.debug.DiagnosticsOutputDirectory; -import jdk.compiler.graal.debug.PathUtilities; -import jdk.compiler.graal.debug.TTY; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.serviceprovider.GlobalAtomicLong; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.debug.DebugOptions; +import jdk.graal.compiler.debug.DiagnosticsOutputDirectory; +import jdk.graal.compiler.debug.PathUtilities; +import jdk.graal.compiler.debug.TTY; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.serviceprovider.GlobalAtomicLong; import jdk.vm.ci.code.BailoutException; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/CompilerThread.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/CompilerThread.java similarity index 95% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/CompilerThread.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/CompilerThread.java index d75562ee8921..33c361d976d0 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/CompilerThread.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/CompilerThread.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core; +package jdk.graal.compiler.core; -import jdk.compiler.graal.serviceprovider.GraalServices; +import jdk.graal.compiler.serviceprovider.GraalServices; /** * A compiler thread is a daemon thread that runs at {@link Thread#MAX_PRIORITY}. diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/CompilerThreadFactory.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/CompilerThreadFactory.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/CompilerThreadFactory.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/CompilerThreadFactory.java index 1b6b978b97d0..8dba7d8c2e69 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/CompilerThreadFactory.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/CompilerThreadFactory.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core; +package jdk.graal.compiler.core; import java.util.concurrent.ThreadFactory; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/GraalCompiler.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/GraalCompiler.java similarity index 90% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/GraalCompiler.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/GraalCompiler.java index 3ec33fee2abe..c6fd755d57c8 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/GraalCompiler.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/GraalCompiler.java @@ -22,34 +22,34 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core; +package jdk.graal.compiler.core; -import jdk.compiler.graal.code.CompilationResult; -import jdk.compiler.graal.core.common.PermanentBailoutException; -import jdk.compiler.graal.core.common.RetryableBailoutException; -import jdk.compiler.graal.core.common.util.CompilationAlarm; -import jdk.compiler.graal.core.target.Backend; -import jdk.compiler.graal.debug.DebugCloseable; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.debug.DebugContext.CompilerPhaseScope; -import jdk.compiler.graal.debug.DebugOptions; -import jdk.compiler.graal.debug.MemUseTrackerKey; -import jdk.compiler.graal.debug.MethodFilter; -import jdk.compiler.graal.debug.TTY; -import jdk.compiler.graal.debug.TimerKey; -import jdk.compiler.graal.lir.asm.CompilationResultBuilderFactory; -import jdk.compiler.graal.lir.asm.EntryPointDecorator; -import jdk.compiler.graal.lir.phases.LIRSuites; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.phases.OptimisticOptimizations; -import jdk.compiler.graal.phases.PhaseSuite; -import jdk.compiler.graal.phases.common.DeadCodeEliminationPhase; -import jdk.compiler.graal.phases.tiers.HighTierContext; -import jdk.compiler.graal.phases.tiers.LowTierContext; -import jdk.compiler.graal.phases.tiers.MidTierContext; -import jdk.compiler.graal.phases.tiers.Suites; -import jdk.compiler.graal.phases.tiers.TargetProvider; -import jdk.compiler.graal.phases.util.Providers; +import jdk.graal.compiler.code.CompilationResult; +import jdk.graal.compiler.core.common.PermanentBailoutException; +import jdk.graal.compiler.core.common.RetryableBailoutException; +import jdk.graal.compiler.core.common.util.CompilationAlarm; +import jdk.graal.compiler.core.target.Backend; +import jdk.graal.compiler.debug.DebugCloseable; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.debug.DebugContext.CompilerPhaseScope; +import jdk.graal.compiler.debug.DebugOptions; +import jdk.graal.compiler.debug.MemUseTrackerKey; +import jdk.graal.compiler.debug.MethodFilter; +import jdk.graal.compiler.debug.TTY; +import jdk.graal.compiler.debug.TimerKey; +import jdk.graal.compiler.lir.asm.CompilationResultBuilderFactory; +import jdk.graal.compiler.lir.asm.EntryPointDecorator; +import jdk.graal.compiler.lir.phases.LIRSuites; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.phases.OptimisticOptimizations; +import jdk.graal.compiler.phases.PhaseSuite; +import jdk.graal.compiler.phases.common.DeadCodeEliminationPhase; +import jdk.graal.compiler.phases.tiers.HighTierContext; +import jdk.graal.compiler.phases.tiers.LowTierContext; +import jdk.graal.compiler.phases.tiers.MidTierContext; +import jdk.graal.compiler.phases.tiers.Suites; +import jdk.graal.compiler.phases.tiers.TargetProvider; +import jdk.graal.compiler.phases.util.Providers; import jdk.vm.ci.meta.ProfilingInfo; import jdk.vm.ci.meta.ResolvedJavaMethod; @@ -262,7 +262,7 @@ private static String match(StructuredGraph graph, String methodPattern) { /** * Substituted by {@code com.oracle.svm.graal.hotspot.libgraal. - * Target_jdk_compiler_graal_core_GraalCompiler} to optionally test routing fatal error handling + * Target_jdk_graal_compiler_core_GraalCompiler} to optionally test routing fatal error handling * from libgraal to HotSpot. * * @return true if the caller should proceed to throw an exception diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/GraalCompilerOptions.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/GraalCompilerOptions.java similarity index 92% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/GraalCompilerOptions.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/GraalCompilerOptions.java index 8807ac05f857..d685956f462d 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/GraalCompilerOptions.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/GraalCompilerOptions.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core; +package jdk.graal.compiler.core; -import jdk.compiler.graal.core.CompilationWrapper.ExceptionAction; -import jdk.compiler.graal.options.EnumOptionKey; -import jdk.compiler.graal.options.Option; -import jdk.compiler.graal.options.OptionKey; -import jdk.compiler.graal.options.OptionStability; -import jdk.compiler.graal.options.OptionType; +import jdk.graal.compiler.core.CompilationWrapper.ExceptionAction; +import jdk.graal.compiler.options.EnumOptionKey; +import jdk.graal.compiler.options.Option; +import jdk.graal.compiler.options.OptionKey; +import jdk.graal.compiler.options.OptionStability; +import jdk.graal.compiler.options.OptionType; /** * Options related to {@link GraalCompiler}. diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/GraalServiceThread.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/GraalServiceThread.java similarity index 94% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/GraalServiceThread.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/GraalServiceThread.java index c8f9a2cbbb8a..29d3afaefeff 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/GraalServiceThread.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/GraalServiceThread.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core; +package jdk.graal.compiler.core; import jdk.vm.ci.services.Services; @@ -72,14 +72,14 @@ protected void onAttachError(InternalError error) { /** * Substituted by {@code com.oracle.svm.graal.hotspot.libgraal. - * Target_jdk_compiler_graal_core_GraalServiceThread} to attach to the peer runtime if required. + * Target_jdk_graal_compiler_core_GraalServiceThread} to attach to the peer runtime if required. */ private void afterRun() { } /** * Substituted by {@code com.oracle.svm.graal.hotspot.libgraal. - * Target_jdk_compiler_graal_core_GraalServiceThread} to attach to the peer runtime if required. + * Target_jdk_graal_compiler_core_GraalServiceThread} to attach to the peer runtime if required. */ private void beforeRun() { } diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/Instrumentation.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/Instrumentation.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/Instrumentation.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/Instrumentation.java index 63a950d7e115..bd9344b85f7b 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/Instrumentation.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/Instrumentation.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core; +package jdk.graal.compiler.core; /** * Interface in charge of holding the instrumentation data structures. diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/LIRGenerationPhase.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/LIRGenerationPhase.java similarity index 83% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/LIRGenerationPhase.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/LIRGenerationPhase.java index ae3889bd52e2..db6d9df95d84 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/LIRGenerationPhase.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/LIRGenerationPhase.java @@ -22,26 +22,26 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core; +package jdk.graal.compiler.core; import java.util.List; -import jdk.compiler.graal.core.common.cfg.BasicBlock; -import jdk.compiler.graal.core.common.cfg.BlockMap; -import jdk.compiler.graal.core.gen.NodeLIRBuilder; -import jdk.compiler.graal.debug.CounterKey; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.lir.LIR; -import jdk.compiler.graal.lir.gen.LIRGenerationResult; -import jdk.compiler.graal.lir.gen.LIRGenerator; -import jdk.compiler.graal.lir.gen.LIRGeneratorTool; -import jdk.compiler.graal.lir.phases.LIRPhase; -import jdk.compiler.graal.lir.ssa.SSAUtil; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.StructuredGraph.ScheduleResult; -import jdk.compiler.graal.nodes.cfg.HIRBlock; -import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool; +import jdk.graal.compiler.core.common.cfg.BasicBlock; +import jdk.graal.compiler.core.common.cfg.BlockMap; +import jdk.graal.compiler.core.gen.NodeLIRBuilder; +import jdk.graal.compiler.debug.CounterKey; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.lir.LIR; +import jdk.graal.compiler.lir.gen.LIRGenerationResult; +import jdk.graal.compiler.lir.gen.LIRGenerator; +import jdk.graal.compiler.lir.gen.LIRGeneratorTool; +import jdk.graal.compiler.lir.phases.LIRPhase; +import jdk.graal.compiler.lir.ssa.SSAUtil; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.StructuredGraph.ScheduleResult; +import jdk.graal.compiler.nodes.cfg.HIRBlock; +import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool; import jdk.vm.ci.code.TargetDescription; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/aarch64/AArch64AddressLoweringByUse.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/aarch64/AArch64AddressLoweringByUse.java similarity index 94% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/aarch64/AArch64AddressLoweringByUse.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/aarch64/AArch64AddressLoweringByUse.java index 5ddc9114a685..4a45b0a5ad97 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/aarch64/AArch64AddressLoweringByUse.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/aarch64/AArch64AddressLoweringByUse.java @@ -24,20 +24,20 @@ * questions. */ -package jdk.compiler.graal.core.aarch64; +package jdk.graal.compiler.core.aarch64; -import jdk.compiler.graal.asm.aarch64.AArch64Address; -import jdk.compiler.graal.asm.aarch64.AArch64Address.AddressingMode; -import jdk.compiler.graal.core.common.LIRKind; -import jdk.compiler.graal.core.common.NumUtil; -import jdk.compiler.graal.core.common.type.Stamp; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.calc.AddNode; -import jdk.compiler.graal.nodes.calc.LeftShiftNode; -import jdk.compiler.graal.nodes.calc.ZeroExtendNode; -import jdk.compiler.graal.nodes.memory.address.AddressNode; -import jdk.compiler.graal.nodes.memory.address.OffsetAddressNode; -import jdk.compiler.graal.phases.common.AddressLoweringByUsePhase; +import jdk.graal.compiler.asm.aarch64.AArch64Address; +import jdk.graal.compiler.asm.aarch64.AArch64Address.AddressingMode; +import jdk.graal.compiler.core.common.LIRKind; +import jdk.graal.compiler.core.common.NumUtil; +import jdk.graal.compiler.core.common.type.Stamp; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.calc.AddNode; +import jdk.graal.compiler.nodes.calc.LeftShiftNode; +import jdk.graal.compiler.nodes.calc.ZeroExtendNode; +import jdk.graal.compiler.nodes.memory.address.AddressNode; +import jdk.graal.compiler.nodes.memory.address.OffsetAddressNode; +import jdk.graal.compiler.phases.common.AddressLoweringByUsePhase; import jdk.vm.ci.aarch64.AArch64Kind; import jdk.vm.ci.meta.JavaConstant; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/aarch64/AArch64AddressNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/aarch64/AArch64AddressNode.java similarity index 89% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/aarch64/AArch64AddressNode.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/aarch64/AArch64AddressNode.java index 9bab5f369b04..64f63d6881c6 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/aarch64/AArch64AddressNode.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/aarch64/AArch64AddressNode.java @@ -23,21 +23,21 @@ * questions. */ -package jdk.compiler.graal.core.aarch64; - -import jdk.compiler.graal.asm.aarch64.AArch64Address; -import jdk.compiler.graal.asm.aarch64.AArch64Address.AddressingMode; -import jdk.compiler.graal.core.common.LIRKind; -import jdk.compiler.graal.core.common.NumUtil; -import jdk.compiler.graal.graph.NodeClass; -import jdk.compiler.graal.lir.aarch64.AArch64AddressValue; -import jdk.compiler.graal.lir.gen.LIRGeneratorTool; -import jdk.compiler.graal.nodeinfo.NodeInfo; -import jdk.compiler.graal.nodes.NodeView; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.memory.address.AddressNode; -import jdk.compiler.graal.nodes.spi.LIRLowerable; -import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool; +package jdk.graal.compiler.core.aarch64; + +import jdk.graal.compiler.asm.aarch64.AArch64Address; +import jdk.graal.compiler.asm.aarch64.AArch64Address.AddressingMode; +import jdk.graal.compiler.core.common.LIRKind; +import jdk.graal.compiler.core.common.NumUtil; +import jdk.graal.compiler.graph.NodeClass; +import jdk.graal.compiler.lir.aarch64.AArch64AddressValue; +import jdk.graal.compiler.lir.gen.LIRGeneratorTool; +import jdk.graal.compiler.nodeinfo.NodeInfo; +import jdk.graal.compiler.nodes.NodeView; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.memory.address.AddressNode; +import jdk.graal.compiler.nodes.spi.LIRLowerable; +import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool; import jdk.vm.ci.meta.AllocatableValue; import jdk.vm.ci.meta.Value; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/aarch64/AArch64ArithmeticLIRGenerator.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/aarch64/AArch64ArithmeticLIRGenerator.java similarity index 92% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/aarch64/AArch64ArithmeticLIRGenerator.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/aarch64/AArch64ArithmeticLIRGenerator.java index 7299681b563d..246b134e12d8 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/aarch64/AArch64ArithmeticLIRGenerator.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/aarch64/AArch64ArithmeticLIRGenerator.java @@ -23,46 +23,46 @@ * questions. */ -package jdk.compiler.graal.core.aarch64; - -import static jdk.compiler.graal.lir.LIRValueUtil.asJavaConstant; -import static jdk.compiler.graal.lir.LIRValueUtil.isJavaConstant; -import static jdk.compiler.graal.lir.aarch64.AArch64BitManipulationOp.BitManipulationOpCode.BSR; -import static jdk.compiler.graal.lir.aarch64.AArch64BitManipulationOp.BitManipulationOpCode.CLZ; -import static jdk.compiler.graal.lir.aarch64.AArch64BitManipulationOp.BitManipulationOpCode.CTZ; -import static jdk.compiler.graal.lir.aarch64.AArch64BitManipulationOp.BitManipulationOpCode.POPCNT; - -import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler; -import jdk.compiler.graal.core.common.LIRKind; -import jdk.compiler.graal.core.common.NumUtil; -import jdk.compiler.graal.core.common.calc.FloatConvert; -import jdk.compiler.graal.core.common.memory.MemoryExtendKind; -import jdk.compiler.graal.core.common.memory.MemoryOrderMode; -import jdk.compiler.graal.core.common.spi.ForeignCallLinkage; -import jdk.compiler.graal.core.target.Backend; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.lir.CastValue; -import jdk.compiler.graal.lir.ConstantValue; -import jdk.compiler.graal.lir.LIRFrameState; -import jdk.compiler.graal.lir.Variable; -import jdk.compiler.graal.lir.aarch64.AArch64AddressValue; -import jdk.compiler.graal.lir.aarch64.AArch64ArithmeticOp; -import jdk.compiler.graal.lir.aarch64.AArch64BitManipulationOp; -import jdk.compiler.graal.lir.aarch64.AArch64BitSwapOp; -import jdk.compiler.graal.lir.aarch64.AArch64Convert; -import jdk.compiler.graal.lir.aarch64.AArch64FloatToHalfFloatOp; -import jdk.compiler.graal.lir.aarch64.AArch64HalfFloatToFloatOp; -import jdk.compiler.graal.lir.aarch64.AArch64MathCopySignOp; -import jdk.compiler.graal.lir.aarch64.AArch64MathSignumOp; -import jdk.compiler.graal.lir.aarch64.AArch64Move; -import jdk.compiler.graal.lir.aarch64.AArch64Move.LoadOp; -import jdk.compiler.graal.lir.aarch64.AArch64Move.StoreOp; -import jdk.compiler.graal.lir.aarch64.AArch64Move.StoreZeroOp; -import jdk.compiler.graal.lir.aarch64.AArch64NormalizedUnsignedCompareOp; -import jdk.compiler.graal.lir.aarch64.AArch64ReinterpretOp; -import jdk.compiler.graal.lir.aarch64.AArch64RoundFloatToIntegerOp; -import jdk.compiler.graal.lir.gen.ArithmeticLIRGenerator; -import jdk.compiler.graal.lir.gen.ArithmeticLIRGeneratorTool; +package jdk.graal.compiler.core.aarch64; + +import static jdk.graal.compiler.lir.LIRValueUtil.asJavaConstant; +import static jdk.graal.compiler.lir.LIRValueUtil.isJavaConstant; +import static jdk.graal.compiler.lir.aarch64.AArch64BitManipulationOp.BitManipulationOpCode.BSR; +import static jdk.graal.compiler.lir.aarch64.AArch64BitManipulationOp.BitManipulationOpCode.CLZ; +import static jdk.graal.compiler.lir.aarch64.AArch64BitManipulationOp.BitManipulationOpCode.CTZ; +import static jdk.graal.compiler.lir.aarch64.AArch64BitManipulationOp.BitManipulationOpCode.POPCNT; + +import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler; +import jdk.graal.compiler.core.common.LIRKind; +import jdk.graal.compiler.core.common.NumUtil; +import jdk.graal.compiler.core.common.calc.FloatConvert; +import jdk.graal.compiler.core.common.memory.MemoryExtendKind; +import jdk.graal.compiler.core.common.memory.MemoryOrderMode; +import jdk.graal.compiler.core.common.spi.ForeignCallLinkage; +import jdk.graal.compiler.core.target.Backend; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.lir.CastValue; +import jdk.graal.compiler.lir.ConstantValue; +import jdk.graal.compiler.lir.LIRFrameState; +import jdk.graal.compiler.lir.Variable; +import jdk.graal.compiler.lir.aarch64.AArch64AddressValue; +import jdk.graal.compiler.lir.aarch64.AArch64ArithmeticOp; +import jdk.graal.compiler.lir.aarch64.AArch64BitManipulationOp; +import jdk.graal.compiler.lir.aarch64.AArch64BitSwapOp; +import jdk.graal.compiler.lir.aarch64.AArch64Convert; +import jdk.graal.compiler.lir.aarch64.AArch64FloatToHalfFloatOp; +import jdk.graal.compiler.lir.aarch64.AArch64HalfFloatToFloatOp; +import jdk.graal.compiler.lir.aarch64.AArch64MathCopySignOp; +import jdk.graal.compiler.lir.aarch64.AArch64MathSignumOp; +import jdk.graal.compiler.lir.aarch64.AArch64Move; +import jdk.graal.compiler.lir.aarch64.AArch64Move.LoadOp; +import jdk.graal.compiler.lir.aarch64.AArch64Move.StoreOp; +import jdk.graal.compiler.lir.aarch64.AArch64Move.StoreZeroOp; +import jdk.graal.compiler.lir.aarch64.AArch64NormalizedUnsignedCompareOp; +import jdk.graal.compiler.lir.aarch64.AArch64ReinterpretOp; +import jdk.graal.compiler.lir.aarch64.AArch64RoundFloatToIntegerOp; +import jdk.graal.compiler.lir.gen.ArithmeticLIRGenerator; +import jdk.graal.compiler.lir.gen.ArithmeticLIRGeneratorTool; import jdk.vm.ci.aarch64.AArch64Kind; import jdk.vm.ci.meta.AllocatableValue; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/aarch64/AArch64BarrierSetLIRGenerator.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/aarch64/AArch64BarrierSetLIRGenerator.java similarity index 86% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/aarch64/AArch64BarrierSetLIRGenerator.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/aarch64/AArch64BarrierSetLIRGenerator.java index 0c31627f3bef..a4fe6a929487 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/aarch64/AArch64BarrierSetLIRGenerator.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/aarch64/AArch64BarrierSetLIRGenerator.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.aarch64; +package jdk.graal.compiler.core.aarch64; -import jdk.compiler.graal.core.common.LIRKind; -import jdk.compiler.graal.core.common.memory.BarrierType; -import jdk.compiler.graal.core.common.memory.MemoryOrderMode; -import jdk.compiler.graal.lir.Variable; -import jdk.compiler.graal.lir.gen.BarrierSetLIRGenerator; +import jdk.graal.compiler.core.common.LIRKind; +import jdk.graal.compiler.core.common.memory.BarrierType; +import jdk.graal.compiler.core.common.memory.MemoryOrderMode; +import jdk.graal.compiler.lir.Variable; +import jdk.graal.compiler.lir.gen.BarrierSetLIRGenerator; import jdk.vm.ci.aarch64.AArch64Kind; import jdk.vm.ci.meta.AllocatableValue; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/aarch64/AArch64LIRGenerator.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/aarch64/AArch64LIRGenerator.java similarity index 90% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/aarch64/AArch64LIRGenerator.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/aarch64/AArch64LIRGenerator.java index 8312b6c8e570..098c26fe32da 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/aarch64/AArch64LIRGenerator.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/aarch64/AArch64LIRGenerator.java @@ -22,87 +22,87 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.aarch64; +package jdk.graal.compiler.core.aarch64; import static jdk.vm.ci.aarch64.AArch64.sp; -import static jdk.compiler.graal.lir.LIRValueUtil.asJavaConstant; -import static jdk.compiler.graal.lir.LIRValueUtil.asVariable; -import static jdk.compiler.graal.lir.LIRValueUtil.isIntConstant; +import static jdk.graal.compiler.lir.LIRValueUtil.asJavaConstant; +import static jdk.graal.compiler.lir.LIRValueUtil.asVariable; +import static jdk.graal.compiler.lir.LIRValueUtil.isIntConstant; import java.util.EnumSet; import java.util.function.Function; -import jdk.compiler.graal.asm.aarch64.AArch64Address; -import jdk.compiler.graal.asm.aarch64.AArch64Assembler.ConditionFlag; -import jdk.compiler.graal.core.common.LIRKind; -import jdk.compiler.graal.core.common.Stride; -import jdk.compiler.graal.core.common.calc.Condition; -import jdk.compiler.graal.core.common.memory.BarrierType; -import jdk.compiler.graal.core.common.memory.MemoryOrderMode; -import jdk.compiler.graal.core.common.spi.LIRKindTool; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.lir.LIRFrameState; -import jdk.compiler.graal.lir.LIRInstruction; -import jdk.compiler.graal.lir.LIRValueUtil; -import jdk.compiler.graal.lir.LabelRef; -import jdk.compiler.graal.lir.StandardOp; -import jdk.compiler.graal.lir.SwitchStrategy; -import jdk.compiler.graal.lir.Variable; -import jdk.compiler.graal.lir.aarch64.AArch64AESDecryptOp; -import jdk.compiler.graal.lir.aarch64.AArch64AESEncryptOp; -import jdk.compiler.graal.lir.aarch64.AArch64AddressValue; -import jdk.compiler.graal.lir.aarch64.AArch64ArithmeticOp; -import jdk.compiler.graal.lir.aarch64.AArch64ArrayCompareToOp; -import jdk.compiler.graal.lir.aarch64.AArch64ArrayCopyWithConversionsOp; -import jdk.compiler.graal.lir.aarch64.AArch64ArrayEqualsOp; -import jdk.compiler.graal.lir.aarch64.AArch64ArrayIndexOfOp; -import jdk.compiler.graal.lir.aarch64.AArch64ArrayRegionCompareToOp; -import jdk.compiler.graal.lir.aarch64.AArch64AtomicMove; -import jdk.compiler.graal.lir.aarch64.AArch64AtomicMove.AtomicReadAndWriteOp; -import jdk.compiler.graal.lir.aarch64.AArch64AtomicMove.CompareAndSwapOp; -import jdk.compiler.graal.lir.aarch64.AArch64BigIntegerMulAddOp; -import jdk.compiler.graal.lir.aarch64.AArch64BigIntegerMultiplyToLenOp; -import jdk.compiler.graal.lir.aarch64.AArch64BigIntegerSquareToLenOp; -import jdk.compiler.graal.lir.aarch64.AArch64ByteSwap; -import jdk.compiler.graal.lir.aarch64.AArch64CacheWritebackOp; -import jdk.compiler.graal.lir.aarch64.AArch64CacheWritebackPostSyncOp; -import jdk.compiler.graal.lir.aarch64.AArch64CalcStringAttributesOp; -import jdk.compiler.graal.lir.aarch64.AArch64CipherBlockChainingAESDecryptOp; -import jdk.compiler.graal.lir.aarch64.AArch64CipherBlockChainingAESEncryptOp; -import jdk.compiler.graal.lir.aarch64.AArch64Compare; -import jdk.compiler.graal.lir.aarch64.AArch64ControlFlow; -import jdk.compiler.graal.lir.aarch64.AArch64ControlFlow.BranchOp; -import jdk.compiler.graal.lir.aarch64.AArch64ControlFlow.CompareBranchZeroOp; -import jdk.compiler.graal.lir.aarch64.AArch64ControlFlow.CondMoveOp; -import jdk.compiler.graal.lir.aarch64.AArch64ControlFlow.CondSetOp; -import jdk.compiler.graal.lir.aarch64.AArch64ControlFlow.HashTableSwitchOp; -import jdk.compiler.graal.lir.aarch64.AArch64ControlFlow.RangeTableSwitchOp; -import jdk.compiler.graal.lir.aarch64.AArch64ControlFlow.StrategySwitchOp; -import jdk.compiler.graal.lir.aarch64.AArch64CountPositivesOp; -import jdk.compiler.graal.lir.aarch64.AArch64CounterModeAESCryptOp; -import jdk.compiler.graal.lir.aarch64.AArch64EncodeArrayOp; -import jdk.compiler.graal.lir.aarch64.AArch64GHASHProcessBlocksOp; -import jdk.compiler.graal.lir.aarch64.AArch64HaltOp; -import jdk.compiler.graal.lir.aarch64.AArch64MD5Op; -import jdk.compiler.graal.lir.aarch64.AArch64Move; -import jdk.compiler.graal.lir.aarch64.AArch64Move.MembarOp; -import jdk.compiler.graal.lir.aarch64.AArch64PauseOp; -import jdk.compiler.graal.lir.aarch64.AArch64SHA1Op; -import jdk.compiler.graal.lir.aarch64.AArch64SHA256Op; -import jdk.compiler.graal.lir.aarch64.AArch64SHA3Op; -import jdk.compiler.graal.lir.aarch64.AArch64SHA512Op; -import jdk.compiler.graal.lir.aarch64.AArch64SpeculativeBarrier; -import jdk.compiler.graal.lir.aarch64.AArch64StringLatin1InflateOp; -import jdk.compiler.graal.lir.aarch64.AArch64StringUTF16CompressOp; -import jdk.compiler.graal.lir.aarch64.AArch64VectorizedMismatchOp; -import jdk.compiler.graal.lir.aarch64.AArch64ZapRegistersOp; -import jdk.compiler.graal.lir.aarch64.AArch64ZapStackOp; -import jdk.compiler.graal.lir.aarch64.AArch64ZeroMemoryOp; -import jdk.compiler.graal.lir.gen.BarrierSetLIRGenerator; -import jdk.compiler.graal.lir.gen.LIRGenerationResult; -import jdk.compiler.graal.lir.gen.LIRGenerator; -import jdk.compiler.graal.lir.gen.MoveFactory; -import jdk.compiler.graal.phases.util.Providers; +import jdk.graal.compiler.asm.aarch64.AArch64Address; +import jdk.graal.compiler.asm.aarch64.AArch64Assembler.ConditionFlag; +import jdk.graal.compiler.core.common.LIRKind; +import jdk.graal.compiler.core.common.Stride; +import jdk.graal.compiler.core.common.calc.Condition; +import jdk.graal.compiler.core.common.memory.BarrierType; +import jdk.graal.compiler.core.common.memory.MemoryOrderMode; +import jdk.graal.compiler.core.common.spi.LIRKindTool; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.lir.LIRFrameState; +import jdk.graal.compiler.lir.LIRInstruction; +import jdk.graal.compiler.lir.LIRValueUtil; +import jdk.graal.compiler.lir.LabelRef; +import jdk.graal.compiler.lir.StandardOp; +import jdk.graal.compiler.lir.SwitchStrategy; +import jdk.graal.compiler.lir.Variable; +import jdk.graal.compiler.lir.aarch64.AArch64AESDecryptOp; +import jdk.graal.compiler.lir.aarch64.AArch64AESEncryptOp; +import jdk.graal.compiler.lir.aarch64.AArch64AddressValue; +import jdk.graal.compiler.lir.aarch64.AArch64ArithmeticOp; +import jdk.graal.compiler.lir.aarch64.AArch64ArrayCompareToOp; +import jdk.graal.compiler.lir.aarch64.AArch64ArrayCopyWithConversionsOp; +import jdk.graal.compiler.lir.aarch64.AArch64ArrayEqualsOp; +import jdk.graal.compiler.lir.aarch64.AArch64ArrayIndexOfOp; +import jdk.graal.compiler.lir.aarch64.AArch64ArrayRegionCompareToOp; +import jdk.graal.compiler.lir.aarch64.AArch64AtomicMove; +import jdk.graal.compiler.lir.aarch64.AArch64AtomicMove.AtomicReadAndWriteOp; +import jdk.graal.compiler.lir.aarch64.AArch64AtomicMove.CompareAndSwapOp; +import jdk.graal.compiler.lir.aarch64.AArch64BigIntegerMulAddOp; +import jdk.graal.compiler.lir.aarch64.AArch64BigIntegerMultiplyToLenOp; +import jdk.graal.compiler.lir.aarch64.AArch64BigIntegerSquareToLenOp; +import jdk.graal.compiler.lir.aarch64.AArch64ByteSwap; +import jdk.graal.compiler.lir.aarch64.AArch64CacheWritebackOp; +import jdk.graal.compiler.lir.aarch64.AArch64CacheWritebackPostSyncOp; +import jdk.graal.compiler.lir.aarch64.AArch64CalcStringAttributesOp; +import jdk.graal.compiler.lir.aarch64.AArch64CipherBlockChainingAESDecryptOp; +import jdk.graal.compiler.lir.aarch64.AArch64CipherBlockChainingAESEncryptOp; +import jdk.graal.compiler.lir.aarch64.AArch64Compare; +import jdk.graal.compiler.lir.aarch64.AArch64ControlFlow; +import jdk.graal.compiler.lir.aarch64.AArch64ControlFlow.BranchOp; +import jdk.graal.compiler.lir.aarch64.AArch64ControlFlow.CompareBranchZeroOp; +import jdk.graal.compiler.lir.aarch64.AArch64ControlFlow.CondMoveOp; +import jdk.graal.compiler.lir.aarch64.AArch64ControlFlow.CondSetOp; +import jdk.graal.compiler.lir.aarch64.AArch64ControlFlow.HashTableSwitchOp; +import jdk.graal.compiler.lir.aarch64.AArch64ControlFlow.RangeTableSwitchOp; +import jdk.graal.compiler.lir.aarch64.AArch64ControlFlow.StrategySwitchOp; +import jdk.graal.compiler.lir.aarch64.AArch64CountPositivesOp; +import jdk.graal.compiler.lir.aarch64.AArch64CounterModeAESCryptOp; +import jdk.graal.compiler.lir.aarch64.AArch64EncodeArrayOp; +import jdk.graal.compiler.lir.aarch64.AArch64GHASHProcessBlocksOp; +import jdk.graal.compiler.lir.aarch64.AArch64HaltOp; +import jdk.graal.compiler.lir.aarch64.AArch64MD5Op; +import jdk.graal.compiler.lir.aarch64.AArch64Move; +import jdk.graal.compiler.lir.aarch64.AArch64Move.MembarOp; +import jdk.graal.compiler.lir.aarch64.AArch64PauseOp; +import jdk.graal.compiler.lir.aarch64.AArch64SHA1Op; +import jdk.graal.compiler.lir.aarch64.AArch64SHA256Op; +import jdk.graal.compiler.lir.aarch64.AArch64SHA3Op; +import jdk.graal.compiler.lir.aarch64.AArch64SHA512Op; +import jdk.graal.compiler.lir.aarch64.AArch64SpeculativeBarrier; +import jdk.graal.compiler.lir.aarch64.AArch64StringLatin1InflateOp; +import jdk.graal.compiler.lir.aarch64.AArch64StringUTF16CompressOp; +import jdk.graal.compiler.lir.aarch64.AArch64VectorizedMismatchOp; +import jdk.graal.compiler.lir.aarch64.AArch64ZapRegistersOp; +import jdk.graal.compiler.lir.aarch64.AArch64ZapStackOp; +import jdk.graal.compiler.lir.aarch64.AArch64ZeroMemoryOp; +import jdk.graal.compiler.lir.gen.BarrierSetLIRGenerator; +import jdk.graal.compiler.lir.gen.LIRGenerationResult; +import jdk.graal.compiler.lir.gen.LIRGenerator; +import jdk.graal.compiler.lir.gen.MoveFactory; +import jdk.graal.compiler.phases.util.Providers; import jdk.vm.ci.aarch64.AArch64; import jdk.vm.ci.aarch64.AArch64Kind; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/aarch64/AArch64LIRKindTool.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/aarch64/AArch64LIRKindTool.java similarity index 93% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/aarch64/AArch64LIRKindTool.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/aarch64/AArch64LIRKindTool.java index 3ecd3b816ca1..9e34e3f6b4d8 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/aarch64/AArch64LIRKindTool.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/aarch64/AArch64LIRKindTool.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.aarch64; +package jdk.graal.compiler.core.aarch64; -import jdk.compiler.graal.core.common.LIRKind; -import jdk.compiler.graal.core.common.spi.LIRKindTool; -import jdk.compiler.graal.debug.GraalError; +import jdk.graal.compiler.core.common.LIRKind; +import jdk.graal.compiler.core.common.spi.LIRKindTool; +import jdk.graal.compiler.debug.GraalError; import jdk.vm.ci.aarch64.AArch64Kind; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/aarch64/AArch64LoweringProviderMixin.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/aarch64/AArch64LoweringProviderMixin.java similarity index 90% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/aarch64/AArch64LoweringProviderMixin.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/aarch64/AArch64LoweringProviderMixin.java index e200273235d9..109d1c32797e 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/aarch64/AArch64LoweringProviderMixin.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/aarch64/AArch64LoweringProviderMixin.java @@ -23,12 +23,12 @@ * questions. */ -package jdk.compiler.graal.core.aarch64; +package jdk.graal.compiler.core.aarch64; -import jdk.compiler.graal.core.common.memory.MemoryExtendKind; -import jdk.compiler.graal.nodes.memory.ExtendableMemoryAccess; -import jdk.compiler.graal.nodes.memory.ReadNode; -import jdk.compiler.graal.nodes.spi.LoweringProvider; +import jdk.graal.compiler.core.common.memory.MemoryExtendKind; +import jdk.graal.compiler.nodes.memory.ExtendableMemoryAccess; +import jdk.graal.compiler.nodes.memory.ReadNode; +import jdk.graal.compiler.nodes.spi.LoweringProvider; public interface AArch64LoweringProviderMixin extends LoweringProvider { diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/aarch64/AArch64MoveFactory.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/aarch64/AArch64MoveFactory.java similarity index 87% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/aarch64/AArch64MoveFactory.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/aarch64/AArch64MoveFactory.java index 27c70fb9a232..bc19fbf02275 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/aarch64/AArch64MoveFactory.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/aarch64/AArch64MoveFactory.java @@ -23,21 +23,21 @@ * questions. */ -package jdk.compiler.graal.core.aarch64; +package jdk.graal.compiler.core.aarch64; -import static jdk.compiler.graal.lir.LIRValueUtil.asConstant; -import static jdk.compiler.graal.lir.LIRValueUtil.isConstantValue; -import static jdk.compiler.graal.lir.LIRValueUtil.isStackSlotValue; +import static jdk.graal.compiler.lir.LIRValueUtil.asConstant; +import static jdk.graal.compiler.lir.LIRValueUtil.isConstantValue; +import static jdk.graal.compiler.lir.LIRValueUtil.isStackSlotValue; -import jdk.compiler.graal.core.common.NumUtil; -import jdk.compiler.graal.core.common.type.DataPointerConstant; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.lir.LIRInstruction; -import jdk.compiler.graal.lir.aarch64.AArch64AddressValue; -import jdk.compiler.graal.lir.aarch64.AArch64LIRInstruction; -import jdk.compiler.graal.lir.aarch64.AArch64Move; -import jdk.compiler.graal.lir.aarch64.AArch64Move.LoadAddressOp; -import jdk.compiler.graal.lir.gen.MoveFactory; +import jdk.graal.compiler.core.common.NumUtil; +import jdk.graal.compiler.core.common.type.DataPointerConstant; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.lir.LIRInstruction; +import jdk.graal.compiler.lir.aarch64.AArch64AddressValue; +import jdk.graal.compiler.lir.aarch64.AArch64LIRInstruction; +import jdk.graal.compiler.lir.aarch64.AArch64Move; +import jdk.graal.compiler.lir.aarch64.AArch64Move.LoadAddressOp; +import jdk.graal.compiler.lir.gen.MoveFactory; import jdk.vm.ci.aarch64.AArch64Kind; import jdk.vm.ci.meta.AllocatableValue; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/aarch64/AArch64NodeLIRBuilder.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/aarch64/AArch64NodeLIRBuilder.java similarity index 88% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/aarch64/AArch64NodeLIRBuilder.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/aarch64/AArch64NodeLIRBuilder.java index 208e1a59299d..012a5de5a813 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/aarch64/AArch64NodeLIRBuilder.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/aarch64/AArch64NodeLIRBuilder.java @@ -23,12 +23,12 @@ * questions. */ -package jdk.compiler.graal.core.aarch64; +package jdk.graal.compiler.core.aarch64; -import jdk.compiler.graal.core.gen.NodeLIRBuilder; -import jdk.compiler.graal.lir.gen.LIRGeneratorTool; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.ValueNode; +import jdk.graal.compiler.core.gen.NodeLIRBuilder; +import jdk.graal.compiler.lir.gen.LIRGeneratorTool; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.ValueNode; /** * This class implements the AArch64 specific portion of the LIR generator. diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/aarch64/AArch64NodeMatchRules.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/aarch64/AArch64NodeMatchRules.java similarity index 94% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/aarch64/AArch64NodeMatchRules.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/aarch64/AArch64NodeMatchRules.java index 6bcd58fddb7d..dc7042d89c93 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/aarch64/AArch64NodeMatchRules.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/aarch64/AArch64NodeMatchRules.java @@ -23,54 +23,54 @@ * questions. */ -package jdk.compiler.graal.core.aarch64; - -import jdk.compiler.graal.core.common.LIRKind; -import jdk.compiler.graal.core.common.calc.CanonicalCondition; -import jdk.compiler.graal.core.common.calc.FloatConvert; -import jdk.compiler.graal.core.gen.NodeMatchRules; -import jdk.compiler.graal.core.match.ComplexMatchResult; -import jdk.compiler.graal.core.match.MatchRule; -import jdk.compiler.graal.core.match.MatchableNode; -import jdk.compiler.graal.debug.GraalError; +package jdk.graal.compiler.core.aarch64; + +import jdk.graal.compiler.core.common.LIRKind; +import jdk.graal.compiler.core.common.calc.CanonicalCondition; +import jdk.graal.compiler.core.common.calc.FloatConvert; +import jdk.graal.compiler.core.gen.NodeMatchRules; +import jdk.graal.compiler.core.match.ComplexMatchResult; +import jdk.graal.compiler.core.match.MatchRule; +import jdk.graal.compiler.core.match.MatchableNode; +import jdk.graal.compiler.debug.GraalError; import org.graalvm.collections.EconomicMap; import org.graalvm.collections.Equivalence; -import jdk.compiler.graal.asm.aarch64.AArch64Assembler; -import jdk.compiler.graal.asm.aarch64.AArch64Assembler.ExtendType; -import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler; -import jdk.compiler.graal.lir.LIRFrameState; -import jdk.compiler.graal.lir.LabelRef; -import jdk.compiler.graal.lir.Variable; -import jdk.compiler.graal.lir.aarch64.AArch64ArithmeticOp; -import jdk.compiler.graal.lir.aarch64.AArch64BitFieldOp; -import jdk.compiler.graal.lir.aarch64.AArch64BitFieldOp.BitFieldOpCode; -import jdk.compiler.graal.lir.aarch64.AArch64ControlFlow; -import jdk.compiler.graal.lir.gen.LIRGeneratorTool; -import jdk.compiler.graal.nodes.ConstantNode; -import jdk.compiler.graal.nodes.DeoptimizingNode; -import jdk.compiler.graal.nodes.FixedNode; -import jdk.compiler.graal.nodes.IfNode; -import jdk.compiler.graal.nodes.NodeView; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.calc.AddNode; -import jdk.compiler.graal.nodes.calc.AndNode; -import jdk.compiler.graal.nodes.calc.BinaryNode; -import jdk.compiler.graal.nodes.calc.FloatConvertNode; -import jdk.compiler.graal.nodes.calc.IntegerConvertNode; -import jdk.compiler.graal.nodes.calc.IntegerLessThanNode; -import jdk.compiler.graal.nodes.calc.LeftShiftNode; -import jdk.compiler.graal.nodes.calc.MulNode; -import jdk.compiler.graal.nodes.calc.NotNode; -import jdk.compiler.graal.nodes.calc.OrNode; -import jdk.compiler.graal.nodes.calc.RightShiftNode; -import jdk.compiler.graal.nodes.calc.ShiftNode; -import jdk.compiler.graal.nodes.calc.SignExtendNode; -import jdk.compiler.graal.nodes.calc.SubNode; -import jdk.compiler.graal.nodes.calc.UnaryNode; -import jdk.compiler.graal.nodes.calc.UnsignedRightShiftNode; -import jdk.compiler.graal.nodes.calc.XorNode; -import jdk.compiler.graal.nodes.calc.ZeroExtendNode; -import jdk.compiler.graal.nodes.memory.MemoryAccess; +import jdk.graal.compiler.asm.aarch64.AArch64Assembler; +import jdk.graal.compiler.asm.aarch64.AArch64Assembler.ExtendType; +import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler; +import jdk.graal.compiler.lir.LIRFrameState; +import jdk.graal.compiler.lir.LabelRef; +import jdk.graal.compiler.lir.Variable; +import jdk.graal.compiler.lir.aarch64.AArch64ArithmeticOp; +import jdk.graal.compiler.lir.aarch64.AArch64BitFieldOp; +import jdk.graal.compiler.lir.aarch64.AArch64BitFieldOp.BitFieldOpCode; +import jdk.graal.compiler.lir.aarch64.AArch64ControlFlow; +import jdk.graal.compiler.lir.gen.LIRGeneratorTool; +import jdk.graal.compiler.nodes.ConstantNode; +import jdk.graal.compiler.nodes.DeoptimizingNode; +import jdk.graal.compiler.nodes.FixedNode; +import jdk.graal.compiler.nodes.IfNode; +import jdk.graal.compiler.nodes.NodeView; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.calc.AddNode; +import jdk.graal.compiler.nodes.calc.AndNode; +import jdk.graal.compiler.nodes.calc.BinaryNode; +import jdk.graal.compiler.nodes.calc.FloatConvertNode; +import jdk.graal.compiler.nodes.calc.IntegerConvertNode; +import jdk.graal.compiler.nodes.calc.IntegerLessThanNode; +import jdk.graal.compiler.nodes.calc.LeftShiftNode; +import jdk.graal.compiler.nodes.calc.MulNode; +import jdk.graal.compiler.nodes.calc.NotNode; +import jdk.graal.compiler.nodes.calc.OrNode; +import jdk.graal.compiler.nodes.calc.RightShiftNode; +import jdk.graal.compiler.nodes.calc.ShiftNode; +import jdk.graal.compiler.nodes.calc.SignExtendNode; +import jdk.graal.compiler.nodes.calc.SubNode; +import jdk.graal.compiler.nodes.calc.UnaryNode; +import jdk.graal.compiler.nodes.calc.UnsignedRightShiftNode; +import jdk.graal.compiler.nodes.calc.XorNode; +import jdk.graal.compiler.nodes.calc.ZeroExtendNode; +import jdk.graal.compiler.nodes.memory.MemoryAccess; import jdk.vm.ci.aarch64.AArch64; import jdk.vm.ci.aarch64.AArch64Kind; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/aarch64/AArch64PointerAddNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/aarch64/AArch64PointerAddNode.java similarity index 76% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/aarch64/AArch64PointerAddNode.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/aarch64/AArch64PointerAddNode.java index 1c01a6048f61..887afdff45df 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/aarch64/AArch64PointerAddNode.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/aarch64/AArch64PointerAddNode.java @@ -23,27 +23,27 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.aarch64; +package jdk.graal.compiler.core.aarch64; -import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_1; -import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1; +import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_1; +import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_1; -import jdk.compiler.graal.core.common.LIRKind; -import jdk.compiler.graal.core.common.type.AbstractPointerStamp; -import jdk.compiler.graal.core.common.type.IntegerStamp; -import jdk.compiler.graal.core.common.type.StampFactory; +import jdk.graal.compiler.core.common.LIRKind; +import jdk.graal.compiler.core.common.type.AbstractPointerStamp; +import jdk.graal.compiler.core.common.type.IntegerStamp; +import jdk.graal.compiler.core.common.type.StampFactory; import jdk.vm.ci.meta.AllocatableValue; import jdk.vm.ci.meta.Value; -import jdk.compiler.graal.graph.NodeClass; -import jdk.compiler.graal.lir.aarch64.AArch64ArithmeticOp; -import jdk.compiler.graal.lir.gen.ArithmeticLIRGeneratorTool; -import jdk.compiler.graal.lir.gen.LIRGeneratorTool; -import jdk.compiler.graal.nodeinfo.NodeInfo; -import jdk.compiler.graal.nodes.NodeView; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.calc.FloatingNode; -import jdk.compiler.graal.nodes.spi.ArithmeticLIRLowerable; -import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool; +import jdk.graal.compiler.graph.NodeClass; +import jdk.graal.compiler.lir.aarch64.AArch64ArithmeticOp; +import jdk.graal.compiler.lir.gen.ArithmeticLIRGeneratorTool; +import jdk.graal.compiler.lir.gen.LIRGeneratorTool; +import jdk.graal.compiler.nodeinfo.NodeInfo; +import jdk.graal.compiler.nodes.NodeView; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.calc.FloatingNode; +import jdk.graal.compiler.nodes.spi.ArithmeticLIRLowerable; +import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool; @NodeInfo(nameTemplate = "AArch64PointerAdd", cycles = CYCLES_1, size = SIZE_1) public class AArch64PointerAddNode extends FloatingNode implements ArithmeticLIRLowerable { diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/aarch64/AArch64SuitesCreator.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/aarch64/AArch64SuitesCreator.java similarity index 87% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/aarch64/AArch64SuitesCreator.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/aarch64/AArch64SuitesCreator.java index 3fc22cc776fa..53171e1ce6f2 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/aarch64/AArch64SuitesCreator.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/aarch64/AArch64SuitesCreator.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.aarch64; +package jdk.graal.compiler.core.aarch64; -import jdk.compiler.graal.java.DefaultSuitesCreator; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins; -import jdk.compiler.graal.phases.tiers.CompilerConfiguration; +import jdk.graal.compiler.java.DefaultSuitesCreator; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins; +import jdk.graal.compiler.phases.tiers.CompilerConfiguration; public abstract class AArch64SuitesCreator extends DefaultSuitesCreator { diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/amd64/AMD64AddressLowering.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/amd64/AMD64AddressLowering.java similarity index 93% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/amd64/AMD64AddressLowering.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/amd64/AMD64AddressLowering.java index c04f946d716c..c401c43c4bee 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/amd64/AMD64AddressLowering.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/amd64/AMD64AddressLowering.java @@ -23,22 +23,22 @@ * questions. */ -package jdk.compiler.graal.core.amd64; - -import jdk.compiler.graal.asm.amd64.AMD64Address; -import jdk.compiler.graal.core.common.type.AbstractPointerStamp; -import jdk.compiler.graal.core.common.type.IntegerStamp; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.core.common.NumUtil; -import jdk.compiler.graal.core.common.Stride; -import jdk.compiler.graal.nodes.NodeView; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.calc.AddNode; -import jdk.compiler.graal.nodes.calc.LeftShiftNode; -import jdk.compiler.graal.nodes.calc.NegateNode; -import jdk.compiler.graal.nodes.memory.address.AddressNode; -import jdk.compiler.graal.phases.common.AddressLoweringByNodePhase.AddressLowering; +package jdk.graal.compiler.core.amd64; + +import jdk.graal.compiler.asm.amd64.AMD64Address; +import jdk.graal.compiler.core.common.type.AbstractPointerStamp; +import jdk.graal.compiler.core.common.type.IntegerStamp; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.core.common.NumUtil; +import jdk.graal.compiler.core.common.Stride; +import jdk.graal.compiler.nodes.NodeView; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.calc.AddNode; +import jdk.graal.compiler.nodes.calc.LeftShiftNode; +import jdk.graal.compiler.nodes.calc.NegateNode; +import jdk.graal.compiler.nodes.memory.address.AddressNode; +import jdk.graal.compiler.phases.common.AddressLoweringByNodePhase.AddressLowering; import jdk.vm.ci.meta.JavaConstant; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/amd64/AMD64AddressNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/amd64/AMD64AddressNode.java similarity index 84% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/amd64/AMD64AddressNode.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/amd64/AMD64AddressNode.java index bb6032daaa8b..79e72c2c4ba3 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/amd64/AMD64AddressNode.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/amd64/AMD64AddressNode.java @@ -23,26 +23,26 @@ * questions. */ -package jdk.compiler.graal.core.amd64; - -import jdk.compiler.graal.core.common.type.IntegerStamp; -import jdk.compiler.graal.core.common.Stride; -import jdk.compiler.graal.core.common.LIRKind; -import jdk.compiler.graal.graph.NodeClass; -import jdk.compiler.graal.nodes.spi.Simplifiable; -import jdk.compiler.graal.nodes.spi.SimplifierTool; -import jdk.compiler.graal.lir.amd64.AMD64AddressValue; -import jdk.compiler.graal.lir.gen.LIRGeneratorTool; -import jdk.compiler.graal.nodeinfo.NodeInfo; -import jdk.compiler.graal.nodes.ConstantNode; -import jdk.compiler.graal.nodes.LoopBeginNode; -import jdk.compiler.graal.nodes.NodeView; -import jdk.compiler.graal.nodes.PhiNode; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.calc.AddNode; -import jdk.compiler.graal.nodes.memory.address.AddressNode; -import jdk.compiler.graal.nodes.spi.LIRLowerable; -import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool; +package jdk.graal.compiler.core.amd64; + +import jdk.graal.compiler.core.common.type.IntegerStamp; +import jdk.graal.compiler.core.common.Stride; +import jdk.graal.compiler.core.common.LIRKind; +import jdk.graal.compiler.graph.NodeClass; +import jdk.graal.compiler.nodes.spi.Simplifiable; +import jdk.graal.compiler.nodes.spi.SimplifierTool; +import jdk.graal.compiler.lir.amd64.AMD64AddressValue; +import jdk.graal.compiler.lir.gen.LIRGeneratorTool; +import jdk.graal.compiler.nodeinfo.NodeInfo; +import jdk.graal.compiler.nodes.ConstantNode; +import jdk.graal.compiler.nodes.LoopBeginNode; +import jdk.graal.compiler.nodes.NodeView; +import jdk.graal.compiler.nodes.PhiNode; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.calc.AddNode; +import jdk.graal.compiler.nodes.memory.address.AddressNode; +import jdk.graal.compiler.nodes.spi.LIRLowerable; +import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool; import jdk.vm.ci.meta.AllocatableValue; import jdk.vm.ci.meta.Value; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/amd64/AMD64ArithmeticLIRGenerator.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/amd64/AMD64ArithmeticLIRGenerator.java similarity index 90% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/amd64/AMD64ArithmeticLIRGenerator.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/amd64/AMD64ArithmeticLIRGenerator.java index 1df569621ad8..16b0e076dd91 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/amd64/AMD64ArithmeticLIRGenerator.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/amd64/AMD64ArithmeticLIRGenerator.java @@ -23,131 +23,131 @@ * questions. */ -package jdk.compiler.graal.core.amd64; - -import static jdk.compiler.graal.asm.amd64.AMD64Assembler.AMD64BinaryArithmetic.ADD; -import static jdk.compiler.graal.asm.amd64.AMD64Assembler.AMD64BinaryArithmetic.AND; -import static jdk.compiler.graal.asm.amd64.AMD64Assembler.AMD64BinaryArithmetic.CMP; -import static jdk.compiler.graal.asm.amd64.AMD64Assembler.AMD64BinaryArithmetic.OR; -import static jdk.compiler.graal.asm.amd64.AMD64Assembler.AMD64BinaryArithmetic.SUB; -import static jdk.compiler.graal.asm.amd64.AMD64Assembler.AMD64BinaryArithmetic.XOR; -import static jdk.compiler.graal.asm.amd64.AMD64Assembler.AMD64MOp.NEG; -import static jdk.compiler.graal.asm.amd64.AMD64Assembler.AMD64MOp.NOT; -import static jdk.compiler.graal.asm.amd64.AMD64Assembler.AMD64RMOp.BSF; -import static jdk.compiler.graal.asm.amd64.AMD64Assembler.AMD64RMOp.BSR; -import static jdk.compiler.graal.asm.amd64.AMD64Assembler.AMD64RMOp.LZCNT; -import static jdk.compiler.graal.asm.amd64.AMD64Assembler.AMD64RMOp.MOV; -import static jdk.compiler.graal.asm.amd64.AMD64Assembler.AMD64RMOp.MOVSX; -import static jdk.compiler.graal.asm.amd64.AMD64Assembler.AMD64RMOp.MOVSXB; -import static jdk.compiler.graal.asm.amd64.AMD64Assembler.AMD64RMOp.MOVSXD; -import static jdk.compiler.graal.asm.amd64.AMD64Assembler.AMD64RMOp.MOVZX; -import static jdk.compiler.graal.asm.amd64.AMD64Assembler.AMD64RMOp.MOVZXB; -import static jdk.compiler.graal.asm.amd64.AMD64Assembler.AMD64RMOp.POPCNT; -import static jdk.compiler.graal.asm.amd64.AMD64Assembler.AMD64RMOp.TEST; -import static jdk.compiler.graal.asm.amd64.AMD64Assembler.AMD64RMOp.TESTB; -import static jdk.compiler.graal.asm.amd64.AMD64Assembler.AMD64RMOp.TZCNT; -import static jdk.compiler.graal.asm.amd64.AMD64Assembler.AMD64Shift.ROL; -import static jdk.compiler.graal.asm.amd64.AMD64Assembler.AMD64Shift.ROR; -import static jdk.compiler.graal.asm.amd64.AMD64Assembler.AMD64Shift.SAR; -import static jdk.compiler.graal.asm.amd64.AMD64Assembler.AMD64Shift.SHL; -import static jdk.compiler.graal.asm.amd64.AMD64Assembler.AMD64Shift.SHR; -import static jdk.compiler.graal.asm.amd64.AMD64Assembler.SSEOp.MOVSD; -import static jdk.compiler.graal.asm.amd64.AMD64Assembler.SSEOp.MOVSS; -import static jdk.compiler.graal.asm.amd64.AMD64Assembler.VexRVMOp.VADDSD; -import static jdk.compiler.graal.asm.amd64.AMD64Assembler.VexRVMOp.VADDSS; -import static jdk.compiler.graal.asm.amd64.AMD64Assembler.VexRVMOp.VDIVSD; -import static jdk.compiler.graal.asm.amd64.AMD64Assembler.VexRVMOp.VDIVSS; -import static jdk.compiler.graal.asm.amd64.AMD64Assembler.VexRVMOp.VFMADD231SD; -import static jdk.compiler.graal.asm.amd64.AMD64Assembler.VexRVMOp.VFMADD231SS; -import static jdk.compiler.graal.asm.amd64.AMD64Assembler.VexRVMOp.VMULSD; -import static jdk.compiler.graal.asm.amd64.AMD64Assembler.VexRVMOp.VMULSS; -import static jdk.compiler.graal.asm.amd64.AMD64Assembler.VexRVMOp.VORPD; -import static jdk.compiler.graal.asm.amd64.AMD64Assembler.VexRVMOp.VORPS; -import static jdk.compiler.graal.asm.amd64.AMD64Assembler.VexRVMOp.VSUBSD; -import static jdk.compiler.graal.asm.amd64.AMD64Assembler.VexRVMOp.VSUBSS; -import static jdk.compiler.graal.asm.amd64.AMD64Assembler.VexRVMOp.VXORPD; -import static jdk.compiler.graal.asm.amd64.AMD64Assembler.VexRVMOp.VXORPS; -import static jdk.compiler.graal.asm.amd64.AMD64Assembler.VexRVMROp.VBLENDVPD; -import static jdk.compiler.graal.asm.amd64.AMD64Assembler.VexRVMROp.VBLENDVPS; -import static jdk.compiler.graal.asm.amd64.AMD64Assembler.VexRVMROp.VPBLENDVB; -import static jdk.compiler.graal.asm.amd64.AMD64BaseAssembler.OperandSize.BYTE; -import static jdk.compiler.graal.asm.amd64.AMD64BaseAssembler.OperandSize.DWORD; -import static jdk.compiler.graal.asm.amd64.AMD64BaseAssembler.OperandSize.PD; -import static jdk.compiler.graal.asm.amd64.AMD64BaseAssembler.OperandSize.PS; -import static jdk.compiler.graal.asm.amd64.AMD64BaseAssembler.OperandSize.QWORD; -import static jdk.compiler.graal.asm.amd64.AMD64BaseAssembler.OperandSize.SD; -import static jdk.compiler.graal.asm.amd64.AMD64BaseAssembler.OperandSize.SS; -import static jdk.compiler.graal.asm.amd64.AMD64BaseAssembler.OperandSize.WORD; -import static jdk.compiler.graal.lir.LIRValueUtil.asConstantValue; -import static jdk.compiler.graal.lir.LIRValueUtil.asJavaConstant; -import static jdk.compiler.graal.lir.LIRValueUtil.isConstantValue; -import static jdk.compiler.graal.lir.LIRValueUtil.isJavaConstant; -import static jdk.compiler.graal.lir.amd64.AMD64Arithmetic.DREM; -import static jdk.compiler.graal.lir.amd64.AMD64Arithmetic.FREM; -import static jdk.compiler.graal.lir.amd64.vector.AMD64VectorUnary.FloatPointClassTestOp.NEG_INF; -import static jdk.compiler.graal.lir.amd64.vector.AMD64VectorUnary.FloatPointClassTestOp.POS_INF; - -import jdk.compiler.graal.asm.amd64.AMD64Assembler.AMD64BinaryArithmetic; -import jdk.compiler.graal.asm.amd64.AMD64Assembler.AMD64MIOp; -import jdk.compiler.graal.asm.amd64.AMD64Assembler.AMD64MOp; -import jdk.compiler.graal.asm.amd64.AMD64Assembler.AMD64MROp; -import jdk.compiler.graal.asm.amd64.AMD64Assembler.AMD64RMIOp; -import jdk.compiler.graal.asm.amd64.AMD64Assembler.AMD64RMOp; -import jdk.compiler.graal.asm.amd64.AMD64Assembler.AMD64Shift; -import jdk.compiler.graal.asm.amd64.AMD64Assembler.SSEMROp; -import jdk.compiler.graal.asm.amd64.AMD64Assembler.SSEOp; -import jdk.compiler.graal.asm.amd64.AMD64Assembler.VexFloatCompareOp; -import jdk.compiler.graal.asm.amd64.AMD64Assembler.VexGeneralPurposeRMOp; -import jdk.compiler.graal.asm.amd64.AMD64Assembler.VexGeneralPurposeRVMOp; -import jdk.compiler.graal.asm.amd64.AMD64Assembler.VexRVMOp; -import jdk.compiler.graal.asm.amd64.AMD64Assembler.VexRVMROp; -import jdk.compiler.graal.asm.amd64.AMD64BaseAssembler.OperandSize; -import jdk.compiler.graal.asm.amd64.AVXKind; -import jdk.compiler.graal.asm.amd64.AVXKind.AVXSize; -import jdk.compiler.graal.core.common.calc.FloatConvert; -import jdk.compiler.graal.core.common.memory.MemoryOrderMode; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.core.common.LIRKind; -import jdk.compiler.graal.core.common.NumUtil; -import jdk.compiler.graal.core.common.memory.MemoryExtendKind; -import jdk.compiler.graal.lir.ConstantValue; -import jdk.compiler.graal.lir.LIRFrameState; -import jdk.compiler.graal.lir.LIRValueUtil; -import jdk.compiler.graal.lir.Variable; -import jdk.compiler.graal.lir.amd64.AMD64AddressValue; -import jdk.compiler.graal.lir.amd64.AMD64Arithmetic.FPDivRemOp; -import jdk.compiler.graal.lir.amd64.AMD64ArithmeticLIRGeneratorTool; -import jdk.compiler.graal.lir.amd64.AMD64Binary; -import jdk.compiler.graal.lir.amd64.AMD64BinaryConsumer; -import jdk.compiler.graal.lir.amd64.AMD64BitSwapOp; -import jdk.compiler.graal.lir.amd64.AMD64ClearRegisterOp; -import jdk.compiler.graal.lir.amd64.AMD64FloatToHalfFloatOp; -import jdk.compiler.graal.lir.amd64.AMD64HalfFloatToFloatOp; -import jdk.compiler.graal.lir.amd64.AMD64MathCopySignOp; -import jdk.compiler.graal.lir.amd64.AMD64MathCosOp; -import jdk.compiler.graal.lir.amd64.AMD64MathExpOp; -import jdk.compiler.graal.lir.amd64.AMD64MathLog10Op; -import jdk.compiler.graal.lir.amd64.AMD64MathLogOp; -import jdk.compiler.graal.lir.amd64.AMD64MathPowOp; -import jdk.compiler.graal.lir.amd64.AMD64MathSignumOp; -import jdk.compiler.graal.lir.amd64.AMD64MathSinOp; -import jdk.compiler.graal.lir.amd64.AMD64MathTanOp; -import jdk.compiler.graal.lir.amd64.AMD64Move; -import jdk.compiler.graal.lir.amd64.AMD64MulDivOp; -import jdk.compiler.graal.lir.amd64.AMD64NormalizedUnsignedCompareOp; -import jdk.compiler.graal.lir.amd64.AMD64RoundFloatToIntegerOp; -import jdk.compiler.graal.lir.amd64.AMD64ShiftOp; -import jdk.compiler.graal.lir.amd64.AMD64SignExtendOp; -import jdk.compiler.graal.lir.amd64.AMD64Ternary; -import jdk.compiler.graal.lir.amd64.AMD64Unary; -import jdk.compiler.graal.lir.amd64.vector.AMD64VectorBinary; -import jdk.compiler.graal.lir.amd64.vector.AMD64VectorBinary.AVXBinaryConstFloatOp; -import jdk.compiler.graal.lir.amd64.vector.AMD64VectorBinary.AVXBinaryOp; -import jdk.compiler.graal.lir.amd64.vector.AMD64VectorBlend; -import jdk.compiler.graal.lir.amd64.vector.AMD64VectorFloatCompareOp; -import jdk.compiler.graal.lir.amd64.vector.AMD64VectorUnary; -import jdk.compiler.graal.lir.gen.ArithmeticLIRGenerator; -import jdk.compiler.graal.lir.gen.ArithmeticLIRGeneratorTool; +package jdk.graal.compiler.core.amd64; + +import static jdk.graal.compiler.asm.amd64.AMD64Assembler.AMD64BinaryArithmetic.ADD; +import static jdk.graal.compiler.asm.amd64.AMD64Assembler.AMD64BinaryArithmetic.AND; +import static jdk.graal.compiler.asm.amd64.AMD64Assembler.AMD64BinaryArithmetic.CMP; +import static jdk.graal.compiler.asm.amd64.AMD64Assembler.AMD64BinaryArithmetic.OR; +import static jdk.graal.compiler.asm.amd64.AMD64Assembler.AMD64BinaryArithmetic.SUB; +import static jdk.graal.compiler.asm.amd64.AMD64Assembler.AMD64BinaryArithmetic.XOR; +import static jdk.graal.compiler.asm.amd64.AMD64Assembler.AMD64MOp.NEG; +import static jdk.graal.compiler.asm.amd64.AMD64Assembler.AMD64MOp.NOT; +import static jdk.graal.compiler.asm.amd64.AMD64Assembler.AMD64RMOp.BSF; +import static jdk.graal.compiler.asm.amd64.AMD64Assembler.AMD64RMOp.BSR; +import static jdk.graal.compiler.asm.amd64.AMD64Assembler.AMD64RMOp.LZCNT; +import static jdk.graal.compiler.asm.amd64.AMD64Assembler.AMD64RMOp.MOV; +import static jdk.graal.compiler.asm.amd64.AMD64Assembler.AMD64RMOp.MOVSX; +import static jdk.graal.compiler.asm.amd64.AMD64Assembler.AMD64RMOp.MOVSXB; +import static jdk.graal.compiler.asm.amd64.AMD64Assembler.AMD64RMOp.MOVSXD; +import static jdk.graal.compiler.asm.amd64.AMD64Assembler.AMD64RMOp.MOVZX; +import static jdk.graal.compiler.asm.amd64.AMD64Assembler.AMD64RMOp.MOVZXB; +import static jdk.graal.compiler.asm.amd64.AMD64Assembler.AMD64RMOp.POPCNT; +import static jdk.graal.compiler.asm.amd64.AMD64Assembler.AMD64RMOp.TEST; +import static jdk.graal.compiler.asm.amd64.AMD64Assembler.AMD64RMOp.TESTB; +import static jdk.graal.compiler.asm.amd64.AMD64Assembler.AMD64RMOp.TZCNT; +import static jdk.graal.compiler.asm.amd64.AMD64Assembler.AMD64Shift.ROL; +import static jdk.graal.compiler.asm.amd64.AMD64Assembler.AMD64Shift.ROR; +import static jdk.graal.compiler.asm.amd64.AMD64Assembler.AMD64Shift.SAR; +import static jdk.graal.compiler.asm.amd64.AMD64Assembler.AMD64Shift.SHL; +import static jdk.graal.compiler.asm.amd64.AMD64Assembler.AMD64Shift.SHR; +import static jdk.graal.compiler.asm.amd64.AMD64Assembler.SSEOp.MOVSD; +import static jdk.graal.compiler.asm.amd64.AMD64Assembler.SSEOp.MOVSS; +import static jdk.graal.compiler.asm.amd64.AMD64Assembler.VexRVMOp.VADDSD; +import static jdk.graal.compiler.asm.amd64.AMD64Assembler.VexRVMOp.VADDSS; +import static jdk.graal.compiler.asm.amd64.AMD64Assembler.VexRVMOp.VDIVSD; +import static jdk.graal.compiler.asm.amd64.AMD64Assembler.VexRVMOp.VDIVSS; +import static jdk.graal.compiler.asm.amd64.AMD64Assembler.VexRVMOp.VFMADD231SD; +import static jdk.graal.compiler.asm.amd64.AMD64Assembler.VexRVMOp.VFMADD231SS; +import static jdk.graal.compiler.asm.amd64.AMD64Assembler.VexRVMOp.VMULSD; +import static jdk.graal.compiler.asm.amd64.AMD64Assembler.VexRVMOp.VMULSS; +import static jdk.graal.compiler.asm.amd64.AMD64Assembler.VexRVMOp.VORPD; +import static jdk.graal.compiler.asm.amd64.AMD64Assembler.VexRVMOp.VORPS; +import static jdk.graal.compiler.asm.amd64.AMD64Assembler.VexRVMOp.VSUBSD; +import static jdk.graal.compiler.asm.amd64.AMD64Assembler.VexRVMOp.VSUBSS; +import static jdk.graal.compiler.asm.amd64.AMD64Assembler.VexRVMOp.VXORPD; +import static jdk.graal.compiler.asm.amd64.AMD64Assembler.VexRVMOp.VXORPS; +import static jdk.graal.compiler.asm.amd64.AMD64Assembler.VexRVMROp.VBLENDVPD; +import static jdk.graal.compiler.asm.amd64.AMD64Assembler.VexRVMROp.VBLENDVPS; +import static jdk.graal.compiler.asm.amd64.AMD64Assembler.VexRVMROp.VPBLENDVB; +import static jdk.graal.compiler.asm.amd64.AMD64BaseAssembler.OperandSize.BYTE; +import static jdk.graal.compiler.asm.amd64.AMD64BaseAssembler.OperandSize.DWORD; +import static jdk.graal.compiler.asm.amd64.AMD64BaseAssembler.OperandSize.PD; +import static jdk.graal.compiler.asm.amd64.AMD64BaseAssembler.OperandSize.PS; +import static jdk.graal.compiler.asm.amd64.AMD64BaseAssembler.OperandSize.QWORD; +import static jdk.graal.compiler.asm.amd64.AMD64BaseAssembler.OperandSize.SD; +import static jdk.graal.compiler.asm.amd64.AMD64BaseAssembler.OperandSize.SS; +import static jdk.graal.compiler.asm.amd64.AMD64BaseAssembler.OperandSize.WORD; +import static jdk.graal.compiler.lir.LIRValueUtil.asConstantValue; +import static jdk.graal.compiler.lir.LIRValueUtil.asJavaConstant; +import static jdk.graal.compiler.lir.LIRValueUtil.isConstantValue; +import static jdk.graal.compiler.lir.LIRValueUtil.isJavaConstant; +import static jdk.graal.compiler.lir.amd64.AMD64Arithmetic.DREM; +import static jdk.graal.compiler.lir.amd64.AMD64Arithmetic.FREM; +import static jdk.graal.compiler.lir.amd64.vector.AMD64VectorUnary.FloatPointClassTestOp.NEG_INF; +import static jdk.graal.compiler.lir.amd64.vector.AMD64VectorUnary.FloatPointClassTestOp.POS_INF; + +import jdk.graal.compiler.asm.amd64.AMD64Assembler.AMD64BinaryArithmetic; +import jdk.graal.compiler.asm.amd64.AMD64Assembler.AMD64MIOp; +import jdk.graal.compiler.asm.amd64.AMD64Assembler.AMD64MOp; +import jdk.graal.compiler.asm.amd64.AMD64Assembler.AMD64MROp; +import jdk.graal.compiler.asm.amd64.AMD64Assembler.AMD64RMIOp; +import jdk.graal.compiler.asm.amd64.AMD64Assembler.AMD64RMOp; +import jdk.graal.compiler.asm.amd64.AMD64Assembler.AMD64Shift; +import jdk.graal.compiler.asm.amd64.AMD64Assembler.SSEMROp; +import jdk.graal.compiler.asm.amd64.AMD64Assembler.SSEOp; +import jdk.graal.compiler.asm.amd64.AMD64Assembler.VexFloatCompareOp; +import jdk.graal.compiler.asm.amd64.AMD64Assembler.VexGeneralPurposeRMOp; +import jdk.graal.compiler.asm.amd64.AMD64Assembler.VexGeneralPurposeRVMOp; +import jdk.graal.compiler.asm.amd64.AMD64Assembler.VexRVMOp; +import jdk.graal.compiler.asm.amd64.AMD64Assembler.VexRVMROp; +import jdk.graal.compiler.asm.amd64.AMD64BaseAssembler.OperandSize; +import jdk.graal.compiler.asm.amd64.AVXKind; +import jdk.graal.compiler.asm.amd64.AVXKind.AVXSize; +import jdk.graal.compiler.core.common.calc.FloatConvert; +import jdk.graal.compiler.core.common.memory.MemoryOrderMode; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.core.common.LIRKind; +import jdk.graal.compiler.core.common.NumUtil; +import jdk.graal.compiler.core.common.memory.MemoryExtendKind; +import jdk.graal.compiler.lir.ConstantValue; +import jdk.graal.compiler.lir.LIRFrameState; +import jdk.graal.compiler.lir.LIRValueUtil; +import jdk.graal.compiler.lir.Variable; +import jdk.graal.compiler.lir.amd64.AMD64AddressValue; +import jdk.graal.compiler.lir.amd64.AMD64Arithmetic.FPDivRemOp; +import jdk.graal.compiler.lir.amd64.AMD64ArithmeticLIRGeneratorTool; +import jdk.graal.compiler.lir.amd64.AMD64Binary; +import jdk.graal.compiler.lir.amd64.AMD64BinaryConsumer; +import jdk.graal.compiler.lir.amd64.AMD64BitSwapOp; +import jdk.graal.compiler.lir.amd64.AMD64ClearRegisterOp; +import jdk.graal.compiler.lir.amd64.AMD64FloatToHalfFloatOp; +import jdk.graal.compiler.lir.amd64.AMD64HalfFloatToFloatOp; +import jdk.graal.compiler.lir.amd64.AMD64MathCopySignOp; +import jdk.graal.compiler.lir.amd64.AMD64MathCosOp; +import jdk.graal.compiler.lir.amd64.AMD64MathExpOp; +import jdk.graal.compiler.lir.amd64.AMD64MathLog10Op; +import jdk.graal.compiler.lir.amd64.AMD64MathLogOp; +import jdk.graal.compiler.lir.amd64.AMD64MathPowOp; +import jdk.graal.compiler.lir.amd64.AMD64MathSignumOp; +import jdk.graal.compiler.lir.amd64.AMD64MathSinOp; +import jdk.graal.compiler.lir.amd64.AMD64MathTanOp; +import jdk.graal.compiler.lir.amd64.AMD64Move; +import jdk.graal.compiler.lir.amd64.AMD64MulDivOp; +import jdk.graal.compiler.lir.amd64.AMD64NormalizedUnsignedCompareOp; +import jdk.graal.compiler.lir.amd64.AMD64RoundFloatToIntegerOp; +import jdk.graal.compiler.lir.amd64.AMD64ShiftOp; +import jdk.graal.compiler.lir.amd64.AMD64SignExtendOp; +import jdk.graal.compiler.lir.amd64.AMD64Ternary; +import jdk.graal.compiler.lir.amd64.AMD64Unary; +import jdk.graal.compiler.lir.amd64.vector.AMD64VectorBinary; +import jdk.graal.compiler.lir.amd64.vector.AMD64VectorBinary.AVXBinaryConstFloatOp; +import jdk.graal.compiler.lir.amd64.vector.AMD64VectorBinary.AVXBinaryOp; +import jdk.graal.compiler.lir.amd64.vector.AMD64VectorBlend; +import jdk.graal.compiler.lir.amd64.vector.AMD64VectorFloatCompareOp; +import jdk.graal.compiler.lir.amd64.vector.AMD64VectorUnary; +import jdk.graal.compiler.lir.gen.ArithmeticLIRGenerator; +import jdk.graal.compiler.lir.gen.ArithmeticLIRGeneratorTool; import jdk.vm.ci.amd64.AMD64; import jdk.vm.ci.amd64.AMD64.CPUFeature; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/amd64/AMD64BarrierSetLIRGenerator.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/amd64/AMD64BarrierSetLIRGenerator.java similarity index 88% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/amd64/AMD64BarrierSetLIRGenerator.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/amd64/AMD64BarrierSetLIRGenerator.java index 09fd26651608..7306812be171 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/amd64/AMD64BarrierSetLIRGenerator.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/amd64/AMD64BarrierSetLIRGenerator.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.amd64; +package jdk.graal.compiler.core.amd64; -import jdk.compiler.graal.core.common.memory.BarrierType; -import jdk.compiler.graal.core.common.LIRKind; -import jdk.compiler.graal.lir.amd64.AMD64AddressValue; -import jdk.compiler.graal.lir.gen.BarrierSetLIRGenerator; +import jdk.graal.compiler.core.common.memory.BarrierType; +import jdk.graal.compiler.core.common.LIRKind; +import jdk.graal.compiler.lir.amd64.AMD64AddressValue; +import jdk.graal.compiler.lir.gen.BarrierSetLIRGenerator; import jdk.vm.ci.amd64.AMD64Kind; import jdk.vm.ci.code.RegisterValue; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/amd64/AMD64CompressAddressLowering.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/amd64/AMD64CompressAddressLowering.java similarity index 80% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/amd64/AMD64CompressAddressLowering.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/amd64/AMD64CompressAddressLowering.java index 59748cf0c631..ecc7d31dcce3 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/amd64/AMD64CompressAddressLowering.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/amd64/AMD64CompressAddressLowering.java @@ -23,26 +23,26 @@ * questions. */ -package jdk.compiler.graal.core.amd64; +package jdk.graal.compiler.core.amd64; -import jdk.compiler.graal.core.common.type.StampFactory; -import jdk.compiler.graal.debug.CounterKey; -import jdk.compiler.graal.debug.DebugContext; +import jdk.graal.compiler.core.common.type.StampFactory; +import jdk.graal.compiler.debug.CounterKey; +import jdk.graal.compiler.debug.DebugContext; import jdk.vm.ci.code.Register; -import jdk.compiler.graal.core.common.LIRKind; -import jdk.compiler.graal.core.common.Stride; -import jdk.compiler.graal.graph.NodeClass; -import jdk.compiler.graal.nodeinfo.NodeInfo; -import jdk.compiler.graal.nodes.CompressionNode; -import jdk.compiler.graal.nodes.NodeView; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.calc.FloatingNode; -import jdk.compiler.graal.nodes.spi.LIRLowerable; -import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool; - -import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0; -import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_0; +import jdk.graal.compiler.core.common.LIRKind; +import jdk.graal.compiler.core.common.Stride; +import jdk.graal.compiler.graph.NodeClass; +import jdk.graal.compiler.nodeinfo.NodeInfo; +import jdk.graal.compiler.nodes.CompressionNode; +import jdk.graal.compiler.nodes.NodeView; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.calc.FloatingNode; +import jdk.graal.compiler.nodes.spi.LIRLowerable; +import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool; + +import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_0; +import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_0; public abstract class AMD64CompressAddressLowering extends AMD64AddressLowering { private static final CounterKey counterFoldedUncompressDuringAddressLowering = DebugContext.counter("FoldedUncompressDuringAddressLowering"); diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/amd64/AMD64LIRGenerator.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/amd64/AMD64LIRGenerator.java similarity index 88% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/amd64/AMD64LIRGenerator.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/amd64/AMD64LIRGenerator.java index 7960841e5e6d..18562ed04f81 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/amd64/AMD64LIRGenerator.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/amd64/AMD64LIRGenerator.java @@ -23,118 +23,118 @@ * questions. */ -package jdk.compiler.graal.core.amd64; +package jdk.graal.compiler.core.amd64; import static jdk.vm.ci.code.ValueUtil.asRegister; import static jdk.vm.ci.code.ValueUtil.isAllocatableValue; import static jdk.vm.ci.code.ValueUtil.isRegister; -import static jdk.compiler.graal.asm.amd64.AMD64BaseAssembler.OperandSize.BYTE; -import static jdk.compiler.graal.asm.amd64.AMD64BaseAssembler.OperandSize.DWORD; -import static jdk.compiler.graal.asm.amd64.AMD64BaseAssembler.OperandSize.PD; -import static jdk.compiler.graal.asm.amd64.AMD64BaseAssembler.OperandSize.PS; -import static jdk.compiler.graal.asm.amd64.AMD64BaseAssembler.OperandSize.QWORD; -import static jdk.compiler.graal.asm.amd64.AMD64MacroAssembler.ExtendMode.ZERO_EXTEND; -import static jdk.compiler.graal.lir.LIRValueUtil.asConstant; -import static jdk.compiler.graal.lir.LIRValueUtil.asConstantValue; -import static jdk.compiler.graal.lir.LIRValueUtil.asJavaConstant; -import static jdk.compiler.graal.lir.LIRValueUtil.isConstantValue; -import static jdk.compiler.graal.lir.LIRValueUtil.isIntConstant; -import static jdk.compiler.graal.lir.LIRValueUtil.isJavaConstant; +import static jdk.graal.compiler.asm.amd64.AMD64BaseAssembler.OperandSize.BYTE; +import static jdk.graal.compiler.asm.amd64.AMD64BaseAssembler.OperandSize.DWORD; +import static jdk.graal.compiler.asm.amd64.AMD64BaseAssembler.OperandSize.PD; +import static jdk.graal.compiler.asm.amd64.AMD64BaseAssembler.OperandSize.PS; +import static jdk.graal.compiler.asm.amd64.AMD64BaseAssembler.OperandSize.QWORD; +import static jdk.graal.compiler.asm.amd64.AMD64MacroAssembler.ExtendMode.ZERO_EXTEND; +import static jdk.graal.compiler.lir.LIRValueUtil.asConstant; +import static jdk.graal.compiler.lir.LIRValueUtil.asConstantValue; +import static jdk.graal.compiler.lir.LIRValueUtil.asJavaConstant; +import static jdk.graal.compiler.lir.LIRValueUtil.isConstantValue; +import static jdk.graal.compiler.lir.LIRValueUtil.isIntConstant; +import static jdk.graal.compiler.lir.LIRValueUtil.isJavaConstant; import java.util.EnumSet; -import jdk.compiler.graal.asm.amd64.AMD64Assembler.AMD64BinaryArithmetic; -import jdk.compiler.graal.asm.amd64.AMD64Assembler.AMD64MIOp; -import jdk.compiler.graal.asm.amd64.AMD64Assembler.AMD64RMOp; -import jdk.compiler.graal.asm.amd64.AMD64Assembler.ConditionFlag; -import jdk.compiler.graal.asm.amd64.AMD64Assembler.SSEOp; -import jdk.compiler.graal.asm.amd64.AMD64Assembler.VexRMOp; -import jdk.compiler.graal.asm.amd64.AMD64BaseAssembler.OperandSize; -import jdk.compiler.graal.asm.amd64.AVXKind; -import jdk.compiler.graal.asm.amd64.AVXKind.AVXSize; -import jdk.compiler.graal.core.common.calc.Condition; -import jdk.compiler.graal.core.common.memory.MemoryOrderMode; -import jdk.compiler.graal.core.common.spi.LIRKindTool; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.core.common.LIRKind; -import jdk.compiler.graal.core.common.NumUtil; -import jdk.compiler.graal.core.common.Stride; -import jdk.compiler.graal.core.common.memory.BarrierType; -import jdk.compiler.graal.core.common.spi.ForeignCallLinkage; -import jdk.compiler.graal.lir.ConstantValue; -import jdk.compiler.graal.lir.LIRFrameState; -import jdk.compiler.graal.lir.LIRInstruction; -import jdk.compiler.graal.lir.LIRValueUtil; -import jdk.compiler.graal.lir.LabelRef; -import jdk.compiler.graal.lir.StandardOp.JumpOp; -import jdk.compiler.graal.lir.SwitchStrategy; -import jdk.compiler.graal.lir.Variable; -import jdk.compiler.graal.lir.amd64.AMD64AESDecryptOp; -import jdk.compiler.graal.lir.amd64.AMD64AESEncryptOp; -import jdk.compiler.graal.lir.amd64.AMD64AddressValue; -import jdk.compiler.graal.lir.amd64.AMD64ArithmeticLIRGeneratorTool; -import jdk.compiler.graal.lir.amd64.AMD64ArrayCompareToOp; -import jdk.compiler.graal.lir.amd64.AMD64ArrayCopyWithConversionsOp; -import jdk.compiler.graal.lir.amd64.AMD64ArrayEqualsOp; -import jdk.compiler.graal.lir.amd64.AMD64ArrayIndexOfOp; -import jdk.compiler.graal.lir.amd64.AMD64ArrayRegionCompareToOp; -import jdk.compiler.graal.lir.amd64.AMD64BigIntegerMulAddOp; -import jdk.compiler.graal.lir.amd64.AMD64BigIntegerMultiplyToLenOp; -import jdk.compiler.graal.lir.amd64.AMD64BigIntegerSquareToLenOp; -import jdk.compiler.graal.lir.amd64.AMD64Binary; -import jdk.compiler.graal.lir.amd64.AMD64BinaryConsumer; -import jdk.compiler.graal.lir.amd64.AMD64ByteSwapOp; -import jdk.compiler.graal.lir.amd64.AMD64CacheWritebackOp; -import jdk.compiler.graal.lir.amd64.AMD64CacheWritebackPostSyncOp; -import jdk.compiler.graal.lir.amd64.AMD64CalcStringAttributesOp; -import jdk.compiler.graal.lir.amd64.AMD64Call; -import jdk.compiler.graal.lir.amd64.AMD64CipherBlockChainingAESDecryptOp; -import jdk.compiler.graal.lir.amd64.AMD64CipherBlockChainingAESEncryptOp; -import jdk.compiler.graal.lir.amd64.AMD64ControlFlow; -import jdk.compiler.graal.lir.amd64.AMD64ControlFlow.BranchOp; -import jdk.compiler.graal.lir.amd64.AMD64ControlFlow.CmpBranchOp; -import jdk.compiler.graal.lir.amd64.AMD64ControlFlow.CmpConstBranchOp; -import jdk.compiler.graal.lir.amd64.AMD64ControlFlow.CmpDataBranchOp; -import jdk.compiler.graal.lir.amd64.AMD64ControlFlow.CondMoveOp; -import jdk.compiler.graal.lir.amd64.AMD64ControlFlow.CondSetOp; -import jdk.compiler.graal.lir.amd64.AMD64ControlFlow.FloatBranchOp; -import jdk.compiler.graal.lir.amd64.AMD64ControlFlow.FloatCondMoveOp; -import jdk.compiler.graal.lir.amd64.AMD64ControlFlow.FloatCondSetOp; -import jdk.compiler.graal.lir.amd64.AMD64ControlFlow.HashTableSwitchOp; -import jdk.compiler.graal.lir.amd64.AMD64ControlFlow.RangeTableSwitchOp; -import jdk.compiler.graal.lir.amd64.AMD64ControlFlow.StrategySwitchOp; -import jdk.compiler.graal.lir.amd64.AMD64ControlFlow.TestBranchOp; -import jdk.compiler.graal.lir.amd64.AMD64ControlFlow.TestByteBranchOp; -import jdk.compiler.graal.lir.amd64.AMD64ControlFlow.TestConstBranchOp; -import jdk.compiler.graal.lir.amd64.AMD64CountPositivesOp; -import jdk.compiler.graal.lir.amd64.AMD64CounterModeAESCryptOp; -import jdk.compiler.graal.lir.amd64.AMD64EncodeArrayOp; -import jdk.compiler.graal.lir.amd64.AMD64GHASHProcessBlocksOp; -import jdk.compiler.graal.lir.amd64.AMD64HaltOp; -import jdk.compiler.graal.lir.amd64.AMD64LFenceOp; -import jdk.compiler.graal.lir.amd64.AMD64MD5Op; -import jdk.compiler.graal.lir.amd64.AMD64Move; -import jdk.compiler.graal.lir.amd64.AMD64Move.CompareAndSwapOp; -import jdk.compiler.graal.lir.amd64.AMD64Move.MembarOp; -import jdk.compiler.graal.lir.amd64.AMD64Move.StackLeaOp; -import jdk.compiler.graal.lir.amd64.AMD64PauseOp; -import jdk.compiler.graal.lir.amd64.AMD64SHA1Op; -import jdk.compiler.graal.lir.amd64.AMD64SHA256AVX2Op; -import jdk.compiler.graal.lir.amd64.AMD64SHA256Op; -import jdk.compiler.graal.lir.amd64.AMD64SHA512Op; -import jdk.compiler.graal.lir.amd64.AMD64StringLatin1InflateOp; -import jdk.compiler.graal.lir.amd64.AMD64StringUTF16CompressOp; -import jdk.compiler.graal.lir.amd64.AMD64VectorizedHashCodeOp; -import jdk.compiler.graal.lir.amd64.AMD64VectorizedMismatchOp; -import jdk.compiler.graal.lir.amd64.AMD64ZapRegistersOp; -import jdk.compiler.graal.lir.amd64.AMD64ZapStackOp; -import jdk.compiler.graal.lir.amd64.AMD64ZeroMemoryOp; -import jdk.compiler.graal.lir.amd64.vector.AMD64VectorCompareOp; -import jdk.compiler.graal.lir.gen.BarrierSetLIRGenerator; -import jdk.compiler.graal.lir.gen.LIRGenerationResult; -import jdk.compiler.graal.lir.gen.LIRGenerator; -import jdk.compiler.graal.lir.gen.MoveFactory; -import jdk.compiler.graal.phases.util.Providers; +import jdk.graal.compiler.asm.amd64.AMD64Assembler.AMD64BinaryArithmetic; +import jdk.graal.compiler.asm.amd64.AMD64Assembler.AMD64MIOp; +import jdk.graal.compiler.asm.amd64.AMD64Assembler.AMD64RMOp; +import jdk.graal.compiler.asm.amd64.AMD64Assembler.ConditionFlag; +import jdk.graal.compiler.asm.amd64.AMD64Assembler.SSEOp; +import jdk.graal.compiler.asm.amd64.AMD64Assembler.VexRMOp; +import jdk.graal.compiler.asm.amd64.AMD64BaseAssembler.OperandSize; +import jdk.graal.compiler.asm.amd64.AVXKind; +import jdk.graal.compiler.asm.amd64.AVXKind.AVXSize; +import jdk.graal.compiler.core.common.calc.Condition; +import jdk.graal.compiler.core.common.memory.MemoryOrderMode; +import jdk.graal.compiler.core.common.spi.LIRKindTool; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.core.common.LIRKind; +import jdk.graal.compiler.core.common.NumUtil; +import jdk.graal.compiler.core.common.Stride; +import jdk.graal.compiler.core.common.memory.BarrierType; +import jdk.graal.compiler.core.common.spi.ForeignCallLinkage; +import jdk.graal.compiler.lir.ConstantValue; +import jdk.graal.compiler.lir.LIRFrameState; +import jdk.graal.compiler.lir.LIRInstruction; +import jdk.graal.compiler.lir.LIRValueUtil; +import jdk.graal.compiler.lir.LabelRef; +import jdk.graal.compiler.lir.StandardOp.JumpOp; +import jdk.graal.compiler.lir.SwitchStrategy; +import jdk.graal.compiler.lir.Variable; +import jdk.graal.compiler.lir.amd64.AMD64AESDecryptOp; +import jdk.graal.compiler.lir.amd64.AMD64AESEncryptOp; +import jdk.graal.compiler.lir.amd64.AMD64AddressValue; +import jdk.graal.compiler.lir.amd64.AMD64ArithmeticLIRGeneratorTool; +import jdk.graal.compiler.lir.amd64.AMD64ArrayCompareToOp; +import jdk.graal.compiler.lir.amd64.AMD64ArrayCopyWithConversionsOp; +import jdk.graal.compiler.lir.amd64.AMD64ArrayEqualsOp; +import jdk.graal.compiler.lir.amd64.AMD64ArrayIndexOfOp; +import jdk.graal.compiler.lir.amd64.AMD64ArrayRegionCompareToOp; +import jdk.graal.compiler.lir.amd64.AMD64BigIntegerMulAddOp; +import jdk.graal.compiler.lir.amd64.AMD64BigIntegerMultiplyToLenOp; +import jdk.graal.compiler.lir.amd64.AMD64BigIntegerSquareToLenOp; +import jdk.graal.compiler.lir.amd64.AMD64Binary; +import jdk.graal.compiler.lir.amd64.AMD64BinaryConsumer; +import jdk.graal.compiler.lir.amd64.AMD64ByteSwapOp; +import jdk.graal.compiler.lir.amd64.AMD64CacheWritebackOp; +import jdk.graal.compiler.lir.amd64.AMD64CacheWritebackPostSyncOp; +import jdk.graal.compiler.lir.amd64.AMD64CalcStringAttributesOp; +import jdk.graal.compiler.lir.amd64.AMD64Call; +import jdk.graal.compiler.lir.amd64.AMD64CipherBlockChainingAESDecryptOp; +import jdk.graal.compiler.lir.amd64.AMD64CipherBlockChainingAESEncryptOp; +import jdk.graal.compiler.lir.amd64.AMD64ControlFlow; +import jdk.graal.compiler.lir.amd64.AMD64ControlFlow.BranchOp; +import jdk.graal.compiler.lir.amd64.AMD64ControlFlow.CmpBranchOp; +import jdk.graal.compiler.lir.amd64.AMD64ControlFlow.CmpConstBranchOp; +import jdk.graal.compiler.lir.amd64.AMD64ControlFlow.CmpDataBranchOp; +import jdk.graal.compiler.lir.amd64.AMD64ControlFlow.CondMoveOp; +import jdk.graal.compiler.lir.amd64.AMD64ControlFlow.CondSetOp; +import jdk.graal.compiler.lir.amd64.AMD64ControlFlow.FloatBranchOp; +import jdk.graal.compiler.lir.amd64.AMD64ControlFlow.FloatCondMoveOp; +import jdk.graal.compiler.lir.amd64.AMD64ControlFlow.FloatCondSetOp; +import jdk.graal.compiler.lir.amd64.AMD64ControlFlow.HashTableSwitchOp; +import jdk.graal.compiler.lir.amd64.AMD64ControlFlow.RangeTableSwitchOp; +import jdk.graal.compiler.lir.amd64.AMD64ControlFlow.StrategySwitchOp; +import jdk.graal.compiler.lir.amd64.AMD64ControlFlow.TestBranchOp; +import jdk.graal.compiler.lir.amd64.AMD64ControlFlow.TestByteBranchOp; +import jdk.graal.compiler.lir.amd64.AMD64ControlFlow.TestConstBranchOp; +import jdk.graal.compiler.lir.amd64.AMD64CountPositivesOp; +import jdk.graal.compiler.lir.amd64.AMD64CounterModeAESCryptOp; +import jdk.graal.compiler.lir.amd64.AMD64EncodeArrayOp; +import jdk.graal.compiler.lir.amd64.AMD64GHASHProcessBlocksOp; +import jdk.graal.compiler.lir.amd64.AMD64HaltOp; +import jdk.graal.compiler.lir.amd64.AMD64LFenceOp; +import jdk.graal.compiler.lir.amd64.AMD64MD5Op; +import jdk.graal.compiler.lir.amd64.AMD64Move; +import jdk.graal.compiler.lir.amd64.AMD64Move.CompareAndSwapOp; +import jdk.graal.compiler.lir.amd64.AMD64Move.MembarOp; +import jdk.graal.compiler.lir.amd64.AMD64Move.StackLeaOp; +import jdk.graal.compiler.lir.amd64.AMD64PauseOp; +import jdk.graal.compiler.lir.amd64.AMD64SHA1Op; +import jdk.graal.compiler.lir.amd64.AMD64SHA256AVX2Op; +import jdk.graal.compiler.lir.amd64.AMD64SHA256Op; +import jdk.graal.compiler.lir.amd64.AMD64SHA512Op; +import jdk.graal.compiler.lir.amd64.AMD64StringLatin1InflateOp; +import jdk.graal.compiler.lir.amd64.AMD64StringUTF16CompressOp; +import jdk.graal.compiler.lir.amd64.AMD64VectorizedHashCodeOp; +import jdk.graal.compiler.lir.amd64.AMD64VectorizedMismatchOp; +import jdk.graal.compiler.lir.amd64.AMD64ZapRegistersOp; +import jdk.graal.compiler.lir.amd64.AMD64ZapStackOp; +import jdk.graal.compiler.lir.amd64.AMD64ZeroMemoryOp; +import jdk.graal.compiler.lir.amd64.vector.AMD64VectorCompareOp; +import jdk.graal.compiler.lir.gen.BarrierSetLIRGenerator; +import jdk.graal.compiler.lir.gen.LIRGenerationResult; +import jdk.graal.compiler.lir.gen.LIRGenerator; +import jdk.graal.compiler.lir.gen.MoveFactory; +import jdk.graal.compiler.phases.util.Providers; import jdk.vm.ci.amd64.AMD64; import jdk.vm.ci.amd64.AMD64.CPUFeature; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/amd64/AMD64LIRKindTool.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/amd64/AMD64LIRKindTool.java similarity index 93% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/amd64/AMD64LIRKindTool.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/amd64/AMD64LIRKindTool.java index 26e49adc62fe..9a611ae78046 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/amd64/AMD64LIRKindTool.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/amd64/AMD64LIRKindTool.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.amd64; +package jdk.graal.compiler.core.amd64; -import jdk.compiler.graal.core.common.spi.LIRKindTool; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.core.common.LIRKind; +import jdk.graal.compiler.core.common.spi.LIRKindTool; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.core.common.LIRKind; import jdk.vm.ci.amd64.AMD64Kind; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/amd64/AMD64LoweringProviderMixin.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/amd64/AMD64LoweringProviderMixin.java similarity index 83% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/amd64/AMD64LoweringProviderMixin.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/amd64/AMD64LoweringProviderMixin.java index 816f376ec02e..dd0f2a86d9ce 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/amd64/AMD64LoweringProviderMixin.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/amd64/AMD64LoweringProviderMixin.java @@ -23,24 +23,24 @@ * questions. */ -package jdk.compiler.graal.core.amd64; +package jdk.graal.compiler.core.amd64; -import jdk.compiler.graal.core.common.memory.MemoryExtendKind; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.nodes.ConstantNode; -import jdk.compiler.graal.nodes.LogicNode; -import jdk.compiler.graal.nodes.NodeView; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.calc.ConditionalNode; -import jdk.compiler.graal.nodes.calc.IntegerEqualsNode; -import jdk.compiler.graal.nodes.calc.SubNode; -import jdk.compiler.graal.nodes.memory.ExtendableMemoryAccess; -import jdk.compiler.graal.nodes.spi.LoweringProvider; -import jdk.compiler.graal.replacements.nodes.BitScanForwardNode; -import jdk.compiler.graal.replacements.nodes.BitScanReverseNode; -import jdk.compiler.graal.replacements.nodes.CountLeadingZerosNode; -import jdk.compiler.graal.replacements.nodes.CountTrailingZerosNode; +import jdk.graal.compiler.core.common.memory.MemoryExtendKind; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.nodes.ConstantNode; +import jdk.graal.compiler.nodes.LogicNode; +import jdk.graal.compiler.nodes.NodeView; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.calc.ConditionalNode; +import jdk.graal.compiler.nodes.calc.IntegerEqualsNode; +import jdk.graal.compiler.nodes.calc.SubNode; +import jdk.graal.compiler.nodes.memory.ExtendableMemoryAccess; +import jdk.graal.compiler.nodes.spi.LoweringProvider; +import jdk.graal.compiler.replacements.nodes.BitScanForwardNode; +import jdk.graal.compiler.replacements.nodes.BitScanReverseNode; +import jdk.graal.compiler.replacements.nodes.CountLeadingZerosNode; +import jdk.graal.compiler.replacements.nodes.CountTrailingZerosNode; import jdk.vm.ci.amd64.AMD64; import jdk.vm.ci.meta.JavaKind; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/amd64/AMD64MoveFactory.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/amd64/AMD64MoveFactory.java similarity index 82% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/amd64/AMD64MoveFactory.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/amd64/AMD64MoveFactory.java index c74500f0a8c4..8c63256c1095 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/amd64/AMD64MoveFactory.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/amd64/AMD64MoveFactory.java @@ -23,27 +23,27 @@ * questions. */ -package jdk.compiler.graal.core.amd64; +package jdk.graal.compiler.core.amd64; import static jdk.vm.ci.code.ValueUtil.isRegister; -import static jdk.compiler.graal.lir.LIRValueUtil.asConstant; -import static jdk.compiler.graal.lir.LIRValueUtil.isConstantValue; -import static jdk.compiler.graal.lir.LIRValueUtil.isStackSlotValue; +import static jdk.graal.compiler.lir.LIRValueUtil.asConstant; +import static jdk.graal.compiler.lir.LIRValueUtil.isConstantValue; +import static jdk.graal.compiler.lir.LIRValueUtil.isStackSlotValue; -import jdk.compiler.graal.asm.amd64.AMD64Assembler; -import jdk.compiler.graal.core.common.type.DataPointerConstant; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.core.common.NumUtil; -import jdk.compiler.graal.lir.LIRInstruction; -import jdk.compiler.graal.lir.amd64.AMD64AddressValue; -import jdk.compiler.graal.lir.amd64.AMD64LIRInstruction; -import jdk.compiler.graal.lir.amd64.AMD64Move; -import jdk.compiler.graal.lir.amd64.AMD64Move.AMD64StackMove; -import jdk.compiler.graal.lir.amd64.AMD64Move.LeaDataOp; -import jdk.compiler.graal.lir.amd64.AMD64Move.LeaOp; -import jdk.compiler.graal.lir.amd64.AMD64Move.MoveFromConstOp; -import jdk.compiler.graal.lir.amd64.AMD64Move.MoveFromRegOp; -import jdk.compiler.graal.lir.amd64.AMD64Move.MoveToRegOp; +import jdk.graal.compiler.asm.amd64.AMD64Assembler; +import jdk.graal.compiler.core.common.type.DataPointerConstant; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.core.common.NumUtil; +import jdk.graal.compiler.lir.LIRInstruction; +import jdk.graal.compiler.lir.amd64.AMD64AddressValue; +import jdk.graal.compiler.lir.amd64.AMD64LIRInstruction; +import jdk.graal.compiler.lir.amd64.AMD64Move; +import jdk.graal.compiler.lir.amd64.AMD64Move.AMD64StackMove; +import jdk.graal.compiler.lir.amd64.AMD64Move.LeaDataOp; +import jdk.graal.compiler.lir.amd64.AMD64Move.LeaOp; +import jdk.graal.compiler.lir.amd64.AMD64Move.MoveFromConstOp; +import jdk.graal.compiler.lir.amd64.AMD64Move.MoveFromRegOp; +import jdk.graal.compiler.lir.amd64.AMD64Move.MoveToRegOp; import jdk.vm.ci.amd64.AMD64Kind; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/amd64/AMD64MoveFactoryBase.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/amd64/AMD64MoveFactoryBase.java similarity index 86% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/amd64/AMD64MoveFactoryBase.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/amd64/AMD64MoveFactoryBase.java index dc0a885323c4..3401b4871007 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/amd64/AMD64MoveFactoryBase.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/amd64/AMD64MoveFactoryBase.java @@ -23,15 +23,15 @@ * questions. */ -package jdk.compiler.graal.core.amd64; +package jdk.graal.compiler.core.amd64; -import static jdk.compiler.graal.asm.amd64.AMD64BaseAssembler.OperandSize.QWORD; -import static jdk.compiler.graal.asm.amd64.AMD64BaseAssembler.OperandSize.WORD; +import static jdk.graal.compiler.asm.amd64.AMD64BaseAssembler.OperandSize.QWORD; +import static jdk.graal.compiler.asm.amd64.AMD64BaseAssembler.OperandSize.WORD; -import jdk.compiler.graal.lir.VirtualStackSlot; -import jdk.compiler.graal.lir.amd64.AMD64LIRInstruction; -import jdk.compiler.graal.lir.amd64.AMD64Move.AMD64PushPopStackMove; -import jdk.compiler.graal.lir.gen.MoveFactory; +import jdk.graal.compiler.lir.VirtualStackSlot; +import jdk.graal.compiler.lir.amd64.AMD64LIRInstruction; +import jdk.graal.compiler.lir.amd64.AMD64Move.AMD64PushPopStackMove; +import jdk.graal.compiler.lir.gen.MoveFactory; import jdk.vm.ci.amd64.AMD64Kind; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/amd64/AMD64NodeLIRBuilder.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/amd64/AMD64NodeLIRBuilder.java similarity index 87% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/amd64/AMD64NodeLIRBuilder.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/amd64/AMD64NodeLIRBuilder.java index ee60eed53950..19b9dd207fa7 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/amd64/AMD64NodeLIRBuilder.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/amd64/AMD64NodeLIRBuilder.java @@ -23,23 +23,23 @@ * questions. */ -package jdk.compiler.graal.core.amd64; +package jdk.graal.compiler.core.amd64; -import jdk.compiler.graal.core.gen.NodeLIRBuilder; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.core.common.util.CompilationAlarm; -import jdk.compiler.graal.lir.LIRFrameState; -import jdk.compiler.graal.lir.amd64.AMD64Call; -import jdk.compiler.graal.lir.gen.LIRGeneratorTool; -import jdk.compiler.graal.nodes.DeoptimizingNode; -import jdk.compiler.graal.nodes.FixedNode; -import jdk.compiler.graal.nodes.FixedWithNextNode; -import jdk.compiler.graal.nodes.IfNode; -import jdk.compiler.graal.nodes.IndirectCallTargetNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.calc.IntegerDivRemNode; -import jdk.compiler.graal.nodes.calc.IntegerDivRemNode.Op; +import jdk.graal.compiler.core.gen.NodeLIRBuilder; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.core.common.util.CompilationAlarm; +import jdk.graal.compiler.lir.LIRFrameState; +import jdk.graal.compiler.lir.amd64.AMD64Call; +import jdk.graal.compiler.lir.gen.LIRGeneratorTool; +import jdk.graal.compiler.nodes.DeoptimizingNode; +import jdk.graal.compiler.nodes.FixedNode; +import jdk.graal.compiler.nodes.FixedWithNextNode; +import jdk.graal.compiler.nodes.IfNode; +import jdk.graal.compiler.nodes.IndirectCallTargetNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.calc.IntegerDivRemNode; +import jdk.graal.compiler.nodes.calc.IntegerDivRemNode.Op; import jdk.vm.ci.amd64.AMD64; import jdk.vm.ci.meta.AllocatableValue; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/amd64/AMD64NodeMatchRules.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/amd64/AMD64NodeMatchRules.java similarity index 89% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/amd64/AMD64NodeMatchRules.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/amd64/AMD64NodeMatchRules.java index 6c0f4271aabd..bb2d3e3d97bd 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/amd64/AMD64NodeMatchRules.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/amd64/AMD64NodeMatchRules.java @@ -23,74 +23,74 @@ * questions. */ -package jdk.compiler.graal.core.amd64; - -import static jdk.compiler.graal.asm.amd64.AMD64Assembler.AMD64BinaryArithmetic.ADD; -import static jdk.compiler.graal.asm.amd64.AMD64Assembler.AMD64BinaryArithmetic.AND; -import static jdk.compiler.graal.asm.amd64.AMD64Assembler.AMD64BinaryArithmetic.OR; -import static jdk.compiler.graal.asm.amd64.AMD64Assembler.AMD64BinaryArithmetic.SUB; -import static jdk.compiler.graal.asm.amd64.AMD64Assembler.AMD64BinaryArithmetic.XOR; -import static jdk.compiler.graal.asm.amd64.AMD64Assembler.AMD64RMOp.MOVSX; -import static jdk.compiler.graal.asm.amd64.AMD64Assembler.AMD64RMOp.MOVSXB; -import static jdk.compiler.graal.asm.amd64.AMD64Assembler.AMD64RMOp.MOVSXD; -import static jdk.compiler.graal.asm.amd64.AMD64Assembler.AMD64Shift.ROL; -import static jdk.compiler.graal.asm.amd64.AMD64Assembler.VexRVMOp.VADDSD; -import static jdk.compiler.graal.asm.amd64.AMD64Assembler.VexRVMOp.VADDSS; -import static jdk.compiler.graal.asm.amd64.AMD64Assembler.VexRVMOp.VMULSD; -import static jdk.compiler.graal.asm.amd64.AMD64Assembler.VexRVMOp.VMULSS; -import static jdk.compiler.graal.asm.amd64.AMD64Assembler.VexRVMOp.VSUBSD; -import static jdk.compiler.graal.asm.amd64.AMD64Assembler.VexRVMOp.VSUBSS; -import static jdk.compiler.graal.asm.amd64.AMD64BaseAssembler.OperandSize.DWORD; -import static jdk.compiler.graal.asm.amd64.AMD64BaseAssembler.OperandSize.QWORD; -import static jdk.compiler.graal.asm.amd64.AMD64BaseAssembler.OperandSize.SD; -import static jdk.compiler.graal.asm.amd64.AMD64BaseAssembler.OperandSize.SS; - -import jdk.compiler.graal.asm.amd64.AMD64Assembler; -import jdk.compiler.graal.asm.amd64.AMD64Assembler.AMD64RMOp; -import jdk.compiler.graal.asm.amd64.AMD64Assembler.SSEOp; -import jdk.compiler.graal.asm.amd64.AMD64BaseAssembler.OperandSize; -import jdk.compiler.graal.core.common.calc.CanonicalCondition; -import jdk.compiler.graal.core.common.calc.Condition; -import jdk.compiler.graal.core.common.calc.FloatConvert; -import jdk.compiler.graal.core.gen.NodeLIRBuilder; -import jdk.compiler.graal.core.gen.NodeMatchRules; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.core.common.LIRKind; -import jdk.compiler.graal.core.common.NumUtil; -import jdk.compiler.graal.core.common.memory.MemoryExtendKind; -import jdk.compiler.graal.core.common.memory.MemoryOrderMode; -import jdk.compiler.graal.core.match.ComplexMatchResult; -import jdk.compiler.graal.core.match.MatchRule; -import jdk.compiler.graal.lir.LIRFrameState; -import jdk.compiler.graal.lir.LIRValueUtil; -import jdk.compiler.graal.lir.LabelRef; -import jdk.compiler.graal.lir.amd64.AMD64AddressValue; -import jdk.compiler.graal.lir.amd64.AMD64BinaryConsumer; -import jdk.compiler.graal.lir.amd64.AMD64ControlFlow.TestBranchOp; -import jdk.compiler.graal.lir.amd64.AMD64ControlFlow.TestConstBranchOp; -import jdk.compiler.graal.lir.amd64.AMD64UnaryConsumer; -import jdk.compiler.graal.lir.gen.LIRGeneratorTool; -import jdk.compiler.graal.nodes.ConstantNode; -import jdk.compiler.graal.nodes.DeoptimizingNode; -import jdk.compiler.graal.nodes.IfNode; -import jdk.compiler.graal.nodes.NodeView; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.calc.CompareNode; -import jdk.compiler.graal.nodes.calc.FloatConvertNode; -import jdk.compiler.graal.nodes.calc.LeftShiftNode; -import jdk.compiler.graal.nodes.calc.NarrowNode; -import jdk.compiler.graal.nodes.calc.ReinterpretNode; -import jdk.compiler.graal.nodes.calc.SignExtendNode; -import jdk.compiler.graal.nodes.calc.UnsignedRightShiftNode; -import jdk.compiler.graal.nodes.calc.ZeroExtendNode; -import jdk.compiler.graal.nodes.java.LogicCompareAndSwapNode; -import jdk.compiler.graal.nodes.java.ValueCompareAndSwapNode; -import jdk.compiler.graal.nodes.memory.AddressableMemoryAccess; -import jdk.compiler.graal.nodes.memory.LIRLowerableAccess; -import jdk.compiler.graal.nodes.memory.MemoryAccess; -import jdk.compiler.graal.nodes.memory.ReadNode; -import jdk.compiler.graal.nodes.memory.WriteNode; -import jdk.compiler.graal.nodes.util.GraphUtil; +package jdk.graal.compiler.core.amd64; + +import static jdk.graal.compiler.asm.amd64.AMD64Assembler.AMD64BinaryArithmetic.ADD; +import static jdk.graal.compiler.asm.amd64.AMD64Assembler.AMD64BinaryArithmetic.AND; +import static jdk.graal.compiler.asm.amd64.AMD64Assembler.AMD64BinaryArithmetic.OR; +import static jdk.graal.compiler.asm.amd64.AMD64Assembler.AMD64BinaryArithmetic.SUB; +import static jdk.graal.compiler.asm.amd64.AMD64Assembler.AMD64BinaryArithmetic.XOR; +import static jdk.graal.compiler.asm.amd64.AMD64Assembler.AMD64RMOp.MOVSX; +import static jdk.graal.compiler.asm.amd64.AMD64Assembler.AMD64RMOp.MOVSXB; +import static jdk.graal.compiler.asm.amd64.AMD64Assembler.AMD64RMOp.MOVSXD; +import static jdk.graal.compiler.asm.amd64.AMD64Assembler.AMD64Shift.ROL; +import static jdk.graal.compiler.asm.amd64.AMD64Assembler.VexRVMOp.VADDSD; +import static jdk.graal.compiler.asm.amd64.AMD64Assembler.VexRVMOp.VADDSS; +import static jdk.graal.compiler.asm.amd64.AMD64Assembler.VexRVMOp.VMULSD; +import static jdk.graal.compiler.asm.amd64.AMD64Assembler.VexRVMOp.VMULSS; +import static jdk.graal.compiler.asm.amd64.AMD64Assembler.VexRVMOp.VSUBSD; +import static jdk.graal.compiler.asm.amd64.AMD64Assembler.VexRVMOp.VSUBSS; +import static jdk.graal.compiler.asm.amd64.AMD64BaseAssembler.OperandSize.DWORD; +import static jdk.graal.compiler.asm.amd64.AMD64BaseAssembler.OperandSize.QWORD; +import static jdk.graal.compiler.asm.amd64.AMD64BaseAssembler.OperandSize.SD; +import static jdk.graal.compiler.asm.amd64.AMD64BaseAssembler.OperandSize.SS; + +import jdk.graal.compiler.asm.amd64.AMD64Assembler; +import jdk.graal.compiler.asm.amd64.AMD64Assembler.AMD64RMOp; +import jdk.graal.compiler.asm.amd64.AMD64Assembler.SSEOp; +import jdk.graal.compiler.asm.amd64.AMD64BaseAssembler.OperandSize; +import jdk.graal.compiler.core.common.calc.CanonicalCondition; +import jdk.graal.compiler.core.common.calc.Condition; +import jdk.graal.compiler.core.common.calc.FloatConvert; +import jdk.graal.compiler.core.gen.NodeLIRBuilder; +import jdk.graal.compiler.core.gen.NodeMatchRules; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.core.common.LIRKind; +import jdk.graal.compiler.core.common.NumUtil; +import jdk.graal.compiler.core.common.memory.MemoryExtendKind; +import jdk.graal.compiler.core.common.memory.MemoryOrderMode; +import jdk.graal.compiler.core.match.ComplexMatchResult; +import jdk.graal.compiler.core.match.MatchRule; +import jdk.graal.compiler.lir.LIRFrameState; +import jdk.graal.compiler.lir.LIRValueUtil; +import jdk.graal.compiler.lir.LabelRef; +import jdk.graal.compiler.lir.amd64.AMD64AddressValue; +import jdk.graal.compiler.lir.amd64.AMD64BinaryConsumer; +import jdk.graal.compiler.lir.amd64.AMD64ControlFlow.TestBranchOp; +import jdk.graal.compiler.lir.amd64.AMD64ControlFlow.TestConstBranchOp; +import jdk.graal.compiler.lir.amd64.AMD64UnaryConsumer; +import jdk.graal.compiler.lir.gen.LIRGeneratorTool; +import jdk.graal.compiler.nodes.ConstantNode; +import jdk.graal.compiler.nodes.DeoptimizingNode; +import jdk.graal.compiler.nodes.IfNode; +import jdk.graal.compiler.nodes.NodeView; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.calc.CompareNode; +import jdk.graal.compiler.nodes.calc.FloatConvertNode; +import jdk.graal.compiler.nodes.calc.LeftShiftNode; +import jdk.graal.compiler.nodes.calc.NarrowNode; +import jdk.graal.compiler.nodes.calc.ReinterpretNode; +import jdk.graal.compiler.nodes.calc.SignExtendNode; +import jdk.graal.compiler.nodes.calc.UnsignedRightShiftNode; +import jdk.graal.compiler.nodes.calc.ZeroExtendNode; +import jdk.graal.compiler.nodes.java.LogicCompareAndSwapNode; +import jdk.graal.compiler.nodes.java.ValueCompareAndSwapNode; +import jdk.graal.compiler.nodes.memory.AddressableMemoryAccess; +import jdk.graal.compiler.nodes.memory.LIRLowerableAccess; +import jdk.graal.compiler.nodes.memory.MemoryAccess; +import jdk.graal.compiler.nodes.memory.ReadNode; +import jdk.graal.compiler.nodes.memory.WriteNode; +import jdk.graal.compiler.nodes.util.GraphUtil; import jdk.vm.ci.amd64.AMD64; import jdk.vm.ci.amd64.AMD64.CPUFeature; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/amd64/AMD64SuitesCreator.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/amd64/AMD64SuitesCreator.java similarity index 81% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/amd64/AMD64SuitesCreator.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/amd64/AMD64SuitesCreator.java index c342e1fa83d4..b32139da4cc3 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/amd64/AMD64SuitesCreator.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/amd64/AMD64SuitesCreator.java @@ -22,20 +22,20 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.amd64; +package jdk.graal.compiler.core.amd64; import java.util.ListIterator; -import jdk.compiler.graal.java.DefaultSuitesCreator; -import jdk.compiler.graal.lir.amd64.phases.StackMoveOptimizationPhase; -import jdk.compiler.graal.lir.phases.LIRSuites; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.phases.BasePhase; -import jdk.compiler.graal.phases.common.UseTrappingNullChecksPhase; -import jdk.compiler.graal.phases.tiers.CompilerConfiguration; -import jdk.compiler.graal.phases.tiers.LowTierContext; -import jdk.compiler.graal.phases.tiers.Suites; +import jdk.graal.compiler.java.DefaultSuitesCreator; +import jdk.graal.compiler.lir.amd64.phases.StackMoveOptimizationPhase; +import jdk.graal.compiler.lir.phases.LIRSuites; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.phases.BasePhase; +import jdk.graal.compiler.phases.common.UseTrappingNullChecksPhase; +import jdk.graal.compiler.phases.tiers.CompilerConfiguration; +import jdk.graal.compiler.phases.tiers.LowTierContext; +import jdk.graal.compiler.phases.tiers.Suites; import jdk.vm.ci.code.Architecture; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/amd64/UseTrappingDivPhase.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/amd64/UseTrappingDivPhase.java similarity index 85% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/amd64/UseTrappingDivPhase.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/amd64/UseTrappingDivPhase.java index 38877dbe0e4e..62bc30499706 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/amd64/UseTrappingDivPhase.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/amd64/UseTrappingDivPhase.java @@ -22,40 +22,40 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.amd64; +package jdk.graal.compiler.core.amd64; import java.util.Optional; -import jdk.compiler.graal.debug.GraalError; +import jdk.graal.compiler.debug.GraalError; import org.graalvm.collections.EconomicMap; -import jdk.compiler.graal.core.common.GraalOptions; -import jdk.compiler.graal.nodes.AbstractBeginNode; -import jdk.compiler.graal.nodes.AbstractDeoptimizeNode; -import jdk.compiler.graal.nodes.BeginNode; -import jdk.compiler.graal.nodes.DeoptimizeNode; -import jdk.compiler.graal.nodes.DeoptimizingFixedWithNextNode; -import jdk.compiler.graal.nodes.DynamicDeoptimizeNode; -import jdk.compiler.graal.nodes.GraphState; -import jdk.compiler.graal.nodes.IfNode; -import jdk.compiler.graal.nodes.LogicNode; -import jdk.compiler.graal.nodes.PhiNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.StructuredGraph.ScheduleResult; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.calc.IntegerDivRemNode; -import jdk.compiler.graal.nodes.calc.IntegerEqualsNode; -import jdk.compiler.graal.nodes.calc.SignedDivNode; -import jdk.compiler.graal.nodes.calc.SignedRemNode; -import jdk.compiler.graal.nodes.cfg.HIRBlock; -import jdk.compiler.graal.nodes.extended.MultiGuardNode; -import jdk.compiler.graal.nodes.memory.address.AddressNode; -import jdk.compiler.graal.nodes.util.GraphUtil; -import jdk.compiler.graal.phases.BasePhase; -import jdk.compiler.graal.phases.common.UseTrappingNullChecksPhase; -import jdk.compiler.graal.phases.common.UseTrappingOperationPhase; -import jdk.compiler.graal.phases.schedule.SchedulePhase; -import jdk.compiler.graal.phases.schedule.SchedulePhase.SchedulingStrategy; -import jdk.compiler.graal.phases.tiers.LowTierContext; +import jdk.graal.compiler.core.common.GraalOptions; +import jdk.graal.compiler.nodes.AbstractBeginNode; +import jdk.graal.compiler.nodes.AbstractDeoptimizeNode; +import jdk.graal.compiler.nodes.BeginNode; +import jdk.graal.compiler.nodes.DeoptimizeNode; +import jdk.graal.compiler.nodes.DeoptimizingFixedWithNextNode; +import jdk.graal.compiler.nodes.DynamicDeoptimizeNode; +import jdk.graal.compiler.nodes.GraphState; +import jdk.graal.compiler.nodes.IfNode; +import jdk.graal.compiler.nodes.LogicNode; +import jdk.graal.compiler.nodes.PhiNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.StructuredGraph.ScheduleResult; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.calc.IntegerDivRemNode; +import jdk.graal.compiler.nodes.calc.IntegerEqualsNode; +import jdk.graal.compiler.nodes.calc.SignedDivNode; +import jdk.graal.compiler.nodes.calc.SignedRemNode; +import jdk.graal.compiler.nodes.cfg.HIRBlock; +import jdk.graal.compiler.nodes.extended.MultiGuardNode; +import jdk.graal.compiler.nodes.memory.address.AddressNode; +import jdk.graal.compiler.nodes.util.GraphUtil; +import jdk.graal.compiler.phases.BasePhase; +import jdk.graal.compiler.phases.common.UseTrappingNullChecksPhase; +import jdk.graal.compiler.phases.common.UseTrappingOperationPhase; +import jdk.graal.compiler.phases.schedule.SchedulePhase; +import jdk.graal.compiler.phases.schedule.SchedulePhase.SchedulingStrategy; +import jdk.graal.compiler.phases.tiers.LowTierContext; import jdk.vm.ci.meta.DeoptimizationReason; import jdk.vm.ci.meta.JavaConstant; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/BootstrapMethodIntrospection.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/BootstrapMethodIntrospection.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/BootstrapMethodIntrospection.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/BootstrapMethodIntrospection.java index f624d0c500b6..6a6c9be95940 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/BootstrapMethodIntrospection.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/BootstrapMethodIntrospection.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.compiler.graal.core.common; +package jdk.graal.compiler.core.common; import java.lang.invoke.MethodType; import java.util.List; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/CancellationBailoutException.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/CancellationBailoutException.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/CancellationBailoutException.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/CancellationBailoutException.java index f78de37fdcae..504c9a609214 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/CancellationBailoutException.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/CancellationBailoutException.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.common; +package jdk.graal.compiler.core.common; /** * A {@linkplain RetryableBailoutException} that will be thrown if an on-going compilation in the diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/CompilationIdentifier.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/CompilationIdentifier.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/CompilationIdentifier.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/CompilationIdentifier.java index c814c974851a..7132552c2d50 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/CompilationIdentifier.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/CompilationIdentifier.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.common; +package jdk.graal.compiler.core.common; import jdk.vm.ci.code.CompilationRequest; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/CompilationListenerProfiler.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/CompilationListenerProfiler.java similarity index 94% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/CompilationListenerProfiler.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/CompilationListenerProfiler.java index 91e739a1747a..72535a14dac1 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/CompilationListenerProfiler.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/CompilationListenerProfiler.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.common; +package jdk.graal.compiler.core.common; -import jdk.compiler.graal.debug.CompilationListener; -import jdk.compiler.graal.debug.DebugContext; +import jdk.graal.compiler.debug.CompilationListener; +import jdk.graal.compiler.debug.DebugContext; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/CompilationRequestIdentifier.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/CompilationRequestIdentifier.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/CompilationRequestIdentifier.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/CompilationRequestIdentifier.java index 19166c854f9a..b4070dc60c4f 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/CompilationRequestIdentifier.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/CompilationRequestIdentifier.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.common; +package jdk.graal.compiler.core.common; import jdk.vm.ci.code.CompilationRequest; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/CompilerProfiler.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/CompilerProfiler.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/CompilerProfiler.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/CompilerProfiler.java index eb80b4cb2b16..6b1e784ab181 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/CompilerProfiler.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/CompilerProfiler.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.common; +package jdk.graal.compiler.core.common; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/CompressEncoding.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/CompressEncoding.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/CompressEncoding.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/CompressEncoding.java index 73d88e5a050f..ecedaf6710a5 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/CompressEncoding.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/CompressEncoding.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.common; +package jdk.graal.compiler.core.common; /** * A compact representation of the different encoding strategies for Objects and metadata. diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/FieldIntrospection.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/FieldIntrospection.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/FieldIntrospection.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/FieldIntrospection.java index 1ef2cb6f0a18..0fa1ea73277a 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/FieldIntrospection.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/FieldIntrospection.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.common; +package jdk.graal.compiler.core.common; public abstract class FieldIntrospection { diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/Fields.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/Fields.java similarity index 99% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/Fields.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/Fields.java index 83508569213f..f19f1c4240ee 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/Fields.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/Fields.java @@ -22,16 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.common; +package jdk.graal.compiler.core.common; -import static jdk.compiler.graal.serviceprovider.GraalUnsafeAccess.getUnsafe; +import static jdk.graal.compiler.serviceprovider.GraalUnsafeAccess.getUnsafe; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.List; -import jdk.compiler.graal.debug.GraalError; +import jdk.graal.compiler.debug.GraalError; import sun.misc.Unsafe; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/FieldsScanner.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/FieldsScanner.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/FieldsScanner.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/FieldsScanner.java index 35f305ca7dcd..d97097bd959a 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/FieldsScanner.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/FieldsScanner.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.common; +package jdk.graal.compiler.core.common; -import static jdk.compiler.graal.serviceprovider.GraalUnsafeAccess.getUnsafe; +import static jdk.graal.compiler.serviceprovider.GraalUnsafeAccess.getUnsafe; import java.lang.reflect.Field; import java.lang.reflect.Modifier; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/GraalBailoutException.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/GraalBailoutException.java similarity index 94% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/GraalBailoutException.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/GraalBailoutException.java index 1cc07bc105fd..137c24ec545f 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/GraalBailoutException.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/GraalBailoutException.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.common; +package jdk.graal.compiler.core.common; -import jdk.compiler.graal.debug.CausableByCompilerAssert; +import jdk.graal.compiler.debug.CausableByCompilerAssert; import jdk.vm.ci.code.BailoutException; @SuppressWarnings("serial") diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/GraalOptions.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/GraalOptions.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/GraalOptions.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/GraalOptions.java index 5f7cfbd1425b..3a116ed90586 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/GraalOptions.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/GraalOptions.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.common; +package jdk.graal.compiler.core.common; -import jdk.compiler.graal.options.Option; -import jdk.compiler.graal.options.OptionKey; -import jdk.compiler.graal.options.OptionStability; -import jdk.compiler.graal.options.OptionType; +import jdk.graal.compiler.options.Option; +import jdk.graal.compiler.options.OptionKey; +import jdk.graal.compiler.options.OptionStability; +import jdk.graal.compiler.options.OptionType; /** * This class encapsulates options that control the behavior of the GraalVM compiler. diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/LIRKind.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/LIRKind.java similarity index 99% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/LIRKind.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/LIRKind.java index df8ffd1ba38a..17b4f5606c37 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/LIRKind.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/LIRKind.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.common; +package jdk.graal.compiler.core.common; -import jdk.compiler.graal.core.common.alloc.RegisterAllocationConfig; +import jdk.graal.compiler.core.common.alloc.RegisterAllocationConfig; import jdk.vm.ci.code.Architecture; import jdk.vm.ci.meta.AllocatableValue; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/LIRKindWithCast.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/LIRKindWithCast.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/LIRKindWithCast.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/LIRKindWithCast.java index 6f313f0209f9..f7872f22354f 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/LIRKindWithCast.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/LIRKindWithCast.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.common; +package jdk.graal.compiler.core.common; import jdk.vm.ci.meta.ValueKind; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/NumUtil.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/NumUtil.java similarity index 99% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/NumUtil.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/NumUtil.java index 8aedc1ea63de..be6b8bc1b0e6 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/NumUtil.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/NumUtil.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.common; +package jdk.graal.compiler.core.common; // JaCoCo Exclude diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/PermanentBailoutException.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/PermanentBailoutException.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/PermanentBailoutException.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/PermanentBailoutException.java index 4aaf6a372e96..ad91666b9852 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/PermanentBailoutException.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/PermanentBailoutException.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.common; +package jdk.graal.compiler.core.common; public class PermanentBailoutException extends GraalBailoutException { diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/RetryableBailoutException.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/RetryableBailoutException.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/RetryableBailoutException.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/RetryableBailoutException.java index eca42c38801d..805c1dfa56be 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/RetryableBailoutException.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/RetryableBailoutException.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.common; +package jdk.graal.compiler.core.common; public class RetryableBailoutException extends GraalBailoutException { diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/SpectrePHTMitigations.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/SpectrePHTMitigations.java similarity index 93% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/SpectrePHTMitigations.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/SpectrePHTMitigations.java index 0418737dab38..267163c04e72 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/SpectrePHTMitigations.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/SpectrePHTMitigations.java @@ -22,16 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.common; +package jdk.graal.compiler.core.common; import org.graalvm.collections.EconomicMap; import org.graalvm.collections.UnmodifiableEconomicMap; -import jdk.compiler.graal.options.EnumOptionKey; -import jdk.compiler.graal.options.Option; -import jdk.compiler.graal.options.OptionKey; -import jdk.compiler.graal.options.OptionStability; -import jdk.compiler.graal.options.OptionType; -import jdk.compiler.graal.options.OptionValues; +import jdk.graal.compiler.options.EnumOptionKey; +import jdk.graal.compiler.options.Option; +import jdk.graal.compiler.options.OptionKey; +import jdk.graal.compiler.options.OptionStability; +import jdk.graal.compiler.options.OptionType; +import jdk.graal.compiler.options.OptionValues; public enum SpectrePHTMitigations { None, diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/Stride.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/Stride.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/Stride.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/Stride.java index 1e91c9f76ec3..203f2f02b4b8 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/Stride.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/Stride.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.common; +package jdk.graal.compiler.core.common; -import jdk.compiler.graal.debug.GraalError; +import jdk.graal.compiler.debug.GraalError; import jdk.vm.ci.meta.JavaKind; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/StrideUtil.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/StrideUtil.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/StrideUtil.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/StrideUtil.java index abd207429e4d..e8a92a84f927 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/StrideUtil.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/StrideUtil.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.common; +package jdk.graal.compiler.core.common; import static jdk.vm.ci.code.ValueUtil.isIllegal; @@ -30,7 +30,7 @@ /** * This class provides utility methods for "stride-agnostic" intrinsic nodes such as - * {@link jdk.compiler.graal.replacements.nodes.ArrayRegionCompareToNode}. These intrinsics may work + * {@link jdk.graal.compiler.replacements.nodes.ArrayRegionCompareToNode}. These intrinsics may work * with fixed strides of 1, 2 or 4 bytes per element, or with a dynamic parameter containing the * stride in log2 format, i.e. {@code 0 -> 1 byte, 1 -> 2 byte, 2 -> 4 byte}. If an intrinsic method * has two array parameters with potentially different strides, both log2 stride values are encoded diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/SuppressFBWarnings.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/SuppressFBWarnings.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/SuppressFBWarnings.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/SuppressFBWarnings.java index 5679095e0064..9b16e5f364dd 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/SuppressFBWarnings.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/SuppressFBWarnings.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.common; +package jdk.graal.compiler.core.common; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/SuppressSVMWarnings.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/SuppressSVMWarnings.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/SuppressSVMWarnings.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/SuppressSVMWarnings.java index 0d12ba595ec7..893b2e8ee450 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/SuppressSVMWarnings.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/SuppressSVMWarnings.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.common; +package jdk.graal.compiler.core.common; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/alloc/BasicBlockOrderUtils.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/alloc/BasicBlockOrderUtils.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/alloc/BasicBlockOrderUtils.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/alloc/BasicBlockOrderUtils.java index d67f4474874c..b31b9903c7a1 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/alloc/BasicBlockOrderUtils.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/alloc/BasicBlockOrderUtils.java @@ -22,16 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.common.alloc; +package jdk.graal.compiler.core.common.alloc; import java.util.ArrayList; import java.util.BitSet; import java.util.Comparator; import java.util.PriorityQueue; -import jdk.compiler.graal.core.common.cfg.BasicBlock; -import jdk.compiler.graal.core.common.cfg.CodeEmissionOrder.ComputationTime; -import jdk.compiler.graal.debug.GraalError; +import jdk.graal.compiler.core.common.cfg.BasicBlock; +import jdk.graal.compiler.core.common.cfg.CodeEmissionOrder.ComputationTime; +import jdk.graal.compiler.debug.GraalError; public final class BasicBlockOrderUtils { diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/alloc/DefaultCodeEmissionOrder.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/alloc/DefaultCodeEmissionOrder.java similarity index 96% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/alloc/DefaultCodeEmissionOrder.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/alloc/DefaultCodeEmissionOrder.java index 09d043ec5d33..c8c2f4d486c6 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/alloc/DefaultCodeEmissionOrder.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/alloc/DefaultCodeEmissionOrder.java @@ -23,16 +23,16 @@ * questions. */ -package jdk.compiler.graal.core.common.alloc; +package jdk.graal.compiler.core.common.alloc; import java.util.BitSet; import java.util.PriorityQueue; -import jdk.compiler.graal.core.common.cfg.BasicBlock; -import jdk.compiler.graal.core.common.cfg.AbstractControlFlowGraph; -import jdk.compiler.graal.core.common.cfg.CodeEmissionOrder; -import jdk.compiler.graal.core.common.cfg.Loop; -import jdk.compiler.graal.options.OptionValues; +import jdk.graal.compiler.core.common.cfg.BasicBlock; +import jdk.graal.compiler.core.common.cfg.AbstractControlFlowGraph; +import jdk.graal.compiler.core.common.cfg.CodeEmissionOrder; +import jdk.graal.compiler.core.common.cfg.Loop; +import jdk.graal.compiler.options.OptionValues; /** * Computes an ordering of the blocks that can be used by the machine code generator. The machine diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/alloc/LinearScanOrder.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/alloc/LinearScanOrder.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/alloc/LinearScanOrder.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/alloc/LinearScanOrder.java index 785ea1a8641b..6b50b4f2305a 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/alloc/LinearScanOrder.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/alloc/LinearScanOrder.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.common.alloc; +package jdk.graal.compiler.core.common.alloc; import java.util.BitSet; import java.util.PriorityQueue; -import jdk.compiler.graal.core.common.cfg.BasicBlock; -import jdk.compiler.graal.core.common.cfg.AbstractControlFlowGraph; +import jdk.graal.compiler.core.common.cfg.BasicBlock; +import jdk.graal.compiler.core.common.cfg.AbstractControlFlowGraph; /** * Computes an ordering of the blocks that can be used by the linear scan register allocator. diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/alloc/RegisterAllocationConfig.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/alloc/RegisterAllocationConfig.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/alloc/RegisterAllocationConfig.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/alloc/RegisterAllocationConfig.java index 1cb36f48dd66..1e3f30af0b7b 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/alloc/RegisterAllocationConfig.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/alloc/RegisterAllocationConfig.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.common.alloc; +package jdk.graal.compiler.core.common.alloc; import java.util.Arrays; import org.graalvm.collections.EconomicMap; import org.graalvm.collections.Equivalence; -import jdk.compiler.graal.core.common.GraalOptions; +import jdk.graal.compiler.core.common.GraalOptions; import jdk.vm.ci.code.Register; import jdk.vm.ci.code.Register.RegisterCategory; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/calc/CanonicalCondition.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/calc/CanonicalCondition.java similarity index 95% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/calc/CanonicalCondition.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/calc/CanonicalCondition.java index 77aa7ca7b2c6..3a7d237d3c96 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/calc/CanonicalCondition.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/calc/CanonicalCondition.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.common.calc; +package jdk.graal.compiler.core.common.calc; -import jdk.compiler.graal.core.common.type.Stamp; +import jdk.graal.compiler.core.common.type.Stamp; import jdk.vm.ci.meta.Constant; import jdk.vm.ci.meta.ConstantReflectionProvider; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/calc/Condition.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/calc/Condition.java similarity index 99% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/calc/Condition.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/calc/Condition.java index ca2762557a16..b5a20152a000 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/calc/Condition.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/calc/Condition.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.common.calc; +package jdk.graal.compiler.core.common.calc; -import jdk.compiler.graal.core.common.type.Stamp; -import jdk.compiler.graal.debug.GraalError; +import jdk.graal.compiler.core.common.type.Stamp; +import jdk.graal.compiler.debug.GraalError; import jdk.vm.ci.meta.Constant; import jdk.vm.ci.meta.ConstantReflectionProvider; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/calc/FloatConvert.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/calc/FloatConvert.java similarity index 93% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/calc/FloatConvert.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/calc/FloatConvert.java index e7e1604a00aa..e5a3503f81fd 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/calc/FloatConvert.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/calc/FloatConvert.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.common.calc; +package jdk.graal.compiler.core.common.calc; -import jdk.compiler.graal.core.common.type.FloatStamp; -import jdk.compiler.graal.core.common.type.IntegerStamp; -import jdk.compiler.graal.core.common.type.PrimitiveStamp; -import jdk.compiler.graal.core.common.type.Stamp; -import jdk.compiler.graal.debug.GraalError; +import jdk.graal.compiler.core.common.type.FloatStamp; +import jdk.graal.compiler.core.common.type.IntegerStamp; +import jdk.graal.compiler.core.common.type.PrimitiveStamp; +import jdk.graal.compiler.core.common.type.Stamp; +import jdk.graal.compiler.debug.GraalError; public enum FloatConvert { F2I(FloatConvertCategory.FloatingPointToInteger, 32), diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/calc/FloatConvertCategory.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/calc/FloatConvertCategory.java similarity index 96% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/calc/FloatConvertCategory.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/calc/FloatConvertCategory.java index 52389ea5ff36..f2762eb13421 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/calc/FloatConvertCategory.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/calc/FloatConvertCategory.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.common.calc; +package jdk.graal.compiler.core.common.calc; public enum FloatConvertCategory { FloatingPointToInteger, diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/calc/ReinterpretUtils.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/calc/ReinterpretUtils.java similarity index 96% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/calc/ReinterpretUtils.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/calc/ReinterpretUtils.java index c3f0e69461e4..9aec09e23742 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/calc/ReinterpretUtils.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/calc/ReinterpretUtils.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.common.calc; +package jdk.graal.compiler.core.common.calc; import java.nio.ByteBuffer; import java.nio.ByteOrder; -import jdk.compiler.graal.core.common.type.ArithmeticStamp; -import jdk.compiler.graal.core.common.type.FloatStamp; -import jdk.compiler.graal.core.common.type.IntegerStamp; -import jdk.compiler.graal.core.common.type.Stamp; +import jdk.graal.compiler.core.common.type.ArithmeticStamp; +import jdk.graal.compiler.core.common.type.FloatStamp; +import jdk.graal.compiler.core.common.type.IntegerStamp; +import jdk.graal.compiler.core.common.type.Stamp; import jdk.vm.ci.code.CodeUtil; import jdk.vm.ci.meta.Constant; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/calc/UnsignedMath.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/calc/UnsignedMath.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/calc/UnsignedMath.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/calc/UnsignedMath.java index fb6ca62753af..5d24422af16c 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/calc/UnsignedMath.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/calc/UnsignedMath.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.common.calc; +package jdk.graal.compiler.core.common.calc; //JaCoCo Exclude diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/cfg/AbstractControlFlowGraph.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/cfg/AbstractControlFlowGraph.java similarity index 99% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/cfg/AbstractControlFlowGraph.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/cfg/AbstractControlFlowGraph.java index 22ff1c217a28..c76e435eb14e 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/cfg/AbstractControlFlowGraph.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/cfg/AbstractControlFlowGraph.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.common.cfg; +package jdk.graal.compiler.core.common.cfg; import java.util.Collection; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/cfg/BasicBlock.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/cfg/BasicBlock.java similarity index 99% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/cfg/BasicBlock.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/cfg/BasicBlock.java index ae84f35da2fd..01f121eb25ff 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/cfg/BasicBlock.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/cfg/BasicBlock.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.common.cfg; +package jdk.graal.compiler.core.common.cfg; import java.util.Comparator; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/cfg/BasicBlockSet.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/cfg/BasicBlockSet.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/cfg/BasicBlockSet.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/cfg/BasicBlockSet.java index 31c0e0162ad4..888aaa6f0268 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/cfg/BasicBlockSet.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/cfg/BasicBlockSet.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.common.cfg; +package jdk.graal.compiler.core.common.cfg; import java.util.BitSet; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/cfg/BlockMap.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/cfg/BlockMap.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/cfg/BlockMap.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/cfg/BlockMap.java index a32d390e8b6b..66f7bfaea774 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/cfg/BlockMap.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/cfg/BlockMap.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.common.cfg; +package jdk.graal.compiler.core.common.cfg; public class BlockMap { diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/cfg/CFGVerifier.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/cfg/CFGVerifier.java similarity index 99% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/cfg/CFGVerifier.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/cfg/CFGVerifier.java index cd9a7a83b67a..8b70b3760cc8 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/cfg/CFGVerifier.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/cfg/CFGVerifier.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.common.cfg; +package jdk.graal.compiler.core.common.cfg; import java.util.ArrayDeque; import java.util.Deque; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/cfg/CodeEmissionOrder.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/cfg/CodeEmissionOrder.java similarity index 95% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/cfg/CodeEmissionOrder.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/cfg/CodeEmissionOrder.java index 461b9b645562..82c6abc686f3 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/cfg/CodeEmissionOrder.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/cfg/CodeEmissionOrder.java @@ -23,9 +23,9 @@ * questions. */ -package jdk.compiler.graal.core.common.cfg; +package jdk.graal.compiler.core.common.cfg; -import jdk.compiler.graal.options.OptionValues; +import jdk.graal.compiler.options.OptionValues; /** * Interface to compute an ordering of the blocks that can be used by the machine code generator. diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/cfg/DominatorOptimizationProblem.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/cfg/DominatorOptimizationProblem.java similarity index 99% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/cfg/DominatorOptimizationProblem.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/cfg/DominatorOptimizationProblem.java index a0c255cde8cd..18a12545eb8b 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/cfg/DominatorOptimizationProblem.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/cfg/DominatorOptimizationProblem.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.common.cfg; +package jdk.graal.compiler.core.common.cfg; import java.util.Arrays; import java.util.BitSet; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/cfg/Loop.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/cfg/Loop.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/cfg/Loop.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/cfg/Loop.java index 75764359358d..7f1e34ef2b6b 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/cfg/Loop.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/cfg/Loop.java @@ -23,9 +23,9 @@ * questions. */ -package jdk.compiler.graal.core.common.cfg; +package jdk.graal.compiler.core.common.cfg; -import static jdk.compiler.graal.core.common.cfg.BasicBlock.BLOCK_ID_COMPARATOR; +import static jdk.graal.compiler.core.common.cfg.BasicBlock.BLOCK_ID_COMPARATOR; import java.util.ArrayList; import java.util.Collections; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/cfg/PropertyConsumable.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/cfg/PropertyConsumable.java similarity index 96% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/cfg/PropertyConsumable.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/cfg/PropertyConsumable.java index de47f2df83cc..a1bf52982f4e 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/cfg/PropertyConsumable.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/cfg/PropertyConsumable.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.common.cfg; +package jdk.graal.compiler.core.common.cfg; import java.util.function.BiConsumer; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/doc-files/MitigateSpeculativeExecutionAttacksHelp.txt b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/doc-files/MitigateSpeculativeExecutionAttacksHelp.txt similarity index 100% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/doc-files/MitigateSpeculativeExecutionAttacksHelp.txt rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/doc-files/MitigateSpeculativeExecutionAttacksHelp.txt diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/doc-files/TraceInliningHelp.txt b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/doc-files/TraceInliningHelp.txt similarity index 100% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/doc-files/TraceInliningHelp.txt rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/doc-files/TraceInliningHelp.txt diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/memory/BarrierType.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/memory/BarrierType.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/memory/BarrierType.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/memory/BarrierType.java index 9fdb48a93204..d083baa1c843 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/memory/BarrierType.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/memory/BarrierType.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.common.memory; +package jdk.graal.compiler.core.common.memory; /** * The types of write and read barriers attached to memory operations. diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/memory/MemoryExtendKind.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/memory/MemoryExtendKind.java similarity index 93% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/memory/MemoryExtendKind.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/memory/MemoryExtendKind.java index fd1e7a5a216b..7cae607e118e 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/memory/MemoryExtendKind.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/memory/MemoryExtendKind.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.common.memory; +package jdk.graal.compiler.core.common.memory; -import jdk.compiler.graal.core.common.type.ArithmeticOpTable; -import jdk.compiler.graal.core.common.type.IntegerStamp; -import jdk.compiler.graal.core.common.type.Stamp; -import jdk.compiler.graal.debug.GraalError; +import jdk.graal.compiler.core.common.type.ArithmeticOpTable; +import jdk.graal.compiler.core.common.type.IntegerStamp; +import jdk.graal.compiler.core.common.type.Stamp; +import jdk.graal.compiler.debug.GraalError; /** * Enumerates the different extend kinds which may be able to be folded into an diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/memory/MemoryOrderMode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/memory/MemoryOrderMode.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/memory/MemoryOrderMode.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/memory/MemoryOrderMode.java index f74479bb0037..c56b2db8087d 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/memory/MemoryOrderMode.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/memory/MemoryOrderMode.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.common.memory; +package jdk.graal.compiler.core.common.memory; import jdk.vm.ci.meta.ResolvedJavaField; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/spi/CodeGenProviders.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/spi/CodeGenProviders.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/spi/CodeGenProviders.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/spi/CodeGenProviders.java index d8c6b06b4402..66f85ae0ac49 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/spi/CodeGenProviders.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/spi/CodeGenProviders.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.common.spi; +package jdk.graal.compiler.core.common.spi; import jdk.vm.ci.code.CodeCacheProvider; import jdk.vm.ci.meta.ConstantReflectionProvider; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/spi/ConstantFieldProvider.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/spi/ConstantFieldProvider.java similarity index 96% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/spi/ConstantFieldProvider.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/spi/ConstantFieldProvider.java index ed53402805c6..4a8380261ea9 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/spi/ConstantFieldProvider.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/spi/ConstantFieldProvider.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.common.spi; +package jdk.graal.compiler.core.common.spi; -import jdk.compiler.graal.options.OptionValues; +import jdk.graal.compiler.options.OptionValues; import jdk.vm.ci.meta.JavaConstant; import jdk.vm.ci.meta.ResolvedJavaField; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/spi/ForeignCallDescriptor.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/spi/ForeignCallDescriptor.java similarity index 99% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/spi/ForeignCallDescriptor.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/spi/ForeignCallDescriptor.java index 13cd87527985..1eceb6e38ce5 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/spi/ForeignCallDescriptor.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/spi/ForeignCallDescriptor.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.common.spi; +package jdk.graal.compiler.core.common.spi; import java.util.Arrays; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/spi/ForeignCallLinkage.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/spi/ForeignCallLinkage.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/spi/ForeignCallLinkage.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/spi/ForeignCallLinkage.java index 55f7ee3e5f4c..31315b1ed11c 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/spi/ForeignCallLinkage.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/spi/ForeignCallLinkage.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.common.spi; +package jdk.graal.compiler.core.common.spi; import jdk.vm.ci.code.CallingConvention; import jdk.vm.ci.meta.InvokeTarget; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/spi/ForeignCallSignature.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/spi/ForeignCallSignature.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/spi/ForeignCallSignature.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/spi/ForeignCallSignature.java index 3eaa62bc11af..c9db91b3aeb4 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/spi/ForeignCallSignature.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/spi/ForeignCallSignature.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.common.spi; +package jdk.graal.compiler.core.common.spi; import java.util.Arrays; import java.util.regex.Pattern; -import jdk.compiler.graal.debug.GraalError; +import jdk.graal.compiler.debug.GraalError; /** * The name and signature of a {@link ForeignCallDescriptor foreign call}. diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/spi/ForeignCallsProvider.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/spi/ForeignCallsProvider.java similarity index 95% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/spi/ForeignCallsProvider.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/spi/ForeignCallsProvider.java index 78e4b3b1ecc2..ade749a08926 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/spi/ForeignCallsProvider.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/spi/ForeignCallsProvider.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.common.spi; +package jdk.graal.compiler.core.common.spi; -import jdk.compiler.graal.core.common.LIRKind; +import jdk.graal.compiler.core.common.LIRKind; import jdk.vm.ci.code.ValueKindFactory; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/spi/JavaConstantFieldProvider.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/spi/JavaConstantFieldProvider.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/spi/JavaConstantFieldProvider.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/spi/JavaConstantFieldProvider.java index 81f9825376c4..fb1d8682ae20 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/spi/JavaConstantFieldProvider.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/spi/JavaConstantFieldProvider.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.common.spi; +package jdk.graal.compiler.core.common.spi; import java.util.Arrays; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.options.Option; -import jdk.compiler.graal.options.OptionKey; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.options.Option; +import jdk.graal.compiler.options.OptionKey; import jdk.vm.ci.meta.JavaConstant; import jdk.vm.ci.meta.JavaType; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/spi/LIRKindTool.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/spi/LIRKindTool.java similarity index 95% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/spi/LIRKindTool.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/spi/LIRKindTool.java index 9c484dd8bd66..8980b64b04ad 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/spi/LIRKindTool.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/spi/LIRKindTool.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.common.spi; +package jdk.graal.compiler.core.common.spi; -import jdk.compiler.graal.core.common.LIRKind; +import jdk.graal.compiler.core.common.LIRKind; /** * This interface can be used to access platform and VM specific kinds. diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/spi/MetaAccessExtensionProvider.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/spi/MetaAccessExtensionProvider.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/spi/MetaAccessExtensionProvider.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/spi/MetaAccessExtensionProvider.java index d1273d7762ef..8c1a803f0a23 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/spi/MetaAccessExtensionProvider.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/spi/MetaAccessExtensionProvider.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.common.spi; +package jdk.graal.compiler.core.common.spi; import jdk.vm.ci.meta.JavaKind; import jdk.vm.ci.meta.JavaType; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/type/AbstractObjectStamp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/type/AbstractObjectStamp.java similarity index 99% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/type/AbstractObjectStamp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/type/AbstractObjectStamp.java index 682211133374..a4655301b103 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/type/AbstractObjectStamp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/type/AbstractObjectStamp.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.common.type; +package jdk.graal.compiler.core.common.type; import java.util.AbstractList; import java.util.Objects; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/type/AbstractPointerStamp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/type/AbstractPointerStamp.java similarity index 99% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/type/AbstractPointerStamp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/type/AbstractPointerStamp.java index cfd6e508fa84..7596aae2b2b0 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/type/AbstractPointerStamp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/type/AbstractPointerStamp.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.common.type; +package jdk.graal.compiler.core.common.type; import jdk.vm.ci.meta.Constant; import jdk.vm.ci.meta.JavaConstant; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/type/ArithmeticOpTable.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/type/ArithmeticOpTable.java similarity index 94% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/type/ArithmeticOpTable.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/type/ArithmeticOpTable.java index b89ed4417d40..d59e30f4b976 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/type/ArithmeticOpTable.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/type/ArithmeticOpTable.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.common.type; +package jdk.graal.compiler.core.common.type; import static jdk.vm.ci.meta.MetaUtil.getSimpleName; @@ -30,35 +30,35 @@ import java.util.Objects; import java.util.function.Function; -import jdk.compiler.graal.core.common.calc.FloatConvert; -import jdk.compiler.graal.core.common.type.ArithmeticOpTable.BinaryOp.Add; -import jdk.compiler.graal.core.common.type.ArithmeticOpTable.BinaryOp.And; -import jdk.compiler.graal.core.common.type.ArithmeticOpTable.BinaryOp.Compress; -import jdk.compiler.graal.core.common.type.ArithmeticOpTable.BinaryOp.Div; -import jdk.compiler.graal.core.common.type.ArithmeticOpTable.BinaryOp.Expand; -import jdk.compiler.graal.core.common.type.ArithmeticOpTable.BinaryOp.Max; -import jdk.compiler.graal.core.common.type.ArithmeticOpTable.BinaryOp.Min; -import jdk.compiler.graal.core.common.type.ArithmeticOpTable.BinaryOp.Mul; -import jdk.compiler.graal.core.common.type.ArithmeticOpTable.BinaryOp.MulHigh; -import jdk.compiler.graal.core.common.type.ArithmeticOpTable.BinaryOp.Or; -import jdk.compiler.graal.core.common.type.ArithmeticOpTable.BinaryOp.Rem; -import jdk.compiler.graal.core.common.type.ArithmeticOpTable.BinaryOp.Sub; -import jdk.compiler.graal.core.common.type.ArithmeticOpTable.BinaryOp.UMax; -import jdk.compiler.graal.core.common.type.ArithmeticOpTable.BinaryOp.UMin; -import jdk.compiler.graal.core.common.type.ArithmeticOpTable.BinaryOp.UMulHigh; -import jdk.compiler.graal.core.common.type.ArithmeticOpTable.BinaryOp.Xor; -import jdk.compiler.graal.core.common.type.ArithmeticOpTable.IntegerConvertOp.Narrow; -import jdk.compiler.graal.core.common.type.ArithmeticOpTable.IntegerConvertOp.SignExtend; -import jdk.compiler.graal.core.common.type.ArithmeticOpTable.IntegerConvertOp.ZeroExtend; -import jdk.compiler.graal.core.common.type.ArithmeticOpTable.ShiftOp.Shl; -import jdk.compiler.graal.core.common.type.ArithmeticOpTable.ShiftOp.Shr; -import jdk.compiler.graal.core.common.type.ArithmeticOpTable.ShiftOp.UShr; -import jdk.compiler.graal.core.common.type.ArithmeticOpTable.UnaryOp.Abs; -import jdk.compiler.graal.core.common.type.ArithmeticOpTable.UnaryOp.Neg; -import jdk.compiler.graal.core.common.type.ArithmeticOpTable.UnaryOp.Not; -import jdk.compiler.graal.core.common.type.ArithmeticOpTable.UnaryOp.Sqrt; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.util.CollectionsUtil; +import jdk.graal.compiler.core.common.calc.FloatConvert; +import jdk.graal.compiler.core.common.type.ArithmeticOpTable.BinaryOp.Add; +import jdk.graal.compiler.core.common.type.ArithmeticOpTable.BinaryOp.And; +import jdk.graal.compiler.core.common.type.ArithmeticOpTable.BinaryOp.Compress; +import jdk.graal.compiler.core.common.type.ArithmeticOpTable.BinaryOp.Div; +import jdk.graal.compiler.core.common.type.ArithmeticOpTable.BinaryOp.Expand; +import jdk.graal.compiler.core.common.type.ArithmeticOpTable.BinaryOp.Max; +import jdk.graal.compiler.core.common.type.ArithmeticOpTable.BinaryOp.Min; +import jdk.graal.compiler.core.common.type.ArithmeticOpTable.BinaryOp.Mul; +import jdk.graal.compiler.core.common.type.ArithmeticOpTable.BinaryOp.MulHigh; +import jdk.graal.compiler.core.common.type.ArithmeticOpTable.BinaryOp.Or; +import jdk.graal.compiler.core.common.type.ArithmeticOpTable.BinaryOp.Rem; +import jdk.graal.compiler.core.common.type.ArithmeticOpTable.BinaryOp.Sub; +import jdk.graal.compiler.core.common.type.ArithmeticOpTable.BinaryOp.UMax; +import jdk.graal.compiler.core.common.type.ArithmeticOpTable.BinaryOp.UMin; +import jdk.graal.compiler.core.common.type.ArithmeticOpTable.BinaryOp.UMulHigh; +import jdk.graal.compiler.core.common.type.ArithmeticOpTable.BinaryOp.Xor; +import jdk.graal.compiler.core.common.type.ArithmeticOpTable.IntegerConvertOp.Narrow; +import jdk.graal.compiler.core.common.type.ArithmeticOpTable.IntegerConvertOp.SignExtend; +import jdk.graal.compiler.core.common.type.ArithmeticOpTable.IntegerConvertOp.ZeroExtend; +import jdk.graal.compiler.core.common.type.ArithmeticOpTable.ShiftOp.Shl; +import jdk.graal.compiler.core.common.type.ArithmeticOpTable.ShiftOp.Shr; +import jdk.graal.compiler.core.common.type.ArithmeticOpTable.ShiftOp.UShr; +import jdk.graal.compiler.core.common.type.ArithmeticOpTable.UnaryOp.Abs; +import jdk.graal.compiler.core.common.type.ArithmeticOpTable.UnaryOp.Neg; +import jdk.graal.compiler.core.common.type.ArithmeticOpTable.UnaryOp.Not; +import jdk.graal.compiler.core.common.type.ArithmeticOpTable.UnaryOp.Sqrt; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.util.CollectionsUtil; import jdk.vm.ci.meta.Constant; import jdk.vm.ci.meta.JavaKind; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/type/ArithmeticStamp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/type/ArithmeticStamp.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/type/ArithmeticStamp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/type/ArithmeticStamp.java index 2cd032221402..06df1fa67557 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/type/ArithmeticStamp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/type/ArithmeticStamp.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.common.type; +package jdk.graal.compiler.core.common.type; import java.nio.ByteBuffer; import java.util.Objects; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/type/CompressibleConstant.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/type/CompressibleConstant.java similarity index 96% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/type/CompressibleConstant.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/type/CompressibleConstant.java index 8708c1630b7b..185c5801a345 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/type/CompressibleConstant.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/type/CompressibleConstant.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.common.type; +package jdk.graal.compiler.core.common.type; import jdk.vm.ci.meta.JavaConstant; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/type/DataPointerConstant.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/type/DataPointerConstant.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/type/DataPointerConstant.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/type/DataPointerConstant.java index d3553f740c53..ffd0924a34ce 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/type/DataPointerConstant.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/type/DataPointerConstant.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.common.type; +package jdk.graal.compiler.core.common.type; import jdk.vm.ci.meta.Constant; import jdk.vm.ci.meta.SerializableConstant; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/type/FloatStamp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/type/FloatStamp.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/type/FloatStamp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/type/FloatStamp.java index 6b2306802ece..96411922a937 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/type/FloatStamp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/type/FloatStamp.java @@ -22,22 +22,22 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.common.type; +package jdk.graal.compiler.core.common.type; -import static jdk.compiler.graal.core.common.calc.FloatConvert.D2F; -import static jdk.compiler.graal.core.common.calc.FloatConvert.D2I; -import static jdk.compiler.graal.core.common.calc.FloatConvert.D2L; -import static jdk.compiler.graal.core.common.calc.FloatConvert.F2D; -import static jdk.compiler.graal.core.common.calc.FloatConvert.F2I; -import static jdk.compiler.graal.core.common.calc.FloatConvert.F2L; +import static jdk.graal.compiler.core.common.calc.FloatConvert.D2F; +import static jdk.graal.compiler.core.common.calc.FloatConvert.D2I; +import static jdk.graal.compiler.core.common.calc.FloatConvert.D2L; +import static jdk.graal.compiler.core.common.calc.FloatConvert.F2D; +import static jdk.graal.compiler.core.common.calc.FloatConvert.F2I; +import static jdk.graal.compiler.core.common.calc.FloatConvert.F2L; import java.nio.ByteBuffer; import java.util.function.DoubleBinaryOperator; -import jdk.compiler.graal.core.common.LIRKind; -import jdk.compiler.graal.core.common.calc.ReinterpretUtils; -import jdk.compiler.graal.core.common.spi.LIRKindTool; -import jdk.compiler.graal.debug.GraalError; +import jdk.graal.compiler.core.common.LIRKind; +import jdk.graal.compiler.core.common.calc.ReinterpretUtils; +import jdk.graal.compiler.core.common.spi.LIRKindTool; +import jdk.graal.compiler.debug.GraalError; import jdk.vm.ci.meta.Constant; import jdk.vm.ci.meta.JavaConstant; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/type/IllegalStamp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/type/IllegalStamp.java similarity index 95% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/type/IllegalStamp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/type/IllegalStamp.java index 8a9ca1ceb874..0556da9b3680 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/type/IllegalStamp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/type/IllegalStamp.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.common.type; +package jdk.graal.compiler.core.common.type; -import jdk.compiler.graal.core.common.LIRKind; -import jdk.compiler.graal.core.common.spi.LIRKindTool; -import jdk.compiler.graal.debug.GraalError; +import jdk.graal.compiler.core.common.LIRKind; +import jdk.graal.compiler.core.common.spi.LIRKindTool; +import jdk.graal.compiler.debug.GraalError; import jdk.vm.ci.meta.Constant; import jdk.vm.ci.meta.JavaKind; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/type/IntegerStamp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/type/IntegerStamp.java similarity index 99% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/type/IntegerStamp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/type/IntegerStamp.java index 633e4b0b846d..05b0d9ae4182 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/type/IntegerStamp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/type/IntegerStamp.java @@ -22,23 +22,23 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.common.type; +package jdk.graal.compiler.core.common.type; import static jdk.vm.ci.code.CodeUtil.isPowerOf2; -import static jdk.compiler.graal.core.common.calc.FloatConvert.I2D; -import static jdk.compiler.graal.core.common.calc.FloatConvert.I2F; -import static jdk.compiler.graal.core.common.calc.FloatConvert.L2D; -import static jdk.compiler.graal.core.common.calc.FloatConvert.L2F; +import static jdk.graal.compiler.core.common.calc.FloatConvert.I2D; +import static jdk.graal.compiler.core.common.calc.FloatConvert.I2F; +import static jdk.graal.compiler.core.common.calc.FloatConvert.L2D; +import static jdk.graal.compiler.core.common.calc.FloatConvert.L2F; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.nio.ByteBuffer; -import jdk.compiler.graal.core.common.LIRKind; -import jdk.compiler.graal.core.common.NumUtil; -import jdk.compiler.graal.core.common.calc.ReinterpretUtils; -import jdk.compiler.graal.core.common.spi.LIRKindTool; -import jdk.compiler.graal.debug.GraalError; +import jdk.graal.compiler.core.common.LIRKind; +import jdk.graal.compiler.core.common.NumUtil; +import jdk.graal.compiler.core.common.calc.ReinterpretUtils; +import jdk.graal.compiler.core.common.spi.LIRKindTool; +import jdk.graal.compiler.debug.GraalError; import jdk.vm.ci.code.CodeUtil; import jdk.vm.ci.meta.Constant; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/type/ObjectStamp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/type/ObjectStamp.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/type/ObjectStamp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/type/ObjectStamp.java index 24021ae584d1..f1a56c0e1168 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/type/ObjectStamp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/type/ObjectStamp.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.common.type; +package jdk.graal.compiler.core.common.type; -import jdk.compiler.graal.core.common.LIRKind; -import jdk.compiler.graal.core.common.spi.LIRKindTool; +import jdk.graal.compiler.core.common.LIRKind; +import jdk.graal.compiler.core.common.spi.LIRKindTool; import jdk.vm.ci.meta.Constant; import jdk.vm.ci.meta.JavaConstant; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/type/PrimitiveStamp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/type/PrimitiveStamp.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/type/PrimitiveStamp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/type/PrimitiveStamp.java index 7bf99b99f176..e93c7ef02e95 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/type/PrimitiveStamp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/type/PrimitiveStamp.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.common.type; +package jdk.graal.compiler.core.common.type; -import jdk.compiler.graal.debug.GraalError; +import jdk.graal.compiler.debug.GraalError; import jdk.vm.ci.meta.Constant; import jdk.vm.ci.meta.JavaConstant; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/type/RawPointerStamp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/type/RawPointerStamp.java similarity index 95% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/type/RawPointerStamp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/type/RawPointerStamp.java index eda4daf77a78..47bd603641e9 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/type/RawPointerStamp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/type/RawPointerStamp.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.common.type; +package jdk.graal.compiler.core.common.type; -import jdk.compiler.graal.core.common.LIRKind; -import jdk.compiler.graal.core.common.spi.LIRKindTool; -import jdk.compiler.graal.debug.GraalError; +import jdk.graal.compiler.core.common.LIRKind; +import jdk.graal.compiler.core.common.spi.LIRKindTool; +import jdk.graal.compiler.debug.GraalError; import jdk.vm.ci.meta.Constant; import jdk.vm.ci.meta.MemoryAccessProvider; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/type/Stamp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/type/Stamp.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/type/Stamp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/type/Stamp.java index c93c6f0fcaaa..0330e870e799 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/type/Stamp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/type/Stamp.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.common.type; +package jdk.graal.compiler.core.common.type; -import jdk.compiler.graal.core.common.LIRKind; -import jdk.compiler.graal.core.common.calc.Condition; -import jdk.compiler.graal.core.common.spi.LIRKindTool; -import jdk.compiler.graal.serviceprovider.SpeculationReasonGroup.SpeculationContextObject; +import jdk.graal.compiler.core.common.LIRKind; +import jdk.graal.compiler.core.common.calc.Condition; +import jdk.graal.compiler.core.common.spi.LIRKindTool; +import jdk.graal.compiler.serviceprovider.SpeculationReasonGroup.SpeculationContextObject; import jdk.vm.ci.meta.Constant; import jdk.vm.ci.meta.ConstantReflectionProvider; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/type/StampFactory.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/type/StampFactory.java similarity index 99% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/type/StampFactory.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/type/StampFactory.java index b888f8423d7e..592753ec6bfa 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/type/StampFactory.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/type/StampFactory.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.common.type; +package jdk.graal.compiler.core.common.type; import static jdk.vm.ci.code.CodeUtil.signExtend; -import jdk.compiler.graal.core.common.NumUtil; -import jdk.compiler.graal.debug.GraalError; +import jdk.graal.compiler.core.common.NumUtil; +import jdk.graal.compiler.debug.GraalError; import jdk.vm.ci.code.CodeUtil; import jdk.vm.ci.meta.Assumptions; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/type/StampPair.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/type/StampPair.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/type/StampPair.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/type/StampPair.java index 37be3903e872..19e92892b062 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/type/StampPair.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/type/StampPair.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.common.type; +package jdk.graal.compiler.core.common.type; import java.util.Objects; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/type/SymbolicJVMCIReference.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/type/SymbolicJVMCIReference.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/type/SymbolicJVMCIReference.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/type/SymbolicJVMCIReference.java index 6ce8264d8d2c..ba40a8d6f70b 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/type/SymbolicJVMCIReference.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/type/SymbolicJVMCIReference.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.common.type; +package jdk.graal.compiler.core.common.type; import jdk.vm.ci.meta.ResolvedJavaType; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/type/TypeReference.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/type/TypeReference.java similarity index 99% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/type/TypeReference.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/type/TypeReference.java index e93432872188..9872a7d5ff65 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/type/TypeReference.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/type/TypeReference.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.common.type; +package jdk.graal.compiler.core.common.type; import jdk.vm.ci.meta.Assumptions; import jdk.vm.ci.meta.ResolvedJavaType; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/type/TypedConstant.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/type/TypedConstant.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/type/TypedConstant.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/type/TypedConstant.java index cb010141a047..c4ac276a23ec 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/type/TypedConstant.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/type/TypedConstant.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.common.type; +package jdk.graal.compiler.core.common.type; import jdk.vm.ci.meta.JavaConstant; import jdk.vm.ci.meta.MetaAccessProvider; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/type/VoidStamp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/type/VoidStamp.java similarity index 95% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/type/VoidStamp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/type/VoidStamp.java index 9f4cb5b1463b..41b710ca8874 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/type/VoidStamp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/type/VoidStamp.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.common.type; +package jdk.graal.compiler.core.common.type; -import jdk.compiler.graal.core.common.LIRKind; -import jdk.compiler.graal.core.common.spi.LIRKindTool; -import jdk.compiler.graal.debug.GraalError; +import jdk.graal.compiler.core.common.LIRKind; +import jdk.graal.compiler.core.common.spi.LIRKindTool; +import jdk.graal.compiler.debug.GraalError; import jdk.vm.ci.meta.Constant; import jdk.vm.ci.meta.JavaKind; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/util/AbstractTypeReader.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/util/AbstractTypeReader.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/util/AbstractTypeReader.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/util/AbstractTypeReader.java index edb42e8d15da..fcbf7456660f 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/util/AbstractTypeReader.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/util/AbstractTypeReader.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.common.util; +package jdk.graal.compiler.core.common.util; public abstract class AbstractTypeReader implements TypeReader { @Override diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/util/BitMap2D.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/util/BitMap2D.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/util/BitMap2D.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/util/BitMap2D.java index ee7b8014a1f5..2952e376e75a 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/util/BitMap2D.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/util/BitMap2D.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.common.util; +package jdk.graal.compiler.core.common.util; import java.util.BitSet; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/util/CompilationAlarm.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/util/CompilationAlarm.java similarity index 96% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/util/CompilationAlarm.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/util/CompilationAlarm.java index 43b82f65f5d9..68e8c6a98afd 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/util/CompilationAlarm.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/util/CompilationAlarm.java @@ -22,18 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.common.util; +package jdk.graal.compiler.core.common.util; import java.util.Arrays; -import jdk.compiler.graal.debug.Assertions; -import jdk.compiler.graal.debug.TTY; -import jdk.compiler.graal.core.common.PermanentBailoutException; -import jdk.compiler.graal.graph.Graph; -import jdk.compiler.graal.options.Option; -import jdk.compiler.graal.options.OptionKey; -import jdk.compiler.graal.options.OptionType; -import jdk.compiler.graal.options.OptionValues; +import jdk.graal.compiler.debug.Assertions; +import jdk.graal.compiler.debug.TTY; +import jdk.graal.compiler.core.common.PermanentBailoutException; +import jdk.graal.compiler.graph.Graph; +import jdk.graal.compiler.options.Option; +import jdk.graal.compiler.options.OptionKey; +import jdk.graal.compiler.options.OptionType; +import jdk.graal.compiler.options.OptionValues; /** * Utility class that allows the compiler to monitor compilations that take a very long time. diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/util/EventCounter.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/util/EventCounter.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/util/EventCounter.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/util/EventCounter.java index ccd1e840b366..7d364eb9d8f9 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/util/EventCounter.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/util/EventCounter.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.common.util; +package jdk.graal.compiler.core.common.util; /** * Interface representing a counter that can overflow to trigger certain events. diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/util/FieldKey.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/util/FieldKey.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/util/FieldKey.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/util/FieldKey.java index 545ba4b4c950..3d3f5fb7a459 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/util/FieldKey.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/util/FieldKey.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.common.util; +package jdk.graal.compiler.core.common.util; import jdk.vm.ci.meta.ResolvedJavaField; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/util/FrequencyEncoder.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/util/FrequencyEncoder.java similarity index 99% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/util/FrequencyEncoder.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/util/FrequencyEncoder.java index 4faba0c78690..1d09231dd55c 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/util/FrequencyEncoder.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/util/FrequencyEncoder.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.common.util; +package jdk.graal.compiler.core.common.util; import java.util.ArrayList; import java.util.List; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/util/IntList.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/util/IntList.java similarity index 99% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/util/IntList.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/util/IntList.java index 9157b7c8716a..413fb71069f9 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/util/IntList.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/util/IntList.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.common.util; +package jdk.graal.compiler.core.common.util; import java.util.Arrays; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/util/MethodKey.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/util/MethodKey.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/util/MethodKey.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/util/MethodKey.java index e7549bd23a09..03b37394db76 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/util/MethodKey.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/util/MethodKey.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.common.util; +package jdk.graal.compiler.core.common.util; import jdk.vm.ci.meta.ResolvedJavaField; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/util/PhasePlan.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/util/PhasePlan.java similarity index 99% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/util/PhasePlan.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/util/PhasePlan.java index a400f15cb775..9286d62cdee8 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/util/PhasePlan.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/util/PhasePlan.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.common.util; +package jdk.graal.compiler.core.common.util; import java.util.Formatter; import java.util.HashMap; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/util/ReversedList.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/util/ReversedList.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/util/ReversedList.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/util/ReversedList.java index 046e9f51963e..3488bcbcf1f7 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/util/ReversedList.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/util/ReversedList.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.common.util; +package jdk.graal.compiler.core.common.util; import java.util.AbstractList; import java.util.List; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/util/TypeConversion.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/util/TypeConversion.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/util/TypeConversion.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/util/TypeConversion.java index ef1a187947dc..6c3bed64b379 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/util/TypeConversion.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/util/TypeConversion.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.common.util; +package jdk.graal.compiler.core.common.util; /** * Provides low-level value checks and conversion for signed and unsigned values of size 1, 2, and 4 diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/util/TypeReader.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/util/TypeReader.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/util/TypeReader.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/util/TypeReader.java index 9ca8910cbeb7..624b60b1eed9 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/util/TypeReader.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/util/TypeReader.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.common.util; +package jdk.graal.compiler.core.common.util; /** * Provides low-level read access for signed and unsigned values of size 1, 2, 4, and 8 bytes. diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/util/TypeWriter.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/util/TypeWriter.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/util/TypeWriter.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/util/TypeWriter.java index 22ad7b9df25c..b0c053e8dd98 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/util/TypeWriter.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/util/TypeWriter.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.common.util; +package jdk.graal.compiler.core.common.util; /** * Provides low-level sequential write access for signed and unsigned values of size 1, 2, 4, and 8 diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/util/UnsafeArrayTypeReader.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/util/UnsafeArrayTypeReader.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/util/UnsafeArrayTypeReader.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/util/UnsafeArrayTypeReader.java index a4eee8e10386..9062a498257c 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/util/UnsafeArrayTypeReader.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/util/UnsafeArrayTypeReader.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.common.util; +package jdk.graal.compiler.core.common.util; -import static jdk.compiler.graal.serviceprovider.GraalUnsafeAccess.getUnsafe; +import static jdk.graal.compiler.serviceprovider.GraalUnsafeAccess.getUnsafe; import sun.misc.Unsafe; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/util/UnsafeArrayTypeWriter.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/util/UnsafeArrayTypeWriter.java similarity index 95% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/util/UnsafeArrayTypeWriter.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/util/UnsafeArrayTypeWriter.java index bb1f108f1aa4..691528c29b57 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/util/UnsafeArrayTypeWriter.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/util/UnsafeArrayTypeWriter.java @@ -22,19 +22,19 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.common.util; +package jdk.graal.compiler.core.common.util; -import static jdk.compiler.graal.core.common.util.TypeConversion.asS1; -import static jdk.compiler.graal.core.common.util.TypeConversion.asS2; -import static jdk.compiler.graal.core.common.util.TypeConversion.asS4; -import static jdk.compiler.graal.core.common.util.TypeConversion.asU1; -import static jdk.compiler.graal.core.common.util.TypeConversion.asU2; -import static jdk.compiler.graal.core.common.util.TypeConversion.asU4; -import static jdk.compiler.graal.serviceprovider.GraalUnsafeAccess.getUnsafe; +import static jdk.graal.compiler.core.common.util.TypeConversion.asS1; +import static jdk.graal.compiler.core.common.util.TypeConversion.asS2; +import static jdk.graal.compiler.core.common.util.TypeConversion.asS4; +import static jdk.graal.compiler.core.common.util.TypeConversion.asU1; +import static jdk.graal.compiler.core.common.util.TypeConversion.asU2; +import static jdk.graal.compiler.core.common.util.TypeConversion.asU4; +import static jdk.graal.compiler.serviceprovider.GraalUnsafeAccess.getUnsafe; import java.nio.ByteBuffer; -import jdk.compiler.graal.core.common.calc.UnsignedMath; +import jdk.graal.compiler.core.common.calc.UnsignedMath; import sun.misc.Unsafe; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/util/UnsignedLong.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/util/UnsignedLong.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/util/UnsignedLong.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/util/UnsignedLong.java index 4a05d040008c..0c2e092de3e9 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/util/UnsignedLong.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/util/UnsignedLong.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.common.util; +package jdk.graal.compiler.core.common.util; public final class UnsignedLong { private final long value; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/util/Util.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/util/Util.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/util/Util.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/util/Util.java index fcb67e80e76f..fb8b02dd76c6 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/util/Util.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/util/Util.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.common.util; +package jdk.graal.compiler.core.common.util; import java.util.List; -import jdk.compiler.graal.debug.TTY; +import jdk.graal.compiler.debug.TTY; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/doc-files/CompilationFailureActionHelp.txt b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/doc-files/CompilationFailureActionHelp.txt similarity index 100% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/doc-files/CompilationFailureActionHelp.txt rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/doc-files/CompilationFailureActionHelp.txt diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/gen/BytecodeParserTool.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/gen/BytecodeParserTool.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/gen/BytecodeParserTool.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/gen/BytecodeParserTool.java index f31c0adf3aee..f7d50d9172e3 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/gen/BytecodeParserTool.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/gen/BytecodeParserTool.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.gen; +package jdk.graal.compiler.core.gen; import jdk.vm.ci.meta.Value; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/gen/DebugInfoBuilder.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/gen/DebugInfoBuilder.java similarity index 95% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/gen/DebugInfoBuilder.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/gen/DebugInfoBuilder.java index d26321d6a405..a0d3cbd73b40 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/gen/DebugInfoBuilder.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/gen/DebugInfoBuilder.java @@ -22,33 +22,33 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.gen; +package jdk.graal.compiler.core.gen; import java.util.ArrayDeque; import java.util.Arrays; import java.util.Queue; -import jdk.compiler.graal.debug.CounterKey; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.debug.GraalError; +import jdk.graal.compiler.debug.CounterKey; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.debug.GraalError; import org.graalvm.collections.EconomicMap; import org.graalvm.collections.Equivalence; -import jdk.compiler.graal.core.common.spi.MetaAccessExtensionProvider; -import jdk.compiler.graal.lir.ConstantValue; -import jdk.compiler.graal.lir.ImplicitLIRFrameState; -import jdk.compiler.graal.lir.LIRFrameState; -import jdk.compiler.graal.lir.LIRValueUtil; -import jdk.compiler.graal.lir.LabelRef; -import jdk.compiler.graal.nodes.FrameState; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.spi.NodeValueMap; -import jdk.compiler.graal.nodes.spi.NodeWithState; -import jdk.compiler.graal.nodes.util.GraphUtil; -import jdk.compiler.graal.nodes.virtual.EscapeObjectState; -import jdk.compiler.graal.nodes.virtual.MaterializedObjectState; -import jdk.compiler.graal.nodes.virtual.VirtualBoxingNode; -import jdk.compiler.graal.nodes.virtual.VirtualObjectNode; -import jdk.compiler.graal.nodes.virtual.VirtualObjectState; +import jdk.graal.compiler.core.common.spi.MetaAccessExtensionProvider; +import jdk.graal.compiler.lir.ConstantValue; +import jdk.graal.compiler.lir.ImplicitLIRFrameState; +import jdk.graal.compiler.lir.LIRFrameState; +import jdk.graal.compiler.lir.LIRValueUtil; +import jdk.graal.compiler.lir.LabelRef; +import jdk.graal.compiler.nodes.FrameState; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.spi.NodeValueMap; +import jdk.graal.compiler.nodes.spi.NodeWithState; +import jdk.graal.compiler.nodes.util.GraphUtil; +import jdk.graal.compiler.nodes.virtual.EscapeObjectState; +import jdk.graal.compiler.nodes.virtual.MaterializedObjectState; +import jdk.graal.compiler.nodes.virtual.VirtualBoxingNode; +import jdk.graal.compiler.nodes.virtual.VirtualObjectNode; +import jdk.graal.compiler.nodes.virtual.VirtualObjectState; import jdk.vm.ci.code.BytecodeFrame; import jdk.vm.ci.code.RegisterValue; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/gen/InstructionPrinter.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/gen/InstructionPrinter.java similarity index 90% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/gen/InstructionPrinter.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/gen/InstructionPrinter.java index 957bd4156258..c1c1b8c9b942 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/gen/InstructionPrinter.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/gen/InstructionPrinter.java @@ -22,17 +22,17 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.gen; +package jdk.graal.compiler.core.gen; -import static jdk.compiler.graal.core.gen.InstructionPrinter.InstructionLineColumn.BCI; -import static jdk.compiler.graal.core.gen.InstructionPrinter.InstructionLineColumn.INSTRUCTION; -import static jdk.compiler.graal.core.gen.InstructionPrinter.InstructionLineColumn.USE; -import static jdk.compiler.graal.core.gen.InstructionPrinter.InstructionLineColumn.VALUE; +import static jdk.graal.compiler.core.gen.InstructionPrinter.InstructionLineColumn.BCI; +import static jdk.graal.compiler.core.gen.InstructionPrinter.InstructionLineColumn.INSTRUCTION; +import static jdk.graal.compiler.core.gen.InstructionPrinter.InstructionLineColumn.USE; +import static jdk.graal.compiler.core.gen.InstructionPrinter.InstructionLineColumn.VALUE; -import jdk.compiler.graal.debug.LogStream; -import jdk.compiler.graal.nodeinfo.Verbosity; -import jdk.compiler.graal.nodes.StateSplit; -import jdk.compiler.graal.nodes.ValueNode; +import jdk.graal.compiler.debug.LogStream; +import jdk.graal.compiler.nodeinfo.Verbosity; +import jdk.graal.compiler.nodes.StateSplit; +import jdk.graal.compiler.nodes.ValueNode; /** * A utility for {@linkplain #printInstruction(ValueNode) printing} a node as an expression or diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/gen/LIRCompilerBackend.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/gen/LIRCompilerBackend.java similarity index 87% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/gen/LIRCompilerBackend.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/gen/LIRCompilerBackend.java index 93faeec78a0b..7e382f616098 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/gen/LIRCompilerBackend.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/gen/LIRCompilerBackend.java @@ -22,43 +22,43 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.gen; +package jdk.graal.compiler.core.gen; import java.util.Collection; import java.util.List; -import jdk.compiler.graal.code.CompilationResult; -import jdk.compiler.graal.core.LIRGenerationPhase; -import jdk.compiler.graal.core.common.alloc.LinearScanOrder; -import jdk.compiler.graal.core.common.alloc.RegisterAllocationConfig; -import jdk.compiler.graal.debug.CounterKey; -import jdk.compiler.graal.debug.DebugCloseable; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.debug.TimerKey; -import jdk.compiler.graal.core.common.GraalOptions; -import jdk.compiler.graal.core.common.cfg.CodeEmissionOrder; -import jdk.compiler.graal.core.common.cfg.CodeEmissionOrder.ComputationTime; -import jdk.compiler.graal.core.target.Backend; -import jdk.compiler.graal.lir.ComputeCodeEmissionOrder; -import jdk.compiler.graal.lir.LIR; -import jdk.compiler.graal.lir.alloc.OutOfRegistersException; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; -import jdk.compiler.graal.lir.asm.CompilationResultBuilderFactory; -import jdk.compiler.graal.lir.asm.EntryPointDecorator; -import jdk.compiler.graal.lir.framemap.FrameMap; -import jdk.compiler.graal.lir.gen.LIRGenerationResult; -import jdk.compiler.graal.lir.gen.LIRGeneratorTool; -import jdk.compiler.graal.lir.phases.AllocationPhase.AllocationContext; -import jdk.compiler.graal.lir.phases.FinalCodeAnalysisPhase.FinalCodeAnalysisContext; -import jdk.compiler.graal.lir.phases.LIRSuites; -import jdk.compiler.graal.lir.phases.PostAllocationOptimizationPhase.PostAllocationOptimizationContext; -import jdk.compiler.graal.lir.phases.PreAllocationOptimizationPhase.PreAllocationOptimizationContext; -import jdk.compiler.graal.nodes.GraphState.StageFlag; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.StructuredGraph.ScheduleResult; -import jdk.compiler.graal.nodes.cfg.HIRBlock; -import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool; +import jdk.graal.compiler.code.CompilationResult; +import jdk.graal.compiler.core.LIRGenerationPhase; +import jdk.graal.compiler.core.common.alloc.LinearScanOrder; +import jdk.graal.compiler.core.common.alloc.RegisterAllocationConfig; +import jdk.graal.compiler.debug.CounterKey; +import jdk.graal.compiler.debug.DebugCloseable; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.debug.TimerKey; +import jdk.graal.compiler.core.common.GraalOptions; +import jdk.graal.compiler.core.common.cfg.CodeEmissionOrder; +import jdk.graal.compiler.core.common.cfg.CodeEmissionOrder.ComputationTime; +import jdk.graal.compiler.core.target.Backend; +import jdk.graal.compiler.lir.ComputeCodeEmissionOrder; +import jdk.graal.compiler.lir.LIR; +import jdk.graal.compiler.lir.alloc.OutOfRegistersException; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.lir.asm.CompilationResultBuilderFactory; +import jdk.graal.compiler.lir.asm.EntryPointDecorator; +import jdk.graal.compiler.lir.framemap.FrameMap; +import jdk.graal.compiler.lir.gen.LIRGenerationResult; +import jdk.graal.compiler.lir.gen.LIRGeneratorTool; +import jdk.graal.compiler.lir.phases.AllocationPhase.AllocationContext; +import jdk.graal.compiler.lir.phases.FinalCodeAnalysisPhase.FinalCodeAnalysisContext; +import jdk.graal.compiler.lir.phases.LIRSuites; +import jdk.graal.compiler.lir.phases.PostAllocationOptimizationPhase.PostAllocationOptimizationContext; +import jdk.graal.compiler.lir.phases.PreAllocationOptimizationPhase.PreAllocationOptimizationContext; +import jdk.graal.compiler.nodes.GraphState.StageFlag; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.StructuredGraph.ScheduleResult; +import jdk.graal.compiler.nodes.cfg.HIRBlock; +import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool; import jdk.vm.ci.code.RegisterConfig; import jdk.vm.ci.code.TargetDescription; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/gen/LIRGenerationProvider.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/gen/LIRGenerationProvider.java similarity index 79% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/gen/LIRGenerationProvider.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/gen/LIRGenerationProvider.java index 53c1df934d85..f0f7385a5fbe 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/gen/LIRGenerationProvider.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/gen/LIRGenerationProvider.java @@ -22,20 +22,20 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.gen; +package jdk.graal.compiler.core.gen; -import jdk.compiler.graal.code.CompilationResult; -import jdk.compiler.graal.core.common.alloc.RegisterAllocationConfig; -import jdk.compiler.graal.core.common.CompilationIdentifier; -import jdk.compiler.graal.lir.LIR; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; -import jdk.compiler.graal.lir.asm.CompilationResultBuilderFactory; -import jdk.compiler.graal.lir.asm.EntryPointDecorator; -import jdk.compiler.graal.lir.framemap.FrameMap; -import jdk.compiler.graal.lir.gen.LIRGenerationResult; -import jdk.compiler.graal.lir.gen.LIRGeneratorTool; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool; +import jdk.graal.compiler.code.CompilationResult; +import jdk.graal.compiler.core.common.alloc.RegisterAllocationConfig; +import jdk.graal.compiler.core.common.CompilationIdentifier; +import jdk.graal.compiler.lir.LIR; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.lir.asm.CompilationResultBuilderFactory; +import jdk.graal.compiler.lir.asm.EntryPointDecorator; +import jdk.graal.compiler.lir.framemap.FrameMap; +import jdk.graal.compiler.lir.gen.LIRGenerationResult; +import jdk.graal.compiler.lir.gen.LIRGeneratorTool; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/gen/NodeLIRBuilder.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/gen/NodeLIRBuilder.java similarity index 89% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/gen/NodeLIRBuilder.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/gen/NodeLIRBuilder.java index c65ae248c091..9333783dfa47 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/gen/NodeLIRBuilder.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/gen/NodeLIRBuilder.java @@ -22,97 +22,97 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.gen; +package jdk.graal.compiler.core.gen; import static jdk.vm.ci.code.ValueUtil.asRegister; import static jdk.vm.ci.code.ValueUtil.isLegal; import static jdk.vm.ci.code.ValueUtil.isRegister; -import static jdk.compiler.graal.core.common.GraalOptions.MatchExpressions; -import static jdk.compiler.graal.core.common.SpectrePHTMitigations.Options.SpeculativeExecutionBarriers; -import static jdk.compiler.graal.core.match.ComplexMatchValue.INTERIOR_MATCH; -import static jdk.compiler.graal.lir.LIR.verifyBlock; +import static jdk.graal.compiler.core.common.GraalOptions.MatchExpressions; +import static jdk.graal.compiler.core.common.SpectrePHTMitigations.Options.SpeculativeExecutionBarriers; +import static jdk.graal.compiler.core.match.ComplexMatchValue.INTERIOR_MATCH; +import static jdk.graal.compiler.lir.LIR.verifyBlock; import java.util.ArrayList; import java.util.Collection; import java.util.List; -import jdk.compiler.graal.core.common.calc.Condition; -import jdk.compiler.graal.core.common.type.Stamp; -import jdk.compiler.graal.core.match.MatchPattern; -import jdk.compiler.graal.core.match.MatchRuleRegistry; -import jdk.compiler.graal.core.match.MatchStatement; -import jdk.compiler.graal.debug.DebugCloseable; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.debug.DebugOptions; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.debug.TTY; +import jdk.graal.compiler.core.common.calc.Condition; +import jdk.graal.compiler.core.common.type.Stamp; +import jdk.graal.compiler.core.match.MatchPattern; +import jdk.graal.compiler.core.match.MatchRuleRegistry; +import jdk.graal.compiler.core.match.MatchStatement; +import jdk.graal.compiler.debug.DebugCloseable; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.debug.DebugOptions; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.debug.TTY; import org.graalvm.collections.EconomicMap; import org.graalvm.collections.UnmodifiableMapCursor; -import jdk.compiler.graal.core.common.LIRKind; -import jdk.compiler.graal.core.common.cfg.BasicBlock; -import jdk.compiler.graal.core.common.cfg.BlockMap; -import jdk.compiler.graal.core.common.spi.ForeignCallLinkage; -import jdk.compiler.graal.core.match.ComplexMatchValue; -import jdk.compiler.graal.graph.GraalGraphError; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.graph.NodeMap; -import jdk.compiler.graal.graph.NodeSourcePosition; -import jdk.compiler.graal.graph.iterators.NodeIterable; -import jdk.compiler.graal.lir.FullInfopointOp; -import jdk.compiler.graal.lir.LIRFrameState; -import jdk.compiler.graal.lir.LIRInstruction; -import jdk.compiler.graal.lir.LabelRef; -import jdk.compiler.graal.lir.StandardOp.JumpOp; -import jdk.compiler.graal.lir.StandardOp.LabelOp; -import jdk.compiler.graal.lir.SwitchStrategy; -import jdk.compiler.graal.lir.Variable; -import jdk.compiler.graal.lir.debug.LIRGenerationDebugContext; -import jdk.compiler.graal.lir.framemap.FrameMapBuilder; -import jdk.compiler.graal.lir.gen.LIRGenerator; -import jdk.compiler.graal.lir.gen.LIRGenerator.Options; -import jdk.compiler.graal.lir.gen.LIRGeneratorTool; -import jdk.compiler.graal.lir.gen.LIRGeneratorTool.BlockScope; -import jdk.compiler.graal.nodes.AbstractBeginNode; -import jdk.compiler.graal.nodes.AbstractEndNode; -import jdk.compiler.graal.nodes.AbstractMergeNode; -import jdk.compiler.graal.nodes.DeoptimizingNode; -import jdk.compiler.graal.nodes.DirectCallTargetNode; -import jdk.compiler.graal.nodes.FixedNode; -import jdk.compiler.graal.nodes.FrameState; -import jdk.compiler.graal.nodes.FullInfopointNode; -import jdk.compiler.graal.nodes.IfNode; -import jdk.compiler.graal.nodes.ImplicitNullCheckNode; -import jdk.compiler.graal.nodes.IndirectCallTargetNode; -import jdk.compiler.graal.nodes.Invoke; -import jdk.compiler.graal.nodes.InvokeWithExceptionNode; -import jdk.compiler.graal.nodes.LogicConstantNode; -import jdk.compiler.graal.nodes.LogicNode; -import jdk.compiler.graal.nodes.LoopEndNode; -import jdk.compiler.graal.nodes.LoweredCallTargetNode; -import jdk.compiler.graal.nodes.NodeView; -import jdk.compiler.graal.nodes.ParameterNode; -import jdk.compiler.graal.nodes.PhiNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.ValuePhiNode; -import jdk.compiler.graal.nodes.WithExceptionNode; -import jdk.compiler.graal.nodes.calc.CompareNode; -import jdk.compiler.graal.nodes.calc.ConditionalNode; -import jdk.compiler.graal.nodes.calc.IntegerDivRemNode; -import jdk.compiler.graal.nodes.calc.IntegerTestNode; -import jdk.compiler.graal.nodes.calc.IsNullNode; -import jdk.compiler.graal.nodes.cfg.ControlFlowGraph; -import jdk.compiler.graal.nodes.cfg.HIRBlock; -import jdk.compiler.graal.nodes.extended.ForeignCall; -import jdk.compiler.graal.nodes.extended.IntegerSwitchNode; -import jdk.compiler.graal.nodes.extended.OpaqueLogicNode; -import jdk.compiler.graal.nodes.extended.SwitchNode; -import jdk.compiler.graal.nodes.spi.LIRLowerable; -import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool; -import jdk.compiler.graal.nodes.spi.NodeValueMap; -import jdk.compiler.graal.nodes.spi.NodeWithState; -import jdk.compiler.graal.nodes.virtual.VirtualObjectNode; -import jdk.compiler.graal.options.OptionValues; +import jdk.graal.compiler.core.common.LIRKind; +import jdk.graal.compiler.core.common.cfg.BasicBlock; +import jdk.graal.compiler.core.common.cfg.BlockMap; +import jdk.graal.compiler.core.common.spi.ForeignCallLinkage; +import jdk.graal.compiler.core.match.ComplexMatchValue; +import jdk.graal.compiler.graph.GraalGraphError; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.graph.NodeMap; +import jdk.graal.compiler.graph.NodeSourcePosition; +import jdk.graal.compiler.graph.iterators.NodeIterable; +import jdk.graal.compiler.lir.FullInfopointOp; +import jdk.graal.compiler.lir.LIRFrameState; +import jdk.graal.compiler.lir.LIRInstruction; +import jdk.graal.compiler.lir.LabelRef; +import jdk.graal.compiler.lir.StandardOp.JumpOp; +import jdk.graal.compiler.lir.StandardOp.LabelOp; +import jdk.graal.compiler.lir.SwitchStrategy; +import jdk.graal.compiler.lir.Variable; +import jdk.graal.compiler.lir.debug.LIRGenerationDebugContext; +import jdk.graal.compiler.lir.framemap.FrameMapBuilder; +import jdk.graal.compiler.lir.gen.LIRGenerator; +import jdk.graal.compiler.lir.gen.LIRGenerator.Options; +import jdk.graal.compiler.lir.gen.LIRGeneratorTool; +import jdk.graal.compiler.lir.gen.LIRGeneratorTool.BlockScope; +import jdk.graal.compiler.nodes.AbstractBeginNode; +import jdk.graal.compiler.nodes.AbstractEndNode; +import jdk.graal.compiler.nodes.AbstractMergeNode; +import jdk.graal.compiler.nodes.DeoptimizingNode; +import jdk.graal.compiler.nodes.DirectCallTargetNode; +import jdk.graal.compiler.nodes.FixedNode; +import jdk.graal.compiler.nodes.FrameState; +import jdk.graal.compiler.nodes.FullInfopointNode; +import jdk.graal.compiler.nodes.IfNode; +import jdk.graal.compiler.nodes.ImplicitNullCheckNode; +import jdk.graal.compiler.nodes.IndirectCallTargetNode; +import jdk.graal.compiler.nodes.Invoke; +import jdk.graal.compiler.nodes.InvokeWithExceptionNode; +import jdk.graal.compiler.nodes.LogicConstantNode; +import jdk.graal.compiler.nodes.LogicNode; +import jdk.graal.compiler.nodes.LoopEndNode; +import jdk.graal.compiler.nodes.LoweredCallTargetNode; +import jdk.graal.compiler.nodes.NodeView; +import jdk.graal.compiler.nodes.ParameterNode; +import jdk.graal.compiler.nodes.PhiNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.ValuePhiNode; +import jdk.graal.compiler.nodes.WithExceptionNode; +import jdk.graal.compiler.nodes.calc.CompareNode; +import jdk.graal.compiler.nodes.calc.ConditionalNode; +import jdk.graal.compiler.nodes.calc.IntegerDivRemNode; +import jdk.graal.compiler.nodes.calc.IntegerTestNode; +import jdk.graal.compiler.nodes.calc.IsNullNode; +import jdk.graal.compiler.nodes.cfg.ControlFlowGraph; +import jdk.graal.compiler.nodes.cfg.HIRBlock; +import jdk.graal.compiler.nodes.extended.ForeignCall; +import jdk.graal.compiler.nodes.extended.IntegerSwitchNode; +import jdk.graal.compiler.nodes.extended.OpaqueLogicNode; +import jdk.graal.compiler.nodes.extended.SwitchNode; +import jdk.graal.compiler.nodes.spi.LIRLowerable; +import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool; +import jdk.graal.compiler.nodes.spi.NodeValueMap; +import jdk.graal.compiler.nodes.spi.NodeWithState; +import jdk.graal.compiler.nodes.virtual.VirtualObjectNode; +import jdk.graal.compiler.options.OptionValues; import jdk.vm.ci.code.BailoutException; import jdk.vm.ci.code.CallingConvention; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/gen/NodeMatchRules.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/gen/NodeMatchRules.java similarity index 72% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/gen/NodeMatchRules.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/gen/NodeMatchRules.java index 7740f0c13c14..2ce11e2b6073 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/gen/NodeMatchRules.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/gen/NodeMatchRules.java @@ -22,51 +22,51 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.gen; +package jdk.graal.compiler.core.gen; -import jdk.compiler.graal.core.match.MatchableNode; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.lir.LIRFrameState; -import jdk.compiler.graal.lir.LIRInstruction; -import jdk.compiler.graal.lir.LabelRef; -import jdk.compiler.graal.lir.gen.LIRGeneratorTool; -import jdk.compiler.graal.nodes.ConstantNode; -import jdk.compiler.graal.nodes.DeoptimizingNode; -import jdk.compiler.graal.nodes.FixedNode; -import jdk.compiler.graal.nodes.IfNode; -import jdk.compiler.graal.nodes.PiNode; -import jdk.compiler.graal.nodes.calc.AddNode; -import jdk.compiler.graal.nodes.calc.AndNode; -import jdk.compiler.graal.nodes.calc.ConditionalNode; -import jdk.compiler.graal.nodes.calc.FloatConvertNode; -import jdk.compiler.graal.nodes.calc.FloatEqualsNode; -import jdk.compiler.graal.nodes.calc.FloatLessThanNode; -import jdk.compiler.graal.nodes.calc.IntegerBelowNode; -import jdk.compiler.graal.nodes.calc.IntegerEqualsNode; -import jdk.compiler.graal.nodes.calc.IntegerLessThanNode; -import jdk.compiler.graal.nodes.calc.IntegerTestNode; -import jdk.compiler.graal.nodes.calc.LeftShiftNode; -import jdk.compiler.graal.nodes.calc.MulNode; -import jdk.compiler.graal.nodes.calc.NarrowNode; -import jdk.compiler.graal.nodes.calc.NegateNode; -import jdk.compiler.graal.nodes.calc.NotNode; -import jdk.compiler.graal.nodes.calc.ObjectEqualsNode; -import jdk.compiler.graal.nodes.calc.OrNode; -import jdk.compiler.graal.nodes.calc.PointerEqualsNode; -import jdk.compiler.graal.nodes.calc.ReinterpretNode; -import jdk.compiler.graal.nodes.calc.RightShiftNode; -import jdk.compiler.graal.nodes.calc.SignExtendNode; -import jdk.compiler.graal.nodes.calc.SqrtNode; -import jdk.compiler.graal.nodes.calc.SubNode; -import jdk.compiler.graal.nodes.calc.UnsignedRightShiftNode; -import jdk.compiler.graal.nodes.calc.XorNode; -import jdk.compiler.graal.nodes.calc.ZeroExtendNode; -import jdk.compiler.graal.nodes.java.LogicCompareAndSwapNode; -import jdk.compiler.graal.nodes.java.ValueCompareAndSwapNode; -import jdk.compiler.graal.nodes.memory.FloatingReadNode; -import jdk.compiler.graal.nodes.memory.ReadNode; -import jdk.compiler.graal.nodes.memory.SideEffectFreeWriteNode; -import jdk.compiler.graal.nodes.memory.WriteNode; +import jdk.graal.compiler.core.match.MatchableNode; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.lir.LIRFrameState; +import jdk.graal.compiler.lir.LIRInstruction; +import jdk.graal.compiler.lir.LabelRef; +import jdk.graal.compiler.lir.gen.LIRGeneratorTool; +import jdk.graal.compiler.nodes.ConstantNode; +import jdk.graal.compiler.nodes.DeoptimizingNode; +import jdk.graal.compiler.nodes.FixedNode; +import jdk.graal.compiler.nodes.IfNode; +import jdk.graal.compiler.nodes.PiNode; +import jdk.graal.compiler.nodes.calc.AddNode; +import jdk.graal.compiler.nodes.calc.AndNode; +import jdk.graal.compiler.nodes.calc.ConditionalNode; +import jdk.graal.compiler.nodes.calc.FloatConvertNode; +import jdk.graal.compiler.nodes.calc.FloatEqualsNode; +import jdk.graal.compiler.nodes.calc.FloatLessThanNode; +import jdk.graal.compiler.nodes.calc.IntegerBelowNode; +import jdk.graal.compiler.nodes.calc.IntegerEqualsNode; +import jdk.graal.compiler.nodes.calc.IntegerLessThanNode; +import jdk.graal.compiler.nodes.calc.IntegerTestNode; +import jdk.graal.compiler.nodes.calc.LeftShiftNode; +import jdk.graal.compiler.nodes.calc.MulNode; +import jdk.graal.compiler.nodes.calc.NarrowNode; +import jdk.graal.compiler.nodes.calc.NegateNode; +import jdk.graal.compiler.nodes.calc.NotNode; +import jdk.graal.compiler.nodes.calc.ObjectEqualsNode; +import jdk.graal.compiler.nodes.calc.OrNode; +import jdk.graal.compiler.nodes.calc.PointerEqualsNode; +import jdk.graal.compiler.nodes.calc.ReinterpretNode; +import jdk.graal.compiler.nodes.calc.RightShiftNode; +import jdk.graal.compiler.nodes.calc.SignExtendNode; +import jdk.graal.compiler.nodes.calc.SqrtNode; +import jdk.graal.compiler.nodes.calc.SubNode; +import jdk.graal.compiler.nodes.calc.UnsignedRightShiftNode; +import jdk.graal.compiler.nodes.calc.XorNode; +import jdk.graal.compiler.nodes.calc.ZeroExtendNode; +import jdk.graal.compiler.nodes.java.LogicCompareAndSwapNode; +import jdk.graal.compiler.nodes.java.ValueCompareAndSwapNode; +import jdk.graal.compiler.nodes.memory.FloatingReadNode; +import jdk.graal.compiler.nodes.memory.ReadNode; +import jdk.graal.compiler.nodes.memory.SideEffectFreeWriteNode; +import jdk.graal.compiler.nodes.memory.WriteNode; import jdk.vm.ci.meta.Value; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/gen/package-info.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/gen/package-info.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/gen/package-info.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/gen/package-info.java index c084f3a6d6e9..b7ef45423962 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/gen/package-info.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/gen/package-info.java @@ -26,4 +26,4 @@ * This package contains the port of the LIRGenerator which translates HIR instructions to LIR * instructions for the backend. */ -package jdk.compiler.graal.core.gen; +package jdk.graal.compiler.core.gen; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/match/ComplexMatchResult.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/match/ComplexMatchResult.java similarity index 94% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/match/ComplexMatchResult.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/match/ComplexMatchResult.java index 907bd62f7336..81ffc48c207c 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/match/ComplexMatchResult.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/match/ComplexMatchResult.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.match; +package jdk.graal.compiler.core.match; -import jdk.compiler.graal.core.gen.NodeLIRBuilder; +import jdk.graal.compiler.core.gen.NodeLIRBuilder; import jdk.vm.ci.meta.Value; /** diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/match/ComplexMatchValue.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/match/ComplexMatchValue.java similarity index 94% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/match/ComplexMatchValue.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/match/ComplexMatchValue.java index bac32dc4f616..4f040832e72a 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/match/ComplexMatchValue.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/match/ComplexMatchValue.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.match; +package jdk.graal.compiler.core.match; -import jdk.compiler.graal.core.gen.NodeLIRBuilder; -import jdk.compiler.graal.core.common.LIRKind; +import jdk.graal.compiler.core.gen.NodeLIRBuilder; +import jdk.graal.compiler.core.common.LIRKind; import jdk.vm.ci.meta.Value; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/match/MatchContext.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/match/MatchContext.java similarity index 96% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/match/MatchContext.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/match/MatchContext.java index 7f532d0036b0..2dc1e0de7a4c 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/match/MatchContext.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/match/MatchContext.java @@ -22,29 +22,29 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.match; +package jdk.graal.compiler.core.match; import java.util.ArrayList; import java.util.Arrays; import java.util.Iterator; import java.util.List; -import jdk.compiler.graal.core.common.cfg.BlockMap; -import jdk.compiler.graal.core.gen.NodeLIRBuilder; -import jdk.compiler.graal.debug.CounterKey; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.debug.DebugOptions; -import jdk.compiler.graal.debug.GraalError; +import jdk.graal.compiler.core.common.cfg.BlockMap; +import jdk.graal.compiler.core.gen.NodeLIRBuilder; +import jdk.graal.compiler.debug.CounterKey; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.debug.DebugOptions; +import jdk.graal.compiler.debug.GraalError; import org.graalvm.collections.EconomicMap; import org.graalvm.collections.Equivalence; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.graph.NodeMap; -import jdk.compiler.graal.nodes.PhiNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.VirtualState; -import jdk.compiler.graal.nodes.calc.FloatingNode; -import jdk.compiler.graal.nodes.cfg.HIRBlock; -import jdk.compiler.graal.nodes.virtual.VirtualObjectNode; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.graph.NodeMap; +import jdk.graal.compiler.nodes.PhiNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.VirtualState; +import jdk.graal.compiler.nodes.calc.FloatingNode; +import jdk.graal.compiler.nodes.cfg.HIRBlock; +import jdk.graal.compiler.nodes.virtual.VirtualObjectNode; /** * Container for state captured during a match. diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/match/MatchGenerator.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/match/MatchGenerator.java similarity index 94% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/match/MatchGenerator.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/match/MatchGenerator.java index 7a381f99dc01..6c8c79670254 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/match/MatchGenerator.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/match/MatchGenerator.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.match; +package jdk.graal.compiler.core.match; -import jdk.compiler.graal.core.gen.NodeMatchRules; +import jdk.graal.compiler.core.gen.NodeMatchRules; /** * Code generator for complex match patterns. diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/match/MatchPattern.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/match/MatchPattern.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/match/MatchPattern.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/match/MatchPattern.java index c98895739612..175c46df3c15 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/match/MatchPattern.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/match/MatchPattern.java @@ -22,17 +22,17 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.match; - -import jdk.compiler.graal.core.common.memory.BarrierType; -import jdk.compiler.graal.debug.CounterKey; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.graph.Position; -import jdk.compiler.graal.nodeinfo.InputType; -import jdk.compiler.graal.nodeinfo.Verbosity; -import jdk.compiler.graal.nodes.calc.FloatingNode; -import jdk.compiler.graal.nodes.memory.OnHeapMemoryAccess; +package jdk.graal.compiler.core.match; + +import jdk.graal.compiler.core.common.memory.BarrierType; +import jdk.graal.compiler.debug.CounterKey; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.graph.Position; +import jdk.graal.compiler.nodeinfo.InputType; +import jdk.graal.compiler.nodeinfo.Verbosity; +import jdk.graal.compiler.nodes.calc.FloatingNode; +import jdk.graal.compiler.nodes.memory.OnHeapMemoryAccess; /** * A simple recursive pattern matcher for a DAG of nodes. diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/match/MatchRule.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/match/MatchRule.java similarity index 96% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/match/MatchRule.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/match/MatchRule.java index aa1b511e7a97..871e4514d71c 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/match/MatchRule.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/match/MatchRule.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.match; +package jdk.graal.compiler.core.match; import java.lang.annotation.ElementType; import java.lang.annotation.Repeatable; @@ -30,7 +30,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import jdk.compiler.graal.nodes.ConstantNode; +import jdk.graal.compiler.nodes.ConstantNode; /** * This annotation declares a textual pattern for matching an HIR tree. The format is a LISP style diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/match/MatchRuleRegistry.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/match/MatchRuleRegistry.java similarity index 92% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/match/MatchRuleRegistry.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/match/MatchRuleRegistry.java index 65b57e750bab..2053bf47157d 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/match/MatchRuleRegistry.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/match/MatchRuleRegistry.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.match; +package jdk.graal.compiler.core.match; -import static jdk.compiler.graal.debug.DebugOptions.LogVerbose; +import static jdk.graal.compiler.debug.DebugOptions.LogVerbose; import java.util.ArrayList; import java.util.List; @@ -32,15 +32,15 @@ import org.graalvm.collections.EconomicMap; import org.graalvm.collections.Equivalence; import org.graalvm.collections.MapCursor; -import jdk.compiler.graal.core.gen.NodeMatchRules; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.graph.Edges; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.graph.NodeClass; -import jdk.compiler.graal.graph.Position; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.serviceprovider.GraalServices; +import jdk.graal.compiler.core.gen.NodeMatchRules; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.graph.Edges; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.graph.NodeClass; +import jdk.graal.compiler.graph.Position; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.serviceprovider.GraalServices; public class MatchRuleRegistry { diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/match/MatchRules.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/match/MatchRules.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/match/MatchRules.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/match/MatchRules.java index c341664c3f7d..5a65f02f1e3a 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/match/MatchRules.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/match/MatchRules.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.match; +package jdk.graal.compiler.core.match; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/match/MatchStatement.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/match/MatchStatement.java similarity index 90% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/match/MatchStatement.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/match/MatchStatement.java index 1b9c21c812e2..4906d4300d22 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/match/MatchStatement.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/match/MatchStatement.java @@ -22,22 +22,22 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.match; +package jdk.graal.compiler.core.match; -import static jdk.compiler.graal.debug.DebugOptions.LogVerbose; +import static jdk.graal.compiler.debug.DebugOptions.LogVerbose; -import jdk.compiler.graal.core.gen.NodeLIRBuilder; -import jdk.compiler.graal.core.match.MatchPattern.MatchResultCode; -import jdk.compiler.graal.core.match.MatchPattern.Result; -import jdk.compiler.graal.debug.CounterKey; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.graph.GraalGraphError; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.nodeinfo.Verbosity; +import jdk.graal.compiler.core.gen.NodeLIRBuilder; +import jdk.graal.compiler.core.match.MatchPattern.MatchResultCode; +import jdk.graal.compiler.core.match.MatchPattern.Result; +import jdk.graal.compiler.debug.CounterKey; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.graph.GraalGraphError; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.nodeinfo.Verbosity; import jdk.vm.ci.meta.Value; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.cfg.HIRBlock; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.cfg.HIRBlock; /** * A named {@link MatchPattern} along with a {@link MatchGenerator} that can be evaluated to replace diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/match/MatchStatementSet.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/match/MatchStatementSet.java similarity index 91% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/match/MatchStatementSet.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/match/MatchStatementSet.java index 71f05994ed9e..ccfab68e5c54 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/match/MatchStatementSet.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/match/MatchStatementSet.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.match; +package jdk.graal.compiler.core.match; import java.util.List; -import jdk.compiler.graal.core.gen.NodeLIRBuilder; -import jdk.compiler.graal.core.gen.NodeMatchRules; +import jdk.graal.compiler.core.gen.NodeLIRBuilder; +import jdk.graal.compiler.core.gen.NodeMatchRules; public interface MatchStatementSet { /** diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/match/MatchableNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/match/MatchableNode.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/match/MatchableNode.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/match/MatchableNode.java index 5c41dfe802aa..933869545df3 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/match/MatchableNode.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/match/MatchableNode.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.match; +package jdk.graal.compiler.core.match; import java.lang.annotation.ElementType; import java.lang.annotation.Repeatable; @@ -30,7 +30,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import jdk.compiler.graal.nodes.ValueNode; +import jdk.graal.compiler.nodes.ValueNode; /** * Describes the properties of a node for use when building a {@link MatchPattern}. These diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/match/MatchableNodes.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/match/MatchableNodes.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/match/MatchableNodes.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/match/MatchableNodes.java index ce2efa309337..994db647c946 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/match/MatchableNodes.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/match/MatchableNodes.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.match; +package jdk.graal.compiler.core.match; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/package-info.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/package-info.java similarity index 93% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/package-info.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/package-info.java index 2f45582e4179..3ffb12089443 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/package-info.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/package-info.java @@ -25,6 +25,6 @@ /** * The top-level package in Graal containing the main compiler class - * {@link jdk.compiler.graal.core.GraalCompiler}. + * {@link jdk.graal.compiler.core.GraalCompiler}. */ -package jdk.compiler.graal.core; +package jdk.graal.compiler.core; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/phases/BaseTier.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/phases/BaseTier.java similarity index 80% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/phases/BaseTier.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/phases/BaseTier.java index 02611f524c0c..8a166bae6078 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/phases/BaseTier.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/phases/BaseTier.java @@ -22,18 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.phases; +package jdk.graal.compiler.core.phases; -import jdk.compiler.graal.debug.DebugCloseable; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.debug.TimerKey; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.loop.DefaultLoopPolicies; -import jdk.compiler.graal.nodes.loop.LoopPolicies; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.phases.BasePhase; -import jdk.compiler.graal.phases.PhaseSuite; -import jdk.compiler.graal.serviceprovider.GraalServices; +import jdk.graal.compiler.debug.DebugCloseable; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.debug.TimerKey; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.loop.DefaultLoopPolicies; +import jdk.graal.compiler.nodes.loop.LoopPolicies; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.phases.BasePhase; +import jdk.graal.compiler.phases.PhaseSuite; +import jdk.graal.compiler.serviceprovider.GraalServices; public class BaseTier extends PhaseSuite { diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/phases/CEOptimization.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/phases/CEOptimization.java similarity index 89% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/phases/CEOptimization.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/phases/CEOptimization.java index caa9ef92f7c7..3d3df746bc1f 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/phases/CEOptimization.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/phases/CEOptimization.java @@ -22,38 +22,38 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.phases; +package jdk.graal.compiler.core.phases; -import jdk.compiler.graal.core.common.GraalOptions; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.loop.phases.ConvertDeoptimizeToGuardPhase; -import jdk.compiler.graal.loop.phases.LoopFullUnrollPhase; -import jdk.compiler.graal.loop.phases.LoopPartialUnrollPhase; -import jdk.compiler.graal.loop.phases.LoopPeelingPhase; -import jdk.compiler.graal.loop.phases.LoopPredicationPhase; -import jdk.compiler.graal.loop.phases.LoopSafepointEliminationPhase; -import jdk.compiler.graal.loop.phases.LoopUnswitchingPhase; -import jdk.compiler.graal.loop.phases.SpeculativeGuardMovementPhase; -import jdk.compiler.graal.nodes.memory.MemoryMap; -import jdk.compiler.graal.nodes.spi.Canonicalizable; -import jdk.compiler.graal.nodes.spi.CanonicalizerTool; -import jdk.compiler.graal.nodes.spi.Simplifiable; -import jdk.compiler.graal.nodes.spi.SimplifierTool; -import jdk.compiler.graal.options.OptionKey; -import jdk.compiler.graal.phases.BasePhase; -import jdk.compiler.graal.phases.common.BoxNodeOptimizationPhase; -import jdk.compiler.graal.phases.common.CanonicalizerPhase; -import jdk.compiler.graal.phases.common.ConditionalEliminationPhase; -import jdk.compiler.graal.phases.common.DeadCodeEliminationPhase; -import jdk.compiler.graal.phases.common.DeoptimizationGroupingPhase; -import jdk.compiler.graal.phases.common.FloatingReadPhase; -import jdk.compiler.graal.phases.common.LockEliminationPhase; -import jdk.compiler.graal.phases.common.ReassociationPhase; -import jdk.compiler.graal.phases.common.UseTrappingNullChecksPhase; -import jdk.compiler.graal.phases.common.inlining.InliningPhase; -import jdk.compiler.graal.phases.schedule.SchedulePhase; -import jdk.compiler.graal.virtual.phases.ea.PartialEscapePhase; -import jdk.compiler.graal.virtual.phases.ea.ReadEliminationPhase; +import jdk.graal.compiler.core.common.GraalOptions; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.loop.phases.ConvertDeoptimizeToGuardPhase; +import jdk.graal.compiler.loop.phases.LoopFullUnrollPhase; +import jdk.graal.compiler.loop.phases.LoopPartialUnrollPhase; +import jdk.graal.compiler.loop.phases.LoopPeelingPhase; +import jdk.graal.compiler.loop.phases.LoopPredicationPhase; +import jdk.graal.compiler.loop.phases.LoopSafepointEliminationPhase; +import jdk.graal.compiler.loop.phases.LoopUnswitchingPhase; +import jdk.graal.compiler.loop.phases.SpeculativeGuardMovementPhase; +import jdk.graal.compiler.nodes.memory.MemoryMap; +import jdk.graal.compiler.nodes.spi.Canonicalizable; +import jdk.graal.compiler.nodes.spi.CanonicalizerTool; +import jdk.graal.compiler.nodes.spi.Simplifiable; +import jdk.graal.compiler.nodes.spi.SimplifierTool; +import jdk.graal.compiler.options.OptionKey; +import jdk.graal.compiler.phases.BasePhase; +import jdk.graal.compiler.phases.common.BoxNodeOptimizationPhase; +import jdk.graal.compiler.phases.common.CanonicalizerPhase; +import jdk.graal.compiler.phases.common.ConditionalEliminationPhase; +import jdk.graal.compiler.phases.common.DeadCodeEliminationPhase; +import jdk.graal.compiler.phases.common.DeoptimizationGroupingPhase; +import jdk.graal.compiler.phases.common.FloatingReadPhase; +import jdk.graal.compiler.phases.common.LockEliminationPhase; +import jdk.graal.compiler.phases.common.ReassociationPhase; +import jdk.graal.compiler.phases.common.UseTrappingNullChecksPhase; +import jdk.graal.compiler.phases.common.inlining.InliningPhase; +import jdk.graal.compiler.phases.schedule.SchedulePhase; +import jdk.graal.compiler.virtual.phases.ea.PartialEscapePhase; +import jdk.graal.compiler.virtual.phases.ea.ReadEliminationPhase; /** * This class enumerates the most important platform-independent optimizations in the GraalVM CE diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/phases/CommunityCompilerConfiguration.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/phases/CommunityCompilerConfiguration.java similarity index 78% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/phases/CommunityCompilerConfiguration.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/phases/CommunityCompilerConfiguration.java index dab2ef8a44b5..68006b53dfa2 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/phases/CommunityCompilerConfiguration.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/phases/CommunityCompilerConfiguration.java @@ -22,19 +22,19 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.phases; +package jdk.graal.compiler.core.phases; -import jdk.compiler.graal.lir.phases.AllocationPhase.AllocationContext; -import jdk.compiler.graal.lir.phases.AllocationStage; -import jdk.compiler.graal.lir.phases.FinalCodeAnalysisPhase.FinalCodeAnalysisContext; -import jdk.compiler.graal.lir.phases.FinalCodeAnalysisStage; -import jdk.compiler.graal.lir.phases.LIRPhaseSuite; -import jdk.compiler.graal.lir.phases.PostAllocationOptimizationPhase.PostAllocationOptimizationContext; -import jdk.compiler.graal.lir.phases.PostAllocationOptimizationStage; -import jdk.compiler.graal.lir.phases.PreAllocationOptimizationPhase.PreAllocationOptimizationContext; -import jdk.compiler.graal.lir.phases.PreAllocationOptimizationStage; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.phases.tiers.CompilerConfiguration; +import jdk.graal.compiler.lir.phases.AllocationPhase.AllocationContext; +import jdk.graal.compiler.lir.phases.AllocationStage; +import jdk.graal.compiler.lir.phases.FinalCodeAnalysisPhase.FinalCodeAnalysisContext; +import jdk.graal.compiler.lir.phases.FinalCodeAnalysisStage; +import jdk.graal.compiler.lir.phases.LIRPhaseSuite; +import jdk.graal.compiler.lir.phases.PostAllocationOptimizationPhase.PostAllocationOptimizationContext; +import jdk.graal.compiler.lir.phases.PostAllocationOptimizationStage; +import jdk.graal.compiler.lir.phases.PreAllocationOptimizationPhase.PreAllocationOptimizationContext; +import jdk.graal.compiler.lir.phases.PreAllocationOptimizationStage; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.phases.tiers.CompilerConfiguration; import jdk.vm.ci.code.Architecture; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/phases/EconomyCompilerConfiguration.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/phases/EconomyCompilerConfiguration.java similarity index 75% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/phases/EconomyCompilerConfiguration.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/phases/EconomyCompilerConfiguration.java index 5b3cc1cb3bbc..5ac87de01b67 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/phases/EconomyCompilerConfiguration.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/phases/EconomyCompilerConfiguration.java @@ -22,23 +22,23 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.phases; +package jdk.graal.compiler.core.phases; -import jdk.compiler.graal.lir.phases.AllocationPhase.AllocationContext; -import jdk.compiler.graal.lir.phases.EconomyAllocationStage; -import jdk.compiler.graal.lir.phases.EconomyFinalCodeAnalysisStage; -import jdk.compiler.graal.lir.phases.EconomyPostAllocationOptimizationStage; -import jdk.compiler.graal.lir.phases.EconomyPreAllocationOptimizationStage; -import jdk.compiler.graal.lir.phases.FinalCodeAnalysisPhase.FinalCodeAnalysisContext; -import jdk.compiler.graal.lir.phases.LIRPhaseSuite; -import jdk.compiler.graal.lir.phases.PostAllocationOptimizationPhase.PostAllocationOptimizationContext; -import jdk.compiler.graal.lir.phases.PreAllocationOptimizationPhase.PreAllocationOptimizationContext; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.phases.PhaseSuite; -import jdk.compiler.graal.phases.tiers.CompilerConfiguration; -import jdk.compiler.graal.phases.tiers.HighTierContext; -import jdk.compiler.graal.phases.tiers.LowTierContext; -import jdk.compiler.graal.phases.tiers.MidTierContext; +import jdk.graal.compiler.lir.phases.AllocationPhase.AllocationContext; +import jdk.graal.compiler.lir.phases.EconomyAllocationStage; +import jdk.graal.compiler.lir.phases.EconomyFinalCodeAnalysisStage; +import jdk.graal.compiler.lir.phases.EconomyPostAllocationOptimizationStage; +import jdk.graal.compiler.lir.phases.EconomyPreAllocationOptimizationStage; +import jdk.graal.compiler.lir.phases.FinalCodeAnalysisPhase.FinalCodeAnalysisContext; +import jdk.graal.compiler.lir.phases.LIRPhaseSuite; +import jdk.graal.compiler.lir.phases.PostAllocationOptimizationPhase.PostAllocationOptimizationContext; +import jdk.graal.compiler.lir.phases.PreAllocationOptimizationPhase.PreAllocationOptimizationContext; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.phases.PhaseSuite; +import jdk.graal.compiler.phases.tiers.CompilerConfiguration; +import jdk.graal.compiler.phases.tiers.HighTierContext; +import jdk.graal.compiler.phases.tiers.LowTierContext; +import jdk.graal.compiler.phases.tiers.MidTierContext; import jdk.vm.ci.code.Architecture; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/phases/EconomyHighTier.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/phases/EconomyHighTier.java similarity index 87% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/phases/EconomyHighTier.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/phases/EconomyHighTier.java index ab2c899c5ad0..e430236c4052 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/phases/EconomyHighTier.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/phases/EconomyHighTier.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.phases; +package jdk.graal.compiler.core.phases; -import jdk.compiler.graal.phases.common.CanonicalizerPhase; -import jdk.compiler.graal.phases.common.HighTierLoweringPhase; -import jdk.compiler.graal.phases.tiers.HighTierContext; +import jdk.graal.compiler.phases.common.CanonicalizerPhase; +import jdk.graal.compiler.phases.common.HighTierLoweringPhase; +import jdk.graal.compiler.phases.tiers.HighTierContext; public class EconomyHighTier extends BaseTier { diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/phases/EconomyLowTier.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/phases/EconomyLowTier.java similarity index 79% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/phases/EconomyLowTier.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/phases/EconomyLowTier.java index b68fa2bd8092..8b3e52460920 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/phases/EconomyLowTier.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/phases/EconomyLowTier.java @@ -22,17 +22,17 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.phases; +package jdk.graal.compiler.core.phases; -import jdk.compiler.graal.debug.Assertions; -import jdk.compiler.graal.phases.PlaceholderPhase; -import jdk.compiler.graal.phases.common.AddressLoweringPhase; -import jdk.compiler.graal.phases.common.BarrierSetVerificationPhase; -import jdk.compiler.graal.phases.common.CanonicalizerPhase; -import jdk.compiler.graal.phases.common.ExpandLogicPhase; -import jdk.compiler.graal.phases.common.LowTierLoweringPhase; -import jdk.compiler.graal.phases.schedule.SchedulePhase; -import jdk.compiler.graal.phases.tiers.LowTierContext; +import jdk.graal.compiler.debug.Assertions; +import jdk.graal.compiler.phases.PlaceholderPhase; +import jdk.graal.compiler.phases.common.AddressLoweringPhase; +import jdk.graal.compiler.phases.common.BarrierSetVerificationPhase; +import jdk.graal.compiler.phases.common.CanonicalizerPhase; +import jdk.graal.compiler.phases.common.ExpandLogicPhase; +import jdk.graal.compiler.phases.common.LowTierLoweringPhase; +import jdk.graal.compiler.phases.schedule.SchedulePhase; +import jdk.graal.compiler.phases.tiers.LowTierContext; public class EconomyLowTier extends BaseTier { diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/phases/EconomyMidTier.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/phases/EconomyMidTier.java similarity index 77% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/phases/EconomyMidTier.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/phases/EconomyMidTier.java index b701d902d7b9..ecb657fad5d2 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/phases/EconomyMidTier.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/phases/EconomyMidTier.java @@ -22,16 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.phases; +package jdk.graal.compiler.core.phases; -import jdk.compiler.graal.phases.common.CanonicalizerPhase; -import jdk.compiler.graal.phases.common.FrameStateAssignmentPhase; -import jdk.compiler.graal.phases.common.GuardLoweringPhase; -import jdk.compiler.graal.phases.common.LoopSafepointInsertionPhase; -import jdk.compiler.graal.phases.common.MidTierLoweringPhase; -import jdk.compiler.graal.phases.common.RemoveValueProxyPhase; -import jdk.compiler.graal.phases.common.WriteBarrierAdditionPhase; -import jdk.compiler.graal.phases.tiers.MidTierContext; +import jdk.graal.compiler.phases.common.CanonicalizerPhase; +import jdk.graal.compiler.phases.common.FrameStateAssignmentPhase; +import jdk.graal.compiler.phases.common.GuardLoweringPhase; +import jdk.graal.compiler.phases.common.LoopSafepointInsertionPhase; +import jdk.graal.compiler.phases.common.MidTierLoweringPhase; +import jdk.graal.compiler.phases.common.RemoveValueProxyPhase; +import jdk.graal.compiler.phases.common.WriteBarrierAdditionPhase; +import jdk.graal.compiler.phases.tiers.MidTierContext; public class EconomyMidTier extends BaseTier { diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/phases/HighTier.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/phases/HighTier.java similarity index 71% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/phases/HighTier.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/phases/HighTier.java index adee9644fde2..254a135da14c 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/phases/HighTier.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/phases/HighTier.java @@ -22,34 +22,34 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.phases; - -import static jdk.compiler.graal.phases.common.DeadCodeEliminationPhase.Optionality.Optional; - -import jdk.compiler.graal.core.common.GraalOptions; -import jdk.compiler.graal.loop.phases.ConvertDeoptimizeToGuardPhase; -import jdk.compiler.graal.loop.phases.LoopFullUnrollPhase; -import jdk.compiler.graal.loop.phases.LoopPeelingPhase; -import jdk.compiler.graal.loop.phases.LoopUnswitchingPhase; -import jdk.compiler.graal.nodes.loop.DefaultLoopPolicies; -import jdk.compiler.graal.nodes.loop.LoopPolicies; -import jdk.compiler.graal.options.Option; -import jdk.compiler.graal.options.OptionKey; -import jdk.compiler.graal.options.OptionType; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.phases.common.BoxNodeIdentityPhase; -import jdk.compiler.graal.phases.common.BoxNodeOptimizationPhase; -import jdk.compiler.graal.phases.common.CanonicalizerPhase; -import jdk.compiler.graal.phases.common.DeadCodeEliminationPhase; -import jdk.compiler.graal.phases.common.DisableOverflownCountedLoopsPhase; -import jdk.compiler.graal.phases.common.DominatorBasedGlobalValueNumberingPhase; -import jdk.compiler.graal.phases.common.HighTierLoweringPhase; -import jdk.compiler.graal.phases.common.IterativeConditionalEliminationPhase; -import jdk.compiler.graal.phases.common.inlining.InliningPhase; -import jdk.compiler.graal.phases.common.inlining.policy.GreedyInliningPolicy; -import jdk.compiler.graal.phases.tiers.HighTierContext; -import jdk.compiler.graal.virtual.phases.ea.FinalPartialEscapePhase; -import jdk.compiler.graal.virtual.phases.ea.ReadEliminationPhase; +package jdk.graal.compiler.core.phases; + +import static jdk.graal.compiler.phases.common.DeadCodeEliminationPhase.Optionality.Optional; + +import jdk.graal.compiler.core.common.GraalOptions; +import jdk.graal.compiler.loop.phases.ConvertDeoptimizeToGuardPhase; +import jdk.graal.compiler.loop.phases.LoopFullUnrollPhase; +import jdk.graal.compiler.loop.phases.LoopPeelingPhase; +import jdk.graal.compiler.loop.phases.LoopUnswitchingPhase; +import jdk.graal.compiler.nodes.loop.DefaultLoopPolicies; +import jdk.graal.compiler.nodes.loop.LoopPolicies; +import jdk.graal.compiler.options.Option; +import jdk.graal.compiler.options.OptionKey; +import jdk.graal.compiler.options.OptionType; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.phases.common.BoxNodeIdentityPhase; +import jdk.graal.compiler.phases.common.BoxNodeOptimizationPhase; +import jdk.graal.compiler.phases.common.CanonicalizerPhase; +import jdk.graal.compiler.phases.common.DeadCodeEliminationPhase; +import jdk.graal.compiler.phases.common.DisableOverflownCountedLoopsPhase; +import jdk.graal.compiler.phases.common.DominatorBasedGlobalValueNumberingPhase; +import jdk.graal.compiler.phases.common.HighTierLoweringPhase; +import jdk.graal.compiler.phases.common.IterativeConditionalEliminationPhase; +import jdk.graal.compiler.phases.common.inlining.InliningPhase; +import jdk.graal.compiler.phases.common.inlining.policy.GreedyInliningPolicy; +import jdk.graal.compiler.phases.tiers.HighTierContext; +import jdk.graal.compiler.virtual.phases.ea.FinalPartialEscapePhase; +import jdk.graal.compiler.virtual.phases.ea.ReadEliminationPhase; public class HighTier extends BaseTier { diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/phases/LowTier.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/phases/LowTier.java similarity index 74% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/phases/LowTier.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/phases/LowTier.java index 853d8206582e..61424ef9e681 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/phases/LowTier.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/phases/LowTier.java @@ -22,29 +22,29 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.phases; - -import static jdk.compiler.graal.phases.common.DeadCodeEliminationPhase.Optionality.Required; - -import jdk.compiler.graal.core.common.GraalOptions; -import jdk.compiler.graal.options.Option; -import jdk.compiler.graal.options.OptionKey; -import jdk.compiler.graal.options.OptionType; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.phases.PlaceholderPhase; -import jdk.compiler.graal.phases.common.AddressLoweringPhase; -import jdk.compiler.graal.phases.common.CanonicalizerPhase; -import jdk.compiler.graal.phases.common.DeadCodeEliminationPhase; -import jdk.compiler.graal.phases.common.ExpandLogicPhase; -import jdk.compiler.graal.phases.common.FinalCanonicalizerPhase; -import jdk.compiler.graal.phases.common.FixReadsPhase; -import jdk.compiler.graal.phases.common.LowTierLoweringPhase; -import jdk.compiler.graal.phases.common.OptimizeExtendsPhase; -import jdk.compiler.graal.phases.common.ProfileCompiledMethodsPhase; -import jdk.compiler.graal.phases.common.PropagateDeoptimizeProbabilityPhase; -import jdk.compiler.graal.phases.schedule.SchedulePhase; -import jdk.compiler.graal.phases.schedule.SchedulePhase.SchedulingStrategy; -import jdk.compiler.graal.phases.tiers.LowTierContext; +package jdk.graal.compiler.core.phases; + +import static jdk.graal.compiler.phases.common.DeadCodeEliminationPhase.Optionality.Required; + +import jdk.graal.compiler.core.common.GraalOptions; +import jdk.graal.compiler.options.Option; +import jdk.graal.compiler.options.OptionKey; +import jdk.graal.compiler.options.OptionType; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.phases.PlaceholderPhase; +import jdk.graal.compiler.phases.common.AddressLoweringPhase; +import jdk.graal.compiler.phases.common.CanonicalizerPhase; +import jdk.graal.compiler.phases.common.DeadCodeEliminationPhase; +import jdk.graal.compiler.phases.common.ExpandLogicPhase; +import jdk.graal.compiler.phases.common.FinalCanonicalizerPhase; +import jdk.graal.compiler.phases.common.FixReadsPhase; +import jdk.graal.compiler.phases.common.LowTierLoweringPhase; +import jdk.graal.compiler.phases.common.OptimizeExtendsPhase; +import jdk.graal.compiler.phases.common.ProfileCompiledMethodsPhase; +import jdk.graal.compiler.phases.common.PropagateDeoptimizeProbabilityPhase; +import jdk.graal.compiler.phases.schedule.SchedulePhase; +import jdk.graal.compiler.phases.schedule.SchedulePhase.SchedulingStrategy; +import jdk.graal.compiler.phases.tiers.LowTierContext; public class LowTier extends BaseTier { diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/phases/MidTier.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/phases/MidTier.java similarity index 71% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/phases/MidTier.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/phases/MidTier.java index 78a3f2d45244..5126b9cabf97 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/phases/MidTier.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/phases/MidTier.java @@ -22,34 +22,34 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.phases; - -import jdk.compiler.graal.core.common.GraalOptions; -import jdk.compiler.graal.core.common.SpectrePHTMitigations; -import jdk.compiler.graal.loop.phases.LoopFullUnrollPhase; -import jdk.compiler.graal.loop.phases.LoopPartialUnrollPhase; -import jdk.compiler.graal.loop.phases.LoopPredicationPhase; -import jdk.compiler.graal.loop.phases.LoopSafepointEliminationPhase; -import jdk.compiler.graal.loop.phases.SpeculativeGuardMovementPhase; -import jdk.compiler.graal.nodes.loop.DefaultLoopPolicies; -import jdk.compiler.graal.nodes.loop.LoopPolicies; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.phases.common.CanonicalizerPhase; -import jdk.compiler.graal.phases.common.DeoptimizationGroupingPhase; -import jdk.compiler.graal.phases.common.FloatingReadPhase; -import jdk.compiler.graal.phases.common.FrameStateAssignmentPhase; -import jdk.compiler.graal.phases.common.GuardLoweringPhase; -import jdk.compiler.graal.phases.common.InsertGuardFencesPhase; -import jdk.compiler.graal.phases.common.IterativeConditionalEliminationPhase; -import jdk.compiler.graal.phases.common.LockEliminationPhase; -import jdk.compiler.graal.phases.common.LoopSafepointInsertionPhase; -import jdk.compiler.graal.phases.common.MidTierLoweringPhase; -import jdk.compiler.graal.phases.common.OptimizeDivPhase; -import jdk.compiler.graal.phases.common.ReassociationPhase; -import jdk.compiler.graal.phases.common.RemoveValueProxyPhase; -import jdk.compiler.graal.phases.common.VerifyHeapAtReturnPhase; -import jdk.compiler.graal.phases.common.WriteBarrierAdditionPhase; -import jdk.compiler.graal.phases.tiers.MidTierContext; +package jdk.graal.compiler.core.phases; + +import jdk.graal.compiler.core.common.GraalOptions; +import jdk.graal.compiler.core.common.SpectrePHTMitigations; +import jdk.graal.compiler.loop.phases.LoopFullUnrollPhase; +import jdk.graal.compiler.loop.phases.LoopPartialUnrollPhase; +import jdk.graal.compiler.loop.phases.LoopPredicationPhase; +import jdk.graal.compiler.loop.phases.LoopSafepointEliminationPhase; +import jdk.graal.compiler.loop.phases.SpeculativeGuardMovementPhase; +import jdk.graal.compiler.nodes.loop.DefaultLoopPolicies; +import jdk.graal.compiler.nodes.loop.LoopPolicies; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.phases.common.CanonicalizerPhase; +import jdk.graal.compiler.phases.common.DeoptimizationGroupingPhase; +import jdk.graal.compiler.phases.common.FloatingReadPhase; +import jdk.graal.compiler.phases.common.FrameStateAssignmentPhase; +import jdk.graal.compiler.phases.common.GuardLoweringPhase; +import jdk.graal.compiler.phases.common.InsertGuardFencesPhase; +import jdk.graal.compiler.phases.common.IterativeConditionalEliminationPhase; +import jdk.graal.compiler.phases.common.LockEliminationPhase; +import jdk.graal.compiler.phases.common.LoopSafepointInsertionPhase; +import jdk.graal.compiler.phases.common.MidTierLoweringPhase; +import jdk.graal.compiler.phases.common.OptimizeDivPhase; +import jdk.graal.compiler.phases.common.ReassociationPhase; +import jdk.graal.compiler.phases.common.RemoveValueProxyPhase; +import jdk.graal.compiler.phases.common.VerifyHeapAtReturnPhase; +import jdk.graal.compiler.phases.common.WriteBarrierAdditionPhase; +import jdk.graal.compiler.phases.tiers.MidTierContext; public class MidTier extends BaseTier { diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/phases/fuzzing/AbstractCompilationPlan.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/phases/fuzzing/AbstractCompilationPlan.java similarity index 93% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/phases/fuzzing/AbstractCompilationPlan.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/phases/fuzzing/AbstractCompilationPlan.java index a8add0a9fd1f..2e0c98ffa640 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/phases/fuzzing/AbstractCompilationPlan.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/phases/fuzzing/AbstractCompilationPlan.java @@ -22,20 +22,20 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.phases.fuzzing; +package jdk.graal.compiler.core.phases.fuzzing; import java.util.Optional; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.nodes.GraphState; -import jdk.compiler.graal.nodes.GraphState.MandatoryStages; -import jdk.compiler.graal.nodes.GraphState.StageFlag; -import jdk.compiler.graal.phases.BasePhase.NotApplicable; -import jdk.compiler.graal.phases.schedule.SchedulePhase; -import jdk.compiler.graal.phases.tiers.HighTierContext; -import jdk.compiler.graal.phases.tiers.LowTierContext; -import jdk.compiler.graal.phases.tiers.MidTierContext; -import jdk.compiler.graal.phases.tiers.Suites; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.nodes.GraphState; +import jdk.graal.compiler.nodes.GraphState.MandatoryStages; +import jdk.graal.compiler.nodes.GraphState.StageFlag; +import jdk.graal.compiler.phases.BasePhase.NotApplicable; +import jdk.graal.compiler.phases.schedule.SchedulePhase; +import jdk.graal.compiler.phases.tiers.HighTierContext; +import jdk.graal.compiler.phases.tiers.LowTierContext; +import jdk.graal.compiler.phases.tiers.MidTierContext; +import jdk.graal.compiler.phases.tiers.Suites; /** * Compilation plan that represents a specific ordering of phases. These phases are grouped into diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/phases/fuzzing/AbstractTierPlan.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/phases/fuzzing/AbstractTierPlan.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/phases/fuzzing/AbstractTierPlan.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/phases/fuzzing/AbstractTierPlan.java index 7a1069ab58a5..fdaa0e631d33 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/phases/fuzzing/AbstractTierPlan.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/phases/fuzzing/AbstractTierPlan.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.phases.fuzzing; +package jdk.graal.compiler.core.phases.fuzzing; import java.util.ArrayList; import java.util.List; -import jdk.compiler.graal.nodes.GraphState; -import jdk.compiler.graal.phases.BasePhase; -import jdk.compiler.graal.phases.PhaseSuite; +import jdk.graal.compiler.nodes.GraphState; +import jdk.graal.compiler.phases.BasePhase; +import jdk.graal.compiler.phases.PhaseSuite; /** * Plan that represents a specific ordering of phases for a tier. diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/phases/fuzzing/FullFuzzedCompilationPlan.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/phases/fuzzing/FullFuzzedCompilationPlan.java similarity index 95% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/phases/fuzzing/FullFuzzedCompilationPlan.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/phases/fuzzing/FullFuzzedCompilationPlan.java index 08e153de2c6a..c753d92d3cfa 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/phases/fuzzing/FullFuzzedCompilationPlan.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/phases/fuzzing/FullFuzzedCompilationPlan.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.phases.fuzzing; +package jdk.graal.compiler.core.phases.fuzzing; import java.util.stream.Collectors; -import jdk.compiler.graal.nodes.GraphState; -import jdk.compiler.graal.phases.tiers.HighTierContext; -import jdk.compiler.graal.phases.tiers.LowTierContext; -import jdk.compiler.graal.phases.tiers.MidTierContext; +import jdk.graal.compiler.nodes.GraphState; +import jdk.graal.compiler.phases.tiers.HighTierContext; +import jdk.graal.compiler.phases.tiers.LowTierContext; +import jdk.graal.compiler.phases.tiers.MidTierContext; /** * Compilation plan that inserts optional phases in a {@link MinimalFuzzedCompilationPlan}. diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/phases/fuzzing/FullFuzzedTierPlan.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/phases/fuzzing/FullFuzzedTierPlan.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/phases/fuzzing/FullFuzzedTierPlan.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/phases/fuzzing/FullFuzzedTierPlan.java index e3e93a6d6ed1..0fe9a0554192 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/phases/fuzzing/FullFuzzedTierPlan.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/phases/fuzzing/FullFuzzedTierPlan.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.phases.fuzzing; +package jdk.graal.compiler.core.phases.fuzzing; import java.util.ArrayList; import java.util.Collections; @@ -31,9 +31,9 @@ import java.util.Random; import java.util.Set; -import jdk.compiler.graal.nodes.GraphState; -import jdk.compiler.graal.phases.BasePhase; -import jdk.compiler.graal.phases.PhaseSuite; +import jdk.graal.compiler.nodes.GraphState; +import jdk.graal.compiler.phases.BasePhase; +import jdk.graal.compiler.phases.PhaseSuite; /** * Tier plan that inserts optional phases in a {@link MinimalFuzzedTierPlan}. diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/phases/fuzzing/FuzzedSuites.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/phases/fuzzing/FuzzedSuites.java similarity index 93% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/phases/fuzzing/FuzzedSuites.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/phases/fuzzing/FuzzedSuites.java index 01a342d0a790..6e1e29adfa99 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/phases/fuzzing/FuzzedSuites.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/phases/fuzzing/FuzzedSuites.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.phases.fuzzing; +package jdk.graal.compiler.core.phases.fuzzing; import java.util.Random; -import jdk.compiler.graal.nodes.GraphState; -import jdk.compiler.graal.nodes.GraphState.MandatoryStages; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.phases.common.CanonicalizerPhase; -import jdk.compiler.graal.phases.tiers.Suites; +import jdk.graal.compiler.nodes.GraphState; +import jdk.graal.compiler.nodes.GraphState.MandatoryStages; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.phases.common.CanonicalizerPhase; +import jdk.graal.compiler.phases.tiers.Suites; /** * {@link Suites} created by fuzzing the order of the phases in each tier. diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/phases/fuzzing/MinimalFuzzedCompilationPlan.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/phases/fuzzing/MinimalFuzzedCompilationPlan.java similarity index 93% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/phases/fuzzing/MinimalFuzzedCompilationPlan.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/phases/fuzzing/MinimalFuzzedCompilationPlan.java index f978f8ee7d64..f4fc0de30c0c 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/phases/fuzzing/MinimalFuzzedCompilationPlan.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/phases/fuzzing/MinimalFuzzedCompilationPlan.java @@ -22,16 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.phases.fuzzing; +package jdk.graal.compiler.core.phases.fuzzing; import java.util.Random; -import jdk.compiler.graal.nodes.GraphState; -import jdk.compiler.graal.nodes.GraphState.MandatoryStages; -import jdk.compiler.graal.phases.tiers.HighTierContext; -import jdk.compiler.graal.phases.tiers.LowTierContext; -import jdk.compiler.graal.phases.tiers.MidTierContext; -import jdk.compiler.graal.phases.tiers.Suites; +import jdk.graal.compiler.nodes.GraphState; +import jdk.graal.compiler.nodes.GraphState.MandatoryStages; +import jdk.graal.compiler.phases.tiers.HighTierContext; +import jdk.graal.compiler.phases.tiers.LowTierContext; +import jdk.graal.compiler.phases.tiers.MidTierContext; +import jdk.graal.compiler.phases.tiers.Suites; /** * {@link AbstractCompilationPlan} created by fuzzing and only contains the phases required to diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/phases/fuzzing/MinimalFuzzedTierPlan.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/phases/fuzzing/MinimalFuzzedTierPlan.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/phases/fuzzing/MinimalFuzzedTierPlan.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/phases/fuzzing/MinimalFuzzedTierPlan.java index fbe86ad6a74b..41ab86e0b26c 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/phases/fuzzing/MinimalFuzzedTierPlan.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/phases/fuzzing/MinimalFuzzedTierPlan.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.phases.fuzzing; +package jdk.graal.compiler.core.phases.fuzzing; import java.util.ArrayDeque; import java.util.ArrayList; @@ -38,13 +38,13 @@ import java.util.Set; import java.util.function.Supplier; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.core.phases.fuzzing.AbstractCompilationPlan.PrintingUtils; -import jdk.compiler.graal.nodes.GraphState; -import jdk.compiler.graal.nodes.GraphState.StageFlag; -import jdk.compiler.graal.phases.BasePhase; -import jdk.compiler.graal.phases.BasePhase.NotApplicable; -import jdk.compiler.graal.phases.PhaseSuite; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.core.phases.fuzzing.AbstractCompilationPlan.PrintingUtils; +import jdk.graal.compiler.nodes.GraphState; +import jdk.graal.compiler.nodes.GraphState.StageFlag; +import jdk.graal.compiler.phases.BasePhase; +import jdk.graal.compiler.phases.BasePhase.NotApplicable; +import jdk.graal.compiler.phases.PhaseSuite; /** * {@link AbstractTierPlan} that only contains the phases required to satisfy a given set of diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/phases/fuzzing/PhasePlanSerializer.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/phases/fuzzing/PhasePlanSerializer.java similarity index 94% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/phases/fuzzing/PhasePlanSerializer.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/phases/fuzzing/PhasePlanSerializer.java index c15f95c89557..dd33412a12e4 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/phases/fuzzing/PhasePlanSerializer.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/phases/fuzzing/PhasePlanSerializer.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.phases.fuzzing; +package jdk.graal.compiler.core.phases.fuzzing; import java.io.ByteArrayOutputStream; import java.io.DataInputStream; @@ -36,13 +36,13 @@ import java.util.List; import java.util.Map; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.phases.BasePhase; -import jdk.compiler.graal.phases.PhaseSuite; -import jdk.compiler.graal.phases.tiers.HighTierContext; -import jdk.compiler.graal.phases.tiers.LowTierContext; -import jdk.compiler.graal.phases.tiers.MidTierContext; -import jdk.compiler.graal.phases.tiers.Suites; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.phases.BasePhase; +import jdk.graal.compiler.phases.PhaseSuite; +import jdk.graal.compiler.phases.tiers.HighTierContext; +import jdk.graal.compiler.phases.tiers.LowTierContext; +import jdk.graal.compiler.phases.tiers.MidTierContext; +import jdk.graal.compiler.phases.tiers.Suites; /** * Provides tools to save a serialized version of the {@link Suites} to a file and load the diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/riscv64/RISCV64LoweringProviderMixin.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/riscv64/RISCV64LoweringProviderMixin.java similarity index 89% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/riscv64/RISCV64LoweringProviderMixin.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/riscv64/RISCV64LoweringProviderMixin.java index 5fa3ab26f574..199d2b87e682 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/riscv64/RISCV64LoweringProviderMixin.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/riscv64/RISCV64LoweringProviderMixin.java @@ -23,11 +23,11 @@ * questions. */ -package jdk.compiler.graal.core.riscv64; +package jdk.graal.compiler.core.riscv64; -import jdk.compiler.graal.core.common.memory.MemoryExtendKind; -import jdk.compiler.graal.nodes.memory.ExtendableMemoryAccess; -import jdk.compiler.graal.nodes.spi.LoweringProvider; +import jdk.graal.compiler.core.common.memory.MemoryExtendKind; +import jdk.graal.compiler.nodes.memory.ExtendableMemoryAccess; +import jdk.graal.compiler.nodes.spi.LoweringProvider; public interface RISCV64LoweringProviderMixin extends LoweringProvider { diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/riscv64/RISCV64NodeMatchRules.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/riscv64/RISCV64NodeMatchRules.java similarity index 90% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/riscv64/RISCV64NodeMatchRules.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/riscv64/RISCV64NodeMatchRules.java index 75a8c62be628..588491373328 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/riscv64/RISCV64NodeMatchRules.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/riscv64/RISCV64NodeMatchRules.java @@ -23,10 +23,10 @@ * questions. */ -package jdk.compiler.graal.core.riscv64; +package jdk.graal.compiler.core.riscv64; -import jdk.compiler.graal.core.gen.NodeMatchRules; -import jdk.compiler.graal.lir.gen.LIRGeneratorTool; +import jdk.graal.compiler.core.gen.NodeMatchRules; +import jdk.graal.compiler.lir.gen.LIRGeneratorTool; public class RISCV64NodeMatchRules extends NodeMatchRules { public RISCV64NodeMatchRules(LIRGeneratorTool gen) { diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/riscv64/RISCV64ReflectionUtil.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/riscv64/RISCV64ReflectionUtil.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/riscv64/RISCV64ReflectionUtil.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/riscv64/RISCV64ReflectionUtil.java index cef29a244706..facb345b9e40 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/riscv64/RISCV64ReflectionUtil.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/riscv64/RISCV64ReflectionUtil.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.compiler.graal.core.riscv64; +package jdk.graal.compiler.core.riscv64; import java.lang.reflect.Method; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/riscv64/ShadowedRISCV64.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/riscv64/ShadowedRISCV64.java similarity index 99% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/riscv64/ShadowedRISCV64.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/riscv64/ShadowedRISCV64.java index 54dc1dba30da..eebbf8ab5f9e 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/riscv64/ShadowedRISCV64.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/riscv64/ShadowedRISCV64.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.compiler.graal.core.riscv64; +package jdk.graal.compiler.core.riscv64; import jdk.vm.ci.code.Architecture; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/target/Backend.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/target/Backend.java similarity index 92% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/target/Backend.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/target/Backend.java index e78e28d0f4f7..227c354da8b0 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/target/Backend.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/target/Backend.java @@ -22,29 +22,29 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.core.target; +package jdk.graal.compiler.core.target; import java.util.ArrayList; -import jdk.compiler.graal.code.CompilationResult; -import jdk.compiler.graal.core.common.CompilationIdentifier; -import jdk.compiler.graal.core.common.LIRKind; -import jdk.compiler.graal.core.common.alloc.DefaultCodeEmissionOrder; -import jdk.compiler.graal.core.common.alloc.RegisterAllocationConfig; -import jdk.compiler.graal.core.common.cfg.BasicBlock; -import jdk.compiler.graal.core.common.cfg.CodeEmissionOrder; -import jdk.compiler.graal.core.common.spi.ForeignCallSignature; -import jdk.compiler.graal.core.common.spi.ForeignCallsProvider; -import jdk.compiler.graal.core.gen.LIRCompilerBackend; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.lir.asm.CompilationResultBuilderFactory; -import jdk.compiler.graal.lir.asm.EntryPointDecorator; -import jdk.compiler.graal.lir.phases.LIRSuites; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.phases.tiers.SuitesProvider; -import jdk.compiler.graal.phases.tiers.TargetProvider; -import jdk.compiler.graal.phases.util.Providers; +import jdk.graal.compiler.code.CompilationResult; +import jdk.graal.compiler.core.common.CompilationIdentifier; +import jdk.graal.compiler.core.common.LIRKind; +import jdk.graal.compiler.core.common.alloc.DefaultCodeEmissionOrder; +import jdk.graal.compiler.core.common.alloc.RegisterAllocationConfig; +import jdk.graal.compiler.core.common.cfg.BasicBlock; +import jdk.graal.compiler.core.common.cfg.CodeEmissionOrder; +import jdk.graal.compiler.core.common.spi.ForeignCallSignature; +import jdk.graal.compiler.core.common.spi.ForeignCallsProvider; +import jdk.graal.compiler.core.gen.LIRCompilerBackend; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.lir.asm.CompilationResultBuilderFactory; +import jdk.graal.compiler.lir.asm.EntryPointDecorator; +import jdk.graal.compiler.lir.phases.LIRSuites; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.phases.tiers.SuitesProvider; +import jdk.graal.compiler.phases.tiers.TargetProvider; +import jdk.graal.compiler.phases.util.Providers; import jdk.vm.ci.code.BailoutException; import jdk.vm.ci.code.CodeCacheProvider; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/AbstractKey.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/AbstractKey.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/AbstractKey.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/AbstractKey.java index 4f26c968545c..446948fbecad 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/AbstractKey.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/AbstractKey.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.debug; +package jdk.graal.compiler.debug; /** * A name and index for a metric value. diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/AccumulatedKey.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/AccumulatedKey.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/AccumulatedKey.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/AccumulatedKey.java index 88404267ba71..3c62b3a17eb8 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/AccumulatedKey.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/AccumulatedKey.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.debug; +package jdk.graal.compiler.debug; abstract class AccumulatedKey extends AbstractKey { protected final AbstractKey flat; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/Assertions.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/Assertions.java similarity index 91% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/Assertions.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/Assertions.java index e419790e884c..3d7ae0de7c16 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/Assertions.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/Assertions.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.debug; +package jdk.graal.compiler.debug; -import jdk.compiler.graal.options.Option; -import jdk.compiler.graal.options.OptionKey; -import jdk.compiler.graal.options.OptionType; -import jdk.compiler.graal.options.OptionValues; +import jdk.graal.compiler.options.Option; +import jdk.graal.compiler.options.OptionKey; +import jdk.graal.compiler.options.OptionType; +import jdk.graal.compiler.options.OptionValues; /** * Utility for query whether assertions are enabled. diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/CSVUtil.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/CSVUtil.java similarity index 99% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/CSVUtil.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/CSVUtil.java index ee0fabad2407..bf9d44c28b21 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/CSVUtil.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/CSVUtil.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.debug; +package jdk.graal.compiler.debug; import java.io.PrintStream; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/CausableByCompilerAssert.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/CausableByCompilerAssert.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/CausableByCompilerAssert.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/CausableByCompilerAssert.java index a84d48f09fc3..4bd4cf17efa2 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/CausableByCompilerAssert.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/CausableByCompilerAssert.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.debug; +package jdk.graal.compiler.debug; public interface CausableByCompilerAssert { boolean isCausedByCompilerAssert(); diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/CloseableCounter.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/CloseableCounter.java similarity index 99% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/CloseableCounter.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/CloseableCounter.java index c12d8aa539ff..3aa5079793d8 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/CloseableCounter.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/CloseableCounter.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.debug; +package jdk.graal.compiler.debug; /** * A helper class for {@link AbstractKey}s that can nest and need to split out accumulated and flat diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/CompilationListener.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/CompilationListener.java similarity index 96% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/CompilationListener.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/CompilationListener.java index 01db7af99ea2..2c89c3c02ff7 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/CompilationListener.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/CompilationListener.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.debug; +package jdk.graal.compiler.debug; -import jdk.compiler.graal.debug.DebugContext.CompilerPhaseScope; +import jdk.graal.compiler.debug.DebugContext.CompilerPhaseScope; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/CounterKey.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/CounterKey.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/CounterKey.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/CounterKey.java index f5cfea58ded8..cd185306e645 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/CounterKey.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/CounterKey.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.debug; +package jdk.graal.compiler.debug; /** * A counter for some value of interest. diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/CounterKeyImpl.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/CounterKeyImpl.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/CounterKeyImpl.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/CounterKeyImpl.java index 9cb93978a21a..9a4a06ada2db 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/CounterKeyImpl.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/CounterKeyImpl.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.debug; +package jdk.graal.compiler.debug; import org.graalvm.collections.Pair; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/DebugCloseable.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/DebugCloseable.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/DebugCloseable.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/DebugCloseable.java index 1633eace71d9..f633e210b4f2 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/DebugCloseable.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/DebugCloseable.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.debug; +package jdk.graal.compiler.debug; /** * An {@link AutoCloseable} whose {@link #close()} does not throw a checked exception. diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/DebugConfig.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/DebugConfig.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/DebugConfig.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/DebugConfig.java index 4715db192bb6..e7472f44bcb2 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/DebugConfig.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/DebugConfig.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.debug; +package jdk.graal.compiler.debug; import java.io.PrintStream; import java.util.Collection; -import jdk.compiler.graal.debug.DebugContext.Scope; -import jdk.compiler.graal.options.OptionValues; +import jdk.graal.compiler.debug.DebugContext.Scope; +import jdk.graal.compiler.options.OptionValues; import jdk.vm.ci.meta.JavaMethod; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/DebugConfigImpl.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/DebugConfigImpl.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/DebugConfigImpl.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/DebugConfigImpl.java index 9b110a19b796..7236b0502cda 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/DebugConfigImpl.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/DebugConfigImpl.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.debug; +package jdk.graal.compiler.debug; -import static jdk.compiler.graal.debug.DebugContext.BASIC_LEVEL; +import static jdk.graal.compiler.debug.DebugContext.BASIC_LEVEL; import java.io.ByteArrayOutputStream; import java.io.PrintStream; @@ -35,7 +35,7 @@ import java.util.List; import java.util.Map; -import jdk.compiler.graal.options.OptionValues; +import jdk.graal.compiler.options.OptionValues; import jdk.vm.ci.code.BailoutException; import jdk.vm.ci.meta.JavaMethod; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/DebugContext.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/DebugContext.java similarity index 99% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/DebugContext.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/DebugContext.java index 72dd146a6e7a..3bd7886f4c80 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/DebugContext.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/DebugContext.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.debug; +package jdk.graal.compiler.debug; import static java.util.FormattableFlags.LEFT_JUSTIFY; import static java.util.FormattableFlags.UPPERCASE; @@ -48,10 +48,10 @@ import org.graalvm.collections.EconomicMap; import org.graalvm.collections.EconomicSet; import org.graalvm.collections.Pair; -import jdk.compiler.graal.options.OptionKey; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.serviceprovider.GraalServices; -import jdk.compiler.graal.graphio.GraphOutput; +import jdk.graal.compiler.options.OptionKey; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.serviceprovider.GraalServices; +import jdk.graal.compiler.graphio.GraphOutput; import jdk.vm.ci.common.NativeImageReinitialize; import jdk.vm.ci.meta.JavaMethod; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/DebugDumpHandler.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/DebugDumpHandler.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/DebugDumpHandler.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/DebugDumpHandler.java index 6fcf29fd55b3..c95559d47991 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/DebugDumpHandler.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/DebugDumpHandler.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.debug; +package jdk.graal.compiler.debug; import java.io.Closeable; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/DebugDumpScope.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/DebugDumpScope.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/DebugDumpScope.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/DebugDumpScope.java index 273562da7349..903b73b8c3b5 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/DebugDumpScope.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/DebugDumpScope.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.debug; +package jdk.graal.compiler.debug; public class DebugDumpScope { diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/DebugFilter.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/DebugFilter.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/DebugFilter.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/DebugFilter.java index de2738371d1c..efa79ae697f4 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/DebugFilter.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/DebugFilter.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.debug; +package jdk.graal.compiler.debug; import java.util.Arrays; import java.util.regex.Pattern; -import jdk.compiler.graal.debug.DebugContext.Scope; +import jdk.graal.compiler.debug.DebugContext.Scope; /** * Implements the filter specified by options such as {@link DebugOptions#Dump}, diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/DebugHandler.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/DebugHandler.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/DebugHandler.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/DebugHandler.java index 1c94eed0ed4a..7cb14a7ebe0e 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/DebugHandler.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/DebugHandler.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.debug; +package jdk.graal.compiler.debug; /** * This interface exists to unify {@link DebugDumpHandler} and {@link DebugVerifyHandler} for the diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/DebugHandlersFactory.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/DebugHandlersFactory.java similarity index 93% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/DebugHandlersFactory.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/DebugHandlersFactory.java index 41308d5e7b90..7be896287c4e 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/DebugHandlersFactory.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/DebugHandlersFactory.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.debug; +package jdk.graal.compiler.debug; import java.util.Iterator; import java.util.List; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.serviceprovider.GraalServices; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.serviceprovider.GraalServices; /** * Factory for creating {@link DebugHandler}s. diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/DebugOptions.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/DebugOptions.java similarity index 95% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/DebugOptions.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/DebugOptions.java index 13e8468820c8..9cc6d49fcef8 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/DebugOptions.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/DebugOptions.java @@ -22,26 +22,26 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.debug; +package jdk.graal.compiler.debug; -import static jdk.compiler.graal.debug.PathUtilities.createDirectories; -import static jdk.compiler.graal.debug.PathUtilities.exists; -import static jdk.compiler.graal.debug.PathUtilities.getAbsolutePath; -import static jdk.compiler.graal.debug.PathUtilities.getPath; +import static jdk.graal.compiler.debug.PathUtilities.createDirectories; +import static jdk.graal.compiler.debug.PathUtilities.exists; +import static jdk.graal.compiler.debug.PathUtilities.getAbsolutePath; +import static jdk.graal.compiler.debug.PathUtilities.getPath; import java.io.IOException; import java.text.SimpleDateFormat; import java.util.Date; import org.graalvm.collections.EconomicMap; -import jdk.compiler.graal.options.EnumMultiOptionKey; -import jdk.compiler.graal.options.EnumOptionKey; -import jdk.compiler.graal.options.Option; -import jdk.compiler.graal.options.OptionKey; -import jdk.compiler.graal.options.OptionStability; -import jdk.compiler.graal.options.OptionType; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.serviceprovider.GraalServices; +import jdk.graal.compiler.options.EnumMultiOptionKey; +import jdk.graal.compiler.options.EnumOptionKey; +import jdk.graal.compiler.options.Option; +import jdk.graal.compiler.options.OptionKey; +import jdk.graal.compiler.options.OptionStability; +import jdk.graal.compiler.options.OptionType; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.serviceprovider.GraalServices; /** * Options that configure a {@link DebugContext} and related functionality. diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/DebugVerifyHandler.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/DebugVerifyHandler.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/DebugVerifyHandler.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/DebugVerifyHandler.java index b6e25bc7e26c..8899df48656a 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/DebugVerifyHandler.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/DebugVerifyHandler.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.debug; +package jdk.graal.compiler.debug; /** * Performs some kind of verification on an object. diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/DiagnosticsOutputDirectory.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/DiagnosticsOutputDirectory.java similarity index 95% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/DiagnosticsOutputDirectory.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/DiagnosticsOutputDirectory.java index 8a3ad50d1a8b..505783d1ea6b 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/DiagnosticsOutputDirectory.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/DiagnosticsOutputDirectory.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.debug; +package jdk.graal.compiler.debug; import java.io.IOException; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.serviceprovider.GraalServices; -import jdk.compiler.graal.serviceprovider.IsolateUtil; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.serviceprovider.GraalServices; +import jdk.graal.compiler.serviceprovider.IsolateUtil; /** * Manages a directory into which diagnostics such crash reports and dumps should be written. The diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/GlobalMetrics.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/GlobalMetrics.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/GlobalMetrics.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/GlobalMetrics.java index 67a1df1dcd42..4159ca74c9e2 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/GlobalMetrics.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/GlobalMetrics.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.debug; +package jdk.graal.compiler.debug; import java.io.IOException; import java.io.PrintStream; @@ -35,8 +35,8 @@ import org.graalvm.collections.EconomicMap; import org.graalvm.collections.MapCursor; import org.graalvm.collections.Pair; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.serviceprovider.IsolateUtil; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.serviceprovider.IsolateUtil; /** * Metric values that can be {@linkplain #add(DebugContext) updated} by multiple threads. diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/GraalError.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/GraalError.java similarity index 99% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/GraalError.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/GraalError.java index a64c824fc9b1..929417fb7d68 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/GraalError.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/GraalError.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.debug; +package jdk.graal.compiler.debug; import java.util.ArrayList; import java.util.Locale; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/IgvDumpChannel.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/IgvDumpChannel.java similarity index 93% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/IgvDumpChannel.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/IgvDumpChannel.java index 2886b832cea6..779520511860 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/IgvDumpChannel.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/IgvDumpChannel.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.debug; +package jdk.graal.compiler.debug; -import static jdk.compiler.graal.debug.DebugOptions.PrintGraphHost; -import static jdk.compiler.graal.debug.DebugOptions.PrintGraphPort; -import static jdk.compiler.graal.debug.PathUtilities.getParent; -import static jdk.compiler.graal.debug.PathUtilities.isDirectory; +import static jdk.graal.compiler.debug.DebugOptions.PrintGraphHost; +import static jdk.graal.compiler.debug.DebugOptions.PrintGraphPort; +import static jdk.graal.compiler.debug.PathUtilities.getParent; +import static jdk.graal.compiler.debug.PathUtilities.isDirectory; import java.io.IOException; import java.io.InterruptedIOException; @@ -39,8 +39,8 @@ import java.nio.file.StandardOpenOption; import java.util.function.Supplier; -import jdk.compiler.graal.debug.DebugOptions.PrintGraphTarget; -import jdk.compiler.graal.options.OptionValues; +import jdk.graal.compiler.debug.DebugOptions.PrintGraphTarget; +import jdk.graal.compiler.options.OptionValues; import jdk.vm.ci.common.NativeImageReinitialize; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/Indent.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/Indent.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/Indent.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/Indent.java index 870fce61cdc4..464bc363eeda 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/Indent.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/Indent.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.debug; +package jdk.graal.compiler.debug; /** * Object used to close a debug {@link DebugContext#indent() indentation} scope. diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/JavaMethodContext.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/JavaMethodContext.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/JavaMethodContext.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/JavaMethodContext.java index a0280239e55f..09c5da75b9b2 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/JavaMethodContext.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/JavaMethodContext.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.debug; +package jdk.graal.compiler.debug; import jdk.vm.ci.meta.JavaMethod; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/KeyRegistry.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/KeyRegistry.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/KeyRegistry.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/KeyRegistry.java index 34244338d9f6..5678fc7f277b 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/KeyRegistry.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/KeyRegistry.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.debug; +package jdk.graal.compiler.debug; import java.util.ArrayList; import java.util.List; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/LogStream.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/LogStream.java similarity index 99% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/LogStream.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/LogStream.java index 44f6ce9425bc..e9a39ec61c3c 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/LogStream.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/LogStream.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.debug; +package jdk.graal.compiler.debug; import java.io.IOException; import java.io.OutputStream; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/MemUseTrackerKey.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/MemUseTrackerKey.java similarity index 95% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/MemUseTrackerKey.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/MemUseTrackerKey.java index 589cd4f88b5d..fe1c84b7e9ea 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/MemUseTrackerKey.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/MemUseTrackerKey.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.debug; +package jdk.graal.compiler.debug; -import jdk.compiler.graal.serviceprovider.GraalServices; +import jdk.graal.compiler.serviceprovider.GraalServices; /** * Tracks memory usage within a scope using {@code com.sun.management.ThreadMXBean}. This facility diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/MemUseTrackerKeyImpl.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/MemUseTrackerKeyImpl.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/MemUseTrackerKeyImpl.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/MemUseTrackerKeyImpl.java index 5f7fd96a823c..f8fe5e4a8250 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/MemUseTrackerKeyImpl.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/MemUseTrackerKeyImpl.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.debug; +package jdk.graal.compiler.debug; -import static jdk.compiler.graal.debug.DebugCloseable.VOID_CLOSEABLE; +import static jdk.graal.compiler.debug.DebugCloseable.VOID_CLOSEABLE; import org.graalvm.collections.Pair; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/MethodFilter.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/MethodFilter.java similarity index 99% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/MethodFilter.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/MethodFilter.java index c71f34ac7115..48592138f99d 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/MethodFilter.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/MethodFilter.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.debug; +package jdk.graal.compiler.debug; import java.util.ArrayList; import java.util.Arrays; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/MetricKey.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/MetricKey.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/MetricKey.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/MetricKey.java index 2b087cf29b31..3dd90dca331a 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/MetricKey.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/MetricKey.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.debug; +package jdk.graal.compiler.debug; import java.util.Comparator; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/PathUtilities.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/PathUtilities.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/PathUtilities.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/PathUtilities.java index 0ae113796039..bf5424caed38 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/PathUtilities.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/PathUtilities.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.debug; +package jdk.graal.compiler.debug; import java.io.File; import java.io.IOException; @@ -37,8 +37,8 @@ import java.util.Iterator; import java.util.ServiceLoader; -import jdk.compiler.graal.options.OptionKey; -import jdk.compiler.graal.options.OptionValues; +import jdk.graal.compiler.options.OptionKey; +import jdk.graal.compiler.options.OptionValues; /** * Miscellaneous methods for modifying and generating file system paths. diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/PathUtilitiesProvider.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/PathUtilitiesProvider.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/PathUtilitiesProvider.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/PathUtilitiesProvider.java index 80c903bb8645..ea6693f59b67 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/PathUtilitiesProvider.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/PathUtilitiesProvider.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.debug; +package jdk.graal.compiler.debug; import java.io.File; import java.io.FileInputStream; @@ -45,7 +45,7 @@ * This exists for Graal embedders in an environment where a standard file system is not available. * An implementation of this service is loaded via {@link ServiceLoader} which means the * implementation class must be named in a - * {@code META-INF/services/jdk.compiler.graal.debug.PathUtilitiesProvider} service description file + * {@code META-INF/services/jdk.graal.compiler.debug.PathUtilitiesProvider} service description file * accessible on the class path. Note that a {@link PathUtilitiesProvider} implementation must work * in the context of building a native image as well as in the context of the resulting native * image. Delegating to {@link StandardPathUtilitiesProvider} is the recommended way to work in the diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/ScopeImpl.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/ScopeImpl.java similarity index 99% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/ScopeImpl.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/ScopeImpl.java index afaaee6ed2fc..9f9157bdac34 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/ScopeImpl.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/ScopeImpl.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.debug; +package jdk.graal.compiler.debug; import java.io.PrintStream; import java.util.Iterator; -import jdk.compiler.graal.debug.DebugContext.DisabledScope; -import jdk.compiler.graal.serviceprovider.GraalServices; +import jdk.graal.compiler.debug.DebugContext.DisabledScope; +import jdk.graal.compiler.serviceprovider.GraalServices; import jdk.vm.ci.meta.JavaMethod; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/StandardPathUtilitiesProvider.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/StandardPathUtilitiesProvider.java similarity index 99% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/StandardPathUtilitiesProvider.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/StandardPathUtilitiesProvider.java index 27105cc148ec..ab8d50322ca9 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/StandardPathUtilitiesProvider.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/StandardPathUtilitiesProvider.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.debug; +package jdk.graal.compiler.debug; import java.io.File; import java.io.FileInputStream; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/TTY.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/TTY.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/TTY.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/TTY.java index 45cec6dced06..c3783d26e956 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/TTY.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/TTY.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.debug; +package jdk.graal.compiler.debug; import java.io.PrintStream; -import jdk.compiler.graal.serviceprovider.GraalServices; +import jdk.graal.compiler.serviceprovider.GraalServices; /** * A collection of static methods for printing debug and informational output to a global @@ -82,7 +82,7 @@ public void close() { /** * The {@link PrintStream} to which all non-suppressed output from {@link TTY} is written. - * Substituted by {@code com.oracle.svm.graal.Target_jdk_compiler_graal_debug_TTY}. + * Substituted by {@code com.oracle.svm.graal.Target_jdk_graal_compiler_debug_TTY}. */ public static final PrintStream out; static { diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/TTYStreamProvider.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/TTYStreamProvider.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/TTYStreamProvider.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/TTYStreamProvider.java index 18a1b0af9e12..5f7513c39902 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/TTYStreamProvider.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/TTYStreamProvider.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.debug; +package jdk.graal.compiler.debug; import java.io.PrintStream; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/TimeSource.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/TimeSource.java similarity index 95% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/TimeSource.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/TimeSource.java index 733e0c689594..4853f878aaf9 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/TimeSource.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/TimeSource.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.debug; +package jdk.graal.compiler.debug; -import jdk.compiler.graal.serviceprovider.GraalServices; +import jdk.graal.compiler.serviceprovider.GraalServices; /** * A consistent source of timing data that should be used by all facilities in the debug package. diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/TimerKey.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/TimerKey.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/TimerKey.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/TimerKey.java index bbf1f786fc09..6b23e435b57c 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/TimerKey.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/TimerKey.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.debug; +package jdk.graal.compiler.debug; import java.util.concurrent.TimeUnit; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/TimerKeyImpl.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/TimerKeyImpl.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/TimerKeyImpl.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/TimerKeyImpl.java index 4731333ce738..fb434fc55455 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/TimerKeyImpl.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/TimerKeyImpl.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.debug; +package jdk.graal.compiler.debug; -import static jdk.compiler.graal.debug.DebugCloseable.VOID_CLOSEABLE; +import static jdk.graal.compiler.debug.DebugCloseable.VOID_CLOSEABLE; import java.util.concurrent.TimeUnit; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/Versions.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/Versions.java similarity index 99% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/Versions.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/Versions.java index 89e2f40aebf8..cb8037cc051e 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/Versions.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/Versions.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.debug; +package jdk.graal.compiler.debug; import java.io.BufferedReader; import java.io.IOException; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/doc-files/DumpHelp.txt b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/doc-files/DumpHelp.txt similarity index 100% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/doc-files/DumpHelp.txt rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/doc-files/DumpHelp.txt diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/doc-files/MethodFilterHelp.txt b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/doc-files/MethodFilterHelp.txt similarity index 92% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/doc-files/MethodFilterHelp.txt rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/doc-files/MethodFilterHelp.txt index 8ad02ce906e2..8e73eb8a90f2 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/doc-files/MethodFilterHelp.txt +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/doc-files/MethodFilterHelp.txt @@ -44,14 +44,14 @@ Examples of method filters: Matches all methods named "set" in a class whose simple name ends with "List". --------- - jdk.compiler.graal.nodes.PhiNode.* + jdk.graal.compiler.nodes.PhiNode.* - Matches all methods in the class "jdk.compiler.graal.nodes.PhiNode". + Matches all methods in the class "jdk.graal.compiler.nodes.PhiNode". --------- - jdk.compiler.graal.nodes.*.canonical + jdk.graal.compiler.nodes.*.canonical Matches all methods named "canonical" in classes in the package - "jdk.compiler.graal.nodes". + "jdk.graal.compiler.nodes". --------- arraycopy,toString diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/doc-files/MetricsFileHelp.txt b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/doc-files/MetricsFileHelp.txt similarity index 100% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/doc-files/MetricsFileHelp.txt rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/doc-files/MetricsFileHelp.txt diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/doc-files/OptimizationLogHelp.txt b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/doc-files/OptimizationLogHelp.txt similarity index 100% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/doc-files/OptimizationLogHelp.txt rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/doc-files/OptimizationLogHelp.txt diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/doc-files/PrintGraphHelp.txt b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/doc-files/PrintGraphHelp.txt similarity index 100% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/doc-files/PrintGraphHelp.txt rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/debug/doc-files/PrintGraphHelp.txt diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/Edges.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/Edges.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/Edges.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/Edges.java index 9934b6b8421b..27f12f9420ee 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/Edges.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/Edges.java @@ -22,18 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.graph; +package jdk.graal.compiler.graph; -import static jdk.compiler.graal.graph.Graph.isNodeModificationCountsEnabled; -import static jdk.compiler.graal.graph.Node.NOT_ITERABLE; +import static jdk.graal.compiler.graph.Graph.isNodeModificationCountsEnabled; +import static jdk.graal.compiler.graph.Node.NOT_ITERABLE; import java.util.ArrayList; import java.util.Iterator; -import jdk.compiler.graal.core.common.Fields; -import jdk.compiler.graal.core.common.FieldsScanner; -import jdk.compiler.graal.graph.NodeClass.EdgeInfo; -import jdk.compiler.graal.serviceprovider.GraalUnsafeAccess; +import jdk.graal.compiler.core.common.Fields; +import jdk.graal.compiler.core.common.FieldsScanner; +import jdk.graal.compiler.graph.NodeClass.EdgeInfo; +import jdk.graal.compiler.serviceprovider.GraalUnsafeAccess; import sun.misc.Unsafe; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/GraalGraphError.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/GraalGraphError.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/GraalGraphError.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/GraalGraphError.java index fa9b41d8be3f..d5ad3d3d8fcb 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/GraalGraphError.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/GraalGraphError.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.graph; +package jdk.graal.compiler.graph; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.nodeinfo.Verbosity; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.nodeinfo.Verbosity; /** * This error is the graph/node aware extension of {@link GraalError}. diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/Graph.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/Graph.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/Graph.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/Graph.java index bf25752880ff..601114149a90 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/Graph.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/Graph.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.graph; +package jdk.graal.compiler.graph; -import static jdk.compiler.graal.core.common.GraalOptions.TrackNodeInsertion; +import static jdk.graal.compiler.core.common.GraalOptions.TrackNodeInsertion; import java.util.ArrayList; import java.util.Arrays; @@ -35,22 +35,22 @@ import org.graalvm.collections.EconomicMap; import org.graalvm.collections.Equivalence; import org.graalvm.collections.UnmodifiableEconomicMap; -import jdk.compiler.graal.core.common.GraalOptions; -import jdk.compiler.graal.core.common.util.CompilationAlarm; -import jdk.compiler.graal.core.common.util.EventCounter; -import jdk.compiler.graal.debug.CounterKey; -import jdk.compiler.graal.debug.DebugCloseable; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.debug.TimerKey; -import jdk.compiler.graal.graph.Node.NodeInsertionStackTrace; -import jdk.compiler.graal.graph.Node.ValueNumberable; -import jdk.compiler.graal.graph.iterators.NodeIterable; -import jdk.compiler.graal.graph.iterators.NodePredicate; -import jdk.compiler.graal.options.Option; -import jdk.compiler.graal.options.OptionKey; -import jdk.compiler.graal.options.OptionType; -import jdk.compiler.graal.options.OptionValues; +import jdk.graal.compiler.core.common.GraalOptions; +import jdk.graal.compiler.core.common.util.CompilationAlarm; +import jdk.graal.compiler.core.common.util.EventCounter; +import jdk.graal.compiler.debug.CounterKey; +import jdk.graal.compiler.debug.DebugCloseable; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.debug.TimerKey; +import jdk.graal.compiler.graph.Node.NodeInsertionStackTrace; +import jdk.graal.compiler.graph.Node.ValueNumberable; +import jdk.graal.compiler.graph.iterators.NodeIterable; +import jdk.graal.compiler.graph.iterators.NodePredicate; +import jdk.graal.compiler.options.Option; +import jdk.graal.compiler.options.OptionKey; +import jdk.graal.compiler.options.OptionType; +import jdk.graal.compiler.options.OptionValues; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/GraphNodeIterator.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/GraphNodeIterator.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/GraphNodeIterator.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/GraphNodeIterator.java index 9de41b6548c3..0eac9a0946bd 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/GraphNodeIterator.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/GraphNodeIterator.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.graph; +package jdk.graal.compiler.graph; import java.util.Iterator; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/InputEdges.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/InputEdges.java similarity index 94% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/InputEdges.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/InputEdges.java index 87ddddf575b5..5be85a14d562 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/InputEdges.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/InputEdges.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.graph; +package jdk.graal.compiler.graph; import java.util.ArrayList; -import jdk.compiler.graal.graph.NodeClass.InputInfo; -import jdk.compiler.graal.nodeinfo.InputType; +import jdk.graal.compiler.graph.NodeClass.InputInfo; +import jdk.graal.compiler.nodeinfo.InputType; public final class InputEdges extends Edges { diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/IterableNodeType.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/IterableNodeType.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/IterableNodeType.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/IterableNodeType.java index 31046c744efb..992c808a203b 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/IterableNodeType.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/IterableNodeType.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.graph; +package jdk.graal.compiler.graph; /** * A marker for a node type supporting {@linkplain Graph#getNodes(NodeClass) fast iteration} of its diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/LinkedStack.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/LinkedStack.java similarity index 96% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/LinkedStack.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/LinkedStack.java index 380af41f65af..ac0b50751b5b 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/LinkedStack.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/LinkedStack.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.graph; +package jdk.graal.compiler.graph; -import jdk.compiler.graal.debug.GraalError; +import jdk.graal.compiler.debug.GraalError; /** * A stack implementation that uses a singly linked list as its underlying storage strategy making diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/MemoryKillMarker.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/MemoryKillMarker.java similarity index 92% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/MemoryKillMarker.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/MemoryKillMarker.java index 1f6e0765d277..bb119385719f 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/MemoryKillMarker.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/MemoryKillMarker.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.graph; +package jdk.graal.compiler.graph; -import jdk.compiler.graal.nodeinfo.InputType; -import jdk.compiler.graal.nodeinfo.NodeInfo; +import jdk.graal.compiler.nodeinfo.InputType; +import jdk.graal.compiler.nodeinfo.NodeInfo; /** * Any node that includes {@link InputType#Memory InputType.Memory} in diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/Node.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/Node.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/Node.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/Node.java index af549e462481..f6e6dc7ab09d 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/Node.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/Node.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.graph; +package jdk.graal.compiler.graph; -import static jdk.compiler.graal.serviceprovider.GraalUnsafeAccess.getUnsafe; +import static jdk.graal.compiler.serviceprovider.GraalUnsafeAccess.getUnsafe; import java.lang.annotation.ElementType; import java.lang.annotation.RetentionPolicy; @@ -40,21 +40,21 @@ import java.util.function.Predicate; import java.util.function.Supplier; -import jdk.compiler.graal.core.common.Fields; -import jdk.compiler.graal.core.common.type.AbstractPointerStamp; -import jdk.compiler.graal.core.common.type.Stamp; -import jdk.compiler.graal.core.common.util.CompilationAlarm; -import jdk.compiler.graal.debug.DebugCloseable; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.graph.iterators.NodeIterable; -import jdk.compiler.graal.graph.iterators.NodePredicate; -import jdk.compiler.graal.nodeinfo.InputType; -import jdk.compiler.graal.nodeinfo.NodeCycles; -import jdk.compiler.graal.nodeinfo.NodeInfo; -import jdk.compiler.graal.nodeinfo.NodeSize; -import jdk.compiler.graal.nodeinfo.Verbosity; -import jdk.compiler.graal.options.OptionValues; +import jdk.graal.compiler.core.common.Fields; +import jdk.graal.compiler.core.common.type.AbstractPointerStamp; +import jdk.graal.compiler.core.common.type.Stamp; +import jdk.graal.compiler.core.common.util.CompilationAlarm; +import jdk.graal.compiler.debug.DebugCloseable; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.graph.iterators.NodeIterable; +import jdk.graal.compiler.graph.iterators.NodePredicate; +import jdk.graal.compiler.nodeinfo.InputType; +import jdk.graal.compiler.nodeinfo.NodeCycles; +import jdk.graal.compiler.nodeinfo.NodeInfo; +import jdk.graal.compiler.nodeinfo.NodeSize; +import jdk.graal.compiler.nodeinfo.Verbosity; +import jdk.graal.compiler.options.OptionValues; import jdk.vm.ci.services.Services; import sun.misc.Unsafe; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/NodeBitMap.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/NodeBitMap.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/NodeBitMap.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/NodeBitMap.java index 326fd3d4d224..51c87a32ada6 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/NodeBitMap.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/NodeBitMap.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.graph; +package jdk.graal.compiler.graph; import java.util.Arrays; import java.util.ConcurrentModificationException; import java.util.Iterator; import java.util.NoSuchElementException; -import jdk.compiler.graal.core.common.util.CompilationAlarm; -import jdk.compiler.graal.graph.iterators.NodeIterable; +import jdk.graal.compiler.core.common.util.CompilationAlarm; +import jdk.graal.compiler.graph.iterators.NodeIterable; public final class NodeBitMap extends NodeIdAccessor implements NodeIterable { private static final int SHIFT = 6; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/NodeClass.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/NodeClass.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/NodeClass.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/NodeClass.java index 99ed99ad4622..557efdb3d17e 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/NodeClass.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/NodeClass.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.graph; +package jdk.graal.compiler.graph; -import static jdk.compiler.graal.core.common.Fields.translateInto; -import static jdk.compiler.graal.debug.GraalError.shouldNotReachHere; -import static jdk.compiler.graal.debug.GraalError.shouldNotReachHereUnexpectedValue; -import static jdk.compiler.graal.graph.Edges.translateInto; -import static jdk.compiler.graal.graph.InputEdges.translateInto; -import static jdk.compiler.graal.graph.Node.WithAllEdges; +import static jdk.graal.compiler.core.common.Fields.translateInto; +import static jdk.graal.compiler.debug.GraalError.shouldNotReachHere; +import static jdk.graal.compiler.debug.GraalError.shouldNotReachHereUnexpectedValue; +import static jdk.graal.compiler.graph.Edges.translateInto; +import static jdk.graal.compiler.graph.InputEdges.translateInto; +import static jdk.graal.compiler.graph.Node.WithAllEdges; import java.lang.annotation.Annotation; import java.lang.reflect.AnnotatedElement; @@ -43,31 +43,31 @@ import java.util.Objects; import java.util.concurrent.atomic.AtomicInteger; -import jdk.compiler.graal.graph.iterators.NodeIterable; -import jdk.compiler.graal.graph.spi.BinaryCommutativeMarker; -import jdk.compiler.graal.graph.spi.CanonicalizableMarker; -import jdk.compiler.graal.graph.spi.NodeWithIdentity; -import jdk.compiler.graal.graph.spi.SimplifiableMarker; +import jdk.graal.compiler.graph.iterators.NodeIterable; +import jdk.graal.compiler.graph.spi.BinaryCommutativeMarker; +import jdk.graal.compiler.graph.spi.CanonicalizableMarker; +import jdk.graal.compiler.graph.spi.NodeWithIdentity; +import jdk.graal.compiler.graph.spi.SimplifiableMarker; import org.graalvm.collections.EconomicMap; import org.graalvm.collections.Equivalence; -import jdk.compiler.graal.core.common.FieldIntrospection; -import jdk.compiler.graal.core.common.Fields; -import jdk.compiler.graal.core.common.FieldsScanner; -import jdk.compiler.graal.debug.CounterKey; -import jdk.compiler.graal.debug.DebugCloseable; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.debug.TimerKey; -import jdk.compiler.graal.graph.Node.EdgeVisitor; -import jdk.compiler.graal.graph.Node.Input; -import jdk.compiler.graal.graph.Node.OptionalInput; -import jdk.compiler.graal.graph.Node.Successor; -import jdk.compiler.graal.nodeinfo.InputType; -import jdk.compiler.graal.nodeinfo.NodeCycles; -import jdk.compiler.graal.nodeinfo.NodeInfo; -import jdk.compiler.graal.nodeinfo.NodeSize; -import jdk.compiler.graal.nodeinfo.Verbosity; -import jdk.compiler.graal.serviceprovider.GraalUnsafeAccess; +import jdk.graal.compiler.core.common.FieldIntrospection; +import jdk.graal.compiler.core.common.Fields; +import jdk.graal.compiler.core.common.FieldsScanner; +import jdk.graal.compiler.debug.CounterKey; +import jdk.graal.compiler.debug.DebugCloseable; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.debug.TimerKey; +import jdk.graal.compiler.graph.Node.EdgeVisitor; +import jdk.graal.compiler.graph.Node.Input; +import jdk.graal.compiler.graph.Node.OptionalInput; +import jdk.graal.compiler.graph.Node.Successor; +import jdk.graal.compiler.nodeinfo.InputType; +import jdk.graal.compiler.nodeinfo.NodeCycles; +import jdk.graal.compiler.nodeinfo.NodeInfo; +import jdk.graal.compiler.nodeinfo.NodeSize; +import jdk.graal.compiler.nodeinfo.Verbosity; +import jdk.graal.compiler.serviceprovider.GraalUnsafeAccess; import sun.misc.Unsafe; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/NodeFlood.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/NodeFlood.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/NodeFlood.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/NodeFlood.java index fd1e2b1fa7ff..2b80a10b5cd1 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/NodeFlood.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/NodeFlood.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.graph; +package jdk.graal.compiler.graph; import java.util.ArrayDeque; import java.util.Iterator; import java.util.Queue; -import jdk.compiler.graal.graph.NodeWorkList.SingletonNodeWorkList; +import jdk.graal.compiler.graph.NodeWorkList.SingletonNodeWorkList; /** * A data structure for visiting nodes in a graph iteratively. Each node added to the flood will be diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/NodeIdAccessor.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/NodeIdAccessor.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/NodeIdAccessor.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/NodeIdAccessor.java index 26f3ea06c14f..4d92acb15196 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/NodeIdAccessor.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/NodeIdAccessor.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.graph; +package jdk.graal.compiler.graph; /** * An entity that depends upon {@linkplain Graph#maybeCompress() stable} node identifiers. diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/NodeInputList.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/NodeInputList.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/NodeInputList.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/NodeInputList.java index 380a223f5a79..46e08f648a88 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/NodeInputList.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/NodeInputList.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.graph; +package jdk.graal.compiler.graph; import java.util.List; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/NodeList.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/NodeList.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/NodeList.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/NodeList.java index 81b93cc49450..77bb0e7ad3cc 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/NodeList.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/NodeList.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.graph; +package jdk.graal.compiler.graph; import java.util.AbstractList; import java.util.Arrays; @@ -32,9 +32,9 @@ import java.util.RandomAccess; import java.util.stream.Stream; -import jdk.compiler.graal.core.common.PermanentBailoutException; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.graph.iterators.NodeIterable; +import jdk.graal.compiler.core.common.PermanentBailoutException; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.graph.iterators.NodeIterable; public abstract class NodeList extends AbstractList implements NodeIterable, RandomAccess { diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/NodeMap.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/NodeMap.java similarity index 99% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/NodeMap.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/NodeMap.java index 828f899c552a..46a427633278 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/NodeMap.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/NodeMap.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.graph; +package jdk.graal.compiler.graph; import java.util.Arrays; import java.util.Iterator; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/NodeSourcePosition.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/NodeSourcePosition.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/NodeSourcePosition.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/NodeSourcePosition.java index 37c0f560b7e8..2a89164d3404 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/NodeSourcePosition.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/NodeSourcePosition.java @@ -22,17 +22,17 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.graph; +package jdk.graal.compiler.graph; -import static jdk.compiler.graal.graph.NodeSourcePosition.Marker.None; -import static jdk.compiler.graal.graph.NodeSourcePosition.Marker.Placeholder; -import static jdk.compiler.graal.graph.NodeSourcePosition.Marker.Substitution; +import static jdk.graal.compiler.graph.NodeSourcePosition.Marker.None; +import static jdk.graal.compiler.graph.NodeSourcePosition.Marker.Placeholder; +import static jdk.graal.compiler.graph.NodeSourcePosition.Marker.Substitution; import java.util.Iterator; import java.util.Objects; -import jdk.compiler.graal.bytecode.BytecodeDisassembler; -import jdk.compiler.graal.bytecode.Bytecodes; +import jdk.graal.compiler.bytecode.BytecodeDisassembler; +import jdk.graal.compiler.bytecode.Bytecodes; import jdk.vm.ci.code.BytecodeFrame; import jdk.vm.ci.code.BytecodePosition; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/NodeStack.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/NodeStack.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/NodeStack.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/NodeStack.java index 4ad9ac667671..3ce33a5d0fae 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/NodeStack.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/NodeStack.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.graph; +package jdk.graal.compiler.graph; public final class NodeStack { private static final int DEFAULT_INITIAL_SIZE = 8; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/NodeSuccessorList.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/NodeSuccessorList.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/NodeSuccessorList.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/NodeSuccessorList.java index ece338eb3bc7..088f0dd88f49 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/NodeSuccessorList.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/NodeSuccessorList.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.graph; +package jdk.graal.compiler.graph; import java.util.List; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/NodeUnionFind.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/NodeUnionFind.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/NodeUnionFind.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/NodeUnionFind.java index 92b0700bd5de..15a5bc817230 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/NodeUnionFind.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/NodeUnionFind.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.graph; +package jdk.graal.compiler.graph; /** * Union-find data structure for {@link Node Nodes}. diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/NodeUsageIterable.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/NodeUsageIterable.java similarity index 96% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/NodeUsageIterable.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/NodeUsageIterable.java index a9ce10ca5bcf..45ab9886b1e9 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/NodeUsageIterable.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/NodeUsageIterable.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.graph; +package jdk.graal.compiler.graph; import java.util.Iterator; -import jdk.compiler.graal.graph.iterators.NodeIterable; +import jdk.graal.compiler.graph.iterators.NodeIterable; class NodeUsageIterable implements NodeIterable { diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/NodeUsageIterator.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/NodeUsageIterator.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/NodeUsageIterator.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/NodeUsageIterator.java index a9a816b039cc..511ba00d5247 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/NodeUsageIterator.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/NodeUsageIterator.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.graph; +package jdk.graal.compiler.graph; import java.util.Iterator; import java.util.NoSuchElementException; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/NodeUsageWithModCountIterator.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/NodeUsageWithModCountIterator.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/NodeUsageWithModCountIterator.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/NodeUsageWithModCountIterator.java index 03e6aace3914..b6482ec2b257 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/NodeUsageWithModCountIterator.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/NodeUsageWithModCountIterator.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.graph; +package jdk.graal.compiler.graph; import java.util.ConcurrentModificationException; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/NodeWorkList.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/NodeWorkList.java similarity index 99% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/NodeWorkList.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/NodeWorkList.java index 38e6117d845b..1d65aab3a5d0 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/NodeWorkList.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/NodeWorkList.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.graph; +package jdk.graal.compiler.graph; import java.util.ArrayDeque; import java.util.Iterator; import java.util.NoSuchElementException; import java.util.Queue; -import jdk.compiler.graal.debug.DebugContext; +import jdk.graal.compiler.debug.DebugContext; public abstract class NodeWorkList implements Iterable { diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/Position.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/Position.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/Position.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/Position.java index 0948d655434d..e7e0ce899d9f 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/Position.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/Position.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.graph; +package jdk.graal.compiler.graph; -import jdk.compiler.graal.nodeinfo.InputType; +import jdk.graal.compiler.nodeinfo.InputType; /** * Describes an edge slot for a {@link NodeClass}. diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/SourceLanguagePosition.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/SourceLanguagePosition.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/SourceLanguagePosition.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/SourceLanguagePosition.java index 95ccd284794d..74699f573acb 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/SourceLanguagePosition.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/SourceLanguagePosition.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.graph; +package jdk.graal.compiler.graph; import java.net.URI; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/SourceLanguagePositionProvider.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/SourceLanguagePositionProvider.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/SourceLanguagePositionProvider.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/SourceLanguagePositionProvider.java index de9dee73d9b6..8e16c8c1635a 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/SourceLanguagePositionProvider.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/SourceLanguagePositionProvider.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.graph; +package jdk.graal.compiler.graph; import jdk.vm.ci.meta.JavaConstant; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/SuccessorEdges.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/SuccessorEdges.java similarity index 91% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/SuccessorEdges.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/SuccessorEdges.java index 9be173548e7a..2ab6d35e4582 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/SuccessorEdges.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/SuccessorEdges.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.graph; +package jdk.graal.compiler.graph; -import static jdk.compiler.graal.graph.Edges.Type.Successors; +import static jdk.graal.compiler.graph.Edges.Type.Successors; import java.util.ArrayList; -import jdk.compiler.graal.graph.NodeClass.EdgeInfo; +import jdk.graal.compiler.graph.NodeClass.EdgeInfo; public final class SuccessorEdges extends Edges { diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/TypedGraphNodeIterator.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/TypedGraphNodeIterator.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/TypedGraphNodeIterator.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/TypedGraphNodeIterator.java index 3a81ac607adf..42b644d8986b 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/TypedGraphNodeIterator.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/TypedGraphNodeIterator.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.graph; +package jdk.graal.compiler.graph; import java.util.Iterator; import java.util.NoSuchElementException; -import jdk.compiler.graal.core.common.util.CompilationAlarm; +import jdk.graal.compiler.core.common.util.CompilationAlarm; class TypedGraphNodeIterator implements Iterator { diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/iterators/FilteredNodeIterable.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/iterators/FilteredNodeIterable.java similarity index 96% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/iterators/FilteredNodeIterable.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/iterators/FilteredNodeIterable.java index 4cf1c77320c4..db859c469879 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/iterators/FilteredNodeIterable.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/iterators/FilteredNodeIterable.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.graph.iterators; +package jdk.graal.compiler.graph.iterators; import java.util.Iterator; -import jdk.compiler.graal.graph.Node; +import jdk.graal.compiler.graph.Node; public class FilteredNodeIterable implements NodeIterable { diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/iterators/NodeIterable.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/iterators/NodeIterable.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/iterators/NodeIterable.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/iterators/NodeIterable.java index e1f4789d91df..63001f0289f2 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/iterators/NodeIterable.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/iterators/NodeIterable.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.graph.iterators; +package jdk.graal.compiler.graph.iterators; import java.util.ArrayList; import java.util.Collection; @@ -31,7 +31,7 @@ import java.util.stream.Stream; import java.util.stream.StreamSupport; -import jdk.compiler.graal.graph.Node; +import jdk.graal.compiler.graph.Node; public interface NodeIterable extends Iterable { diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/iterators/NodeIterator.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/iterators/NodeIterator.java similarity index 95% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/iterators/NodeIterator.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/iterators/NodeIterator.java index 434081268602..2e2c9ebf33fe 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/iterators/NodeIterator.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/iterators/NodeIterator.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.graph.iterators; +package jdk.graal.compiler.graph.iterators; import java.util.Iterator; import java.util.NoSuchElementException; -import jdk.compiler.graal.graph.Node; +import jdk.graal.compiler.graph.Node; public abstract class NodeIterator implements Iterator { diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/iterators/NodePredicate.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/iterators/NodePredicate.java similarity index 94% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/iterators/NodePredicate.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/iterators/NodePredicate.java index c2a93a9de26a..80daf2d63922 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/iterators/NodePredicate.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/iterators/NodePredicate.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.graph.iterators; +package jdk.graal.compiler.graph.iterators; import java.util.function.Predicate; -import jdk.compiler.graal.graph.Node; +import jdk.graal.compiler.graph.Node; public interface NodePredicate extends Predicate { diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/iterators/NodePredicates.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/iterators/NodePredicates.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/iterators/NodePredicates.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/iterators/NodePredicates.java index eb1509c91924..6d4a3ac5ca6e 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/iterators/NodePredicates.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/iterators/NodePredicates.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.graph.iterators; +package jdk.graal.compiler.graph.iterators; -import jdk.compiler.graal.graph.Node; +import jdk.graal.compiler.graph.Node; public abstract class NodePredicates { diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/iterators/PredicatedProxyNodeIterator.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/iterators/PredicatedProxyNodeIterator.java similarity index 95% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/iterators/PredicatedProxyNodeIterator.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/iterators/PredicatedProxyNodeIterator.java index 5b988056347b..94dd7e79de4e 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/iterators/PredicatedProxyNodeIterator.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/iterators/PredicatedProxyNodeIterator.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.graph.iterators; +package jdk.graal.compiler.graph.iterators; import java.util.Iterator; -import jdk.compiler.graal.graph.Node; +import jdk.graal.compiler.graph.Node; public class PredicatedProxyNodeIterator extends NodeIterator { diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/package-info.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/package-info.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/package-info.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/package-info.java index c05e17cacc23..fb271a939125 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/package-info.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/package-info.java @@ -25,4 +25,4 @@ /** * This package contains the Node base class and the Graph container class of the Graal IR. */ -package jdk.compiler.graal.graph; +package jdk.graal.compiler.graph; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/spi/BinaryCommutativeMarker.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/spi/BinaryCommutativeMarker.java similarity index 92% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/spi/BinaryCommutativeMarker.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/spi/BinaryCommutativeMarker.java index c107c1174d26..1de7bbd4fd5a 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/spi/BinaryCommutativeMarker.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/spi/BinaryCommutativeMarker.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.graph.spi; +package jdk.graal.compiler.graph.spi; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.graph.NodeClass; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.graph.NodeClass; /** * A marker interface for {@link Node} classes that can be efficiently queried via diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/spi/CanonicalizableMarker.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/spi/CanonicalizableMarker.java similarity index 92% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/spi/CanonicalizableMarker.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/spi/CanonicalizableMarker.java index 88eeb3071236..f472f06e6403 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/spi/CanonicalizableMarker.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/spi/CanonicalizableMarker.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.graph.spi; +package jdk.graal.compiler.graph.spi; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.graph.NodeClass; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.graph.NodeClass; /** * A marker interface for {@link Node} classes that can be efficiently queried via diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/spi/NodeWithIdentity.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/spi/NodeWithIdentity.java similarity index 94% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/spi/NodeWithIdentity.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/spi/NodeWithIdentity.java index d9272b454366..60b9022cf2d2 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/spi/NodeWithIdentity.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/spi/NodeWithIdentity.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.graph.spi; +package jdk.graal.compiler.graph.spi; -import jdk.compiler.graal.graph.NodeClass; +import jdk.graal.compiler.graph.NodeClass; /** * Nodes that are marked with this interface have an implicit unique identity, i.e., two nodes are diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/spi/SimplifiableMarker.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/spi/SimplifiableMarker.java similarity index 92% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/spi/SimplifiableMarker.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/spi/SimplifiableMarker.java index c03c7d4d2c83..54535bd2d424 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/spi/SimplifiableMarker.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graph/spi/SimplifiableMarker.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.graph.spi; +package jdk.graal.compiler.graph.spi; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.graph.NodeClass; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.graph.NodeClass; /** * A marker interface for {@link Node} classes that can be efficiently queried via diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graphio/DefaultGraphBlocks.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graphio/DefaultGraphBlocks.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graphio/DefaultGraphBlocks.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graphio/DefaultGraphBlocks.java index 45a64cab7afc..f0ae4e54bfe6 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graphio/DefaultGraphBlocks.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graphio/DefaultGraphBlocks.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.graphio; +package jdk.graal.compiler.graphio; import java.util.Collection; import java.util.Collections; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graphio/DefaultGraphTypes.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graphio/DefaultGraphTypes.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graphio/DefaultGraphTypes.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graphio/DefaultGraphTypes.java index bff001ea7c2f..e43730e0eb70 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graphio/DefaultGraphTypes.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graphio/DefaultGraphTypes.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.graphio; +package jdk.graal.compiler.graphio; final class DefaultGraphTypes implements GraphTypes { static final GraphTypes DEFAULT = new DefaultGraphTypes(); diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graphio/GraphBlocks.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graphio/GraphBlocks.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graphio/GraphBlocks.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graphio/GraphBlocks.java index 4027b6e15abb..0c5a235090f3 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graphio/GraphBlocks.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graphio/GraphBlocks.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.graphio; +package jdk.graal.compiler.graphio; import java.util.Collection; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graphio/GraphElements.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graphio/GraphElements.java similarity index 99% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graphio/GraphElements.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graphio/GraphElements.java index 661d2020b4ff..9a4f98f46d6c 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graphio/GraphElements.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graphio/GraphElements.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.graphio; +package jdk.graal.compiler.graphio; /** * Representation of methods, fields, their signatures and code locations. diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graphio/GraphJavadocSnippets.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graphio/GraphJavadocSnippets.java similarity index 93% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graphio/GraphJavadocSnippets.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graphio/GraphJavadocSnippets.java index d69b34e52af8..91c8795a76cf 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graphio/GraphJavadocSnippets.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graphio/GraphJavadocSnippets.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.compiler.graal.graphio; +package jdk.graal.compiler.graphio; import java.io.File; import java.io.FileOutputStream; @@ -38,7 +38,7 @@ final class GraphJavadocSnippets { static GraphStructure acmeGraphStructure() { // @formatter:off - // BEGIN: jdk.compiler.graal.graphio.GraphJavadocSnippets#acmeGraphStructure + // BEGIN: jdk.graal.compiler.graphio.GraphJavadocSnippets#acmeGraphStructure class AcmeGraphStructure implements GraphStructure { @@ -142,12 +142,12 @@ public Collection edgeNodes( } } - // END: jdk.compiler.graal.graphio.GraphJavadocSnippets#acmeGraphStructure + // END: jdk.graal.compiler.graphio.GraphJavadocSnippets#acmeGraphStructure return new AcmeGraphStructure(); } - // BEGIN: jdk.compiler.graal.graphio.GraphJavadocSnippets#buildOutput + // BEGIN: jdk.graal.compiler.graphio.GraphJavadocSnippets#buildOutput static GraphOutput buildOutput(WritableByteChannel channel) throws IOException { return GraphOutput.newBuilder(acmeGraphStructure()). @@ -155,9 +155,9 @@ public Collection edgeNodes( protocolVersion(6, 0). build(channel); } - // END: jdk.compiler.graal.graphio.GraphJavadocSnippets#buildOutput + // END: jdk.graal.compiler.graphio.GraphJavadocSnippets#buildOutput - // BEGIN: jdk.compiler.graal.graphio.GraphJavadocSnippets#buildAll + // BEGIN: jdk.graal.compiler.graphio.GraphJavadocSnippets#buildAll static GraphOutput buildAll(WritableByteChannel channel) throws IOException { GraphBlocks graphBlocks = acmeBlocks(); @@ -172,7 +172,7 @@ public Collection edgeNodes( types(graphTypes). build(channel); } - // END: jdk.compiler.graal.graphio.GraphJavadocSnippets#buildAll + // END: jdk.graal.compiler.graphio.GraphJavadocSnippets#buildAll private static GraphTypes acmeTypes() { GraphTypes graphTypes = null; @@ -259,7 +259,7 @@ private static class AcmeSignature { private static class AcmeCodePosition { } - // BEGIN: jdk.compiler.graal.graphio.GraphJavadocSnippets#dump + // BEGIN: jdk.graal.compiler.graphio.GraphJavadocSnippets#dump static void dump(File toFile) throws IOException { try ( FileChannel ch = new FileOutputStream(toFile).getChannel(); @@ -282,6 +282,6 @@ static void dump(File toFile) throws IOException { output.endGroup(); } } - // END: jdk.compiler.graal.graphio.GraphJavadocSnippets#dump + // END: jdk.graal.compiler.graphio.GraphJavadocSnippets#dump } diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graphio/GraphLocations.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graphio/GraphLocations.java similarity index 99% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graphio/GraphLocations.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graphio/GraphLocations.java index 9aad6669777f..c27b5a2c628b 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graphio/GraphLocations.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graphio/GraphLocations.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.graphio; +package jdk.graal.compiler.graphio; import java.net.URI; import java.net.URISyntaxException; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graphio/GraphOutput.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graphio/GraphOutput.java similarity index 99% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graphio/GraphOutput.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graphio/GraphOutput.java index 7ffebfa13016..74ac21ad0e98 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graphio/GraphOutput.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graphio/GraphOutput.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.graphio; +package jdk.graal.compiler.graphio; import java.io.Closeable; import java.io.IOException; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graphio/GraphProtocol.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graphio/GraphProtocol.java similarity index 99% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graphio/GraphProtocol.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graphio/GraphProtocol.java index 64bb8f3fc431..26ac93b9fee4 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graphio/GraphProtocol.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graphio/GraphProtocol.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.graphio; +package jdk.graal.compiler.graphio; import java.io.Closeable; import java.io.IOException; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graphio/GraphStructure.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graphio/GraphStructure.java similarity index 99% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graphio/GraphStructure.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graphio/GraphStructure.java index a13ca3601799..fcbbfb33a692 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graphio/GraphStructure.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graphio/GraphStructure.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.graphio; +package jdk.graal.compiler.graphio; import java.util.Collection; import java.util.Map; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graphio/GraphTypes.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graphio/GraphTypes.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graphio/GraphTypes.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graphio/GraphTypes.java index 69609241a68b..7427f15f7734 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graphio/GraphTypes.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graphio/GraphTypes.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.graphio; +package jdk.graal.compiler.graphio; /** * Special support for dealing with enums. Normally one can represent various {@link GraphOutput diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graphio/ProtocolImpl.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graphio/ProtocolImpl.java similarity index 99% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graphio/ProtocolImpl.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graphio/ProtocolImpl.java index 88e80e39eea5..a643938daccb 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graphio/ProtocolImpl.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graphio/ProtocolImpl.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.graphio; +package jdk.graal.compiler.graphio; import java.io.File; import java.io.IOException; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graphio/doc-files/diamond.png b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graphio/doc-files/diamond.png similarity index 100% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graphio/doc-files/diamond.png rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graphio/doc-files/diamond.png diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graphio/package-info.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graphio/package-info.java similarity index 78% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graphio/package-info.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graphio/package-info.java index 2942f7500634..03ead14e1353 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graphio/package-info.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/graphio/package-info.java @@ -28,24 +28,24 @@ * any graph-like data structure and send it for visualization to OracleLab's Ideal Graph * Visualizer tool. Assuming you already have your own data structure that contains * nodes and edges among them, creating a - * {@link jdk.compiler.graal.graphio.GraphOutput} specialized for your data is a matter of + * {@link jdk.graal.compiler.graphio.GraphOutput} specialized for your data is a matter of * implementing a single interface: * - * {@link jdk.compiler.graal.graphio.GraphJavadocSnippets#acmeGraphStructure} + * {@link jdk.graal.compiler.graphio.GraphJavadocSnippets#acmeGraphStructure} * - * The {@link jdk.compiler.graal.graphio.GraphStructure} interface defines the set of operations + * The {@link jdk.graal.compiler.graphio.GraphStructure} interface defines the set of operations * that are needed by the graph protocol to encode a graph into the IGV expected * format. The graph structure is implemented as a so called * singletonizer API pattern: there is no * need to change your data structures or implement some special interfaces - everything needed is - * provided by implementing the {@link jdk.compiler.graal.graphio.GraphStructure} operations. + * provided by implementing the {@link jdk.graal.compiler.graphio.GraphStructure} operations. *

* The next step is to turn this graph structure into an instance of - * {@link jdk.compiler.graal.graphio.GraphOutput}. To do so use the associated - * {@link jdk.compiler.graal.graphio.GraphOutput.Builder builder} just like shown in the following + * {@link jdk.graal.compiler.graphio.GraphOutput}. To do so use the associated + * {@link jdk.graal.compiler.graphio.GraphOutput.Builder builder} just like shown in the following * method: * - * {@link jdk.compiler.graal.graphio.GraphJavadocSnippets#buildOutput} + * {@link jdk.graal.compiler.graphio.GraphJavadocSnippets#buildOutput} * * Now you are ready to dump your graph into IGV. Where to obtain the right channel? One * option is to create a {@link java.nio.channels.FileChannel} and dump the data into a file @@ -53,7 +53,7 @@ * 4445 (the default port IGV listens to) and dump the data there. Here is an * example: * - * {@link jdk.compiler.graal.graphio.GraphJavadocSnippets#dump} + * {@link jdk.graal.compiler.graphio.GraphJavadocSnippets#dump} * * Call the {@code dump} method with pointer to file {@code diamond.bgv} and then you can open the * file in IGV. The result will look like this: @@ -67,18 +67,18 @@ * The primary IGV focus is on graphs used by the compiler. As such they aren't plain graphs, * but contain various compiler oriented attributes: *

    - *
  • {@linkplain jdk.compiler.graal.graphio.GraphBlocks code blocks} information
    • - *
  • {@linkplain jdk.compiler.graal.graphio.GraphElements method and fields} information
    • - *
  • Advanced support for {@linkplain jdk.compiler.graal.graphio.GraphTypes recognizing + *
  • {@linkplain jdk.graal.compiler.graphio.GraphBlocks code blocks} information
    • + *
  • {@linkplain jdk.graal.compiler.graphio.GraphElements method and fields} information
    • + *
  • Advanced support for {@linkplain jdk.graal.compiler.graphio.GraphTypes recognizing * types}
    • *
- * all these additional interfaces ({@link jdk.compiler.graal.graphio.GraphBlocks}, - * {@link jdk.compiler.graal.graphio.GraphElements} and - * {@link jdk.compiler.graal.graphio.GraphTypes}) are optional - they don't have to be provided. As - * such they can be specified via {@link jdk.compiler.graal.graphio.GraphOutput.Builder} instance + * all these additional interfaces ({@link jdk.graal.compiler.graphio.GraphBlocks}, + * {@link jdk.graal.compiler.graphio.GraphElements} and + * {@link jdk.graal.compiler.graphio.GraphTypes}) are optional - they don't have to be provided. As + * such they can be specified via {@link jdk.graal.compiler.graphio.GraphOutput.Builder} instance * methods, which may, but need not be called at all. Here is an example: * - * {@link jdk.compiler.graal.graphio.GraphJavadocSnippets#buildAll} + * {@link jdk.graal.compiler.graphio.GraphJavadocSnippets#buildAll} * * All these interfaces follow the * singletonizer API pattern again - e.g. @@ -86,4 +86,4 @@ * interfaces you pass into the builder. By combining these interfaces together you can get as rich, * colorful, source linked graphs as the compiler produces to describe its optimizations. */ -package jdk.compiler.graal.graphio; +package jdk.graal.compiler.graphio; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/CodeBuffer.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hightiercodegen/CodeBuffer.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/CodeBuffer.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hightiercodegen/CodeBuffer.java index 0f1cb97b9820..0c63f8661c92 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/CodeBuffer.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hightiercodegen/CodeBuffer.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hightiercodegen; +package jdk.graal.compiler.hightiercodegen; import java.io.BufferedOutputStream; import java.io.ByteArrayOutputStream; @@ -32,8 +32,8 @@ import java.nio.file.Path; import java.util.List; -import jdk.compiler.graal.core.common.calc.CanonicalCondition; -import jdk.compiler.graal.nodes.ParameterNode; +import jdk.graal.compiler.core.common.calc.CanonicalCondition; +import jdk.graal.compiler.nodes.ParameterNode; import jdk.vm.ci.common.JVMCIError; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/CodeGenTool.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hightiercodegen/CodeGenTool.java similarity index 95% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/CodeGenTool.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hightiercodegen/CodeGenTool.java index 98678866a1f3..6ae03b1ebb7b 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/CodeGenTool.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hightiercodegen/CodeGenTool.java @@ -22,23 +22,23 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hightiercodegen; +package jdk.graal.compiler.hightiercodegen; import java.lang.reflect.Field; import java.lang.reflect.Method; import java.util.List; -import jdk.compiler.graal.core.common.calc.CanonicalCondition; -import jdk.compiler.graal.core.common.type.Stamp; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.hightiercodegen.variables.ResolvedVar; -import jdk.compiler.graal.hightiercodegen.variables.VariableAllocation; -import jdk.compiler.graal.hightiercodegen.variables.VariableMap; -import jdk.compiler.graal.nodes.LogicNode; -import jdk.compiler.graal.nodes.ParameterNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.spi.CoreProviders; +import jdk.graal.compiler.core.common.calc.CanonicalCondition; +import jdk.graal.compiler.core.common.type.Stamp; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.hightiercodegen.variables.ResolvedVar; +import jdk.graal.compiler.hightiercodegen.variables.VariableAllocation; +import jdk.graal.compiler.hightiercodegen.variables.VariableMap; +import jdk.graal.compiler.nodes.LogicNode; +import jdk.graal.compiler.nodes.ParameterNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.spi.CoreProviders; import jdk.vm.ci.meta.ResolvedJavaField; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/Emitter.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hightiercodegen/Emitter.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/Emitter.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hightiercodegen/Emitter.java index fd22d8d0a45e..5bfa7dc3f673 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/Emitter.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hightiercodegen/Emitter.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.compiler.graal.hightiercodegen; +package jdk.graal.compiler.hightiercodegen; import java.lang.reflect.Field; import java.lang.reflect.Method; @@ -32,8 +32,8 @@ import java.util.Objects; import java.util.function.Consumer; -import jdk.compiler.graal.hightiercodegen.variables.ResolvedVar; -import jdk.compiler.graal.nodes.ValueNode; +import jdk.graal.compiler.hightiercodegen.variables.ResolvedVar; +import jdk.graal.compiler.nodes.ValueNode; import jdk.vm.ci.meta.ResolvedJavaField; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/IEmitter.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hightiercodegen/IEmitter.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/IEmitter.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hightiercodegen/IEmitter.java index 051aab905f1d..fa06cded8bea 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/IEmitter.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hightiercodegen/IEmitter.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.compiler.graal.hightiercodegen; +package jdk.graal.compiler.hightiercodegen; /** * Abstract interface to facilitate lowering of various objects. diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/Keyword.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hightiercodegen/Keyword.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/Keyword.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hightiercodegen/Keyword.java index 2a2a7fdd57fd..b675d44ea28a 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/Keyword.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hightiercodegen/Keyword.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hightiercodegen; +package jdk.graal.compiler.hightiercodegen; /** * This class represents keywords of a high level programming language. diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/NodeLowerer.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hightiercodegen/NodeLowerer.java similarity index 79% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/NodeLowerer.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hightiercodegen/NodeLowerer.java index 1af817daa018..862c73338b94 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/NodeLowerer.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hightiercodegen/NodeLowerer.java @@ -22,92 +22,92 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hightiercodegen; - -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.graph.iterators.NodeIterable; -import jdk.compiler.graal.hightiercodegen.variables.ResolvedVar; -import jdk.compiler.graal.nodes.ConstantNode; -import jdk.compiler.graal.nodes.DeadEndNode; -import jdk.compiler.graal.nodes.EndNode; -import jdk.compiler.graal.nodes.GuardPhiNode; -import jdk.compiler.graal.nodes.Invoke; -import jdk.compiler.graal.nodes.InvokeNode; -import jdk.compiler.graal.nodes.InvokeWithExceptionNode; -import jdk.compiler.graal.nodes.LogicNegationNode; -import jdk.compiler.graal.nodes.ParameterNode; -import jdk.compiler.graal.nodes.PhiNode; -import jdk.compiler.graal.nodes.PiNode; -import jdk.compiler.graal.nodes.ReturnNode; -import jdk.compiler.graal.nodes.ShortCircuitOrNode; -import jdk.compiler.graal.nodes.UnwindNode; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.ValueProxyNode; -import jdk.compiler.graal.nodes.calc.AbsNode; -import jdk.compiler.graal.nodes.calc.BinaryArithmeticNode; -import jdk.compiler.graal.nodes.calc.CompareNode; -import jdk.compiler.graal.nodes.calc.ConditionalNode; -import jdk.compiler.graal.nodes.calc.FloatConvertNode; -import jdk.compiler.graal.nodes.calc.IntegerDivRemNode; -import jdk.compiler.graal.nodes.calc.IntegerTestNode; -import jdk.compiler.graal.nodes.calc.IsNullNode; -import jdk.compiler.graal.nodes.calc.NarrowNode; -import jdk.compiler.graal.nodes.calc.NegateNode; -import jdk.compiler.graal.nodes.calc.NotNode; -import jdk.compiler.graal.nodes.calc.ObjectEqualsNode; -import jdk.compiler.graal.nodes.calc.ReinterpretNode; -import jdk.compiler.graal.nodes.calc.RoundNode; -import jdk.compiler.graal.nodes.calc.ShiftNode; -import jdk.compiler.graal.nodes.calc.SignExtendNode; -import jdk.compiler.graal.nodes.calc.SignumNode; -import jdk.compiler.graal.nodes.calc.SqrtNode; -import jdk.compiler.graal.nodes.calc.ZeroExtendNode; -import jdk.compiler.graal.nodes.debug.BlackholeNode; -import jdk.compiler.graal.nodes.extended.BoxNode; -import jdk.compiler.graal.nodes.extended.BytecodeExceptionNode; -import jdk.compiler.graal.nodes.extended.ForeignCall; -import jdk.compiler.graal.nodes.extended.GetClassNode; -import jdk.compiler.graal.nodes.extended.JavaReadNode; -import jdk.compiler.graal.nodes.extended.JavaWriteNode; -import jdk.compiler.graal.nodes.extended.LoadArrayComponentHubNode; -import jdk.compiler.graal.nodes.extended.LoadHubNode; -import jdk.compiler.graal.nodes.extended.ObjectIsArrayNode; -import jdk.compiler.graal.nodes.extended.RawLoadNode; -import jdk.compiler.graal.nodes.extended.RawStoreNode; -import jdk.compiler.graal.nodes.extended.StateSplitProxyNode; -import jdk.compiler.graal.nodes.extended.UnboxNode; -import jdk.compiler.graal.nodes.extended.UnsafeMemoryLoadNode; -import jdk.compiler.graal.nodes.extended.UnsafeMemoryStoreNode; -import jdk.compiler.graal.nodes.java.AbstractUnsafeCompareAndSwapNode; -import jdk.compiler.graal.nodes.java.ArrayLengthNode; -import jdk.compiler.graal.nodes.java.AtomicReadAndAddNode; -import jdk.compiler.graal.nodes.java.AtomicReadAndWriteNode; -import jdk.compiler.graal.nodes.java.ClassIsAssignableFromNode; -import jdk.compiler.graal.nodes.java.DynamicNewArrayNode; -import jdk.compiler.graal.nodes.java.DynamicNewInstanceNode; -import jdk.compiler.graal.nodes.java.ExceptionObjectNode; -import jdk.compiler.graal.nodes.java.InstanceOfDynamicNode; -import jdk.compiler.graal.nodes.java.InstanceOfNode; -import jdk.compiler.graal.nodes.java.LoadFieldNode; -import jdk.compiler.graal.nodes.java.LoadIndexedNode; -import jdk.compiler.graal.nodes.java.NewArrayNode; -import jdk.compiler.graal.nodes.java.NewInstanceNode; -import jdk.compiler.graal.nodes.java.NewMultiArrayNode; -import jdk.compiler.graal.nodes.java.ReachabilityFenceNode; -import jdk.compiler.graal.nodes.java.StoreFieldNode; -import jdk.compiler.graal.nodes.java.StoreIndexedNode; -import jdk.compiler.graal.nodes.memory.ReadNode; -import jdk.compiler.graal.nodes.virtual.AllocatedObjectNode; -import jdk.compiler.graal.nodes.virtual.CommitAllocationNode; -import jdk.compiler.graal.nodes.virtual.VirtualObjectNode; -import jdk.compiler.graal.replacements.nodes.ArrayEqualsNode; -import jdk.compiler.graal.replacements.nodes.BasicArrayCopyNode; -import jdk.compiler.graal.replacements.nodes.BinaryMathIntrinsicNode; -import jdk.compiler.graal.replacements.nodes.IdentityHashCodeNode; -import jdk.compiler.graal.replacements.nodes.ObjectClone; -import jdk.compiler.graal.replacements.nodes.UnaryMathIntrinsicNode; -import jdk.compiler.graal.word.WordCastNode; +package jdk.graal.compiler.hightiercodegen; + +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.graph.iterators.NodeIterable; +import jdk.graal.compiler.hightiercodegen.variables.ResolvedVar; +import jdk.graal.compiler.nodes.ConstantNode; +import jdk.graal.compiler.nodes.DeadEndNode; +import jdk.graal.compiler.nodes.EndNode; +import jdk.graal.compiler.nodes.GuardPhiNode; +import jdk.graal.compiler.nodes.Invoke; +import jdk.graal.compiler.nodes.InvokeNode; +import jdk.graal.compiler.nodes.InvokeWithExceptionNode; +import jdk.graal.compiler.nodes.LogicNegationNode; +import jdk.graal.compiler.nodes.ParameterNode; +import jdk.graal.compiler.nodes.PhiNode; +import jdk.graal.compiler.nodes.PiNode; +import jdk.graal.compiler.nodes.ReturnNode; +import jdk.graal.compiler.nodes.ShortCircuitOrNode; +import jdk.graal.compiler.nodes.UnwindNode; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.ValueProxyNode; +import jdk.graal.compiler.nodes.calc.AbsNode; +import jdk.graal.compiler.nodes.calc.BinaryArithmeticNode; +import jdk.graal.compiler.nodes.calc.CompareNode; +import jdk.graal.compiler.nodes.calc.ConditionalNode; +import jdk.graal.compiler.nodes.calc.FloatConvertNode; +import jdk.graal.compiler.nodes.calc.IntegerDivRemNode; +import jdk.graal.compiler.nodes.calc.IntegerTestNode; +import jdk.graal.compiler.nodes.calc.IsNullNode; +import jdk.graal.compiler.nodes.calc.NarrowNode; +import jdk.graal.compiler.nodes.calc.NegateNode; +import jdk.graal.compiler.nodes.calc.NotNode; +import jdk.graal.compiler.nodes.calc.ObjectEqualsNode; +import jdk.graal.compiler.nodes.calc.ReinterpretNode; +import jdk.graal.compiler.nodes.calc.RoundNode; +import jdk.graal.compiler.nodes.calc.ShiftNode; +import jdk.graal.compiler.nodes.calc.SignExtendNode; +import jdk.graal.compiler.nodes.calc.SignumNode; +import jdk.graal.compiler.nodes.calc.SqrtNode; +import jdk.graal.compiler.nodes.calc.ZeroExtendNode; +import jdk.graal.compiler.nodes.debug.BlackholeNode; +import jdk.graal.compiler.nodes.extended.BoxNode; +import jdk.graal.compiler.nodes.extended.BytecodeExceptionNode; +import jdk.graal.compiler.nodes.extended.ForeignCall; +import jdk.graal.compiler.nodes.extended.GetClassNode; +import jdk.graal.compiler.nodes.extended.JavaReadNode; +import jdk.graal.compiler.nodes.extended.JavaWriteNode; +import jdk.graal.compiler.nodes.extended.LoadArrayComponentHubNode; +import jdk.graal.compiler.nodes.extended.LoadHubNode; +import jdk.graal.compiler.nodes.extended.ObjectIsArrayNode; +import jdk.graal.compiler.nodes.extended.RawLoadNode; +import jdk.graal.compiler.nodes.extended.RawStoreNode; +import jdk.graal.compiler.nodes.extended.StateSplitProxyNode; +import jdk.graal.compiler.nodes.extended.UnboxNode; +import jdk.graal.compiler.nodes.extended.UnsafeMemoryLoadNode; +import jdk.graal.compiler.nodes.extended.UnsafeMemoryStoreNode; +import jdk.graal.compiler.nodes.java.AbstractUnsafeCompareAndSwapNode; +import jdk.graal.compiler.nodes.java.ArrayLengthNode; +import jdk.graal.compiler.nodes.java.AtomicReadAndAddNode; +import jdk.graal.compiler.nodes.java.AtomicReadAndWriteNode; +import jdk.graal.compiler.nodes.java.ClassIsAssignableFromNode; +import jdk.graal.compiler.nodes.java.DynamicNewArrayNode; +import jdk.graal.compiler.nodes.java.DynamicNewInstanceNode; +import jdk.graal.compiler.nodes.java.ExceptionObjectNode; +import jdk.graal.compiler.nodes.java.InstanceOfDynamicNode; +import jdk.graal.compiler.nodes.java.InstanceOfNode; +import jdk.graal.compiler.nodes.java.LoadFieldNode; +import jdk.graal.compiler.nodes.java.LoadIndexedNode; +import jdk.graal.compiler.nodes.java.NewArrayNode; +import jdk.graal.compiler.nodes.java.NewInstanceNode; +import jdk.graal.compiler.nodes.java.NewMultiArrayNode; +import jdk.graal.compiler.nodes.java.ReachabilityFenceNode; +import jdk.graal.compiler.nodes.java.StoreFieldNode; +import jdk.graal.compiler.nodes.java.StoreIndexedNode; +import jdk.graal.compiler.nodes.memory.ReadNode; +import jdk.graal.compiler.nodes.virtual.AllocatedObjectNode; +import jdk.graal.compiler.nodes.virtual.CommitAllocationNode; +import jdk.graal.compiler.nodes.virtual.VirtualObjectNode; +import jdk.graal.compiler.replacements.nodes.ArrayEqualsNode; +import jdk.graal.compiler.replacements.nodes.BasicArrayCopyNode; +import jdk.graal.compiler.replacements.nodes.BinaryMathIntrinsicNode; +import jdk.graal.compiler.replacements.nodes.IdentityHashCodeNode; +import jdk.graal.compiler.replacements.nodes.ObjectClone; +import jdk.graal.compiler.replacements.nodes.UnaryMathIntrinsicNode; +import jdk.graal.compiler.word.WordCastNode; /** * This class is responsible for generating code for individual {@link Node}s in the graph. diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/irwalk/BasicBlockInterpreter.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hightiercodegen/irwalk/BasicBlockInterpreter.java similarity index 93% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/irwalk/BasicBlockInterpreter.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hightiercodegen/irwalk/BasicBlockInterpreter.java index 3051c314a980..ad0fc3e54961 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/irwalk/BasicBlockInterpreter.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hightiercodegen/irwalk/BasicBlockInterpreter.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.compiler.graal.hightiercodegen.irwalk; +package jdk.graal.compiler.hightiercodegen.irwalk; import java.util.ArrayList; import java.util.Arrays; @@ -31,23 +31,23 @@ import java.util.HashMap; import java.util.List; -import jdk.compiler.graal.core.common.cfg.BlockMap; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.graph.NodeMap; -import jdk.compiler.graal.nodes.IfNode; -import jdk.compiler.graal.nodes.InvokeWithExceptionNode; -import jdk.compiler.graal.nodes.LoopBeginNode; -import jdk.compiler.graal.nodes.LoopEndNode; -import jdk.compiler.graal.nodes.LoopExitNode; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.cfg.HIRBlock; -import jdk.compiler.graal.nodes.cfg.ControlFlowGraph; -import jdk.compiler.graal.nodes.extended.IntegerSwitchNode; -import jdk.compiler.graal.nodes.java.ExceptionObjectNode; - -import jdk.compiler.graal.hightiercodegen.CodeGenTool; -import jdk.compiler.graal.hightiercodegen.reconstruction.ReconstructionData; +import jdk.graal.compiler.core.common.cfg.BlockMap; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.graph.NodeMap; +import jdk.graal.compiler.nodes.IfNode; +import jdk.graal.compiler.nodes.InvokeWithExceptionNode; +import jdk.graal.compiler.nodes.LoopBeginNode; +import jdk.graal.compiler.nodes.LoopEndNode; +import jdk.graal.compiler.nodes.LoopExitNode; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.cfg.HIRBlock; +import jdk.graal.compiler.nodes.cfg.ControlFlowGraph; +import jdk.graal.compiler.nodes.extended.IntegerSwitchNode; +import jdk.graal.compiler.nodes.java.ExceptionObjectNode; + +import jdk.graal.compiler.hightiercodegen.CodeGenTool; +import jdk.graal.compiler.hightiercodegen.reconstruction.ReconstructionData; import jdk.vm.ci.meta.Constant; import jdk.vm.ci.meta.PrimitiveConstant; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/irwalk/BlockNestingVerifier.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hightiercodegen/irwalk/BlockNestingVerifier.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/irwalk/BlockNestingVerifier.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hightiercodegen/irwalk/BlockNestingVerifier.java index e7561b38525e..f600a208540d 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/irwalk/BlockNestingVerifier.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hightiercodegen/irwalk/BlockNestingVerifier.java @@ -23,7 +23,7 @@ * questions. */ -package jdk.compiler.graal.hightiercodegen.irwalk; +package jdk.graal.compiler.hightiercodegen.irwalk; import java.util.ArrayDeque; import java.util.Deque; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/irwalk/BlockVisitHistory.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hightiercodegen/irwalk/BlockVisitHistory.java similarity index 94% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/irwalk/BlockVisitHistory.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hightiercodegen/irwalk/BlockVisitHistory.java index fad84ebf6995..566713006988 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/irwalk/BlockVisitHistory.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hightiercodegen/irwalk/BlockVisitHistory.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hightiercodegen.irwalk; +package jdk.graal.compiler.hightiercodegen.irwalk; import java.util.HashSet; import java.util.Set; -import jdk.compiler.graal.nodes.cfg.HIRBlock; +import jdk.graal.compiler.nodes.cfg.HIRBlock; public class BlockVisitHistory { private final Set visitedBlocks; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/irwalk/IRWalkVerifier.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hightiercodegen/irwalk/IRWalkVerifier.java similarity index 92% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/irwalk/IRWalkVerifier.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hightiercodegen/irwalk/IRWalkVerifier.java index 95e4d9c8a37e..d1d193e9d66b 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/irwalk/IRWalkVerifier.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hightiercodegen/irwalk/IRWalkVerifier.java @@ -22,16 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hightiercodegen.irwalk; +package jdk.graal.compiler.hightiercodegen.irwalk; import java.util.List; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.hightiercodegen.CodeGenTool; -import jdk.compiler.graal.hightiercodegen.reconstruction.ReconstructionData; -import jdk.compiler.graal.nodes.MergeNode; -import jdk.compiler.graal.nodes.StructuredGraph; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.hightiercodegen.CodeGenTool; +import jdk.graal.compiler.hightiercodegen.reconstruction.ReconstructionData; +import jdk.graal.compiler.nodes.MergeNode; +import jdk.graal.compiler.nodes.StructuredGraph; public class IRWalkVerifier { /** diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/irwalk/IRWalker.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hightiercodegen/irwalk/IRWalker.java similarity index 84% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/irwalk/IRWalker.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hightiercodegen/irwalk/IRWalker.java index c19a8d4ddfa6..ed4c70a81455 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/irwalk/IRWalker.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hightiercodegen/irwalk/IRWalker.java @@ -22,22 +22,22 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hightiercodegen.irwalk; +package jdk.graal.compiler.hightiercodegen.irwalk; import java.util.ArrayList; import java.util.List; -import jdk.compiler.graal.core.common.cfg.BlockMap; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.debug.DebugContext.Scope; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.graph.NodeMap; -import jdk.compiler.graal.hightiercodegen.CodeGenTool; -import jdk.compiler.graal.hightiercodegen.lowerer.PhiResolveLowerer; -import jdk.compiler.graal.hightiercodegen.reconstruction.ReconstructionData; -import jdk.compiler.graal.nodes.LoopEndNode; -import jdk.compiler.graal.nodes.cfg.ControlFlowGraph; -import jdk.compiler.graal.nodes.cfg.HIRBlock; +import jdk.graal.compiler.core.common.cfg.BlockMap; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.debug.DebugContext.Scope; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.graph.NodeMap; +import jdk.graal.compiler.hightiercodegen.CodeGenTool; +import jdk.graal.compiler.hightiercodegen.lowerer.PhiResolveLowerer; +import jdk.graal.compiler.hightiercodegen.reconstruction.ReconstructionData; +import jdk.graal.compiler.nodes.LoopEndNode; +import jdk.graal.compiler.nodes.cfg.ControlFlowGraph; +import jdk.graal.compiler.nodes.cfg.HIRBlock; /** * Abstract interface for generating textual control flow in code from a {@link ControlFlowGraph}s. diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/irwalk/StackifierIRWalker.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hightiercodegen/irwalk/StackifierIRWalker.java similarity index 94% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/irwalk/StackifierIRWalker.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hightiercodegen/irwalk/StackifierIRWalker.java index e8107435ccf5..55a730944b71 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/irwalk/StackifierIRWalker.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hightiercodegen/irwalk/StackifierIRWalker.java @@ -22,51 +22,51 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hightiercodegen.irwalk; +package jdk.graal.compiler.hightiercodegen.irwalk; import java.util.ArrayList; import java.util.List; import java.util.SortedSet; -import jdk.compiler.graal.core.common.cfg.BlockMap; -import jdk.compiler.graal.core.common.cfg.Loop; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.graph.NodeMap; -import jdk.compiler.graal.hightiercodegen.CodeGenTool; -import jdk.compiler.graal.hightiercodegen.reconstruction.stackifier.StackifierScopeComputation; -import jdk.compiler.graal.hightiercodegen.reconstruction.ReconstructionData; -import jdk.compiler.graal.hightiercodegen.reconstruction.StackifierData; -import jdk.compiler.graal.hightiercodegen.reconstruction.stackifier.blocks.LabeledBlock; -import jdk.compiler.graal.hightiercodegen.reconstruction.stackifier.blocks.LabeledBlockGeneration; -import jdk.compiler.graal.hightiercodegen.reconstruction.stackifier.scopes.CatchScopeContainer; -import jdk.compiler.graal.hightiercodegen.reconstruction.stackifier.scopes.IfScopeContainer; -import jdk.compiler.graal.hightiercodegen.reconstruction.stackifier.scopes.LoopScopeContainer; -import jdk.compiler.graal.hightiercodegen.reconstruction.stackifier.scopes.Scope; -import jdk.compiler.graal.hightiercodegen.reconstruction.stackifier.scopes.SwitchScopeContainer; -import jdk.compiler.graal.nodes.AbstractBeginNode; -import jdk.compiler.graal.nodes.AbstractMergeNode; -import jdk.compiler.graal.nodes.BeginNode; -import jdk.compiler.graal.nodes.ControlSinkNode; -import jdk.compiler.graal.nodes.ControlSplitNode; -import jdk.compiler.graal.nodes.EndNode; -import jdk.compiler.graal.nodes.FixedNode; -import jdk.compiler.graal.nodes.IfNode; -import jdk.compiler.graal.nodes.InvokeWithExceptionNode; -import jdk.compiler.graal.nodes.LoopBeginNode; -import jdk.compiler.graal.nodes.LoopEndNode; -import jdk.compiler.graal.nodes.LoopExitNode; -import jdk.compiler.graal.nodes.NodeView; -import jdk.compiler.graal.nodes.PhiNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.WithExceptionNode; -import jdk.compiler.graal.nodes.cfg.ControlFlowGraph; -import jdk.compiler.graal.nodes.cfg.HIRBlock; -import jdk.compiler.graal.nodes.extended.IntegerSwitchNode; -import jdk.compiler.graal.nodes.java.ExceptionObjectNode; -import jdk.compiler.graal.nodes.java.TypeSwitchNode; -import jdk.compiler.graal.replacements.nodes.BasicArrayCopyNode; +import jdk.graal.compiler.core.common.cfg.BlockMap; +import jdk.graal.compiler.core.common.cfg.Loop; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.graph.NodeMap; +import jdk.graal.compiler.hightiercodegen.CodeGenTool; +import jdk.graal.compiler.hightiercodegen.reconstruction.stackifier.StackifierScopeComputation; +import jdk.graal.compiler.hightiercodegen.reconstruction.ReconstructionData; +import jdk.graal.compiler.hightiercodegen.reconstruction.StackifierData; +import jdk.graal.compiler.hightiercodegen.reconstruction.stackifier.blocks.LabeledBlock; +import jdk.graal.compiler.hightiercodegen.reconstruction.stackifier.blocks.LabeledBlockGeneration; +import jdk.graal.compiler.hightiercodegen.reconstruction.stackifier.scopes.CatchScopeContainer; +import jdk.graal.compiler.hightiercodegen.reconstruction.stackifier.scopes.IfScopeContainer; +import jdk.graal.compiler.hightiercodegen.reconstruction.stackifier.scopes.LoopScopeContainer; +import jdk.graal.compiler.hightiercodegen.reconstruction.stackifier.scopes.Scope; +import jdk.graal.compiler.hightiercodegen.reconstruction.stackifier.scopes.SwitchScopeContainer; +import jdk.graal.compiler.nodes.AbstractBeginNode; +import jdk.graal.compiler.nodes.AbstractMergeNode; +import jdk.graal.compiler.nodes.BeginNode; +import jdk.graal.compiler.nodes.ControlSinkNode; +import jdk.graal.compiler.nodes.ControlSplitNode; +import jdk.graal.compiler.nodes.EndNode; +import jdk.graal.compiler.nodes.FixedNode; +import jdk.graal.compiler.nodes.IfNode; +import jdk.graal.compiler.nodes.InvokeWithExceptionNode; +import jdk.graal.compiler.nodes.LoopBeginNode; +import jdk.graal.compiler.nodes.LoopEndNode; +import jdk.graal.compiler.nodes.LoopExitNode; +import jdk.graal.compiler.nodes.NodeView; +import jdk.graal.compiler.nodes.PhiNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.WithExceptionNode; +import jdk.graal.compiler.nodes.cfg.ControlFlowGraph; +import jdk.graal.compiler.nodes.cfg.HIRBlock; +import jdk.graal.compiler.nodes.extended.IntegerSwitchNode; +import jdk.graal.compiler.nodes.java.ExceptionObjectNode; +import jdk.graal.compiler.nodes.java.TypeSwitchNode; +import jdk.graal.compiler.replacements.nodes.BasicArrayCopyNode; import jdk.vm.ci.meta.ResolvedJavaType; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/lowerer/CommitAllocationLowerer.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hightiercodegen/lowerer/CommitAllocationLowerer.java similarity index 94% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/lowerer/CommitAllocationLowerer.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hightiercodegen/lowerer/CommitAllocationLowerer.java index 390a232bb9f3..8fdbd6b6772a 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/lowerer/CommitAllocationLowerer.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hightiercodegen/lowerer/CommitAllocationLowerer.java @@ -22,18 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hightiercodegen.lowerer; +package jdk.graal.compiler.hightiercodegen.lowerer; import java.util.ArrayList; import java.util.List; -import jdk.compiler.graal.hightiercodegen.CodeGenTool; -import jdk.compiler.graal.hightiercodegen.Emitter; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.virtual.CommitAllocationNode; -import jdk.compiler.graal.nodes.virtual.VirtualArrayNode; -import jdk.compiler.graal.nodes.virtual.VirtualInstanceNode; -import jdk.compiler.graal.nodes.virtual.VirtualObjectNode; +import jdk.graal.compiler.hightiercodegen.CodeGenTool; +import jdk.graal.compiler.hightiercodegen.Emitter; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.virtual.CommitAllocationNode; +import jdk.graal.compiler.nodes.virtual.VirtualArrayNode; +import jdk.graal.compiler.nodes.virtual.VirtualInstanceNode; +import jdk.graal.compiler.nodes.virtual.VirtualObjectNode; import jdk.vm.ci.meta.JavaConstant; import jdk.vm.ci.meta.ResolvedJavaField; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/lowerer/MoveResolver.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hightiercodegen/lowerer/MoveResolver.java similarity index 99% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/lowerer/MoveResolver.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hightiercodegen/lowerer/MoveResolver.java index e49d96e2d4da..92fc512ff574 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/lowerer/MoveResolver.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hightiercodegen/lowerer/MoveResolver.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hightiercodegen.lowerer; +package jdk.graal.compiler.hightiercodegen.lowerer; import java.util.ArrayDeque; import java.util.ArrayList; @@ -41,9 +41,9 @@ import org.graalvm.collections.EconomicMap; import org.graalvm.collections.Pair; -import jdk.compiler.graal.nodes.AbstractEndNode; -import jdk.compiler.graal.nodes.AbstractMergeNode; -import jdk.compiler.graal.nodes.ValuePhiNode; +import jdk.graal.compiler.nodes.AbstractEndNode; +import jdk.graal.compiler.nodes.AbstractMergeNode; +import jdk.graal.compiler.nodes.ValuePhiNode; /** * Schedules a set of moves that are supposed to happen simultaneously as consecutive moves while diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/lowerer/PhiResolveLowerer.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hightiercodegen/lowerer/PhiResolveLowerer.java similarity index 92% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/lowerer/PhiResolveLowerer.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hightiercodegen/lowerer/PhiResolveLowerer.java index 1017227ff47d..e41cdfb408fe 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/lowerer/PhiResolveLowerer.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hightiercodegen/lowerer/PhiResolveLowerer.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hightiercodegen.lowerer; +package jdk.graal.compiler.hightiercodegen.lowerer; -import jdk.compiler.graal.hightiercodegen.CodeGenTool; -import jdk.compiler.graal.nodes.AbstractEndNode; -import jdk.compiler.graal.nodes.AbstractMergeNode; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.ValuePhiNode; +import jdk.graal.compiler.hightiercodegen.CodeGenTool; +import jdk.graal.compiler.nodes.AbstractEndNode; +import jdk.graal.compiler.nodes.AbstractMergeNode; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.ValuePhiNode; /** * Resolves phi's on end node lowering. This component is responsible for scheduling phi-to-phi diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/reconstruction/ReconstructionData.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hightiercodegen/reconstruction/ReconstructionData.java similarity index 92% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/reconstruction/ReconstructionData.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hightiercodegen/reconstruction/ReconstructionData.java index 55b790e1f12e..a7b70eaf27fb 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/reconstruction/ReconstructionData.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hightiercodegen/reconstruction/ReconstructionData.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hightiercodegen.reconstruction; +package jdk.graal.compiler.hightiercodegen.reconstruction; -import jdk.compiler.graal.debug.DebugContext; +import jdk.graal.compiler.debug.DebugContext; public interface ReconstructionData { diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/reconstruction/ReconstructionPhase.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hightiercodegen/reconstruction/ReconstructionPhase.java similarity index 90% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/reconstruction/ReconstructionPhase.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hightiercodegen/reconstruction/ReconstructionPhase.java index ce545715a050..3b1639e5c16e 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/reconstruction/ReconstructionPhase.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hightiercodegen/reconstruction/ReconstructionPhase.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hightiercodegen.reconstruction; +package jdk.graal.compiler.hightiercodegen.reconstruction; -import jdk.compiler.graal.nodes.spi.CoreProviders; -import jdk.compiler.graal.phases.BasePhase; +import jdk.graal.compiler.nodes.spi.CoreProviders; +import jdk.graal.compiler.phases.BasePhase; /** * Base class for a phase that performs control-flow reconstruction. diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/reconstruction/ScheduleWithReconstructionResult.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hightiercodegen/reconstruction/ScheduleWithReconstructionResult.java similarity index 94% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/reconstruction/ScheduleWithReconstructionResult.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hightiercodegen/reconstruction/ScheduleWithReconstructionResult.java index 2ad6fd73af84..5fb827ac7c47 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/reconstruction/ScheduleWithReconstructionResult.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hightiercodegen/reconstruction/ScheduleWithReconstructionResult.java @@ -23,9 +23,9 @@ * questions. */ -package jdk.compiler.graal.hightiercodegen.reconstruction; +package jdk.graal.compiler.hightiercodegen.reconstruction; -import jdk.compiler.graal.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.StructuredGraph; public class ScheduleWithReconstructionResult extends StructuredGraph.ScheduleResult { private final ReconstructionData reconstructionData; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/reconstruction/StackifierData.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hightiercodegen/reconstruction/StackifierData.java similarity index 92% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/reconstruction/StackifierData.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hightiercodegen/reconstruction/StackifierData.java index 9fb2a83129bc..02acde60d026 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/reconstruction/StackifierData.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hightiercodegen/reconstruction/StackifierData.java @@ -22,23 +22,23 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hightiercodegen.reconstruction; +package jdk.graal.compiler.hightiercodegen.reconstruction; import java.util.SortedSet; -import jdk.compiler.graal.hightiercodegen.reconstruction.stackifier.CFStackifierSortPhase; -import jdk.compiler.graal.hightiercodegen.reconstruction.stackifier.scopes.CatchScopeContainer; -import jdk.compiler.graal.hightiercodegen.reconstruction.stackifier.scopes.IfScopeContainer; -import jdk.compiler.graal.hightiercodegen.reconstruction.stackifier.scopes.LoopScopeContainer; -import jdk.compiler.graal.hightiercodegen.reconstruction.stackifier.scopes.Scope; -import jdk.compiler.graal.hightiercodegen.reconstruction.stackifier.scopes.ScopeContainer; -import jdk.compiler.graal.hightiercodegen.reconstruction.stackifier.scopes.SwitchScopeContainer; +import jdk.graal.compiler.hightiercodegen.reconstruction.stackifier.CFStackifierSortPhase; +import jdk.graal.compiler.hightiercodegen.reconstruction.stackifier.scopes.CatchScopeContainer; +import jdk.graal.compiler.hightiercodegen.reconstruction.stackifier.scopes.IfScopeContainer; +import jdk.graal.compiler.hightiercodegen.reconstruction.stackifier.scopes.LoopScopeContainer; +import jdk.graal.compiler.hightiercodegen.reconstruction.stackifier.scopes.Scope; +import jdk.graal.compiler.hightiercodegen.reconstruction.stackifier.scopes.ScopeContainer; +import jdk.graal.compiler.hightiercodegen.reconstruction.stackifier.scopes.SwitchScopeContainer; import org.graalvm.collections.EconomicMap; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.nodes.cfg.HIRBlock; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.nodes.cfg.HIRBlock; -import jdk.compiler.graal.hightiercodegen.reconstruction.stackifier.blocks.LabeledBlock; -import jdk.compiler.graal.hightiercodegen.reconstruction.stackifier.blocks.LabeledBlockGeneration; +import jdk.graal.compiler.hightiercodegen.reconstruction.stackifier.blocks.LabeledBlock; +import jdk.graal.compiler.hightiercodegen.reconstruction.stackifier.blocks.LabeledBlockGeneration; /** * This class contains all the data that is computed by the stackifier algorithm. diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/reconstruction/stackifier/CFStackifierSortPhase.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hightiercodegen/reconstruction/stackifier/CFStackifierSortPhase.java similarity index 94% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/reconstruction/stackifier/CFStackifierSortPhase.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hightiercodegen/reconstruction/stackifier/CFStackifierSortPhase.java index 211e4481ded2..2a895c8532fb 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/reconstruction/stackifier/CFStackifierSortPhase.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hightiercodegen/reconstruction/stackifier/CFStackifierSortPhase.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hightiercodegen.reconstruction.stackifier; +package jdk.graal.compiler.hightiercodegen.reconstruction.stackifier; import java.util.Comparator; import java.util.Deque; @@ -35,24 +35,24 @@ import org.graalvm.collections.EconomicMap; import org.graalvm.collections.EconomicSet; import org.graalvm.collections.Equivalence; -import jdk.compiler.graal.core.common.cfg.BlockMap; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.hightiercodegen.reconstruction.StackifierData; -import jdk.compiler.graal.hightiercodegen.reconstruction.stackifier.scopes.CatchScopeContainer; -import jdk.compiler.graal.hightiercodegen.reconstruction.stackifier.scopes.IfScopeContainer; -import jdk.compiler.graal.hightiercodegen.reconstruction.stackifier.scopes.LoopScopeContainer; -import jdk.compiler.graal.hightiercodegen.reconstruction.stackifier.scopes.Scope; -import jdk.compiler.graal.hightiercodegen.reconstruction.stackifier.scopes.ScopeContainer; -import jdk.compiler.graal.hightiercodegen.reconstruction.stackifier.scopes.SwitchScopeContainer; -import jdk.compiler.graal.nodes.GraphState; -import jdk.compiler.graal.nodes.IfNode; -import jdk.compiler.graal.nodes.LoopBeginNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.cfg.ControlFlowGraph; -import jdk.compiler.graal.nodes.cfg.HIRBlock; -import jdk.compiler.graal.phases.BasePhase; +import jdk.graal.compiler.core.common.cfg.BlockMap; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.hightiercodegen.reconstruction.StackifierData; +import jdk.graal.compiler.hightiercodegen.reconstruction.stackifier.scopes.CatchScopeContainer; +import jdk.graal.compiler.hightiercodegen.reconstruction.stackifier.scopes.IfScopeContainer; +import jdk.graal.compiler.hightiercodegen.reconstruction.stackifier.scopes.LoopScopeContainer; +import jdk.graal.compiler.hightiercodegen.reconstruction.stackifier.scopes.Scope; +import jdk.graal.compiler.hightiercodegen.reconstruction.stackifier.scopes.ScopeContainer; +import jdk.graal.compiler.hightiercodegen.reconstruction.stackifier.scopes.SwitchScopeContainer; +import jdk.graal.compiler.nodes.GraphState; +import jdk.graal.compiler.nodes.IfNode; +import jdk.graal.compiler.nodes.LoopBeginNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.cfg.ControlFlowGraph; +import jdk.graal.compiler.nodes.cfg.HIRBlock; +import jdk.graal.compiler.phases.BasePhase; /** * This phase sorts the basic blocks of a {@link ControlFlowGraph} such that the basic blocks from a diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/reconstruction/stackifier/StackifierReconstructionPhase.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hightiercodegen/reconstruction/stackifier/StackifierReconstructionPhase.java similarity index 79% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/reconstruction/stackifier/StackifierReconstructionPhase.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hightiercodegen/reconstruction/stackifier/StackifierReconstructionPhase.java index 31f85af9698c..1efb76cdc58e 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/reconstruction/stackifier/StackifierReconstructionPhase.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hightiercodegen/reconstruction/stackifier/StackifierReconstructionPhase.java @@ -22,21 +22,21 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hightiercodegen.reconstruction.stackifier; +package jdk.graal.compiler.hightiercodegen.reconstruction.stackifier; import java.util.Optional; -import jdk.compiler.graal.hightiercodegen.irwalk.StackifierIRWalker; -import jdk.compiler.graal.hightiercodegen.reconstruction.ReconstructionPhase; -import jdk.compiler.graal.hightiercodegen.reconstruction.ScheduleWithReconstructionResult; -import jdk.compiler.graal.hightiercodegen.reconstruction.StackifierData; -import jdk.compiler.graal.hightiercodegen.reconstruction.stackifier.blocks.LabeledBlockGeneration; -import jdk.compiler.graal.nodes.GraphState; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.cfg.ControlFlowGraph; -import jdk.compiler.graal.nodes.spi.CoreProviders; -import jdk.compiler.graal.phases.BasePhase; -import jdk.compiler.graal.phases.schedule.SchedulePhase; +import jdk.graal.compiler.hightiercodegen.irwalk.StackifierIRWalker; +import jdk.graal.compiler.hightiercodegen.reconstruction.ReconstructionPhase; +import jdk.graal.compiler.hightiercodegen.reconstruction.ScheduleWithReconstructionResult; +import jdk.graal.compiler.hightiercodegen.reconstruction.StackifierData; +import jdk.graal.compiler.hightiercodegen.reconstruction.stackifier.blocks.LabeledBlockGeneration; +import jdk.graal.compiler.nodes.GraphState; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.cfg.ControlFlowGraph; +import jdk.graal.compiler.nodes.spi.CoreProviders; +import jdk.graal.compiler.phases.BasePhase; +import jdk.graal.compiler.phases.schedule.SchedulePhase; /** * Computes a {@link ScheduleWithReconstructionResult} for the graph, meant specifically for use by diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/reconstruction/stackifier/StackifierScopeComputation.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hightiercodegen/reconstruction/stackifier/StackifierScopeComputation.java similarity index 91% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/reconstruction/stackifier/StackifierScopeComputation.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hightiercodegen/reconstruction/stackifier/StackifierScopeComputation.java index ddd4c4942eea..0846bda3f24f 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/reconstruction/stackifier/StackifierScopeComputation.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hightiercodegen/reconstruction/stackifier/StackifierScopeComputation.java @@ -22,30 +22,30 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hightiercodegen.reconstruction.stackifier; +package jdk.graal.compiler.hightiercodegen.reconstruction.stackifier; import org.graalvm.collections.EconomicMap; import org.graalvm.collections.EconomicSet; import org.graalvm.collections.Equivalence; -import jdk.compiler.graal.core.common.cfg.AbstractControlFlowGraph; -import jdk.compiler.graal.core.common.cfg.Loop; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.hightiercodegen.reconstruction.StackifierData; -import jdk.compiler.graal.hightiercodegen.reconstruction.stackifier.blocks.LabeledBlock; -import jdk.compiler.graal.hightiercodegen.reconstruction.stackifier.scopes.CatchScopeContainer; -import jdk.compiler.graal.hightiercodegen.reconstruction.stackifier.scopes.IfScopeContainer; -import jdk.compiler.graal.hightiercodegen.reconstruction.stackifier.scopes.LoopScopeContainer; -import jdk.compiler.graal.hightiercodegen.reconstruction.stackifier.scopes.Scope; -import jdk.compiler.graal.hightiercodegen.reconstruction.stackifier.scopes.ScopeContainer; -import jdk.compiler.graal.hightiercodegen.reconstruction.stackifier.scopes.SwitchScopeContainer; -import jdk.compiler.graal.nodes.AbstractBeginNode; -import jdk.compiler.graal.nodes.IfNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.WithExceptionNode; -import jdk.compiler.graal.nodes.cfg.HIRBlock; -import jdk.compiler.graal.nodes.cfg.ControlFlowGraph; -import jdk.compiler.graal.nodes.extended.IntegerSwitchNode; +import jdk.graal.compiler.core.common.cfg.AbstractControlFlowGraph; +import jdk.graal.compiler.core.common.cfg.Loop; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.hightiercodegen.reconstruction.StackifierData; +import jdk.graal.compiler.hightiercodegen.reconstruction.stackifier.blocks.LabeledBlock; +import jdk.graal.compiler.hightiercodegen.reconstruction.stackifier.scopes.CatchScopeContainer; +import jdk.graal.compiler.hightiercodegen.reconstruction.stackifier.scopes.IfScopeContainer; +import jdk.graal.compiler.hightiercodegen.reconstruction.stackifier.scopes.LoopScopeContainer; +import jdk.graal.compiler.hightiercodegen.reconstruction.stackifier.scopes.Scope; +import jdk.graal.compiler.hightiercodegen.reconstruction.stackifier.scopes.ScopeContainer; +import jdk.graal.compiler.hightiercodegen.reconstruction.stackifier.scopes.SwitchScopeContainer; +import jdk.graal.compiler.nodes.AbstractBeginNode; +import jdk.graal.compiler.nodes.IfNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.WithExceptionNode; +import jdk.graal.compiler.nodes.cfg.HIRBlock; +import jdk.graal.compiler.nodes.cfg.ControlFlowGraph; +import jdk.graal.compiler.nodes.extended.IntegerSwitchNode; /** * This class computes {@link Scope}s for then-else branches, catch-blocks and cases of a switch diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/reconstruction/stackifier/blocks/LabeledBlock.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hightiercodegen/reconstruction/stackifier/blocks/LabeledBlock.java similarity index 95% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/reconstruction/stackifier/blocks/LabeledBlock.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hightiercodegen/reconstruction/stackifier/blocks/LabeledBlock.java index b01e5b0fc468..8a113d79033b 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/reconstruction/stackifier/blocks/LabeledBlock.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hightiercodegen/reconstruction/stackifier/blocks/LabeledBlock.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hightiercodegen.reconstruction.stackifier.blocks; +package jdk.graal.compiler.hightiercodegen.reconstruction.stackifier.blocks; -import jdk.compiler.graal.nodes.cfg.HIRBlock; +import jdk.graal.compiler.nodes.cfg.HIRBlock; /** * This class represents labeled blocks in the generated code. They are used to replace goto diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/reconstruction/stackifier/blocks/LabeledBlockGeneration.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hightiercodegen/reconstruction/stackifier/blocks/LabeledBlockGeneration.java similarity index 95% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/reconstruction/stackifier/blocks/LabeledBlockGeneration.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hightiercodegen/reconstruction/stackifier/blocks/LabeledBlockGeneration.java index c1aeb166a55d..bd03c1bbb4c3 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/reconstruction/stackifier/blocks/LabeledBlockGeneration.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hightiercodegen/reconstruction/stackifier/blocks/LabeledBlockGeneration.java @@ -22,31 +22,31 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hightiercodegen.reconstruction.stackifier.blocks; +package jdk.graal.compiler.hightiercodegen.reconstruction.stackifier.blocks; -import static jdk.compiler.graal.debug.Assertions.assertionsEnabled; +import static jdk.graal.compiler.debug.Assertions.assertionsEnabled; import java.util.SortedSet; import java.util.TreeSet; -import jdk.compiler.graal.hightiercodegen.irwalk.StackifierIRWalker; -import jdk.compiler.graal.hightiercodegen.reconstruction.StackifierData; -import jdk.compiler.graal.hightiercodegen.reconstruction.stackifier.scopes.CatchScopeContainer; -import jdk.compiler.graal.hightiercodegen.reconstruction.stackifier.scopes.IfScopeContainer; -import jdk.compiler.graal.hightiercodegen.reconstruction.stackifier.scopes.LoopScopeContainer; -import jdk.compiler.graal.hightiercodegen.reconstruction.stackifier.scopes.Scope; -import jdk.compiler.graal.hightiercodegen.reconstruction.stackifier.scopes.ScopeContainer; -import jdk.compiler.graal.hightiercodegen.reconstruction.stackifier.scopes.SwitchScopeContainer; +import jdk.graal.compiler.hightiercodegen.irwalk.StackifierIRWalker; +import jdk.graal.compiler.hightiercodegen.reconstruction.StackifierData; +import jdk.graal.compiler.hightiercodegen.reconstruction.stackifier.scopes.CatchScopeContainer; +import jdk.graal.compiler.hightiercodegen.reconstruction.stackifier.scopes.IfScopeContainer; +import jdk.graal.compiler.hightiercodegen.reconstruction.stackifier.scopes.LoopScopeContainer; +import jdk.graal.compiler.hightiercodegen.reconstruction.stackifier.scopes.Scope; +import jdk.graal.compiler.hightiercodegen.reconstruction.stackifier.scopes.ScopeContainer; +import jdk.graal.compiler.hightiercodegen.reconstruction.stackifier.scopes.SwitchScopeContainer; import org.graalvm.collections.EconomicMap; import org.graalvm.collections.EconomicSet; -import jdk.compiler.graal.core.common.cfg.AbstractControlFlowGraph; -import jdk.compiler.graal.core.common.cfg.Loop; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.nodes.IfNode; -import jdk.compiler.graal.nodes.InvokeWithExceptionNode; -import jdk.compiler.graal.nodes.cfg.HIRBlock; -import jdk.compiler.graal.nodes.cfg.ControlFlowGraph; -import jdk.compiler.graal.nodes.extended.IntegerSwitchNode; +import jdk.graal.compiler.core.common.cfg.AbstractControlFlowGraph; +import jdk.graal.compiler.core.common.cfg.Loop; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.nodes.IfNode; +import jdk.graal.compiler.nodes.InvokeWithExceptionNode; +import jdk.graal.compiler.nodes.cfg.HIRBlock; +import jdk.graal.compiler.nodes.cfg.ControlFlowGraph; +import jdk.graal.compiler.nodes.extended.IntegerSwitchNode; /** * This class generates {@link LabeledBlock}s that enable us to do forward jumps and skip over basic diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/reconstruction/stackifier/scopes/CatchScopeContainer.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hightiercodegen/reconstruction/stackifier/scopes/CatchScopeContainer.java similarity index 93% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/reconstruction/stackifier/scopes/CatchScopeContainer.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hightiercodegen/reconstruction/stackifier/scopes/CatchScopeContainer.java index 6a3610796ede..12be18690314 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/reconstruction/stackifier/scopes/CatchScopeContainer.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hightiercodegen/reconstruction/stackifier/scopes/CatchScopeContainer.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hightiercodegen.reconstruction.stackifier.scopes; +package jdk.graal.compiler.hightiercodegen.reconstruction.stackifier.scopes; -import jdk.compiler.graal.nodes.InvokeWithExceptionNode; +import jdk.graal.compiler.nodes.InvokeWithExceptionNode; /** * This class is a container for the catch scope that is generated by an diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/reconstruction/stackifier/scopes/IfScopeContainer.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hightiercodegen/reconstruction/stackifier/scopes/IfScopeContainer.java similarity index 94% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/reconstruction/stackifier/scopes/IfScopeContainer.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hightiercodegen/reconstruction/stackifier/scopes/IfScopeContainer.java index 9d950f8b7958..d30712a64549 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/reconstruction/stackifier/scopes/IfScopeContainer.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hightiercodegen/reconstruction/stackifier/scopes/IfScopeContainer.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hightiercodegen.reconstruction.stackifier.scopes; +package jdk.graal.compiler.hightiercodegen.reconstruction.stackifier.scopes; -import jdk.compiler.graal.nodes.IfNode; +import jdk.graal.compiler.nodes.IfNode; /** * This class is a container for the then- and else-scopes that are generated by an {@link IfNode}. diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/reconstruction/stackifier/scopes/LoopScopeContainer.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hightiercodegen/reconstruction/stackifier/scopes/LoopScopeContainer.java similarity index 93% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/reconstruction/stackifier/scopes/LoopScopeContainer.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hightiercodegen/reconstruction/stackifier/scopes/LoopScopeContainer.java index fc98b8f46146..20427b08d02b 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/reconstruction/stackifier/scopes/LoopScopeContainer.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hightiercodegen/reconstruction/stackifier/scopes/LoopScopeContainer.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hightiercodegen.reconstruction.stackifier.scopes; +package jdk.graal.compiler.hightiercodegen.reconstruction.stackifier.scopes; -import jdk.compiler.graal.nodes.LoopBeginNode; +import jdk.graal.compiler.nodes.LoopBeginNode; /** * This class is a container for a loop that is generated by a {@link LoopBeginNode}. diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/reconstruction/stackifier/scopes/Scope.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hightiercodegen/reconstruction/stackifier/scopes/Scope.java similarity index 94% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/reconstruction/stackifier/scopes/Scope.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hightiercodegen/reconstruction/stackifier/scopes/Scope.java index 40b78b865464..64286bfcbc62 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/reconstruction/stackifier/scopes/Scope.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hightiercodegen/reconstruction/stackifier/scopes/Scope.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hightiercodegen.reconstruction.stackifier.scopes; +package jdk.graal.compiler.hightiercodegen.reconstruction.stackifier.scopes; import java.util.Arrays; import java.util.Comparator; -import jdk.compiler.graal.hightiercodegen.reconstruction.stackifier.CFStackifierSortPhase; +import jdk.graal.compiler.hightiercodegen.reconstruction.stackifier.CFStackifierSortPhase; import org.graalvm.collections.EconomicSet; -import jdk.compiler.graal.core.common.cfg.BasicBlock; -import jdk.compiler.graal.nodes.cfg.HIRBlock; +import jdk.graal.compiler.core.common.cfg.BasicBlock; +import jdk.graal.compiler.nodes.cfg.HIRBlock; /** * This class represents a scope, i.e. a set of basic blocks that belong together in a block, e.g. a diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/reconstruction/stackifier/scopes/ScopeContainer.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hightiercodegen/reconstruction/stackifier/scopes/ScopeContainer.java similarity index 95% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/reconstruction/stackifier/scopes/ScopeContainer.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hightiercodegen/reconstruction/stackifier/scopes/ScopeContainer.java index f72be3d544d2..d4c8b7be13f7 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/reconstruction/stackifier/scopes/ScopeContainer.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hightiercodegen/reconstruction/stackifier/scopes/ScopeContainer.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hightiercodegen.reconstruction.stackifier.scopes; +package jdk.graal.compiler.hightiercodegen.reconstruction.stackifier.scopes; /** * This interface is implemented by classes that hold scopes. diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/reconstruction/stackifier/scopes/SwitchScopeContainer.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hightiercodegen/reconstruction/stackifier/scopes/SwitchScopeContainer.java similarity index 92% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/reconstruction/stackifier/scopes/SwitchScopeContainer.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hightiercodegen/reconstruction/stackifier/scopes/SwitchScopeContainer.java index e983f6dfbb30..08b22d8fe9b0 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/reconstruction/stackifier/scopes/SwitchScopeContainer.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hightiercodegen/reconstruction/stackifier/scopes/SwitchScopeContainer.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hightiercodegen.reconstruction.stackifier.scopes; +package jdk.graal.compiler.hightiercodegen.reconstruction.stackifier.scopes; -import jdk.compiler.graal.nodes.extended.IntegerSwitchNode; +import jdk.graal.compiler.nodes.extended.IntegerSwitchNode; /** * This class contains scopes for the cases of a {@link IntegerSwitchNode}. diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/variables/ResolvedVar.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hightiercodegen/variables/ResolvedVar.java similarity index 96% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/variables/ResolvedVar.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hightiercodegen/variables/ResolvedVar.java index 543d355e7e12..9a6e4d3b2916 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/variables/ResolvedVar.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hightiercodegen/variables/ResolvedVar.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hightiercodegen.variables; +package jdk.graal.compiler.hightiercodegen.variables; -import jdk.compiler.graal.graph.Node; +import jdk.graal.compiler.graph.Node; import jdk.vm.ci.common.JVMCIError; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/variables/VariableAllocation.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hightiercodegen/variables/VariableAllocation.java similarity index 92% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/variables/VariableAllocation.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hightiercodegen/variables/VariableAllocation.java index 0b327f392de3..417eba395def 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/variables/VariableAllocation.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hightiercodegen/variables/VariableAllocation.java @@ -23,28 +23,28 @@ * questions. */ -package jdk.compiler.graal.hightiercodegen.variables; +package jdk.graal.compiler.hightiercodegen.variables; import java.util.ArrayList; import java.util.Collection; import java.util.List; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.graph.NodeInputList; -import jdk.compiler.graal.graph.NodeMap; -import jdk.compiler.graal.hightiercodegen.CodeGenTool; -import jdk.compiler.graal.hightiercodegen.NodeLowerer; -import jdk.compiler.graal.nodes.AbstractBeginNode; -import jdk.compiler.graal.nodes.AbstractMergeNode; -import jdk.compiler.graal.nodes.CallTargetNode; -import jdk.compiler.graal.nodes.FixedNode; -import jdk.compiler.graal.nodes.FixedWithNextNode; -import jdk.compiler.graal.nodes.Invoke; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.ValuePhiNode; -import jdk.compiler.graal.nodes.cfg.HIRBlock; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.graph.NodeInputList; +import jdk.graal.compiler.graph.NodeMap; +import jdk.graal.compiler.hightiercodegen.CodeGenTool; +import jdk.graal.compiler.hightiercodegen.NodeLowerer; +import jdk.graal.compiler.nodes.AbstractBeginNode; +import jdk.graal.compiler.nodes.AbstractMergeNode; +import jdk.graal.compiler.nodes.CallTargetNode; +import jdk.graal.compiler.nodes.FixedNode; +import jdk.graal.compiler.nodes.FixedWithNextNode; +import jdk.graal.compiler.nodes.Invoke; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.ValuePhiNode; +import jdk.graal.compiler.nodes.cfg.HIRBlock; /** * Performs variable allocation on SSA form. diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/variables/VariableMap.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hightiercodegen/variables/VariableMap.java similarity index 95% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/variables/VariableMap.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hightiercodegen/variables/VariableMap.java index d00480528595..ff57049a035c 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/variables/VariableMap.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hightiercodegen/variables/VariableMap.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hightiercodegen.variables; +package jdk.graal.compiler.hightiercodegen.variables; import java.util.HashMap; -import jdk.compiler.graal.nodes.ValueNode; +import jdk.graal.compiler.nodes.ValueNode; /** * Storing variable allocation result for a method. diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/BootstrapWatchDog.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/BootstrapWatchDog.java similarity index 96% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/BootstrapWatchDog.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/BootstrapWatchDog.java index bdf4b25ff177..1f91bca98dfe 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/BootstrapWatchDog.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/BootstrapWatchDog.java @@ -22,20 +22,20 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot; +package jdk.graal.compiler.hotspot; import java.util.Arrays; import java.util.HashMap; import java.util.Map; import java.util.concurrent.atomic.AtomicInteger; -import jdk.compiler.graal.core.CompilationWatchDog; -import jdk.compiler.graal.core.common.util.Util; -import jdk.compiler.graal.debug.TTY; -import jdk.compiler.graal.options.Option; -import jdk.compiler.graal.options.OptionKey; -import jdk.compiler.graal.options.OptionType; -import jdk.compiler.graal.options.OptionValues; +import jdk.graal.compiler.core.CompilationWatchDog; +import jdk.graal.compiler.core.common.util.Util; +import jdk.graal.compiler.debug.TTY; +import jdk.graal.compiler.options.Option; +import jdk.graal.compiler.options.OptionKey; +import jdk.graal.compiler.options.OptionType; +import jdk.graal.compiler.options.OptionValues; import jdk.vm.ci.code.CompilationRequest; import jdk.vm.ci.services.Services; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/CommunityCompilerConfigurationFactory.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/CommunityCompilerConfigurationFactory.java similarity index 88% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/CommunityCompilerConfigurationFactory.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/CommunityCompilerConfigurationFactory.java index 87536dc47a35..59669b48d5e6 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/CommunityCompilerConfigurationFactory.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/CommunityCompilerConfigurationFactory.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot; +package jdk.graal.compiler.hotspot; -import jdk.compiler.graal.core.Instrumentation; -import jdk.compiler.graal.core.phases.CommunityCompilerConfiguration; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.phases.tiers.CompilerConfiguration; -import jdk.compiler.graal.serviceprovider.ServiceProvider; +import jdk.graal.compiler.core.Instrumentation; +import jdk.graal.compiler.core.phases.CommunityCompilerConfiguration; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.phases.tiers.CompilerConfiguration; +import jdk.graal.compiler.serviceprovider.ServiceProvider; /** * Factory for creating the default configuration for the community edition of Graal. diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/CompilationContext.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/CompilationContext.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/CompilationContext.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/CompilationContext.java index 4606d1349661..007e405b33c1 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/CompilationContext.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/CompilationContext.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot; +package jdk.graal.compiler.hotspot; -import jdk.compiler.graal.debug.GraalError; +import jdk.graal.compiler.debug.GraalError; import jdk.vm.ci.meta.JavaConstant; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/CompilationCounters.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/CompilationCounters.java similarity index 93% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/CompilationCounters.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/CompilationCounters.java index 4d86671cf172..8b1a24d57f95 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/CompilationCounters.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/CompilationCounters.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot; +package jdk.graal.compiler.hotspot; import java.util.Comparator; import java.util.HashMap; @@ -31,12 +31,12 @@ import java.util.SortedSet; import java.util.TreeSet; -import jdk.compiler.graal.core.common.util.MethodKey; -import jdk.compiler.graal.debug.TTY; -import jdk.compiler.graal.options.Option; -import jdk.compiler.graal.options.OptionKey; -import jdk.compiler.graal.options.OptionType; -import jdk.compiler.graal.options.OptionValues; +import jdk.graal.compiler.core.common.util.MethodKey; +import jdk.graal.compiler.debug.TTY; +import jdk.graal.compiler.options.Option; +import jdk.graal.compiler.options.OptionKey; +import jdk.graal.compiler.options.OptionType; +import jdk.graal.compiler.options.OptionValues; import jdk.vm.ci.code.CompilationRequest; import jdk.vm.ci.hotspot.HotSpotJVMCIRuntime; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/CompilationStatistics.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/CompilationStatistics.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/CompilationStatistics.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/CompilationStatistics.java index 24addc2c5fc8..92861aa0392b 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/CompilationStatistics.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/CompilationStatistics.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot; +package jdk.graal.compiler.hotspot; import java.io.FileNotFoundException; import java.io.FileOutputStream; @@ -40,11 +40,11 @@ import java.util.Locale; import java.util.concurrent.ConcurrentLinkedDeque; -import jdk.compiler.graal.debug.CSVUtil; -import jdk.compiler.graal.options.Option; -import jdk.compiler.graal.options.OptionKey; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.serviceprovider.GraalServices; +import jdk.graal.compiler.debug.CSVUtil; +import jdk.graal.compiler.options.Option; +import jdk.graal.compiler.options.OptionKey; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.serviceprovider.GraalServices; import jdk.vm.ci.hotspot.HotSpotInstalledCode; import jdk.vm.ci.hotspot.HotSpotResolvedJavaMethod; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/CompilationTask.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/CompilationTask.java similarity index 92% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/CompilationTask.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/CompilationTask.java index 4f54217b2a20..b124780f42eb 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/CompilationTask.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/CompilationTask.java @@ -22,43 +22,43 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot; +package jdk.graal.compiler.hotspot; import static jdk.vm.ci.services.Services.IS_IN_NATIVE_IMAGE; -import static jdk.compiler.graal.core.CompilationWrapper.ExceptionAction.Diagnose; -import static jdk.compiler.graal.core.CompilationWrapper.ExceptionAction.ExitVM; -import static jdk.compiler.graal.core.GraalCompilerOptions.CompilationBailoutAsFailure; -import static jdk.compiler.graal.core.GraalCompilerOptions.CompilationFailureAction; -import static jdk.compiler.graal.core.phases.HighTier.Options.Inline; -import static jdk.compiler.graal.java.BytecodeParserOptions.InlineDuringParsing; +import static jdk.graal.compiler.core.CompilationWrapper.ExceptionAction.Diagnose; +import static jdk.graal.compiler.core.CompilationWrapper.ExceptionAction.ExitVM; +import static jdk.graal.compiler.core.GraalCompilerOptions.CompilationBailoutAsFailure; +import static jdk.graal.compiler.core.GraalCompilerOptions.CompilationFailureAction; +import static jdk.graal.compiler.core.phases.HighTier.Options.Inline; +import static jdk.graal.compiler.java.BytecodeParserOptions.InlineDuringParsing; import java.io.PrintStream; import org.graalvm.collections.EconomicMap; -import jdk.compiler.graal.api.replacements.SnippetReflectionProvider; -import jdk.compiler.graal.code.CompilationResult; -import jdk.compiler.graal.core.CompilationPrinter; -import jdk.compiler.graal.core.CompilationWatchDog; -import jdk.compiler.graal.core.CompilationWrapper; -import jdk.compiler.graal.core.common.CompilationIdentifier; -import jdk.compiler.graal.debug.Assertions; -import jdk.compiler.graal.debug.CounterKey; -import jdk.compiler.graal.debug.DebugCloseable; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.debug.DebugContext.Builder; -import jdk.compiler.graal.debug.DebugContext.Description; -import jdk.compiler.graal.debug.DebugDumpScope; -import jdk.compiler.graal.debug.DebugHandlersFactory; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.debug.TTY; -import jdk.compiler.graal.debug.TimerKey; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.spi.StableProfileProvider; -import jdk.compiler.graal.nodes.spi.StableProfileProvider.TypeFilter; -import jdk.compiler.graal.options.OptionKey; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.printer.GraalDebugHandlersFactory; -import jdk.compiler.graal.serviceprovider.GraalServices; +import jdk.graal.compiler.api.replacements.SnippetReflectionProvider; +import jdk.graal.compiler.code.CompilationResult; +import jdk.graal.compiler.core.CompilationPrinter; +import jdk.graal.compiler.core.CompilationWatchDog; +import jdk.graal.compiler.core.CompilationWrapper; +import jdk.graal.compiler.core.common.CompilationIdentifier; +import jdk.graal.compiler.debug.Assertions; +import jdk.graal.compiler.debug.CounterKey; +import jdk.graal.compiler.debug.DebugCloseable; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.debug.DebugContext.Builder; +import jdk.graal.compiler.debug.DebugContext.Description; +import jdk.graal.compiler.debug.DebugDumpScope; +import jdk.graal.compiler.debug.DebugHandlersFactory; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.debug.TTY; +import jdk.graal.compiler.debug.TimerKey; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.spi.StableProfileProvider; +import jdk.graal.compiler.nodes.spi.StableProfileProvider.TypeFilter; +import jdk.graal.compiler.options.OptionKey; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.printer.GraalDebugHandlersFactory; +import jdk.graal.compiler.serviceprovider.GraalServices; import jdk.vm.ci.code.BailoutException; import jdk.vm.ci.code.CodeCacheProvider; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/CompileTheWorldFuzzedSuitesCompilationTask.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/CompileTheWorldFuzzedSuitesCompilationTask.java similarity index 93% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/CompileTheWorldFuzzedSuitesCompilationTask.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/CompileTheWorldFuzzedSuitesCompilationTask.java index dd4838eb1951..5d007982af25 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/CompileTheWorldFuzzedSuitesCompilationTask.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/CompileTheWorldFuzzedSuitesCompilationTask.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot; +package jdk.graal.compiler.hotspot; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -30,11 +30,11 @@ import java.nio.file.Files; import java.nio.file.Paths; -import jdk.compiler.graal.core.common.CancellationBailoutException; -import jdk.compiler.graal.core.phases.fuzzing.FuzzedSuites; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.hotspot.meta.HotSpotFuzzedSuitesProvider; +import jdk.graal.compiler.core.common.CancellationBailoutException; +import jdk.graal.compiler.core.phases.fuzzing.FuzzedSuites; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.hotspot.meta.HotSpotFuzzedSuitesProvider; import jdk.vm.ci.hotspot.HotSpotCompilationRequest; import jdk.vm.ci.hotspot.HotSpotCompilationRequestResult; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/CompilerConfigurationFactory.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/CompilerConfigurationFactory.java similarity index 94% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/CompilerConfigurationFactory.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/CompilerConfigurationFactory.java index b7e491214494..bd235ff16a60 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/CompilerConfigurationFactory.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/CompilerConfigurationFactory.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot; +package jdk.graal.compiler.hotspot; import static jdk.vm.ci.common.InitTimer.timer; @@ -33,20 +33,20 @@ import java.util.stream.Collectors; import org.graalvm.collections.EconomicMap; -import jdk.compiler.graal.core.Instrumentation; -import jdk.compiler.graal.core.common.SuppressFBWarnings; -import jdk.compiler.graal.core.common.util.PhasePlan; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.debug.TTY; -import jdk.compiler.graal.options.EnumOptionKey; -import jdk.compiler.graal.options.Option; -import jdk.compiler.graal.options.OptionKey; -import jdk.compiler.graal.options.OptionStability; -import jdk.compiler.graal.options.OptionType; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.phases.tiers.CompilerConfiguration; -import jdk.compiler.graal.serviceprovider.GlobalAtomicLong; -import jdk.compiler.graal.serviceprovider.GraalServices; +import jdk.graal.compiler.core.Instrumentation; +import jdk.graal.compiler.core.common.SuppressFBWarnings; +import jdk.graal.compiler.core.common.util.PhasePlan; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.debug.TTY; +import jdk.graal.compiler.options.EnumOptionKey; +import jdk.graal.compiler.options.Option; +import jdk.graal.compiler.options.OptionKey; +import jdk.graal.compiler.options.OptionStability; +import jdk.graal.compiler.options.OptionType; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.phases.tiers.CompilerConfiguration; +import jdk.graal.compiler.serviceprovider.GlobalAtomicLong; +import jdk.graal.compiler.serviceprovider.GraalServices; import jdk.vm.ci.code.Architecture; import jdk.vm.ci.common.InitTimer; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/DefaultInstrumentation.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/DefaultInstrumentation.java similarity index 94% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/DefaultInstrumentation.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/DefaultInstrumentation.java index 673ba959d7d5..cfbd3bdac475 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/DefaultInstrumentation.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/DefaultInstrumentation.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot; +package jdk.graal.compiler.hotspot; -import jdk.compiler.graal.core.Instrumentation; +import jdk.graal.compiler.core.Instrumentation; /** * Default version of {@link Instrumentation}. diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/EconomyCompilerConfigurationFactory.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/EconomyCompilerConfigurationFactory.java similarity index 88% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/EconomyCompilerConfigurationFactory.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/EconomyCompilerConfigurationFactory.java index ea5047d58717..e84f1222fee4 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/EconomyCompilerConfigurationFactory.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/EconomyCompilerConfigurationFactory.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot; +package jdk.graal.compiler.hotspot; -import jdk.compiler.graal.core.Instrumentation; -import jdk.compiler.graal.core.phases.EconomyCompilerConfiguration; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.phases.tiers.CompilerConfiguration; -import jdk.compiler.graal.serviceprovider.ServiceProvider; +import jdk.graal.compiler.core.Instrumentation; +import jdk.graal.compiler.core.phases.EconomyCompilerConfiguration; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.phases.tiers.CompilerConfiguration; +import jdk.graal.compiler.serviceprovider.ServiceProvider; /** * Factory that creates a {@link EconomyCompilerConfiguration}. diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/EncodedSnippets.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/EncodedSnippets.java similarity index 94% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/EncodedSnippets.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/EncodedSnippets.java index 87a2d7f05bff..68c951c016f8 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/EncodedSnippets.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/EncodedSnippets.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot; +package jdk.graal.compiler.hotspot; import static jdk.vm.ci.runtime.JVMCI.getRuntime; import static jdk.vm.ci.services.Services.IS_IN_NATIVE_IMAGE; -import static jdk.compiler.graal.hotspot.HotSpotReplacementsImpl.isGraalClass; -import static jdk.compiler.graal.nodes.graphbuilderconf.IntrinsicContext.CompilationContext.INLINE_AFTER_PARSING; +import static jdk.graal.compiler.hotspot.HotSpotReplacementsImpl.isGraalClass; +import static jdk.graal.compiler.nodes.graphbuilderconf.IntrinsicContext.CompilationContext.INLINE_AFTER_PARSING; import java.lang.reflect.Executable; import java.lang.reflect.Field; @@ -36,33 +36,33 @@ import java.util.function.Consumer; import org.graalvm.collections.UnmodifiableEconomicMap; -import jdk.compiler.graal.api.replacements.SnippetReflectionProvider; -import jdk.compiler.graal.api.runtime.GraalJVMCICompiler; -import jdk.compiler.graal.api.runtime.GraalRuntime; -import jdk.compiler.graal.bytecode.BytecodeProvider; -import jdk.compiler.graal.bytecode.ResolvedJavaMethodBytecode; -import jdk.compiler.graal.core.common.type.Stamp; -import jdk.compiler.graal.core.common.type.StampPair; -import jdk.compiler.graal.core.common.type.SymbolicJVMCIReference; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.graph.NodeClass; -import jdk.compiler.graal.nodeinfo.Verbosity; -import jdk.compiler.graal.nodes.ConstantNode; -import jdk.compiler.graal.nodes.EncodedGraph; -import jdk.compiler.graal.nodes.FieldLocationIdentity; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.graphbuilderconf.InlineInvokePlugin; -import jdk.compiler.graal.nodes.graphbuilderconf.IntrinsicContext; -import jdk.compiler.graal.nodes.graphbuilderconf.ParameterPlugin; -import jdk.compiler.graal.nodes.java.MethodCallTargetNode; -import jdk.compiler.graal.nodes.spi.SnippetParameterInfo; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.phases.util.Providers; -import jdk.compiler.graal.replacements.ConstantBindingParameterPlugin; -import jdk.compiler.graal.replacements.PEGraphDecoder; -import jdk.compiler.graal.replacements.PartialIntrinsicCallTargetNode; +import jdk.graal.compiler.api.replacements.SnippetReflectionProvider; +import jdk.graal.compiler.api.runtime.GraalJVMCICompiler; +import jdk.graal.compiler.api.runtime.GraalRuntime; +import jdk.graal.compiler.bytecode.BytecodeProvider; +import jdk.graal.compiler.bytecode.ResolvedJavaMethodBytecode; +import jdk.graal.compiler.core.common.type.Stamp; +import jdk.graal.compiler.core.common.type.StampPair; +import jdk.graal.compiler.core.common.type.SymbolicJVMCIReference; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.graph.NodeClass; +import jdk.graal.compiler.nodeinfo.Verbosity; +import jdk.graal.compiler.nodes.ConstantNode; +import jdk.graal.compiler.nodes.EncodedGraph; +import jdk.graal.compiler.nodes.FieldLocationIdentity; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.graphbuilderconf.InlineInvokePlugin; +import jdk.graal.compiler.nodes.graphbuilderconf.IntrinsicContext; +import jdk.graal.compiler.nodes.graphbuilderconf.ParameterPlugin; +import jdk.graal.compiler.nodes.java.MethodCallTargetNode; +import jdk.graal.compiler.nodes.spi.SnippetParameterInfo; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.phases.util.Providers; +import jdk.graal.compiler.replacements.ConstantBindingParameterPlugin; +import jdk.graal.compiler.replacements.PEGraphDecoder; +import jdk.graal.compiler.replacements.PartialIntrinsicCallTargetNode; import jdk.vm.ci.meta.JavaConstant; import jdk.vm.ci.meta.JavaKind; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/GraalHotSpotVMConfig.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/GraalHotSpotVMConfig.java similarity index 99% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/GraalHotSpotVMConfig.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/GraalHotSpotVMConfig.java index 851ec4fd6cd1..62e2ba69bcdf 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/GraalHotSpotVMConfig.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/GraalHotSpotVMConfig.java @@ -22,18 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot; +package jdk.graal.compiler.hotspot; import java.lang.reflect.Field; import java.lang.reflect.Modifier; import java.util.List; import java.util.Map; -import jdk.compiler.graal.api.replacements.Fold; -import jdk.compiler.graal.api.replacements.Fold.InjectedParameter; -import jdk.compiler.graal.core.common.CompressEncoding; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.options.OptionValues; +import jdk.graal.compiler.api.replacements.Fold; +import jdk.graal.compiler.api.replacements.Fold.InjectedParameter; +import jdk.graal.compiler.core.common.CompressEncoding; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.options.OptionValues; import jdk.vm.ci.hotspot.HotSpotResolvedJavaMethod; import jdk.vm.ci.hotspot.HotSpotVMConfigStore; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/GraalHotSpotVMConfigAccess.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/GraalHotSpotVMConfigAccess.java similarity index 99% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/GraalHotSpotVMConfigAccess.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/GraalHotSpotVMConfigAccess.java index 4968845117b0..9ee0a9d9fdb3 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/GraalHotSpotVMConfigAccess.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/GraalHotSpotVMConfigAccess.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot; +package jdk.graal.compiler.hotspot; import static jdk.vm.ci.services.Services.getSavedProperty; @@ -36,7 +36,7 @@ import java.util.Set; import java.util.stream.Collectors; -import jdk.compiler.graal.debug.Assertions; +import jdk.graal.compiler.debug.Assertions; import jdk.vm.ci.common.JVMCIError; import jdk.vm.ci.hotspot.HotSpotVMConfigAccess; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotBackend.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/HotSpotBackend.java similarity index 92% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotBackend.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/HotSpotBackend.java index 27ead931f2ff..8b925cfbd7d8 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotBackend.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/HotSpotBackend.java @@ -22,55 +22,55 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot; +package jdk.graal.compiler.hotspot; import static org.graalvm.word.LocationIdentity.any; import java.util.EnumSet; -import jdk.compiler.graal.hotspot.meta.HotSpotForeignCallDescriptor; -import jdk.compiler.graal.hotspot.meta.HotSpotForeignCallsProviderImpl; -import jdk.compiler.graal.hotspot.meta.HotSpotHostForeignCallsProvider; -import jdk.compiler.graal.hotspot.meta.HotSpotProviders; -import jdk.compiler.graal.hotspot.nodes.VMErrorNode; -import jdk.compiler.graal.hotspot.replacements.HotSpotReplacementsUtil; -import jdk.compiler.graal.hotspot.word.KlassPointer; +import jdk.graal.compiler.hotspot.meta.HotSpotForeignCallDescriptor; +import jdk.graal.compiler.hotspot.meta.HotSpotForeignCallsProviderImpl; +import jdk.graal.compiler.hotspot.meta.HotSpotHostForeignCallsProvider; +import jdk.graal.compiler.hotspot.meta.HotSpotProviders; +import jdk.graal.compiler.hotspot.nodes.VMErrorNode; +import jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil; +import jdk.graal.compiler.hotspot.word.KlassPointer; import org.graalvm.collections.EconomicMap; import org.graalvm.collections.EconomicSet; import org.graalvm.collections.Equivalence; import org.graalvm.collections.MapCursor; -import jdk.compiler.graal.code.CompilationResult; -import jdk.compiler.graal.core.common.CompilationIdentifier; -import jdk.compiler.graal.core.common.alloc.RegisterAllocationConfig; -import jdk.compiler.graal.core.common.cfg.AbstractControlFlowGraph; -import jdk.compiler.graal.core.common.cfg.BasicBlock; -import jdk.compiler.graal.core.common.spi.ForeignCallDescriptor; -import jdk.compiler.graal.core.common.spi.ForeignCallLinkage; -import jdk.compiler.graal.core.common.spi.ForeignCallSignature; -import jdk.compiler.graal.core.target.Backend; -import jdk.compiler.graal.graph.Node.ConstantNodeParameter; -import jdk.compiler.graal.graph.Node.NodeIntrinsic; -import jdk.compiler.graal.hotspot.stubs.ExceptionHandlerStub; -import jdk.compiler.graal.hotspot.stubs.Stub; -import jdk.compiler.graal.hotspot.stubs.UnwindExceptionToCallerStub; -import jdk.compiler.graal.lir.LIR; -import jdk.compiler.graal.lir.LIRFrameState; -import jdk.compiler.graal.lir.LIRInstruction; -import jdk.compiler.graal.lir.LIRInstruction.OperandFlag; -import jdk.compiler.graal.lir.LIRInstruction.OperandMode; -import jdk.compiler.graal.lir.StandardOp.LabelOp; -import jdk.compiler.graal.lir.StandardOp.RestoreRegistersOp; -import jdk.compiler.graal.lir.StandardOp.SaveRegistersOp; -import jdk.compiler.graal.lir.ValueConsumer; -import jdk.compiler.graal.lir.framemap.FrameMap; -import jdk.compiler.graal.nodes.NamedLocationIdentity; -import jdk.compiler.graal.nodes.UnwindNode; -import jdk.compiler.graal.nodes.extended.ForeignCallNode; -import jdk.compiler.graal.options.Option; -import jdk.compiler.graal.options.OptionKey; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.phases.tiers.SuitesProvider; -import jdk.compiler.graal.word.Word; +import jdk.graal.compiler.code.CompilationResult; +import jdk.graal.compiler.core.common.CompilationIdentifier; +import jdk.graal.compiler.core.common.alloc.RegisterAllocationConfig; +import jdk.graal.compiler.core.common.cfg.AbstractControlFlowGraph; +import jdk.graal.compiler.core.common.cfg.BasicBlock; +import jdk.graal.compiler.core.common.spi.ForeignCallDescriptor; +import jdk.graal.compiler.core.common.spi.ForeignCallLinkage; +import jdk.graal.compiler.core.common.spi.ForeignCallSignature; +import jdk.graal.compiler.core.target.Backend; +import jdk.graal.compiler.graph.Node.ConstantNodeParameter; +import jdk.graal.compiler.graph.Node.NodeIntrinsic; +import jdk.graal.compiler.hotspot.stubs.ExceptionHandlerStub; +import jdk.graal.compiler.hotspot.stubs.Stub; +import jdk.graal.compiler.hotspot.stubs.UnwindExceptionToCallerStub; +import jdk.graal.compiler.lir.LIR; +import jdk.graal.compiler.lir.LIRFrameState; +import jdk.graal.compiler.lir.LIRInstruction; +import jdk.graal.compiler.lir.LIRInstruction.OperandFlag; +import jdk.graal.compiler.lir.LIRInstruction.OperandMode; +import jdk.graal.compiler.lir.StandardOp.LabelOp; +import jdk.graal.compiler.lir.StandardOp.RestoreRegistersOp; +import jdk.graal.compiler.lir.StandardOp.SaveRegistersOp; +import jdk.graal.compiler.lir.ValueConsumer; +import jdk.graal.compiler.lir.framemap.FrameMap; +import jdk.graal.compiler.nodes.NamedLocationIdentity; +import jdk.graal.compiler.nodes.UnwindNode; +import jdk.graal.compiler.nodes.extended.ForeignCallNode; +import jdk.graal.compiler.options.Option; +import jdk.graal.compiler.options.OptionKey; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.phases.tiers.SuitesProvider; +import jdk.graal.compiler.word.Word; import org.graalvm.word.LocationIdentity; import org.graalvm.word.WordBase; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotBackendFactory.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/HotSpotBackendFactory.java similarity index 89% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotBackendFactory.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/HotSpotBackendFactory.java index d7e211ed5b47..6201447ebdde 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotBackendFactory.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/HotSpotBackendFactory.java @@ -22,42 +22,42 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot; +package jdk.graal.compiler.hotspot; import static jdk.vm.ci.common.InitTimer.timer; import static jdk.vm.ci.services.Services.IS_BUILDING_NATIVE_IMAGE; import static jdk.vm.ci.services.Services.IS_IN_NATIVE_IMAGE; -import jdk.compiler.graal.bytecode.BytecodeProvider; -import jdk.compiler.graal.core.common.spi.ConstantFieldProvider; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.hotspot.meta.HotSpotGraalConstantFieldProvider; -import jdk.compiler.graal.hotspot.meta.HotSpotHostForeignCallsProvider; -import jdk.compiler.graal.hotspot.meta.HotSpotLoweringProvider; -import jdk.compiler.graal.hotspot.meta.HotSpotMetaAccessExtensionProvider; -import jdk.compiler.graal.hotspot.meta.HotSpotPlatformConfigurationProvider; -import jdk.compiler.graal.hotspot.meta.HotSpotProviders; -import jdk.compiler.graal.hotspot.meta.HotSpotRegistersProvider; -import jdk.compiler.graal.hotspot.meta.HotSpotSnippetReflectionProvider; -import jdk.compiler.graal.hotspot.meta.HotSpotStampProvider; -import jdk.compiler.graal.hotspot.meta.HotSpotSuitesProvider; -import jdk.compiler.graal.hotspot.replacements.HotSpotReplacementsUtil; -import jdk.compiler.graal.hotspot.word.HotSpotWordTypes; -import jdk.compiler.graal.nodes.FixedWithNextNode; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.extended.ArrayRangeWrite; -import jdk.compiler.graal.nodes.gc.BarrierSet; -import jdk.compiler.graal.nodes.gc.CardTableBarrierSet; -import jdk.compiler.graal.nodes.gc.G1BarrierSet; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration; -import jdk.compiler.graal.nodes.java.AbstractNewObjectNode; -import jdk.compiler.graal.nodes.loop.LoopsDataProviderImpl; -import jdk.compiler.graal.nodes.memory.FixedAccessNode; -import jdk.compiler.graal.nodes.spi.LoopsDataProvider; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.phases.tiers.CompilerConfiguration; -import jdk.compiler.graal.replacements.classfile.ClassfileBytecodeProvider; +import jdk.graal.compiler.bytecode.BytecodeProvider; +import jdk.graal.compiler.core.common.spi.ConstantFieldProvider; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.hotspot.meta.HotSpotGraalConstantFieldProvider; +import jdk.graal.compiler.hotspot.meta.HotSpotHostForeignCallsProvider; +import jdk.graal.compiler.hotspot.meta.HotSpotLoweringProvider; +import jdk.graal.compiler.hotspot.meta.HotSpotMetaAccessExtensionProvider; +import jdk.graal.compiler.hotspot.meta.HotSpotPlatformConfigurationProvider; +import jdk.graal.compiler.hotspot.meta.HotSpotProviders; +import jdk.graal.compiler.hotspot.meta.HotSpotRegistersProvider; +import jdk.graal.compiler.hotspot.meta.HotSpotSnippetReflectionProvider; +import jdk.graal.compiler.hotspot.meta.HotSpotStampProvider; +import jdk.graal.compiler.hotspot.meta.HotSpotSuitesProvider; +import jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil; +import jdk.graal.compiler.hotspot.word.HotSpotWordTypes; +import jdk.graal.compiler.nodes.FixedWithNextNode; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.extended.ArrayRangeWrite; +import jdk.graal.compiler.nodes.gc.BarrierSet; +import jdk.graal.compiler.nodes.gc.CardTableBarrierSet; +import jdk.graal.compiler.nodes.gc.G1BarrierSet; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration; +import jdk.graal.compiler.nodes.java.AbstractNewObjectNode; +import jdk.graal.compiler.nodes.loop.LoopsDataProviderImpl; +import jdk.graal.compiler.nodes.memory.FixedAccessNode; +import jdk.graal.compiler.nodes.spi.LoopsDataProvider; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.phases.tiers.CompilerConfiguration; +import jdk.graal.compiler.replacements.classfile.ClassfileBytecodeProvider; import jdk.vm.ci.code.Architecture; import jdk.vm.ci.code.RegisterConfig; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotBytecodeParser.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/HotSpotBytecodeParser.java similarity index 88% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotBytecodeParser.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/HotSpotBytecodeParser.java index eaef8805d587..36a56eb2d590 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotBytecodeParser.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/HotSpotBytecodeParser.java @@ -22,17 +22,17 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot; +package jdk.graal.compiler.hotspot; -import jdk.compiler.graal.java.BytecodeParser; -import jdk.compiler.graal.java.GraphBuilderPhase.Instance; -import jdk.compiler.graal.nodes.DeoptimizeNode; -import jdk.compiler.graal.nodes.FixedGuardNode; -import jdk.compiler.graal.nodes.LogicNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.extended.GuardingNode; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext; -import jdk.compiler.graal.nodes.graphbuilderconf.IntrinsicContext; +import jdk.graal.compiler.java.BytecodeParser; +import jdk.graal.compiler.java.GraphBuilderPhase.Instance; +import jdk.graal.compiler.nodes.DeoptimizeNode; +import jdk.graal.compiler.nodes.FixedGuardNode; +import jdk.graal.compiler.nodes.LogicNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.extended.GuardingNode; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext; +import jdk.graal.compiler.nodes.graphbuilderconf.IntrinsicContext; import jdk.vm.ci.meta.DeoptimizationAction; import jdk.vm.ci.meta.DeoptimizationReason; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotCodeCacheListener.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/HotSpotCodeCacheListener.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotCodeCacheListener.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/HotSpotCodeCacheListener.java index fb6053fdc262..ae3f9fb334a2 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotCodeCacheListener.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/HotSpotCodeCacheListener.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot; +package jdk.graal.compiler.hotspot; import jdk.vm.ci.code.CompiledCode; import jdk.vm.ci.code.InstalledCode; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotCompilationIdentifier.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/HotSpotCompilationIdentifier.java similarity index 94% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotCompilationIdentifier.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/HotSpotCompilationIdentifier.java index e75a3524a37e..7e0aa6c14b85 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotCompilationIdentifier.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/HotSpotCompilationIdentifier.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot; +package jdk.graal.compiler.hotspot; -import jdk.compiler.graal.core.common.CompilationIdentifier; -import jdk.compiler.graal.core.common.CompilationRequestIdentifier; -import jdk.compiler.graal.debug.GraalError; +import jdk.graal.compiler.core.common.CompilationIdentifier; +import jdk.graal.compiler.core.common.CompilationRequestIdentifier; +import jdk.graal.compiler.debug.GraalError; import jdk.vm.ci.hotspot.HotSpotCompilationRequest; import jdk.vm.ci.runtime.JVMCICompiler; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotCompiledCodeBuilder.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/HotSpotCompiledCodeBuilder.java similarity index 95% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotCompiledCodeBuilder.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/HotSpotCompiledCodeBuilder.java index fcedde315532..1adb5a47178a 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotCompiledCodeBuilder.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/HotSpotCompiledCodeBuilder.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot; +package jdk.graal.compiler.hotspot; import static java.util.Collections.emptyList; import static java.util.Collections.unmodifiableList; -import static jdk.compiler.graal.hotspot.HotSpotCompiledCodeBuilder.Options.ShowSubstitutionSourceInfo; -import static jdk.compiler.graal.util.CollectionsUtil.anyMatch; +import static jdk.graal.compiler.hotspot.HotSpotCompiledCodeBuilder.Options.ShowSubstitutionSourceInfo; +import static jdk.graal.compiler.util.CollectionsUtil.anyMatch; import java.nio.ByteBuffer; import java.nio.ByteOrder; @@ -39,18 +39,18 @@ import java.util.ListIterator; import java.util.Map; -import jdk.compiler.graal.code.CompilationResult; -import jdk.compiler.graal.code.CompilationResult.CodeAnnotation; -import jdk.compiler.graal.code.CompilationResult.CodeComment; -import jdk.compiler.graal.code.CompilationResult.CodeMark; -import jdk.compiler.graal.code.CompilationResult.JumpTable; -import jdk.compiler.graal.code.DataSection; -import jdk.compiler.graal.code.SourceMapping; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.graph.NodeSourcePosition; -import jdk.compiler.graal.options.Option; -import jdk.compiler.graal.options.OptionKey; -import jdk.compiler.graal.options.OptionValues; +import jdk.graal.compiler.code.CompilationResult; +import jdk.graal.compiler.code.CompilationResult.CodeAnnotation; +import jdk.graal.compiler.code.CompilationResult.CodeComment; +import jdk.graal.compiler.code.CompilationResult.CodeMark; +import jdk.graal.compiler.code.CompilationResult.JumpTable; +import jdk.graal.compiler.code.DataSection; +import jdk.graal.compiler.code.SourceMapping; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.graph.NodeSourcePosition; +import jdk.graal.compiler.options.Option; +import jdk.graal.compiler.options.OptionKey; +import jdk.graal.compiler.options.OptionValues; import jdk.vm.ci.code.BytecodeFrame; import jdk.vm.ci.code.CodeCacheProvider; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotCounterOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/HotSpotCounterOp.java similarity index 91% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotCounterOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/HotSpotCounterOp.java index 296818fb36f5..863902b1e67a 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotCounterOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/HotSpotCounterOp.java @@ -22,24 +22,24 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot; +package jdk.graal.compiler.hotspot; import static jdk.vm.ci.code.ValueUtil.isRegister; -import static jdk.compiler.graal.lir.LIRValueUtil.asJavaConstant; -import static jdk.compiler.graal.lir.LIRValueUtil.isJavaConstant; -import static jdk.compiler.graal.nodes.debug.DynamicCounterNode.MAX_INCREMENT; -import static jdk.compiler.graal.nodes.debug.DynamicCounterNode.MIN_INCREMENT; +import static jdk.graal.compiler.lir.LIRValueUtil.asJavaConstant; +import static jdk.graal.compiler.lir.LIRValueUtil.isJavaConstant; +import static jdk.graal.compiler.nodes.debug.DynamicCounterNode.MAX_INCREMENT; +import static jdk.graal.compiler.nodes.debug.DynamicCounterNode.MIN_INCREMENT; import java.util.Arrays; -import jdk.compiler.graal.hotspot.meta.HotSpotRegistersProvider; +import jdk.graal.compiler.hotspot.meta.HotSpotRegistersProvider; import org.graalvm.collections.EconomicMap; -import jdk.compiler.graal.asm.Assembler; -import jdk.compiler.graal.core.common.NumUtil; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.hotspot.debug.BenchmarkCounters; -import jdk.compiler.graal.lir.LIRInstruction; -import jdk.compiler.graal.lir.LIRInstructionClass; +import jdk.graal.compiler.asm.Assembler; +import jdk.graal.compiler.core.common.NumUtil; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.hotspot.debug.BenchmarkCounters; +import jdk.graal.compiler.lir.LIRInstruction; +import jdk.graal.compiler.lir.LIRInstructionClass; import jdk.vm.ci.code.Register; import jdk.vm.ci.code.TargetDescription; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotDataBuilder.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/HotSpotDataBuilder.java similarity index 94% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotDataBuilder.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/HotSpotDataBuilder.java index ef8f4ed9fb72..c5839bc5b273 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotDataBuilder.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/HotSpotDataBuilder.java @@ -22,16 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot; +package jdk.graal.compiler.hotspot; import static jdk.vm.ci.hotspot.HotSpotCompressedNullConstant.COMPRESSED_NULL; import java.nio.ByteBuffer; -import jdk.compiler.graal.code.DataSection.Data; -import jdk.compiler.graal.code.DataSection.Patches; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.lir.asm.DataBuilder; +import jdk.graal.compiler.code.DataSection.Data; +import jdk.graal.compiler.code.DataSection.Patches; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.lir.asm.DataBuilder; import jdk.vm.ci.code.TargetDescription; import jdk.vm.ci.hotspot.HotSpotConstant; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotDebugInfoBuilder.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/HotSpotDebugInfoBuilder.java similarity index 89% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotDebugInfoBuilder.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/HotSpotDebugInfoBuilder.java index 2b3b3a649911..1ab41cbdca75 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotDebugInfoBuilder.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/HotSpotDebugInfoBuilder.java @@ -22,28 +22,28 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot; +package jdk.graal.compiler.hotspot; import static jdk.vm.ci.code.BytecodeFrame.isPlaceholderBci; import java.util.ArrayList; import java.util.List; -import jdk.compiler.graal.bytecode.Bytecodes; -import jdk.compiler.graal.core.common.spi.ForeignCallDescriptor; -import jdk.compiler.graal.core.gen.DebugInfoBuilder; -import jdk.compiler.graal.graph.GraalGraphError; -import jdk.compiler.graal.graph.NodeSourcePosition; -import jdk.compiler.graal.hotspot.meta.DefaultHotSpotLoweringProvider; -import jdk.compiler.graal.lir.VirtualStackSlot; -import jdk.compiler.graal.nodeinfo.Verbosity; -import jdk.compiler.graal.nodes.DeoptimizeNode; -import jdk.compiler.graal.nodes.FrameState; -import jdk.compiler.graal.nodes.FullInfopointNode; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.extended.ForeignCall; -import jdk.compiler.graal.nodes.spi.NodeValueMap; -import jdk.compiler.graal.nodes.spi.NodeWithState; +import jdk.graal.compiler.bytecode.Bytecodes; +import jdk.graal.compiler.core.common.spi.ForeignCallDescriptor; +import jdk.graal.compiler.core.gen.DebugInfoBuilder; +import jdk.graal.compiler.graph.GraalGraphError; +import jdk.graal.compiler.graph.NodeSourcePosition; +import jdk.graal.compiler.hotspot.meta.DefaultHotSpotLoweringProvider; +import jdk.graal.compiler.lir.VirtualStackSlot; +import jdk.graal.compiler.nodeinfo.Verbosity; +import jdk.graal.compiler.nodes.DeoptimizeNode; +import jdk.graal.compiler.nodes.FrameState; +import jdk.graal.compiler.nodes.FullInfopointNode; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.extended.ForeignCall; +import jdk.graal.compiler.nodes.spi.NodeValueMap; +import jdk.graal.compiler.nodes.spi.NodeWithState; import jdk.vm.ci.code.BytecodeFrame; import jdk.vm.ci.code.StackLockValue; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotForeignCallLinkage.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/HotSpotForeignCallLinkage.java similarity index 92% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotForeignCallLinkage.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/HotSpotForeignCallLinkage.java index 8d3f5ed4372b..582bd6a2fab8 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotForeignCallLinkage.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/HotSpotForeignCallLinkage.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot; +package jdk.graal.compiler.hotspot; -import jdk.compiler.graal.core.common.spi.ForeignCallLinkage; -import jdk.compiler.graal.core.target.Backend; -import jdk.compiler.graal.hotspot.meta.HotSpotForeignCallDescriptor; -import jdk.compiler.graal.hotspot.stubs.Stub; +import jdk.graal.compiler.core.common.spi.ForeignCallLinkage; +import jdk.graal.compiler.core.target.Backend; +import jdk.graal.compiler.hotspot.meta.HotSpotForeignCallDescriptor; +import jdk.graal.compiler.hotspot.stubs.Stub; import jdk.vm.ci.meta.InvokeTarget; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotForeignCallLinkageImpl.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/HotSpotForeignCallLinkageImpl.java similarity index 96% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotForeignCallLinkageImpl.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/HotSpotForeignCallLinkageImpl.java index d2afd2427aa3..7fa7aab9cc1c 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotForeignCallLinkageImpl.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/HotSpotForeignCallLinkageImpl.java @@ -22,18 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot; +package jdk.graal.compiler.hotspot; import static jdk.vm.ci.hotspot.HotSpotJVMCIRuntime.runtime; -import jdk.compiler.graal.hotspot.meta.HotSpotForeignCallDescriptor; -import jdk.compiler.graal.hotspot.meta.HotSpotForeignCallsProvider; +import jdk.graal.compiler.hotspot.meta.HotSpotForeignCallDescriptor; +import jdk.graal.compiler.hotspot.meta.HotSpotForeignCallsProvider; import org.graalvm.collections.EconomicSet; -import jdk.compiler.graal.core.common.spi.ForeignCallDescriptor; -import jdk.compiler.graal.core.target.Backend; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.hotspot.stubs.Stub; -import jdk.compiler.graal.word.WordTypes; +import jdk.graal.compiler.core.common.spi.ForeignCallDescriptor; +import jdk.graal.compiler.core.target.Backend; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.hotspot.stubs.Stub; +import jdk.graal.compiler.word.WordTypes; import jdk.vm.ci.code.CallingConvention; import jdk.vm.ci.code.CallingConvention.Type; @@ -317,7 +317,7 @@ public CodeInfo(long start, EconomicSet killedRegisters) { /** * Substituted by - * {@code com.oracle.svm.graal.hotspot.libgraal.Target_jdk_compiler_graal_hotspot_HotSpotForeignCallLinkageImpl}. + * {@code com.oracle.svm.graal.hotspot.libgraal.Target_jdk_graal_compiler_hotspot_HotSpotForeignCallLinkageImpl}. */ private static CodeInfo getCodeInfo(Stub stub, Backend backend) { return new CodeInfo(stub.getCode(backend).getStart(), stub.getDestroyedCallerRegisters()); diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotGraalCompiler.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/HotSpotGraalCompiler.java similarity index 88% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotGraalCompiler.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/HotSpotGraalCompiler.java index 721ea44a5261..cf4e670ef96d 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotGraalCompiler.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/HotSpotGraalCompiler.java @@ -22,43 +22,43 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot; +package jdk.graal.compiler.hotspot; -import static jdk.compiler.graal.core.common.GraalOptions.OptAssumptions; +import static jdk.graal.compiler.core.common.GraalOptions.OptAssumptions; import java.util.Collections; import java.util.List; -import jdk.compiler.graal.api.runtime.GraalJVMCICompiler; -import jdk.compiler.graal.code.CompilationResult; -import jdk.compiler.graal.core.CompilationWatchDog; -import jdk.compiler.graal.core.GraalCompiler; -import jdk.compiler.graal.core.common.CompilationIdentifier; -import jdk.compiler.graal.core.common.util.CompilationAlarm; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.debug.DebugContext.Activation; -import jdk.compiler.graal.debug.DebugHandlersFactory; -import jdk.compiler.graal.debug.DebugOptions; -import jdk.compiler.graal.hotspot.meta.HotSpotProviders; -import jdk.compiler.graal.hotspot.HotSpotGraalRuntime.HotSpotGC; -import jdk.compiler.graal.hotspot.phases.OnStackReplacementPhase; -import jdk.compiler.graal.java.GraphBuilderPhase; -import jdk.compiler.graal.java.StableMethodNameFormatter; -import jdk.compiler.graal.lir.asm.CompilationResultBuilderFactory; -import jdk.compiler.graal.lir.phases.LIRSuites; -import jdk.compiler.graal.nodes.Cancellable; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration; -import jdk.compiler.graal.nodes.spi.ProfileProvider; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.phases.OptimisticOptimizations; -import jdk.compiler.graal.phases.OptimisticOptimizations.Optimization; -import jdk.compiler.graal.phases.PhaseSuite; -import jdk.compiler.graal.phases.tiers.HighTierContext; -import jdk.compiler.graal.phases.tiers.Suites; -import jdk.compiler.graal.printer.GraalDebugHandlersFactory; -import jdk.compiler.graal.serviceprovider.GraalUnsafeAccess; +import jdk.graal.compiler.api.runtime.GraalJVMCICompiler; +import jdk.graal.compiler.code.CompilationResult; +import jdk.graal.compiler.core.CompilationWatchDog; +import jdk.graal.compiler.core.GraalCompiler; +import jdk.graal.compiler.core.common.CompilationIdentifier; +import jdk.graal.compiler.core.common.util.CompilationAlarm; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.debug.DebugContext.Activation; +import jdk.graal.compiler.debug.DebugHandlersFactory; +import jdk.graal.compiler.debug.DebugOptions; +import jdk.graal.compiler.hotspot.meta.HotSpotProviders; +import jdk.graal.compiler.hotspot.HotSpotGraalRuntime.HotSpotGC; +import jdk.graal.compiler.hotspot.phases.OnStackReplacementPhase; +import jdk.graal.compiler.java.GraphBuilderPhase; +import jdk.graal.compiler.java.StableMethodNameFormatter; +import jdk.graal.compiler.lir.asm.CompilationResultBuilderFactory; +import jdk.graal.compiler.lir.phases.LIRSuites; +import jdk.graal.compiler.nodes.Cancellable; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.StructuredGraph.AllowAssumptions; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration; +import jdk.graal.compiler.nodes.spi.ProfileProvider; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.phases.OptimisticOptimizations; +import jdk.graal.compiler.phases.OptimisticOptimizations.Optimization; +import jdk.graal.compiler.phases.PhaseSuite; +import jdk.graal.compiler.phases.tiers.HighTierContext; +import jdk.graal.compiler.phases.tiers.Suites; +import jdk.graal.compiler.printer.GraalDebugHandlersFactory; +import jdk.graal.compiler.serviceprovider.GraalUnsafeAccess; import jdk.vm.ci.code.CompilationRequest; import jdk.vm.ci.code.CompilationRequestResult; @@ -111,7 +111,7 @@ public CompilationRequestResult compileMethod(CompilationRequest request) { /** * Substituted by - * {@code com.oracle.svm.graal.hotspot.libgraal.Target_jdk_compiler_graal_hotspot_HotSpotGraalCompiler} + * {@code com.oracle.svm.graal.hotspot.libgraal.Target_jdk_graal_compiler_hotspot_HotSpotGraalCompiler} * to create a {@code org.graalvm.libgraal.jni.JNILibGraalScope}. */ private static CompilationRequestResult compileMethod(HotSpotGraalCompiler compiler, CompilationRequest request) { diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotGraalCompilerFactory.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/HotSpotGraalCompilerFactory.java similarity index 95% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotGraalCompilerFactory.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/HotSpotGraalCompilerFactory.java index af3404b15a8b..7e9941e56ff2 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotGraalCompilerFactory.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/HotSpotGraalCompilerFactory.java @@ -22,24 +22,24 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot; +package jdk.graal.compiler.hotspot; import static jdk.vm.ci.common.InitTimer.timer; import static jdk.vm.ci.hotspot.HotSpotJVMCICompilerFactory.CompilationLevelAdjustment.None; import static jdk.vm.ci.services.Services.IS_BUILDING_NATIVE_IMAGE; import static jdk.vm.ci.services.Services.IS_IN_NATIVE_IMAGE; -import static jdk.compiler.graal.hotspot.HotSpotGraalOptionValues.GRAAL_OPTION_PROPERTY_PREFIX; +import static jdk.graal.compiler.hotspot.HotSpotGraalOptionValues.GRAAL_OPTION_PROPERTY_PREFIX; import java.io.PrintStream; -import jdk.compiler.graal.api.runtime.GraalRuntime; -import jdk.compiler.graal.debug.MethodFilter; -import jdk.compiler.graal.options.Option; -import jdk.compiler.graal.options.OptionKey; -import jdk.compiler.graal.options.OptionType; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.options.OptionsParser; -import jdk.compiler.graal.phases.tiers.CompilerConfiguration; +import jdk.graal.compiler.api.runtime.GraalRuntime; +import jdk.graal.compiler.debug.MethodFilter; +import jdk.graal.compiler.options.Option; +import jdk.graal.compiler.options.OptionKey; +import jdk.graal.compiler.options.OptionType; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.options.OptionsParser; +import jdk.graal.compiler.phases.tiers.CompilerConfiguration; import jdk.vm.ci.common.InitTimer; import jdk.vm.ci.hotspot.HotSpotJVMCICompilerFactory; @@ -229,7 +229,7 @@ public CompilationLevel adjustCompilationLevel(Object declaringClassObject, Stri // Fail-fast detection for package renaming to guard use of package // prefixes in adjustCompilationLevelInternal. assert jdk.vm.ci.services.Services.class.getName().equals("jdk.vm.ci.services.Services"); - assert HotSpotGraalCompilerFactory.class.getName().equals("jdk.compiler.graal.hotspot.HotSpotGraalCompilerFactory"); + assert HotSpotGraalCompilerFactory.class.getName().equals("jdk.graal.compiler.hotspot.HotSpotGraalCompilerFactory"); } private CompilationLevel adjustCompilationLevelInternal(Class declaringClass, CompilationLevel level) { diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotGraalJVMCIServiceLocator.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/HotSpotGraalJVMCIServiceLocator.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotGraalJVMCIServiceLocator.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/HotSpotGraalJVMCIServiceLocator.java index 416280ce43a7..576fb3b3c227 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotGraalJVMCIServiceLocator.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/HotSpotGraalJVMCIServiceLocator.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot; +package jdk.graal.compiler.hotspot; -import jdk.compiler.graal.serviceprovider.ServiceProvider; +import jdk.graal.compiler.serviceprovider.ServiceProvider; import jdk.vm.ci.common.NativeImageReinitialize; import jdk.vm.ci.hotspot.HotSpotVMEventListener; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotGraalOptionValues.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/HotSpotGraalOptionValues.java similarity index 94% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotGraalOptionValues.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/HotSpotGraalOptionValues.java index dcb29afdad3f..464d9a1eea33 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotGraalOptionValues.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/HotSpotGraalOptionValues.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot; +package jdk.graal.compiler.hotspot; import static jdk.vm.ci.common.InitTimer.timer; @@ -33,11 +33,11 @@ import java.util.Properties; import org.graalvm.collections.EconomicMap; -import jdk.compiler.graal.options.Option; -import jdk.compiler.graal.options.OptionDescriptors; -import jdk.compiler.graal.options.OptionKey; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.options.OptionsParser; +import jdk.graal.compiler.options.Option; +import jdk.graal.compiler.options.OptionDescriptors; +import jdk.graal.compiler.options.OptionKey; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.options.OptionsParser; import jdk.vm.ci.common.InitTimer; import jdk.vm.ci.common.NativeImageReinitialize; @@ -148,7 +148,7 @@ public static EconomicMap, Object> parseOptions() { /** * Substituted by - * {@code com.oracle.svm.graal.hotspot.libgraal.Target_jdk_compiler_graal_hotspot_HotSpotGraalOptionValues} + * {@code com.oracle.svm.graal.hotspot.libgraal.Target_jdk_graal_compiler_hotspot_HotSpotGraalOptionValues} * to update {@code com.oracle.svm.core.option.RuntimeOptionValues.singleton()} instead of * creating a new {@link OptionValues} object. */ diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotGraalRuntime.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/HotSpotGraalRuntime.java similarity index 89% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotGraalRuntime.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/HotSpotGraalRuntime.java index bfa17308cc39..3d8a1d120b32 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotGraalRuntime.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/HotSpotGraalRuntime.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot; +package jdk.graal.compiler.hotspot; import static jdk.vm.ci.common.InitTimer.timer; import static jdk.vm.ci.hotspot.HotSpotJVMCIRuntime.runtime; -import static jdk.compiler.graal.core.common.GraalOptions.HotSpotPrintInlining; +import static jdk.graal.compiler.core.common.GraalOptions.HotSpotPrintInlining; import java.io.PrintStream; import java.util.ArrayList; @@ -34,35 +34,35 @@ import java.util.List; import java.util.Map; -import jdk.compiler.graal.hotspot.debug.BenchmarkCounters; -import jdk.compiler.graal.hotspot.meta.HotSpotProviders; +import jdk.graal.compiler.hotspot.debug.BenchmarkCounters; +import jdk.graal.compiler.hotspot.meta.HotSpotProviders; import org.graalvm.collections.EconomicMap; import org.graalvm.collections.Equivalence; -import jdk.compiler.graal.api.replacements.SnippetReflectionProvider; -import jdk.compiler.graal.api.runtime.GraalRuntime; -import jdk.compiler.graal.core.CompilationWrapper.ExceptionAction; -import jdk.compiler.graal.core.Instrumentation; -import jdk.compiler.graal.core.common.CompilationIdentifier; -import jdk.compiler.graal.core.common.CompilationListenerProfiler; -import jdk.compiler.graal.core.common.CompilerProfiler; -import jdk.compiler.graal.core.common.GraalOptions; -import jdk.compiler.graal.core.common.spi.ForeignCallsProvider; -import jdk.compiler.graal.core.target.Backend; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.debug.DebugContext.Builder; -import jdk.compiler.graal.debug.DebugContext.Description; -import jdk.compiler.graal.debug.DebugHandlersFactory; -import jdk.compiler.graal.debug.DiagnosticsOutputDirectory; -import jdk.compiler.graal.debug.GlobalMetrics; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.debug.TTY; -import jdk.compiler.graal.nodes.spi.StampProvider; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.phases.tiers.CompilerConfiguration; -import jdk.compiler.graal.replacements.SnippetCounter; -import jdk.compiler.graal.replacements.SnippetCounter.Group; -import jdk.compiler.graal.runtime.RuntimeProvider; -import jdk.compiler.graal.serviceprovider.GraalServices; +import jdk.graal.compiler.api.replacements.SnippetReflectionProvider; +import jdk.graal.compiler.api.runtime.GraalRuntime; +import jdk.graal.compiler.core.CompilationWrapper.ExceptionAction; +import jdk.graal.compiler.core.Instrumentation; +import jdk.graal.compiler.core.common.CompilationIdentifier; +import jdk.graal.compiler.core.common.CompilationListenerProfiler; +import jdk.graal.compiler.core.common.CompilerProfiler; +import jdk.graal.compiler.core.common.GraalOptions; +import jdk.graal.compiler.core.common.spi.ForeignCallsProvider; +import jdk.graal.compiler.core.target.Backend; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.debug.DebugContext.Builder; +import jdk.graal.compiler.debug.DebugContext.Description; +import jdk.graal.compiler.debug.DebugHandlersFactory; +import jdk.graal.compiler.debug.DiagnosticsOutputDirectory; +import jdk.graal.compiler.debug.GlobalMetrics; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.debug.TTY; +import jdk.graal.compiler.nodes.spi.StampProvider; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.phases.tiers.CompilerConfiguration; +import jdk.graal.compiler.replacements.SnippetCounter; +import jdk.graal.compiler.replacements.SnippetCounter.Group; +import jdk.graal.compiler.runtime.RuntimeProvider; +import jdk.graal.compiler.serviceprovider.GraalServices; import jdk.vm.ci.code.Architecture; import jdk.vm.ci.code.stack.StackIntrospection; @@ -419,7 +419,7 @@ synchronized void shutdown() { /** * Substituted by - * {@code com.oracle.svm.graal.hotspot.libgraal.Target_jdk_compiler_graal_hotspot_HotSpotGraalRuntime} + * {@code com.oracle.svm.graal.hotspot.libgraal.Target_jdk_graal_compiler_hotspot_HotSpotGraalRuntime} * to notify {@code org.graalvm.libgraal.LibGraalIsolate} and call * {@code org.graalvm.nativeimage.VMRuntime.initialize()}. */ @@ -429,7 +429,7 @@ private static void startupLibGraal(HotSpotGraalRuntime runtime) { /** * Substituted by - * {@code com.oracle.svm.graal.hotspot.libgraal.Target_jdk_compiler_graal_hotspot_HotSpotGraalRuntime} + * {@code com.oracle.svm.graal.hotspot.libgraal.Target_jdk_graal_compiler_hotspot_HotSpotGraalRuntime} * to notify {@code org.graalvm.libgraal.LibGraalIsolate} and call * {@code org.graalvm.nativeimage.VMRuntime.shutdown()}. */ diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotGraalRuntimeProvider.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/HotSpotGraalRuntimeProvider.java similarity index 84% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotGraalRuntimeProvider.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/HotSpotGraalRuntimeProvider.java index 82bb043e0f05..c697ae80b7af 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotGraalRuntimeProvider.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/HotSpotGraalRuntimeProvider.java @@ -22,22 +22,22 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot; +package jdk.graal.compiler.hotspot; import java.io.PrintStream; import java.util.Map; -import jdk.compiler.graal.api.runtime.GraalRuntime; -import jdk.compiler.graal.core.CompilationWrapper.ExceptionAction; -import jdk.compiler.graal.core.Instrumentation; -import jdk.compiler.graal.core.common.CompilationIdentifier; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.debug.DebugHandlersFactory; -import jdk.compiler.graal.debug.DiagnosticsOutputDirectory; -import jdk.compiler.graal.hotspot.meta.HotSpotProviders; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.replacements.SnippetCounter.Group; -import jdk.compiler.graal.runtime.RuntimeProvider; +import jdk.graal.compiler.api.runtime.GraalRuntime; +import jdk.graal.compiler.core.CompilationWrapper.ExceptionAction; +import jdk.graal.compiler.core.Instrumentation; +import jdk.graal.compiler.core.common.CompilationIdentifier; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.debug.DebugHandlersFactory; +import jdk.graal.compiler.debug.DiagnosticsOutputDirectory; +import jdk.graal.compiler.hotspot.meta.HotSpotProviders; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.replacements.SnippetCounter.Group; +import jdk.graal.compiler.runtime.RuntimeProvider; import jdk.vm.ci.code.TargetDescription; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotGraalServices.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/HotSpotGraalServices.java similarity index 99% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotGraalServices.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/HotSpotGraalServices.java index d4195bc509ce..229ae8702a98 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotGraalServices.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/HotSpotGraalServices.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot; +package jdk.graal.compiler.hotspot; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotGraalVMEventListener.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/HotSpotGraalVMEventListener.java similarity index 93% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotGraalVMEventListener.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/HotSpotGraalVMEventListener.java index 44d733b7d1c9..344e4c770f1c 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotGraalVMEventListener.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/HotSpotGraalVMEventListener.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot; +package jdk.graal.compiler.hotspot; import java.util.ArrayList; import java.util.List; -import jdk.compiler.graal.code.CompilationResult; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.debug.DebugOptions; -import jdk.compiler.graal.serviceprovider.GraalServices; +import jdk.graal.compiler.code.CompilationResult; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.debug.DebugOptions; +import jdk.graal.compiler.serviceprovider.GraalServices; import jdk.vm.ci.code.CompiledCode; import jdk.vm.ci.code.InstalledCode; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotGraphBuilderInstance.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/HotSpotGraphBuilderInstance.java similarity index 82% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotGraphBuilderInstance.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/HotSpotGraphBuilderInstance.java index 036806bba58e..82b3acf90e66 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotGraphBuilderInstance.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/HotSpotGraphBuilderInstance.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot; +package jdk.graal.compiler.hotspot; -import jdk.compiler.graal.java.BytecodeParser; -import jdk.compiler.graal.java.GraphBuilderPhase; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration; -import jdk.compiler.graal.nodes.graphbuilderconf.IntrinsicContext; -import jdk.compiler.graal.nodes.spi.CoreProviders; -import jdk.compiler.graal.phases.OptimisticOptimizations; +import jdk.graal.compiler.java.BytecodeParser; +import jdk.graal.compiler.java.GraphBuilderPhase; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration; +import jdk.graal.compiler.nodes.graphbuilderconf.IntrinsicContext; +import jdk.graal.compiler.nodes.spi.CoreProviders; +import jdk.graal.compiler.phases.OptimisticOptimizations; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotGraphBuilderPhase.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/HotSpotGraphBuilderPhase.java similarity index 84% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotGraphBuilderPhase.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/HotSpotGraphBuilderPhase.java index 90695192092f..7410dc5f825c 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotGraphBuilderPhase.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/HotSpotGraphBuilderPhase.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot; +package jdk.graal.compiler.hotspot; -import jdk.compiler.graal.java.GraphBuilderPhase; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration; -import jdk.compiler.graal.nodes.graphbuilderconf.IntrinsicContext; -import jdk.compiler.graal.nodes.spi.CoreProviders; -import jdk.compiler.graal.phases.OptimisticOptimizations; +import jdk.graal.compiler.java.GraphBuilderPhase; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration; +import jdk.graal.compiler.nodes.graphbuilderconf.IntrinsicContext; +import jdk.graal.compiler.nodes.spi.CoreProviders; +import jdk.graal.compiler.phases.OptimisticOptimizations; public class HotSpotGraphBuilderPhase extends GraphBuilderPhase { diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotHostBackend.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/HotSpotHostBackend.java similarity index 88% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotHostBackend.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/HotSpotHostBackend.java index a1d708cd41d1..a52ee0625524 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotHostBackend.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/HotSpotHostBackend.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot; +package jdk.graal.compiler.hotspot; import static jdk.vm.ci.code.CodeUtil.K; import static jdk.vm.ci.code.CodeUtil.getCallingConvention; @@ -30,26 +30,26 @@ import java.util.Collections; -import jdk.compiler.graal.core.common.CompilationIdentifier; -import jdk.compiler.graal.core.common.NumUtil; -import jdk.compiler.graal.core.common.alloc.RegisterAllocationConfig; -import jdk.compiler.graal.core.gen.LIRGenerationProvider; -import jdk.compiler.graal.debug.DebugHandlersFactory; -import jdk.compiler.graal.hotspot.meta.HotSpotForeignCallDescriptor; -import jdk.compiler.graal.hotspot.meta.HotSpotForeignCallsProviderImpl; -import jdk.compiler.graal.hotspot.meta.HotSpotHostForeignCallsProvider; -import jdk.compiler.graal.hotspot.meta.HotSpotLoweringProvider; -import jdk.compiler.graal.hotspot.meta.HotSpotProviders; -import jdk.compiler.graal.hotspot.stubs.Stub; -import jdk.compiler.graal.lir.LIR; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; -import jdk.compiler.graal.lir.framemap.FrameMapBuilder; -import jdk.compiler.graal.lir.framemap.ReferenceMapBuilder; -import jdk.compiler.graal.lir.gen.LIRGenerationResult; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.printer.GraalDebugHandlersFactory; -import jdk.compiler.graal.word.Word; +import jdk.graal.compiler.core.common.CompilationIdentifier; +import jdk.graal.compiler.core.common.NumUtil; +import jdk.graal.compiler.core.common.alloc.RegisterAllocationConfig; +import jdk.graal.compiler.core.gen.LIRGenerationProvider; +import jdk.graal.compiler.debug.DebugHandlersFactory; +import jdk.graal.compiler.hotspot.meta.HotSpotForeignCallDescriptor; +import jdk.graal.compiler.hotspot.meta.HotSpotForeignCallsProviderImpl; +import jdk.graal.compiler.hotspot.meta.HotSpotHostForeignCallsProvider; +import jdk.graal.compiler.hotspot.meta.HotSpotLoweringProvider; +import jdk.graal.compiler.hotspot.meta.HotSpotProviders; +import jdk.graal.compiler.hotspot.stubs.Stub; +import jdk.graal.compiler.lir.LIR; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.lir.framemap.FrameMapBuilder; +import jdk.graal.compiler.lir.framemap.ReferenceMapBuilder; +import jdk.graal.compiler.lir.gen.LIRGenerationResult; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.printer.GraalDebugHandlersFactory; +import jdk.graal.compiler.word.Word; import jdk.vm.ci.code.CallingConvention; import jdk.vm.ci.code.RegisterConfig; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotLIRGenerationResult.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/HotSpotLIRGenerationResult.java similarity index 88% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotLIRGenerationResult.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/HotSpotLIRGenerationResult.java index cfe81b02b5ca..cf4aba80a12b 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotLIRGenerationResult.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/HotSpotLIRGenerationResult.java @@ -22,18 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot; +package jdk.graal.compiler.hotspot; import org.graalvm.collections.EconomicMap; import org.graalvm.collections.Equivalence; -import jdk.compiler.graal.core.common.CompilationIdentifier; -import jdk.compiler.graal.core.common.alloc.RegisterAllocationConfig; -import jdk.compiler.graal.hotspot.stubs.Stub; -import jdk.compiler.graal.lir.LIR; -import jdk.compiler.graal.lir.LIRFrameState; -import jdk.compiler.graal.lir.StandardOp.SaveRegistersOp; -import jdk.compiler.graal.lir.framemap.FrameMapBuilder; -import jdk.compiler.graal.lir.gen.LIRGenerationResult; +import jdk.graal.compiler.core.common.CompilationIdentifier; +import jdk.graal.compiler.core.common.alloc.RegisterAllocationConfig; +import jdk.graal.compiler.hotspot.stubs.Stub; +import jdk.graal.compiler.lir.LIR; +import jdk.graal.compiler.lir.LIRFrameState; +import jdk.graal.compiler.lir.StandardOp.SaveRegistersOp; +import jdk.graal.compiler.lir.framemap.FrameMapBuilder; +import jdk.graal.compiler.lir.gen.LIRGenerationResult; import jdk.vm.ci.code.CallingConvention; import jdk.vm.ci.code.StackSlot; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotLIRGenerator.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/HotSpotLIRGenerator.java similarity index 90% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotLIRGenerator.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/HotSpotLIRGenerator.java index 55d72dc7095c..54dfc9d55d31 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotLIRGenerator.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/HotSpotLIRGenerator.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot; +package jdk.graal.compiler.hotspot; -import jdk.compiler.graal.hotspot.meta.HotSpotProviders; -import jdk.compiler.graal.lir.VirtualStackSlot; -import jdk.compiler.graal.lir.gen.LIRGenerator; -import jdk.compiler.graal.lir.gen.LIRGeneratorTool; +import jdk.graal.compiler.hotspot.meta.HotSpotProviders; +import jdk.graal.compiler.lir.VirtualStackSlot; +import jdk.graal.compiler.lir.gen.LIRGenerator; +import jdk.graal.compiler.lir.gen.LIRGeneratorTool; import jdk.vm.ci.meta.DeoptimizationAction; import jdk.vm.ci.meta.DeoptimizationReason; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotLockStack.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/HotSpotLockStack.java similarity index 89% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotLockStack.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/HotSpotLockStack.java index f0e2fb4edd82..9c798638b369 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotLockStack.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/HotSpotLockStack.java @@ -22,18 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot; +package jdk.graal.compiler.hotspot; -import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.STACK; +import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.STACK; import java.util.Arrays; -import jdk.compiler.graal.core.common.LIRKind; -import jdk.compiler.graal.lir.LIRInstruction; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.VirtualStackSlot; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; -import jdk.compiler.graal.lir.framemap.FrameMapBuilder; +import jdk.graal.compiler.core.common.LIRKind; +import jdk.graal.compiler.lir.LIRInstruction; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.VirtualStackSlot; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.lir.framemap.FrameMapBuilder; import jdk.vm.ci.meta.AllocatableValue; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotMarkId.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/HotSpotMarkId.java similarity index 95% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotMarkId.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/HotSpotMarkId.java index 7efccb2dbf85..3a698fead49a 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotMarkId.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/HotSpotMarkId.java @@ -23,10 +23,10 @@ * questions. */ -package jdk.compiler.graal.hotspot; +package jdk.graal.compiler.hotspot; -import jdk.compiler.graal.code.CompilationResult; -import jdk.compiler.graal.debug.GraalError; +import jdk.graal.compiler.code.CompilationResult; +import jdk.graal.compiler.debug.GraalError; import jdk.vm.ci.common.NativeImageReinitialize; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotNodeLIRBuilder.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/HotSpotNodeLIRBuilder.java similarity index 86% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotNodeLIRBuilder.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/HotSpotNodeLIRBuilder.java index 957e0ef2c5ea..f9c02bf84148 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotNodeLIRBuilder.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/HotSpotNodeLIRBuilder.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot; +package jdk.graal.compiler.hotspot; -import jdk.compiler.graal.core.match.MatchableNode; -import jdk.compiler.graal.lir.gen.LIRGenerator; -import jdk.compiler.graal.nodes.CompressionNode; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool; +import jdk.graal.compiler.core.match.MatchableNode; +import jdk.graal.compiler.lir.gen.LIRGenerator; +import jdk.graal.compiler.nodes.CompressionNode; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool; /** * This interface defines the contract a HotSpot backend LIR generator needs to fulfill in addition diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotReferenceMapBuilder.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/HotSpotReferenceMapBuilder.java similarity index 93% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotReferenceMapBuilder.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/HotSpotReferenceMapBuilder.java index 0ab96e14ed8b..90d59248fb0c 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotReferenceMapBuilder.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/HotSpotReferenceMapBuilder.java @@ -22,22 +22,22 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot; +package jdk.graal.compiler.hotspot; import static jdk.vm.ci.code.ValueUtil.asRegister; import static jdk.vm.ci.code.ValueUtil.asStackSlot; import static jdk.vm.ci.code.ValueUtil.isRegister; -import static jdk.compiler.graal.lir.LIRValueUtil.isJavaConstant; +import static jdk.graal.compiler.lir.LIRValueUtil.isJavaConstant; import java.util.ArrayList; -import jdk.compiler.graal.core.common.LIRKind; -import jdk.compiler.graal.core.common.PermanentBailoutException; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.lir.LIRFrameState; -import jdk.compiler.graal.lir.LIRValueUtil; -import jdk.compiler.graal.lir.Variable; -import jdk.compiler.graal.lir.framemap.ReferenceMapBuilder; +import jdk.graal.compiler.core.common.LIRKind; +import jdk.graal.compiler.core.common.PermanentBailoutException; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.lir.LIRFrameState; +import jdk.graal.compiler.lir.LIRValueUtil; +import jdk.graal.compiler.lir.Variable; +import jdk.graal.compiler.lir.framemap.ReferenceMapBuilder; import jdk.vm.ci.code.Location; import jdk.vm.ci.code.ReferenceMap; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotReplacementsImpl.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/HotSpotReplacementsImpl.java similarity index 88% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotReplacementsImpl.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/HotSpotReplacementsImpl.java index 764cf35dd5e8..4087865aa6fa 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotReplacementsImpl.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/HotSpotReplacementsImpl.java @@ -22,43 +22,43 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot; +package jdk.graal.compiler.hotspot; import static jdk.vm.ci.services.Services.IS_BUILDING_NATIVE_IMAGE; import static jdk.vm.ci.services.Services.IS_IN_NATIVE_IMAGE; import java.util.BitSet; -import jdk.compiler.graal.hotspot.meta.HotSpotProviders; -import jdk.compiler.graal.hotspot.meta.HotSpotWordOperationPlugin; +import jdk.graal.compiler.hotspot.meta.HotSpotProviders; +import jdk.graal.compiler.hotspot.meta.HotSpotWordOperationPlugin; import org.graalvm.collections.EconomicSet; -import jdk.compiler.graal.api.replacements.SnippetReflectionProvider; -import jdk.compiler.graal.bytecode.Bytecode; -import jdk.compiler.graal.bytecode.BytecodeProvider; -import jdk.compiler.graal.bytecode.ResolvedJavaMethodBytecode; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.graph.NodeSourcePosition; -import jdk.compiler.graal.hotspot.word.HotSpotOperation; -import jdk.compiler.graal.java.GraphBuilderPhase.Instance; -import jdk.compiler.graal.nodes.Invoke; -import jdk.compiler.graal.nodes.LogicNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions; -import jdk.compiler.graal.nodes.extended.GuardingNode; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderPlugin; -import jdk.compiler.graal.nodes.graphbuilderconf.IntrinsicContext; -import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin; -import jdk.compiler.graal.nodes.spi.CoreProviders; -import jdk.compiler.graal.nodes.spi.SnippetParameterInfo; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.phases.OptimisticOptimizations; -import jdk.compiler.graal.phases.util.Providers; -import jdk.compiler.graal.printer.GraalDebugHandlersFactory; -import jdk.compiler.graal.replacements.IntrinsicGraphBuilder; -import jdk.compiler.graal.replacements.ReplacementsImpl; +import jdk.graal.compiler.api.replacements.SnippetReflectionProvider; +import jdk.graal.compiler.bytecode.Bytecode; +import jdk.graal.compiler.bytecode.BytecodeProvider; +import jdk.graal.compiler.bytecode.ResolvedJavaMethodBytecode; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.graph.NodeSourcePosition; +import jdk.graal.compiler.hotspot.word.HotSpotOperation; +import jdk.graal.compiler.java.GraphBuilderPhase.Instance; +import jdk.graal.compiler.nodes.Invoke; +import jdk.graal.compiler.nodes.LogicNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.StructuredGraph.AllowAssumptions; +import jdk.graal.compiler.nodes.extended.GuardingNode; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderPlugin; +import jdk.graal.compiler.nodes.graphbuilderconf.IntrinsicContext; +import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin; +import jdk.graal.compiler.nodes.spi.CoreProviders; +import jdk.graal.compiler.nodes.spi.SnippetParameterInfo; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.phases.OptimisticOptimizations; +import jdk.graal.compiler.phases.util.Providers; +import jdk.graal.compiler.printer.GraalDebugHandlersFactory; +import jdk.graal.compiler.replacements.IntrinsicGraphBuilder; +import jdk.graal.compiler.replacements.ReplacementsImpl; import jdk.vm.ci.code.TargetDescription; import jdk.vm.ci.common.NativeImageReinitialize; @@ -317,7 +317,7 @@ static boolean isGraalClass(String className) { elementClassName = className; } return elementClassName.startsWith("jdk.vm.ci.") || - elementClassName.startsWith("jdk.compiler.graal.") || + elementClassName.startsWith("jdk.graal.compiler.") || elementClassName.startsWith("org.graalvm.") || elementClassName.startsWith("com.oracle.graal."); } diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotSnippetMetaAccessProvider.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/HotSpotSnippetMetaAccessProvider.java similarity index 99% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotSnippetMetaAccessProvider.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/HotSpotSnippetMetaAccessProvider.java index c1c8d24716b7..ef7c6b109a82 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotSnippetMetaAccessProvider.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/HotSpotSnippetMetaAccessProvider.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot; +package jdk.graal.compiler.hotspot; import static jdk.vm.ci.services.Services.IS_IN_NATIVE_IMAGE; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotTTYStreamProvider.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/HotSpotTTYStreamProvider.java similarity index 94% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotTTYStreamProvider.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/HotSpotTTYStreamProvider.java index 4f8933d34ed5..d2cc9d13bc94 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotTTYStreamProvider.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/HotSpotTTYStreamProvider.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot; +package jdk.graal.compiler.hotspot; -import static jdk.compiler.graal.hotspot.HotSpotGraalOptionValues.GRAAL_OPTION_PROPERTY_PREFIX; -import static jdk.compiler.graal.hotspot.HotSpotGraalOptionValues.defaultOptions; +import static jdk.graal.compiler.hotspot.HotSpotGraalOptionValues.GRAAL_OPTION_PROPERTY_PREFIX; +import static jdk.graal.compiler.hotspot.HotSpotGraalOptionValues.defaultOptions; import java.io.File; import java.io.FileOutputStream; @@ -34,16 +34,16 @@ import java.io.PrintStream; import java.util.List; -import jdk.compiler.graal.core.common.SuppressFBWarnings; -import jdk.compiler.graal.debug.TTYStreamProvider; -import jdk.compiler.graal.options.Option; -import jdk.compiler.graal.options.OptionKey; -import jdk.compiler.graal.options.OptionType; -import jdk.compiler.graal.serviceprovider.GlobalAtomicLong; -import jdk.compiler.graal.serviceprovider.GraalServices; -import jdk.compiler.graal.serviceprovider.IsolateUtil; -import jdk.compiler.graal.serviceprovider.ServiceProvider; -import jdk.compiler.graal.word.Word; +import jdk.graal.compiler.core.common.SuppressFBWarnings; +import jdk.graal.compiler.debug.TTYStreamProvider; +import jdk.graal.compiler.options.Option; +import jdk.graal.compiler.options.OptionKey; +import jdk.graal.compiler.options.OptionType; +import jdk.graal.compiler.serviceprovider.GlobalAtomicLong; +import jdk.graal.compiler.serviceprovider.GraalServices; +import jdk.graal.compiler.serviceprovider.IsolateUtil; +import jdk.graal.compiler.serviceprovider.ServiceProvider; +import jdk.graal.compiler.word.Word; import jdk.vm.ci.common.NativeImageReinitialize; import jdk.vm.ci.hotspot.HotSpotJVMCIRuntime; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotZBarrierSet.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/HotSpotZBarrierSet.java similarity index 86% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotZBarrierSet.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/HotSpotZBarrierSet.java index 77b73756bde1..14075100fcf1 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotZBarrierSet.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/HotSpotZBarrierSet.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot; +package jdk.graal.compiler.hotspot; -import jdk.compiler.graal.core.common.memory.BarrierType; -import jdk.compiler.graal.core.common.type.AbstractObjectStamp; -import jdk.compiler.graal.core.common.type.Stamp; -import jdk.compiler.graal.hotspot.replacements.HotSpotReplacementsUtil; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.gc.ZBarrierSet; +import jdk.graal.compiler.core.common.memory.BarrierType; +import jdk.graal.compiler.core.common.type.AbstractObjectStamp; +import jdk.graal.compiler.core.common.type.Stamp; +import jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.gc.ZBarrierSet; import org.graalvm.word.LocationIdentity; import jdk.vm.ci.meta.JavaKind; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/IsGraalPredicate.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/IsGraalPredicate.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/IsGraalPredicate.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/IsGraalPredicate.java index 3b3999eda336..8bc574307cc6 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/IsGraalPredicate.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/IsGraalPredicate.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot; +package jdk.graal.compiler.hotspot; import static jdk.vm.ci.hotspot.HotSpotJVMCICompilerFactory.CompilationLevelAdjustment.None; -import jdk.compiler.graal.debug.GraalError; +import jdk.graal.compiler.debug.GraalError; import jdk.vm.ci.hotspot.HotSpotJVMCICompilerFactory; import jdk.vm.ci.hotspot.HotSpotJVMCIRuntime; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/IsGraalPredicateBase.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/IsGraalPredicateBase.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/IsGraalPredicateBase.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/IsGraalPredicateBase.java index bac8352866c9..7691b7a16260 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/IsGraalPredicateBase.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/IsGraalPredicateBase.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot; +package jdk.graal.compiler.hotspot; import jdk.vm.ci.hotspot.HotSpotJVMCICompilerFactory; import jdk.vm.ci.hotspot.HotSpotJVMCIRuntime; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/JFRCompilerProfiler.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/JFRCompilerProfiler.java similarity index 93% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/JFRCompilerProfiler.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/JFRCompilerProfiler.java index 4701b8215250..f6270986c163 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/JFRCompilerProfiler.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/JFRCompilerProfiler.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot; +package jdk.graal.compiler.hotspot; -import jdk.compiler.graal.core.common.CompilerProfiler; -import jdk.compiler.graal.serviceprovider.ServiceProvider; +import jdk.graal.compiler.core.common.CompilerProfiler; +import jdk.graal.compiler.serviceprovider.ServiceProvider; import jdk.vm.ci.hotspot.JFR; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/JVMCICompilerShadow.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/JVMCICompilerShadow.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/JVMCICompilerShadow.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/JVMCICompilerShadow.java index f0dca2e89a59..5871ce0dc10d 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/JVMCICompilerShadow.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/JVMCICompilerShadow.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot; +package jdk.graal.compiler.hotspot; import jdk.vm.ci.runtime.JVMCICompiler; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/JVMCIVersionCheck.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/JVMCIVersionCheck.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/JVMCIVersionCheck.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/JVMCIVersionCheck.java index bdd3c8e29202..8b73e65ffa7c 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/JVMCIVersionCheck.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/JVMCIVersionCheck.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot; +package jdk.graal.compiler.hotspot; import java.util.Formatter; import java.util.HashMap; @@ -47,8 +47,8 @@ public final class JVMCIVersionCheck { * Minimum JVMCI version supported by Graal. */ private static final Map JVMCI_MIN_VERSIONS = Map.of( - "21", new Version(23, 1, 21), - "22", new Version("22+18", 2)); + "21", new Version(23, 1, 22), + "22", new Version("22+18", 3)); private static final int NA = 0; /** diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/JVMCIVersionCompare.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/JVMCIVersionCompare.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/JVMCIVersionCompare.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/JVMCIVersionCompare.java index caf3a1e19001..f9e5d3197a3f 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/JVMCIVersionCompare.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/JVMCIVersionCompare.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot; +package jdk.graal.compiler.hotspot; public final class JVMCIVersionCompare { diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/ProfileReplaySupport.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/ProfileReplaySupport.java similarity index 90% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/ProfileReplaySupport.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/ProfileReplaySupport.java index 5a0e49dfe655..b3c0a9ae489f 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/ProfileReplaySupport.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/ProfileReplaySupport.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot; +package jdk.graal.compiler.hotspot; -import static jdk.compiler.graal.hotspot.ProfileReplaySupport.Options.LoadProfiles; -import static jdk.compiler.graal.hotspot.ProfileReplaySupport.Options.ProfileMethodFilter; -import static jdk.compiler.graal.hotspot.ProfileReplaySupport.Options.SaveProfiles; -import static jdk.compiler.graal.hotspot.ProfileReplaySupport.Options.StrictProfiles; +import static jdk.graal.compiler.hotspot.ProfileReplaySupport.Options.LoadProfiles; +import static jdk.graal.compiler.hotspot.ProfileReplaySupport.Options.ProfileMethodFilter; +import static jdk.graal.compiler.hotspot.ProfileReplaySupport.Options.SaveProfiles; +import static jdk.graal.compiler.hotspot.ProfileReplaySupport.Options.StrictProfiles; import java.io.BufferedOutputStream; import java.io.File; @@ -42,33 +42,33 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import jdk.compiler.graal.util.json.JSONFormatter; +import jdk.graal.compiler.util.json.JSONFormatter; import org.graalvm.collections.EconomicMap; -import jdk.compiler.graal.code.CompilationResult; -import jdk.compiler.graal.core.common.CompilationIdentifier; -import jdk.compiler.graal.core.common.cfg.BasicBlock; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.debug.MethodFilter; -import jdk.compiler.graal.debug.PathUtilities; -import jdk.compiler.graal.debug.TTY; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.graph.NodeMap; -import jdk.compiler.graal.java.LambdaUtils; -import jdk.compiler.graal.java.StableMethodNameFormatter; -import jdk.compiler.graal.nodes.ConstantNode; -import jdk.compiler.graal.nodes.FrameState; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.java.AccessFieldNode; -import jdk.compiler.graal.nodes.spi.StableProfileProvider; -import jdk.compiler.graal.nodes.spi.StableProfileProvider.LambdaNameFormatter; -import jdk.compiler.graal.nodes.spi.StableProfileProvider.TypeFilter; -import jdk.compiler.graal.options.Option; -import jdk.compiler.graal.options.OptionKey; -import jdk.compiler.graal.options.OptionType; -import jdk.compiler.graal.phases.schedule.SchedulePhase; -import jdk.compiler.graal.util.json.JSONParser; +import jdk.graal.compiler.code.CompilationResult; +import jdk.graal.compiler.core.common.CompilationIdentifier; +import jdk.graal.compiler.core.common.cfg.BasicBlock; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.debug.MethodFilter; +import jdk.graal.compiler.debug.PathUtilities; +import jdk.graal.compiler.debug.TTY; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.graph.NodeMap; +import jdk.graal.compiler.java.LambdaUtils; +import jdk.graal.compiler.java.StableMethodNameFormatter; +import jdk.graal.compiler.nodes.ConstantNode; +import jdk.graal.compiler.nodes.FrameState; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.java.AccessFieldNode; +import jdk.graal.compiler.nodes.spi.StableProfileProvider; +import jdk.graal.compiler.nodes.spi.StableProfileProvider.LambdaNameFormatter; +import jdk.graal.compiler.nodes.spi.StableProfileProvider.TypeFilter; +import jdk.graal.compiler.options.Option; +import jdk.graal.compiler.options.OptionKey; +import jdk.graal.compiler.options.OptionType; +import jdk.graal.compiler.phases.schedule.SchedulePhase; +import jdk.graal.compiler.util.json.JSONParser; import jdk.vm.ci.hotspot.HotSpotResolvedJavaMethod; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/SnippetObjectConstant.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/SnippetObjectConstant.java similarity index 99% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/SnippetObjectConstant.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/SnippetObjectConstant.java index 48b4e84d104c..01f075acc4b0 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/SnippetObjectConstant.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/SnippetObjectConstant.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot; +package jdk.graal.compiler.hotspot; import java.util.Objects; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/SnippetResolvedJavaMethod.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/SnippetResolvedJavaMethod.java similarity index 99% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/SnippetResolvedJavaMethod.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/SnippetResolvedJavaMethod.java index 9a94ad7fe23b..140abd0b5a7c 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/SnippetResolvedJavaMethod.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/SnippetResolvedJavaMethod.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot; +package jdk.graal.compiler.hotspot; import java.lang.annotation.Annotation; import java.lang.reflect.Type; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/SnippetResolvedJavaType.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/SnippetResolvedJavaType.java similarity index 99% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/SnippetResolvedJavaType.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/SnippetResolvedJavaType.java index 4b55058f898e..15c6c7e4c857 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/SnippetResolvedJavaType.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/SnippetResolvedJavaType.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot; +package jdk.graal.compiler.hotspot; import static jdk.vm.ci.services.Services.IS_IN_NATIVE_IMAGE; @@ -31,7 +31,7 @@ import java.util.List; import java.util.Objects; -import jdk.compiler.graal.debug.GraalError; +import jdk.graal.compiler.debug.GraalError; import jdk.vm.ci.meta.Assumptions; import jdk.vm.ci.meta.JavaConstant; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/SnippetSignature.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/SnippetSignature.java similarity index 99% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/SnippetSignature.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/SnippetSignature.java index 0a531cfac460..84d2bf264425 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/SnippetSignature.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/SnippetSignature.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot; +package jdk.graal.compiler.hotspot; import java.util.ArrayList; import java.util.EnumMap; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/SymbolicSnippetEncoder.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/SymbolicSnippetEncoder.java similarity index 93% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/SymbolicSnippetEncoder.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/SymbolicSnippetEncoder.java index 1e94130f477b..6d54163b9503 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/SymbolicSnippetEncoder.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/SymbolicSnippetEncoder.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot; +package jdk.graal.compiler.hotspot; -import static jdk.compiler.graal.hotspot.HotSpotReplacementsImpl.isGraalClass; -import static jdk.compiler.graal.nodes.graphbuilderconf.InlineInvokePlugin.InlineInfo.createIntrinsicInlineInfo; +import static jdk.graal.compiler.hotspot.HotSpotReplacementsImpl.isGraalClass; +import static jdk.graal.compiler.nodes.graphbuilderconf.InlineInvokePlugin.InlineInfo.createIntrinsicInlineInfo; import java.lang.reflect.Executable; import java.lang.reflect.Field; @@ -41,71 +41,71 @@ import java.util.Set; import java.util.function.BiFunction; -import jdk.compiler.graal.hotspot.meta.HotSpotForeignCallsProvider; -import jdk.compiler.graal.hotspot.meta.HotSpotProviders; -import jdk.compiler.graal.hotspot.word.HotSpotWordTypes; +import jdk.graal.compiler.hotspot.meta.HotSpotForeignCallsProvider; +import jdk.graal.compiler.hotspot.meta.HotSpotProviders; +import jdk.graal.compiler.hotspot.word.HotSpotWordTypes; import org.graalvm.collections.EconomicMap; import org.graalvm.collections.EconomicSet; import org.graalvm.collections.MapCursor; -import jdk.compiler.graal.api.replacements.Fold; -import jdk.compiler.graal.api.replacements.Snippet; -import jdk.compiler.graal.api.replacements.SnippetReflectionProvider; -import jdk.compiler.graal.bytecode.BytecodeProvider; -import jdk.compiler.graal.bytecode.ResolvedJavaMethodBytecode; -import jdk.compiler.graal.core.common.type.AbstractObjectStamp; -import jdk.compiler.graal.core.common.type.ObjectStamp; -import jdk.compiler.graal.core.common.type.Stamp; -import jdk.compiler.graal.core.common.type.StampPair; -import jdk.compiler.graal.core.common.type.SymbolicJVMCIReference; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.graph.NodeMap; -import jdk.compiler.graal.graph.NodeSourcePosition; -import jdk.compiler.graal.hotspot.stubs.ForeignCallStub; -import jdk.compiler.graal.java.BytecodeParser; -import jdk.compiler.graal.java.GraphBuilderPhase; -import jdk.compiler.graal.nodeinfo.Verbosity; -import jdk.compiler.graal.nodes.CallTargetNode; -import jdk.compiler.graal.nodes.CompressionNode; -import jdk.compiler.graal.nodes.ConstantNode; -import jdk.compiler.graal.nodes.EncodedGraph; -import jdk.compiler.graal.nodes.FieldLocationIdentity; -import jdk.compiler.graal.nodes.FrameState; -import jdk.compiler.graal.nodes.FullInfopointNode; -import jdk.compiler.graal.nodes.GraphEncoder; -import jdk.compiler.graal.nodes.NamedLocationIdentity; -import jdk.compiler.graal.nodes.NodeView; -import jdk.compiler.graal.nodes.ParameterNode; -import jdk.compiler.graal.nodes.ProxyNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.cfg.HIRBlock; -import jdk.compiler.graal.nodes.graphbuilderconf.GeneratedInvocationPlugin; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext; -import jdk.compiler.graal.nodes.graphbuilderconf.InlineInvokePlugin; -import jdk.compiler.graal.nodes.graphbuilderconf.IntrinsicContext; -import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin; -import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins; -import jdk.compiler.graal.nodes.graphbuilderconf.NodePlugin; -import jdk.compiler.graal.nodes.java.AccessFieldNode; -import jdk.compiler.graal.nodes.java.MethodCallTargetNode; -import jdk.compiler.graal.nodes.memory.ReadNode; -import jdk.compiler.graal.nodes.spi.CoreProviders; -import jdk.compiler.graal.nodes.spi.SnippetParameterInfo; -import jdk.compiler.graal.nodes.type.NarrowOopStamp; -import jdk.compiler.graal.nodes.virtual.VirtualObjectNode; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.phases.OptimisticOptimizations; -import jdk.compiler.graal.phases.schedule.SchedulePhase; -import jdk.compiler.graal.phases.util.Providers; -import jdk.compiler.graal.replacements.PartialIntrinsicCallTargetNode; -import jdk.compiler.graal.replacements.ReplacementsImpl; -import jdk.compiler.graal.replacements.SnippetCounter; -import jdk.compiler.graal.replacements.SnippetIntegerHistogram; -import jdk.compiler.graal.replacements.SnippetTemplate; -import jdk.compiler.graal.replacements.classfile.ClassfileBytecode; +import jdk.graal.compiler.api.replacements.Fold; +import jdk.graal.compiler.api.replacements.Snippet; +import jdk.graal.compiler.api.replacements.SnippetReflectionProvider; +import jdk.graal.compiler.bytecode.BytecodeProvider; +import jdk.graal.compiler.bytecode.ResolvedJavaMethodBytecode; +import jdk.graal.compiler.core.common.type.AbstractObjectStamp; +import jdk.graal.compiler.core.common.type.ObjectStamp; +import jdk.graal.compiler.core.common.type.Stamp; +import jdk.graal.compiler.core.common.type.StampPair; +import jdk.graal.compiler.core.common.type.SymbolicJVMCIReference; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.graph.NodeMap; +import jdk.graal.compiler.graph.NodeSourcePosition; +import jdk.graal.compiler.hotspot.stubs.ForeignCallStub; +import jdk.graal.compiler.java.BytecodeParser; +import jdk.graal.compiler.java.GraphBuilderPhase; +import jdk.graal.compiler.nodeinfo.Verbosity; +import jdk.graal.compiler.nodes.CallTargetNode; +import jdk.graal.compiler.nodes.CompressionNode; +import jdk.graal.compiler.nodes.ConstantNode; +import jdk.graal.compiler.nodes.EncodedGraph; +import jdk.graal.compiler.nodes.FieldLocationIdentity; +import jdk.graal.compiler.nodes.FrameState; +import jdk.graal.compiler.nodes.FullInfopointNode; +import jdk.graal.compiler.nodes.GraphEncoder; +import jdk.graal.compiler.nodes.NamedLocationIdentity; +import jdk.graal.compiler.nodes.NodeView; +import jdk.graal.compiler.nodes.ParameterNode; +import jdk.graal.compiler.nodes.ProxyNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.cfg.HIRBlock; +import jdk.graal.compiler.nodes.graphbuilderconf.GeneratedInvocationPlugin; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext; +import jdk.graal.compiler.nodes.graphbuilderconf.InlineInvokePlugin; +import jdk.graal.compiler.nodes.graphbuilderconf.IntrinsicContext; +import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin; +import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins; +import jdk.graal.compiler.nodes.graphbuilderconf.NodePlugin; +import jdk.graal.compiler.nodes.java.AccessFieldNode; +import jdk.graal.compiler.nodes.java.MethodCallTargetNode; +import jdk.graal.compiler.nodes.memory.ReadNode; +import jdk.graal.compiler.nodes.spi.CoreProviders; +import jdk.graal.compiler.nodes.spi.SnippetParameterInfo; +import jdk.graal.compiler.nodes.type.NarrowOopStamp; +import jdk.graal.compiler.nodes.virtual.VirtualObjectNode; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.phases.OptimisticOptimizations; +import jdk.graal.compiler.phases.schedule.SchedulePhase; +import jdk.graal.compiler.phases.util.Providers; +import jdk.graal.compiler.replacements.PartialIntrinsicCallTargetNode; +import jdk.graal.compiler.replacements.ReplacementsImpl; +import jdk.graal.compiler.replacements.SnippetCounter; +import jdk.graal.compiler.replacements.SnippetIntegerHistogram; +import jdk.graal.compiler.replacements.SnippetTemplate; +import jdk.graal.compiler.replacements.classfile.ClassfileBytecode; import jdk.vm.ci.code.Architecture; import jdk.vm.ci.code.TargetDescription; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotBackend.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/aarch64/AArch64HotSpotBackend.java similarity index 91% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotBackend.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/aarch64/AArch64HotSpotBackend.java index 41704597a042..f2ff309a5f44 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotBackend.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/aarch64/AArch64HotSpotBackend.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.aarch64; +package jdk.graal.compiler.hotspot.aarch64; import static java.lang.reflect.Modifier.isStatic; import static jdk.vm.ci.aarch64.AArch64.lr; @@ -31,49 +31,49 @@ import static jdk.vm.ci.aarch64.AArch64.zr; import static jdk.vm.ci.code.ValueUtil.asRegister; import static jdk.vm.ci.hotspot.aarch64.AArch64HotSpotRegisterConfig.fp; -import static jdk.compiler.graal.asm.aarch64.AArch64Address.AddressingMode.IMMEDIATE_UNSIGNED_SCALED; -import static jdk.compiler.graal.core.common.GraalOptions.ZapStackOnMethodEntry; - -import jdk.compiler.graal.asm.BranchTargetOutOfBoundsException; -import jdk.compiler.graal.asm.Label; -import jdk.compiler.graal.asm.aarch64.AArch64Address; -import jdk.compiler.graal.asm.aarch64.AArch64Assembler; -import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler; -import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler.ScratchRegister; -import jdk.compiler.graal.code.CompilationResult; -import jdk.compiler.graal.code.DataSection; -import jdk.compiler.graal.core.aarch64.AArch64NodeMatchRules; -import jdk.compiler.graal.core.common.alloc.RegisterAllocationConfig; -import jdk.compiler.graal.core.common.spi.ForeignCallLinkage; -import jdk.compiler.graal.core.gen.LIRGenerationProvider; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.hotspot.GraalHotSpotVMConfig; -import jdk.compiler.graal.hotspot.HotSpotDataBuilder; -import jdk.compiler.graal.hotspot.HotSpotGraalRuntimeProvider; -import jdk.compiler.graal.hotspot.HotSpotHostBackend; -import jdk.compiler.graal.hotspot.HotSpotLIRGenerationResult; -import jdk.compiler.graal.hotspot.HotSpotMarkId; -import jdk.compiler.graal.hotspot.meta.HotSpotForeignCallsProvider; -import jdk.compiler.graal.hotspot.meta.HotSpotHostForeignCallsProvider; -import jdk.compiler.graal.hotspot.meta.HotSpotProviders; -import jdk.compiler.graal.hotspot.stubs.Stub; -import jdk.compiler.graal.lir.LIR; -import jdk.compiler.graal.lir.aarch64.AArch64Call; -import jdk.compiler.graal.lir.aarch64.AArch64FrameMap; -import jdk.compiler.graal.lir.aarch64.AArch64FrameMapBuilder; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; -import jdk.compiler.graal.lir.asm.CompilationResultBuilderFactory; -import jdk.compiler.graal.lir.asm.DataBuilder; -import jdk.compiler.graal.lir.asm.EntryPointDecorator; -import jdk.compiler.graal.lir.asm.FrameContext; -import jdk.compiler.graal.lir.framemap.FrameMap; -import jdk.compiler.graal.lir.framemap.FrameMapBuilder; -import jdk.compiler.graal.lir.gen.LIRGenerationResult; -import jdk.compiler.graal.lir.gen.LIRGeneratorTool; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool; -import jdk.compiler.graal.serviceprovider.GraalUnsafeAccess; +import static jdk.graal.compiler.asm.aarch64.AArch64Address.AddressingMode.IMMEDIATE_UNSIGNED_SCALED; +import static jdk.graal.compiler.core.common.GraalOptions.ZapStackOnMethodEntry; + +import jdk.graal.compiler.asm.BranchTargetOutOfBoundsException; +import jdk.graal.compiler.asm.Label; +import jdk.graal.compiler.asm.aarch64.AArch64Address; +import jdk.graal.compiler.asm.aarch64.AArch64Assembler; +import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler; +import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler.ScratchRegister; +import jdk.graal.compiler.code.CompilationResult; +import jdk.graal.compiler.code.DataSection; +import jdk.graal.compiler.core.aarch64.AArch64NodeMatchRules; +import jdk.graal.compiler.core.common.alloc.RegisterAllocationConfig; +import jdk.graal.compiler.core.common.spi.ForeignCallLinkage; +import jdk.graal.compiler.core.gen.LIRGenerationProvider; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.hotspot.GraalHotSpotVMConfig; +import jdk.graal.compiler.hotspot.HotSpotDataBuilder; +import jdk.graal.compiler.hotspot.HotSpotGraalRuntimeProvider; +import jdk.graal.compiler.hotspot.HotSpotHostBackend; +import jdk.graal.compiler.hotspot.HotSpotLIRGenerationResult; +import jdk.graal.compiler.hotspot.HotSpotMarkId; +import jdk.graal.compiler.hotspot.meta.HotSpotForeignCallsProvider; +import jdk.graal.compiler.hotspot.meta.HotSpotHostForeignCallsProvider; +import jdk.graal.compiler.hotspot.meta.HotSpotProviders; +import jdk.graal.compiler.hotspot.stubs.Stub; +import jdk.graal.compiler.lir.LIR; +import jdk.graal.compiler.lir.aarch64.AArch64Call; +import jdk.graal.compiler.lir.aarch64.AArch64FrameMap; +import jdk.graal.compiler.lir.aarch64.AArch64FrameMapBuilder; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.lir.asm.CompilationResultBuilderFactory; +import jdk.graal.compiler.lir.asm.DataBuilder; +import jdk.graal.compiler.lir.asm.EntryPointDecorator; +import jdk.graal.compiler.lir.asm.FrameContext; +import jdk.graal.compiler.lir.framemap.FrameMap; +import jdk.graal.compiler.lir.framemap.FrameMapBuilder; +import jdk.graal.compiler.lir.gen.LIRGenerationResult; +import jdk.graal.compiler.lir.gen.LIRGeneratorTool; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool; +import jdk.graal.compiler.serviceprovider.GraalUnsafeAccess; import jdk.vm.ci.aarch64.AArch64Kind; import jdk.vm.ci.code.CallingConvention; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotBackendFactory.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/aarch64/AArch64HotSpotBackendFactory.java similarity index 81% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotBackendFactory.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/aarch64/AArch64HotSpotBackendFactory.java index af4cbdf3e322..6ecc2aefb33f 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotBackendFactory.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/aarch64/AArch64HotSpotBackendFactory.java @@ -23,41 +23,41 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.aarch64; +package jdk.graal.compiler.hotspot.aarch64; import static jdk.vm.ci.aarch64.AArch64.sp; import java.util.ArrayList; import java.util.List; -import jdk.compiler.graal.core.aarch64.AArch64AddressLoweringByUse; -import jdk.compiler.graal.core.aarch64.AArch64LIRKindTool; -import jdk.compiler.graal.core.aarch64.AArch64SuitesCreator; -import jdk.compiler.graal.hotspot.GraalHotSpotVMConfig; -import jdk.compiler.graal.hotspot.HotSpotBackendFactory; -import jdk.compiler.graal.hotspot.HotSpotGraalRuntimeProvider; -import jdk.compiler.graal.hotspot.HotSpotReplacementsImpl; -import jdk.compiler.graal.hotspot.meta.AddressLoweringHotSpotSuitesProvider; -import jdk.compiler.graal.hotspot.meta.HotSpotGraphBuilderPlugins; -import jdk.compiler.graal.hotspot.meta.HotSpotHostForeignCallsProvider; -import jdk.compiler.graal.hotspot.meta.HotSpotLoweringProvider; -import jdk.compiler.graal.hotspot.meta.HotSpotMetaAccessExtensionProvider; -import jdk.compiler.graal.hotspot.meta.HotSpotPlatformConfigurationProvider; -import jdk.compiler.graal.hotspot.meta.HotSpotProviders; -import jdk.compiler.graal.hotspot.meta.HotSpotRegisters; -import jdk.compiler.graal.hotspot.meta.HotSpotRegistersProvider; -import jdk.compiler.graal.hotspot.meta.HotSpotSnippetReflectionProvider; -import jdk.compiler.graal.hotspot.meta.HotSpotSuitesProvider; -import jdk.compiler.graal.hotspot.word.HotSpotWordTypes; -import jdk.compiler.graal.nodes.gc.BarrierSet; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins; -import jdk.compiler.graal.nodes.spi.CoreProviders; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.phases.BasePhase; -import jdk.compiler.graal.phases.common.AddressLoweringByUsePhase; -import jdk.compiler.graal.phases.tiers.CompilerConfiguration; -import jdk.compiler.graal.replacements.aarch64.AArch64GraphBuilderPlugins; -import jdk.compiler.graal.serviceprovider.ServiceProvider; +import jdk.graal.compiler.core.aarch64.AArch64AddressLoweringByUse; +import jdk.graal.compiler.core.aarch64.AArch64LIRKindTool; +import jdk.graal.compiler.core.aarch64.AArch64SuitesCreator; +import jdk.graal.compiler.hotspot.GraalHotSpotVMConfig; +import jdk.graal.compiler.hotspot.HotSpotBackendFactory; +import jdk.graal.compiler.hotspot.HotSpotGraalRuntimeProvider; +import jdk.graal.compiler.hotspot.HotSpotReplacementsImpl; +import jdk.graal.compiler.hotspot.meta.AddressLoweringHotSpotSuitesProvider; +import jdk.graal.compiler.hotspot.meta.HotSpotGraphBuilderPlugins; +import jdk.graal.compiler.hotspot.meta.HotSpotHostForeignCallsProvider; +import jdk.graal.compiler.hotspot.meta.HotSpotLoweringProvider; +import jdk.graal.compiler.hotspot.meta.HotSpotMetaAccessExtensionProvider; +import jdk.graal.compiler.hotspot.meta.HotSpotPlatformConfigurationProvider; +import jdk.graal.compiler.hotspot.meta.HotSpotProviders; +import jdk.graal.compiler.hotspot.meta.HotSpotRegisters; +import jdk.graal.compiler.hotspot.meta.HotSpotRegistersProvider; +import jdk.graal.compiler.hotspot.meta.HotSpotSnippetReflectionProvider; +import jdk.graal.compiler.hotspot.meta.HotSpotSuitesProvider; +import jdk.graal.compiler.hotspot.word.HotSpotWordTypes; +import jdk.graal.compiler.nodes.gc.BarrierSet; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins; +import jdk.graal.compiler.nodes.spi.CoreProviders; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.phases.BasePhase; +import jdk.graal.compiler.phases.common.AddressLoweringByUsePhase; +import jdk.graal.compiler.phases.tiers.CompilerConfiguration; +import jdk.graal.compiler.replacements.aarch64.AArch64GraphBuilderPlugins; +import jdk.graal.compiler.serviceprovider.ServiceProvider; import jdk.vm.ci.aarch64.AArch64; import jdk.vm.ci.code.Architecture; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotCRuntimeCallEpilogueOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/aarch64/AArch64HotSpotCRuntimeCallEpilogueOp.java similarity index 87% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotCRuntimeCallEpilogueOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/aarch64/AArch64HotSpotCRuntimeCallEpilogueOp.java index fdfa182deaa0..fd9281c89cb7 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotCRuntimeCallEpilogueOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/aarch64/AArch64HotSpotCRuntimeCallEpilogueOp.java @@ -22,16 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.aarch64; +package jdk.graal.compiler.hotspot.aarch64; import static jdk.vm.ci.aarch64.AArch64.zr; -import jdk.compiler.graal.asm.Label; -import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.Opcode; -import jdk.compiler.graal.lir.aarch64.AArch64LIRInstruction; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.asm.Label; +import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.Opcode; +import jdk.graal.compiler.lir.aarch64.AArch64LIRInstruction; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotCRuntimeCallPrologueOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/aarch64/AArch64HotSpotCRuntimeCallPrologueOp.java similarity index 87% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotCRuntimeCallPrologueOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/aarch64/AArch64HotSpotCRuntimeCallPrologueOp.java index 7f45888a69b5..acd8264eca9c 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotCRuntimeCallPrologueOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/aarch64/AArch64HotSpotCRuntimeCallPrologueOp.java @@ -23,18 +23,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.aarch64; +package jdk.graal.compiler.hotspot.aarch64; -import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.REG; +import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.REG; import static jdk.vm.ci.aarch64.AArch64.sp; import static jdk.vm.ci.code.ValueUtil.asRegister; -import jdk.compiler.graal.asm.Label; -import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.Opcode; -import jdk.compiler.graal.lir.aarch64.AArch64LIRInstruction; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.asm.Label; +import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.Opcode; +import jdk.graal.compiler.lir.aarch64.AArch64LIRInstruction; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; import jdk.vm.ci.code.Register; import jdk.vm.ci.meta.AllocatableValue; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotCounterOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/aarch64/AArch64HotSpotCounterOp.java similarity index 84% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotCounterOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/aarch64/AArch64HotSpotCounterOp.java index a819c99f5e0d..f3f86a96823d 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotCounterOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/aarch64/AArch64HotSpotCounterOp.java @@ -22,24 +22,24 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.aarch64; +package jdk.graal.compiler.hotspot.aarch64; import static jdk.vm.ci.code.ValueUtil.asRegister; -import static jdk.compiler.graal.lir.LIRValueUtil.asJavaConstant; -import static jdk.compiler.graal.lir.LIRValueUtil.isJavaConstant; +import static jdk.graal.compiler.lir.LIRValueUtil.asJavaConstant; +import static jdk.graal.compiler.lir.LIRValueUtil.isJavaConstant; -import jdk.compiler.graal.asm.Label; -import jdk.compiler.graal.asm.aarch64.AArch64Address; -import jdk.compiler.graal.asm.aarch64.AArch64Assembler; -import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler; -import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler.ScratchRegister; -import jdk.compiler.graal.hotspot.GraalHotSpotVMConfig; -import jdk.compiler.graal.hotspot.HotSpotCounterOp; -import jdk.compiler.graal.hotspot.debug.BenchmarkCounters; -import jdk.compiler.graal.hotspot.meta.HotSpotRegistersProvider; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.Opcode; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.asm.Label; +import jdk.graal.compiler.asm.aarch64.AArch64Address; +import jdk.graal.compiler.asm.aarch64.AArch64Assembler; +import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler; +import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler.ScratchRegister; +import jdk.graal.compiler.hotspot.GraalHotSpotVMConfig; +import jdk.graal.compiler.hotspot.HotSpotCounterOp; +import jdk.graal.compiler.hotspot.debug.BenchmarkCounters; +import jdk.graal.compiler.hotspot.meta.HotSpotRegistersProvider; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.Opcode; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; import jdk.vm.ci.code.Register; import jdk.vm.ci.code.TargetDescription; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotDeoptimizeCallerOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/aarch64/AArch64HotSpotDeoptimizeCallerOp.java similarity index 82% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotDeoptimizeCallerOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/aarch64/AArch64HotSpotDeoptimizeCallerOp.java index b5a5de806262..6c428129911e 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotDeoptimizeCallerOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/aarch64/AArch64HotSpotDeoptimizeCallerOp.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.aarch64; +package jdk.graal.compiler.hotspot.aarch64; -import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler; -import jdk.compiler.graal.hotspot.GraalHotSpotVMConfig; -import jdk.compiler.graal.hotspot.HotSpotHostBackend; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.Opcode; -import jdk.compiler.graal.lir.aarch64.AArch64Call; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler; +import jdk.graal.compiler.hotspot.GraalHotSpotVMConfig; +import jdk.graal.compiler.hotspot.HotSpotHostBackend; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.Opcode; +import jdk.graal.compiler.lir.aarch64.AArch64Call; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; /** * Removes the current frame and tail calls the uncommon trap routine. diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotDeoptimizeOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/aarch64/AArch64HotSpotDeoptimizeOp.java similarity index 79% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotDeoptimizeOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/aarch64/AArch64HotSpotDeoptimizeOp.java index 47945c9c97a3..5622fad69628 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotDeoptimizeOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/aarch64/AArch64HotSpotDeoptimizeOp.java @@ -22,17 +22,17 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.aarch64; +package jdk.graal.compiler.hotspot.aarch64; -import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler; -import jdk.compiler.graal.hotspot.HotSpotHostBackend; -import jdk.compiler.graal.lir.LIRFrameState; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.Opcode; -import jdk.compiler.graal.lir.StandardOp.BlockEndOp; -import jdk.compiler.graal.lir.aarch64.AArch64BlockEndOp; -import jdk.compiler.graal.lir.aarch64.AArch64Call; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler; +import jdk.graal.compiler.hotspot.HotSpotHostBackend; +import jdk.graal.compiler.lir.LIRFrameState; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.Opcode; +import jdk.graal.compiler.lir.StandardOp.BlockEndOp; +import jdk.graal.compiler.lir.aarch64.AArch64BlockEndOp; +import jdk.graal.compiler.lir.aarch64.AArch64Call; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; @Opcode("DEOPT") public class AArch64HotSpotDeoptimizeOp extends AArch64BlockEndOp implements BlockEndOp { diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotDeoptimizeWithExceptionCallerOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/aarch64/AArch64HotSpotDeoptimizeWithExceptionCallerOp.java similarity index 86% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotDeoptimizeWithExceptionCallerOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/aarch64/AArch64HotSpotDeoptimizeWithExceptionCallerOp.java index dbd8025150fe..4542a15e3b49 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotDeoptimizeWithExceptionCallerOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/aarch64/AArch64HotSpotDeoptimizeWithExceptionCallerOp.java @@ -22,18 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.aarch64; +package jdk.graal.compiler.hotspot.aarch64; import static jdk.vm.ci.aarch64.AArch64.lr; import static jdk.vm.ci.code.ValueUtil.asRegister; -import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler; -import jdk.compiler.graal.hotspot.GraalHotSpotVMConfig; -import jdk.compiler.graal.hotspot.HotSpotHostBackend; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.Opcode; -import jdk.compiler.graal.lir.aarch64.AArch64Call; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler; +import jdk.graal.compiler.hotspot.GraalHotSpotVMConfig; +import jdk.graal.compiler.hotspot.HotSpotHostBackend; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.Opcode; +import jdk.graal.compiler.lir.aarch64.AArch64Call; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; import jdk.vm.ci.code.Register; import jdk.vm.ci.meta.Value; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotDirectStaticCallOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/aarch64/AArch64HotSpotDirectStaticCallOp.java similarity index 85% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotDirectStaticCallOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/aarch64/AArch64HotSpotDirectStaticCallOp.java index a3f7604fb8fa..3790fa3cf0a0 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotDirectStaticCallOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/aarch64/AArch64HotSpotDirectStaticCallOp.java @@ -22,20 +22,20 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.aarch64; +package jdk.graal.compiler.hotspot.aarch64; import static jdk.vm.ci.hotspot.aarch64.AArch64HotSpotRegisterConfig.inlineCacheRegister; -import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler; -import jdk.compiler.graal.hotspot.GraalHotSpotVMConfig; -import jdk.compiler.graal.hotspot.HotSpotMarkId; -import jdk.compiler.graal.lir.LIRFrameState; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.Opcode; -import jdk.compiler.graal.lir.aarch64.AArch64Call; -import jdk.compiler.graal.lir.aarch64.AArch64Call.DirectCallOp; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; -import jdk.compiler.graal.nodes.CallTargetNode.InvokeKind; +import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler; +import jdk.graal.compiler.hotspot.GraalHotSpotVMConfig; +import jdk.graal.compiler.hotspot.HotSpotMarkId; +import jdk.graal.compiler.lir.LIRFrameState; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.Opcode; +import jdk.graal.compiler.lir.aarch64.AArch64Call; +import jdk.graal.compiler.lir.aarch64.AArch64Call.DirectCallOp; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.nodes.CallTargetNode.InvokeKind; import jdk.vm.ci.hotspot.HotSpotResolvedJavaMethod; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotDirectVirtualCallOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/aarch64/AArch64HotSpotDirectVirtualCallOp.java similarity index 85% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotDirectVirtualCallOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/aarch64/AArch64HotSpotDirectVirtualCallOp.java index 5ada65d3127d..964c87d27821 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotDirectVirtualCallOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/aarch64/AArch64HotSpotDirectVirtualCallOp.java @@ -22,20 +22,20 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.aarch64; +package jdk.graal.compiler.hotspot.aarch64; import static jdk.vm.ci.hotspot.aarch64.AArch64HotSpotRegisterConfig.inlineCacheRegister; -import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler; -import jdk.compiler.graal.hotspot.GraalHotSpotVMConfig; -import jdk.compiler.graal.hotspot.HotSpotMarkId; -import jdk.compiler.graal.lir.LIRFrameState; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.Opcode; -import jdk.compiler.graal.lir.aarch64.AArch64Call; -import jdk.compiler.graal.lir.aarch64.AArch64Call.DirectCallOp; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; -import jdk.compiler.graal.nodes.CallTargetNode.InvokeKind; +import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler; +import jdk.graal.compiler.hotspot.GraalHotSpotVMConfig; +import jdk.graal.compiler.hotspot.HotSpotMarkId; +import jdk.graal.compiler.lir.LIRFrameState; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.Opcode; +import jdk.graal.compiler.lir.aarch64.AArch64Call; +import jdk.graal.compiler.lir.aarch64.AArch64Call.DirectCallOp; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.nodes.CallTargetNode.InvokeKind; import jdk.vm.ci.hotspot.HotSpotResolvedJavaMethod; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotEpilogueOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/aarch64/AArch64HotSpotEpilogueOp.java similarity index 85% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotEpilogueOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/aarch64/AArch64HotSpotEpilogueOp.java index 1b01f71973e7..33bbb8250c23 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotEpilogueOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/aarch64/AArch64HotSpotEpilogueOp.java @@ -22,26 +22,26 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.aarch64; +package jdk.graal.compiler.hotspot.aarch64; import static jdk.vm.ci.aarch64.AArch64.lr; import static jdk.vm.ci.aarch64.AArch64.sp; import static jdk.vm.ci.aarch64.AArch64.zr; import static jdk.vm.ci.hotspot.aarch64.AArch64HotSpotRegisterConfig.fp; -import jdk.compiler.graal.asm.Label; -import jdk.compiler.graal.asm.aarch64.AArch64Address; -import jdk.compiler.graal.asm.aarch64.AArch64Assembler; -import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler; -import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler.ScratchRegister; -import jdk.compiler.graal.core.common.spi.ForeignCallLinkage; -import jdk.compiler.graal.hotspot.GraalHotSpotVMConfig; -import jdk.compiler.graal.hotspot.HotSpotHostBackend; -import jdk.compiler.graal.hotspot.meta.HotSpotForeignCallsProvider; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.aarch64.AArch64BlockEndOp; -import jdk.compiler.graal.lir.aarch64.AArch64Call; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.asm.Label; +import jdk.graal.compiler.asm.aarch64.AArch64Address; +import jdk.graal.compiler.asm.aarch64.AArch64Assembler; +import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler; +import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler.ScratchRegister; +import jdk.graal.compiler.core.common.spi.ForeignCallLinkage; +import jdk.graal.compiler.hotspot.GraalHotSpotVMConfig; +import jdk.graal.compiler.hotspot.HotSpotHostBackend; +import jdk.graal.compiler.hotspot.meta.HotSpotForeignCallsProvider; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.aarch64.AArch64BlockEndOp; +import jdk.graal.compiler.lir.aarch64.AArch64Call; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; import jdk.vm.ci.code.CallingConvention; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotForeignCallsProvider.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/aarch64/AArch64HotSpotForeignCallsProvider.java similarity index 86% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotForeignCallsProvider.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/aarch64/AArch64HotSpotForeignCallsProvider.java index 7f6cc9e3511a..4e8db7e6924e 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotForeignCallsProvider.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/aarch64/AArch64HotSpotForeignCallsProvider.java @@ -22,21 +22,21 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.aarch64; +package jdk.graal.compiler.hotspot.aarch64; import static jdk.vm.ci.aarch64.AArch64.r0; import static jdk.vm.ci.aarch64.AArch64.r3; import static jdk.vm.ci.meta.Value.ILLEGAL; -import jdk.compiler.graal.core.common.LIRKind; -import jdk.compiler.graal.hotspot.HotSpotBackend; -import jdk.compiler.graal.hotspot.HotSpotForeignCallLinkage; -import jdk.compiler.graal.hotspot.HotSpotForeignCallLinkageImpl; -import jdk.compiler.graal.hotspot.HotSpotGraalRuntimeProvider; -import jdk.compiler.graal.hotspot.meta.HotSpotHostForeignCallsProvider; -import jdk.compiler.graal.hotspot.meta.HotSpotProviders; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.word.WordTypes; +import jdk.graal.compiler.core.common.LIRKind; +import jdk.graal.compiler.hotspot.HotSpotBackend; +import jdk.graal.compiler.hotspot.HotSpotForeignCallLinkage; +import jdk.graal.compiler.hotspot.HotSpotForeignCallLinkageImpl; +import jdk.graal.compiler.hotspot.HotSpotGraalRuntimeProvider; +import jdk.graal.compiler.hotspot.meta.HotSpotHostForeignCallsProvider; +import jdk.graal.compiler.hotspot.meta.HotSpotProviders; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.word.WordTypes; import jdk.vm.ci.code.CallingConvention; import jdk.vm.ci.code.CodeCacheProvider; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotJumpToExceptionHandlerInCallerOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/aarch64/AArch64HotSpotJumpToExceptionHandlerInCallerOp.java similarity index 86% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotJumpToExceptionHandlerInCallerOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/aarch64/AArch64HotSpotJumpToExceptionHandlerInCallerOp.java index 646399802d98..0d7e0182c518 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotJumpToExceptionHandlerInCallerOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/aarch64/AArch64HotSpotJumpToExceptionHandlerInCallerOp.java @@ -22,16 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.aarch64; +package jdk.graal.compiler.hotspot.aarch64; import static jdk.vm.ci.code.ValueUtil.asRegister; -import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.REG; +import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.REG; -import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler; -import jdk.compiler.graal.hotspot.GraalHotSpotVMConfig; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.Opcode; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler; +import jdk.graal.compiler.hotspot.GraalHotSpotVMConfig; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.Opcode; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; import jdk.vm.ci.meta.AllocatableValue; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotLIRGenerator.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/aarch64/AArch64HotSpotLIRGenerator.java similarity index 87% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotLIRGenerator.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/aarch64/AArch64HotSpotLIRGenerator.java index 159f3149e149..099811cb247f 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotLIRGenerator.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/aarch64/AArch64HotSpotLIRGenerator.java @@ -24,67 +24,67 @@ * questions. */ -package jdk.compiler.graal.hotspot.aarch64; +package jdk.graal.compiler.hotspot.aarch64; import static jdk.vm.ci.code.ValueUtil.isStackSlot; import static jdk.vm.ci.meta.JavaConstant.INT_0; import static jdk.vm.ci.meta.JavaConstant.LONG_0; -import static jdk.compiler.graal.lir.LIRValueUtil.asConstant; -import static jdk.compiler.graal.lir.LIRValueUtil.asJavaConstant; -import static jdk.compiler.graal.lir.LIRValueUtil.isConstantValue; -import static jdk.compiler.graal.lir.LIRValueUtil.isJavaConstant; +import static jdk.graal.compiler.lir.LIRValueUtil.asConstant; +import static jdk.graal.compiler.lir.LIRValueUtil.asJavaConstant; +import static jdk.graal.compiler.lir.LIRValueUtil.isConstantValue; +import static jdk.graal.compiler.lir.LIRValueUtil.isJavaConstant; import java.util.Arrays; import java.util.EnumSet; import java.util.function.Consumer; import java.util.function.Function; -import jdk.compiler.graal.asm.Label; -import jdk.compiler.graal.asm.aarch64.AArch64Address; -import jdk.compiler.graal.asm.aarch64.AArch64Assembler.ConditionFlag; -import jdk.compiler.graal.asm.aarch64.AArch64Assembler.PrefetchMode; -import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler; -import jdk.compiler.graal.core.aarch64.AArch64ArithmeticLIRGenerator; -import jdk.compiler.graal.core.aarch64.AArch64LIRGenerator; -import jdk.compiler.graal.core.aarch64.AArch64LIRKindTool; -import jdk.compiler.graal.core.common.CompressEncoding; -import jdk.compiler.graal.core.common.LIRKind; -import jdk.compiler.graal.core.common.calc.Condition; -import jdk.compiler.graal.core.common.spi.ForeignCallLinkage; -import jdk.compiler.graal.core.common.spi.LIRKindTool; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.hotspot.GraalHotSpotVMConfig; -import jdk.compiler.graal.hotspot.HotSpotBackend; -import jdk.compiler.graal.hotspot.HotSpotDebugInfoBuilder; -import jdk.compiler.graal.hotspot.HotSpotForeignCallLinkage; -import jdk.compiler.graal.hotspot.HotSpotGraalRuntime; -import jdk.compiler.graal.hotspot.HotSpotLIRGenerationResult; -import jdk.compiler.graal.hotspot.HotSpotLIRGenerator; -import jdk.compiler.graal.hotspot.HotSpotLockStack; -import jdk.compiler.graal.hotspot.debug.BenchmarkCounters; -import jdk.compiler.graal.hotspot.meta.HotSpotProviders; -import jdk.compiler.graal.hotspot.meta.HotSpotRegistersProvider; -import jdk.compiler.graal.hotspot.stubs.Stub; -import jdk.compiler.graal.lir.ConstantValue; -import jdk.compiler.graal.lir.LIRFrameState; -import jdk.compiler.graal.lir.LIRInstruction; -import jdk.compiler.graal.lir.LabelRef; -import jdk.compiler.graal.lir.SwitchStrategy; -import jdk.compiler.graal.lir.Variable; -import jdk.compiler.graal.lir.VirtualStackSlot; -import jdk.compiler.graal.lir.aarch64.AArch64AddressValue; -import jdk.compiler.graal.lir.aarch64.AArch64Call; -import jdk.compiler.graal.lir.aarch64.AArch64ControlFlow.StrategySwitchOp; -import jdk.compiler.graal.lir.aarch64.AArch64FrameMapBuilder; -import jdk.compiler.graal.lir.aarch64.AArch64Move; -import jdk.compiler.graal.lir.aarch64.AArch64Move.StoreOp; -import jdk.compiler.graal.lir.aarch64.AArch64PrefetchOp; -import jdk.compiler.graal.lir.aarch64.AArch64RestoreRegistersOp; -import jdk.compiler.graal.lir.aarch64.AArch64SaveRegistersOp; -import jdk.compiler.graal.lir.aarch64.AArch64SpinWaitOp; -import jdk.compiler.graal.lir.gen.BarrierSetLIRGenerator; -import jdk.compiler.graal.lir.gen.LIRGenerationResult; -import jdk.compiler.graal.lir.gen.MoveFactory; +import jdk.graal.compiler.asm.Label; +import jdk.graal.compiler.asm.aarch64.AArch64Address; +import jdk.graal.compiler.asm.aarch64.AArch64Assembler.ConditionFlag; +import jdk.graal.compiler.asm.aarch64.AArch64Assembler.PrefetchMode; +import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler; +import jdk.graal.compiler.core.aarch64.AArch64ArithmeticLIRGenerator; +import jdk.graal.compiler.core.aarch64.AArch64LIRGenerator; +import jdk.graal.compiler.core.aarch64.AArch64LIRKindTool; +import jdk.graal.compiler.core.common.CompressEncoding; +import jdk.graal.compiler.core.common.LIRKind; +import jdk.graal.compiler.core.common.calc.Condition; +import jdk.graal.compiler.core.common.spi.ForeignCallLinkage; +import jdk.graal.compiler.core.common.spi.LIRKindTool; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.hotspot.GraalHotSpotVMConfig; +import jdk.graal.compiler.hotspot.HotSpotBackend; +import jdk.graal.compiler.hotspot.HotSpotDebugInfoBuilder; +import jdk.graal.compiler.hotspot.HotSpotForeignCallLinkage; +import jdk.graal.compiler.hotspot.HotSpotGraalRuntime; +import jdk.graal.compiler.hotspot.HotSpotLIRGenerationResult; +import jdk.graal.compiler.hotspot.HotSpotLIRGenerator; +import jdk.graal.compiler.hotspot.HotSpotLockStack; +import jdk.graal.compiler.hotspot.debug.BenchmarkCounters; +import jdk.graal.compiler.hotspot.meta.HotSpotProviders; +import jdk.graal.compiler.hotspot.meta.HotSpotRegistersProvider; +import jdk.graal.compiler.hotspot.stubs.Stub; +import jdk.graal.compiler.lir.ConstantValue; +import jdk.graal.compiler.lir.LIRFrameState; +import jdk.graal.compiler.lir.LIRInstruction; +import jdk.graal.compiler.lir.LabelRef; +import jdk.graal.compiler.lir.SwitchStrategy; +import jdk.graal.compiler.lir.Variable; +import jdk.graal.compiler.lir.VirtualStackSlot; +import jdk.graal.compiler.lir.aarch64.AArch64AddressValue; +import jdk.graal.compiler.lir.aarch64.AArch64Call; +import jdk.graal.compiler.lir.aarch64.AArch64ControlFlow.StrategySwitchOp; +import jdk.graal.compiler.lir.aarch64.AArch64FrameMapBuilder; +import jdk.graal.compiler.lir.aarch64.AArch64Move; +import jdk.graal.compiler.lir.aarch64.AArch64Move.StoreOp; +import jdk.graal.compiler.lir.aarch64.AArch64PrefetchOp; +import jdk.graal.compiler.lir.aarch64.AArch64RestoreRegistersOp; +import jdk.graal.compiler.lir.aarch64.AArch64SaveRegistersOp; +import jdk.graal.compiler.lir.aarch64.AArch64SpinWaitOp; +import jdk.graal.compiler.lir.gen.BarrierSetLIRGenerator; +import jdk.graal.compiler.lir.gen.LIRGenerationResult; +import jdk.graal.compiler.lir.gen.MoveFactory; import jdk.vm.ci.aarch64.AArch64; import jdk.vm.ci.aarch64.AArch64Kind; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotLoweringProvider.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/aarch64/AArch64HotSpotLoweringProvider.java similarity index 75% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotLoweringProvider.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/aarch64/AArch64HotSpotLoweringProvider.java index 74d64c956768..5b791189bb22 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotLoweringProvider.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/aarch64/AArch64HotSpotLoweringProvider.java @@ -23,26 +23,26 @@ * questions. */ -package jdk.compiler.graal.hotspot.aarch64; +package jdk.graal.compiler.hotspot.aarch64; -import jdk.compiler.graal.core.aarch64.AArch64LoweringProviderMixin; -import jdk.compiler.graal.core.common.spi.ForeignCallsProvider; -import jdk.compiler.graal.core.common.spi.MetaAccessExtensionProvider; -import jdk.compiler.graal.debug.DebugHandlersFactory; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.hotspot.GraalHotSpotVMConfig; -import jdk.compiler.graal.hotspot.HotSpotGraalRuntimeProvider; -import jdk.compiler.graal.hotspot.meta.DefaultHotSpotLoweringProvider; -import jdk.compiler.graal.hotspot.meta.HotSpotProviders; -import jdk.compiler.graal.hotspot.meta.HotSpotRegistersProvider; -import jdk.compiler.graal.hotspot.replacements.HotSpotAllocationSnippets; -import jdk.compiler.graal.hotspot.replacements.arraycopy.HotSpotArraycopySnippets; -import jdk.compiler.graal.nodes.calc.FloatConvertNode; -import jdk.compiler.graal.nodes.calc.IntegerDivRemNode; -import jdk.compiler.graal.nodes.spi.LoweringTool; -import jdk.compiler.graal.nodes.spi.PlatformConfigurationProvider; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.replacements.aarch64.AArch64IntegerArithmeticSnippets; +import jdk.graal.compiler.core.aarch64.AArch64LoweringProviderMixin; +import jdk.graal.compiler.core.common.spi.ForeignCallsProvider; +import jdk.graal.compiler.core.common.spi.MetaAccessExtensionProvider; +import jdk.graal.compiler.debug.DebugHandlersFactory; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.hotspot.GraalHotSpotVMConfig; +import jdk.graal.compiler.hotspot.HotSpotGraalRuntimeProvider; +import jdk.graal.compiler.hotspot.meta.DefaultHotSpotLoweringProvider; +import jdk.graal.compiler.hotspot.meta.HotSpotProviders; +import jdk.graal.compiler.hotspot.meta.HotSpotRegistersProvider; +import jdk.graal.compiler.hotspot.replacements.HotSpotAllocationSnippets; +import jdk.graal.compiler.hotspot.replacements.arraycopy.HotSpotArraycopySnippets; +import jdk.graal.compiler.nodes.calc.FloatConvertNode; +import jdk.graal.compiler.nodes.calc.IntegerDivRemNode; +import jdk.graal.compiler.nodes.spi.LoweringTool; +import jdk.graal.compiler.nodes.spi.PlatformConfigurationProvider; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.replacements.aarch64.AArch64IntegerArithmeticSnippets; import jdk.vm.ci.code.TargetDescription; import jdk.vm.ci.hotspot.HotSpotConstantReflectionProvider; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotMacroAssembler.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/aarch64/AArch64HotSpotMacroAssembler.java similarity index 94% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotMacroAssembler.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/aarch64/AArch64HotSpotMacroAssembler.java index cdf3117a3831..bd4c8459c1cc 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotMacroAssembler.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/aarch64/AArch64HotSpotMacroAssembler.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.aarch64; +package jdk.graal.compiler.hotspot.aarch64; -import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler; -import jdk.compiler.graal.hotspot.GraalHotSpotVMConfig; +import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler; +import jdk.graal.compiler.hotspot.GraalHotSpotVMConfig; import jdk.vm.ci.aarch64.AArch64; import jdk.vm.ci.code.TargetDescription; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotMove.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/aarch64/AArch64HotSpotMove.java similarity index 91% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotMove.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/aarch64/AArch64HotSpotMove.java index 736eabe64b1c..1d6f088ef512 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotMove.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/aarch64/AArch64HotSpotMove.java @@ -22,24 +22,24 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.aarch64; +package jdk.graal.compiler.hotspot.aarch64; import static jdk.vm.ci.aarch64.AArch64.zr; import static jdk.vm.ci.code.ValueUtil.asRegister; import static jdk.vm.ci.code.ValueUtil.isRegister; -import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.HINT; -import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.ILLEGAL; -import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.REG; -import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.STACK; - -import jdk.compiler.graal.asm.Label; -import jdk.compiler.graal.asm.aarch64.AArch64Assembler; -import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler; -import jdk.compiler.graal.core.common.CompressEncoding; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.StandardOp.LoadConstantOp; -import jdk.compiler.graal.lir.aarch64.AArch64LIRInstruction; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; +import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.HINT; +import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.ILLEGAL; +import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.REG; +import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.STACK; + +import jdk.graal.compiler.asm.Label; +import jdk.graal.compiler.asm.aarch64.AArch64Assembler; +import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler; +import jdk.graal.compiler.core.common.CompressEncoding; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.StandardOp.LoadConstantOp; +import jdk.graal.compiler.lir.aarch64.AArch64LIRInstruction; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; import jdk.vm.ci.code.Register; import jdk.vm.ci.hotspot.HotSpotConstant; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotMoveFactory.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/aarch64/AArch64HotSpotMoveFactory.java similarity index 95% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotMoveFactory.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/aarch64/AArch64HotSpotMoveFactory.java index a278cc0243af..cc863dddb07a 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotMoveFactory.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/aarch64/AArch64HotSpotMoveFactory.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.aarch64; +package jdk.graal.compiler.hotspot.aarch64; import static jdk.vm.ci.meta.JavaConstant.INT_0; import static jdk.vm.ci.meta.JavaConstant.LONG_0; -import jdk.compiler.graal.core.aarch64.AArch64MoveFactory; -import jdk.compiler.graal.lir.aarch64.AArch64LIRInstruction; +import jdk.graal.compiler.core.aarch64.AArch64MoveFactory; +import jdk.graal.compiler.lir.aarch64.AArch64LIRInstruction; import jdk.vm.ci.aarch64.AArch64Kind; import jdk.vm.ci.hotspot.HotSpotConstant; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotNodeLIRBuilder.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/aarch64/AArch64HotSpotNodeLIRBuilder.java similarity index 84% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotNodeLIRBuilder.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/aarch64/AArch64HotSpotNodeLIRBuilder.java index 71d73762aa43..5a41c3e631ea 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotNodeLIRBuilder.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/aarch64/AArch64HotSpotNodeLIRBuilder.java @@ -22,40 +22,40 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.aarch64; +package jdk.graal.compiler.hotspot.aarch64; import static jdk.vm.ci.aarch64.AArch64.lr; import static jdk.vm.ci.hotspot.aarch64.AArch64HotSpotRegisterConfig.fp; import static jdk.vm.ci.hotspot.aarch64.AArch64HotSpotRegisterConfig.inlineCacheRegister; import static jdk.vm.ci.hotspot.aarch64.AArch64HotSpotRegisterConfig.metaspaceMethodRegister; -import jdk.compiler.graal.core.aarch64.AArch64NodeLIRBuilder; -import jdk.compiler.graal.core.aarch64.AArch64NodeMatchRules; -import jdk.compiler.graal.core.common.LIRKind; -import jdk.compiler.graal.core.common.spi.ForeignCallDescriptor; -import jdk.compiler.graal.core.common.spi.ForeignCallLinkage; -import jdk.compiler.graal.core.gen.DebugInfoBuilder; -import jdk.compiler.graal.hotspot.HotSpotBackend; -import jdk.compiler.graal.hotspot.HotSpotDebugInfoBuilder; -import jdk.compiler.graal.hotspot.HotSpotLIRGenerator; -import jdk.compiler.graal.hotspot.HotSpotLockStack; -import jdk.compiler.graal.hotspot.HotSpotNodeLIRBuilder; -import jdk.compiler.graal.hotspot.nodes.HotSpotDirectCallTargetNode; -import jdk.compiler.graal.hotspot.nodes.HotSpotIndirectCallTargetNode; -import jdk.compiler.graal.lir.LIRFrameState; -import jdk.compiler.graal.lir.Variable; -import jdk.compiler.graal.lir.aarch64.AArch64BreakpointOp; -import jdk.compiler.graal.lir.gen.LIRGeneratorTool; -import jdk.compiler.graal.nodes.BreakpointNode; -import jdk.compiler.graal.nodes.CallTargetNode.InvokeKind; -import jdk.compiler.graal.nodes.DirectCallTargetNode; -import jdk.compiler.graal.nodes.FullInfopointNode; -import jdk.compiler.graal.nodes.IndirectCallTargetNode; -import jdk.compiler.graal.nodes.NodeView; -import jdk.compiler.graal.nodes.SafepointNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.spi.NodeValueMap; +import jdk.graal.compiler.core.aarch64.AArch64NodeLIRBuilder; +import jdk.graal.compiler.core.aarch64.AArch64NodeMatchRules; +import jdk.graal.compiler.core.common.LIRKind; +import jdk.graal.compiler.core.common.spi.ForeignCallDescriptor; +import jdk.graal.compiler.core.common.spi.ForeignCallLinkage; +import jdk.graal.compiler.core.gen.DebugInfoBuilder; +import jdk.graal.compiler.hotspot.HotSpotBackend; +import jdk.graal.compiler.hotspot.HotSpotDebugInfoBuilder; +import jdk.graal.compiler.hotspot.HotSpotLIRGenerator; +import jdk.graal.compiler.hotspot.HotSpotLockStack; +import jdk.graal.compiler.hotspot.HotSpotNodeLIRBuilder; +import jdk.graal.compiler.hotspot.nodes.HotSpotDirectCallTargetNode; +import jdk.graal.compiler.hotspot.nodes.HotSpotIndirectCallTargetNode; +import jdk.graal.compiler.lir.LIRFrameState; +import jdk.graal.compiler.lir.Variable; +import jdk.graal.compiler.lir.aarch64.AArch64BreakpointOp; +import jdk.graal.compiler.lir.gen.LIRGeneratorTool; +import jdk.graal.compiler.nodes.BreakpointNode; +import jdk.graal.compiler.nodes.CallTargetNode.InvokeKind; +import jdk.graal.compiler.nodes.DirectCallTargetNode; +import jdk.graal.compiler.nodes.FullInfopointNode; +import jdk.graal.compiler.nodes.IndirectCallTargetNode; +import jdk.graal.compiler.nodes.NodeView; +import jdk.graal.compiler.nodes.SafepointNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.spi.NodeValueMap; import jdk.vm.ci.aarch64.AArch64Kind; import jdk.vm.ci.code.BytecodeFrame; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotPatchReturnAddressOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/aarch64/AArch64HotSpotPatchReturnAddressOp.java similarity index 84% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotPatchReturnAddressOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/aarch64/AArch64HotSpotPatchReturnAddressOp.java index 8aae784cbf08..60058d078544 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotPatchReturnAddressOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/aarch64/AArch64HotSpotPatchReturnAddressOp.java @@ -22,18 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.aarch64; +package jdk.graal.compiler.hotspot.aarch64; -import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.REG; +import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.REG; import static jdk.vm.ci.aarch64.AArch64.sp; import static jdk.vm.ci.code.ValueUtil.asRegister; -import jdk.compiler.graal.asm.aarch64.AArch64Address; -import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.Opcode; -import jdk.compiler.graal.lir.aarch64.AArch64LIRInstruction; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.asm.aarch64.AArch64Address; +import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.Opcode; +import jdk.graal.compiler.lir.aarch64.AArch64LIRInstruction; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; import jdk.vm.ci.meta.AllocatableValue; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotRegisterAllocationConfig.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/aarch64/AArch64HotSpotRegisterAllocationConfig.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotRegisterAllocationConfig.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/aarch64/AArch64HotSpotRegisterAllocationConfig.java index ebbe11416dad..e214ea1c6a58 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotRegisterAllocationConfig.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/aarch64/AArch64HotSpotRegisterAllocationConfig.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.aarch64; +package jdk.graal.compiler.hotspot.aarch64; import static jdk.vm.ci.aarch64.AArch64.r0; import static jdk.vm.ci.aarch64.AArch64.r1; @@ -90,7 +90,7 @@ import java.util.ArrayList; import java.util.BitSet; -import jdk.compiler.graal.core.common.alloc.RegisterAllocationConfig; +import jdk.graal.compiler.core.common.alloc.RegisterAllocationConfig; import jdk.vm.ci.code.Register; import jdk.vm.ci.code.RegisterArray; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotReturnOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/aarch64/AArch64HotSpotReturnOp.java similarity index 85% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotReturnOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/aarch64/AArch64HotSpotReturnOp.java index 547a4eb550a0..89efcb744f8d 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotReturnOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/aarch64/AArch64HotSpotReturnOp.java @@ -22,21 +22,21 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.aarch64; +package jdk.graal.compiler.hotspot.aarch64; import static jdk.vm.ci.aarch64.AArch64.lr; import static jdk.vm.ci.aarch64.AArch64.r0; import static jdk.vm.ci.aarch64.AArch64.v0; import static jdk.vm.ci.code.ValueUtil.asRegister; -import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.ILLEGAL; -import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.REG; +import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.ILLEGAL; +import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.REG; -import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler; -import jdk.compiler.graal.hotspot.GraalHotSpotVMConfig; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.Opcode; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; -import jdk.compiler.graal.lir.gen.DiagnosticLIRGeneratorTool.ZapStackArgumentSpaceBeforeInstruction; +import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler; +import jdk.graal.compiler.hotspot.GraalHotSpotVMConfig; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.Opcode; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.lir.gen.DiagnosticLIRGeneratorTool.ZapStackArgumentSpaceBeforeInstruction; import jdk.vm.ci.code.Register; import jdk.vm.ci.meta.Value; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotSafepointOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/aarch64/AArch64HotSpotSafepointOp.java similarity index 85% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotSafepointOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/aarch64/AArch64HotSpotSafepointOp.java index de3574a9c3e0..cc8110af5e34 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotSafepointOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/aarch64/AArch64HotSpotSafepointOp.java @@ -22,23 +22,23 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.aarch64; +package jdk.graal.compiler.hotspot.aarch64; import static jdk.vm.ci.code.ValueUtil.asRegister; -import jdk.compiler.graal.asm.Label; -import jdk.compiler.graal.asm.aarch64.AArch64Address; -import jdk.compiler.graal.asm.aarch64.AArch64Assembler; -import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler; -import jdk.compiler.graal.hotspot.GraalHotSpotVMConfig; -import jdk.compiler.graal.hotspot.HotSpotHostBackend; -import jdk.compiler.graal.hotspot.HotSpotMarkId; -import jdk.compiler.graal.lir.LIRFrameState; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.Opcode; -import jdk.compiler.graal.lir.aarch64.AArch64Call; -import jdk.compiler.graal.lir.aarch64.AArch64LIRInstruction; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.asm.Label; +import jdk.graal.compiler.asm.aarch64.AArch64Address; +import jdk.graal.compiler.asm.aarch64.AArch64Assembler; +import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler; +import jdk.graal.compiler.hotspot.GraalHotSpotVMConfig; +import jdk.graal.compiler.hotspot.HotSpotHostBackend; +import jdk.graal.compiler.hotspot.HotSpotMarkId; +import jdk.graal.compiler.lir.LIRFrameState; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.Opcode; +import jdk.graal.compiler.lir.aarch64.AArch64Call; +import jdk.graal.compiler.lir.aarch64.AArch64LIRInstruction; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; import jdk.vm.ci.aarch64.AArch64; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotStrategySwitchOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/aarch64/AArch64HotSpotStrategySwitchOp.java similarity index 86% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotStrategySwitchOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/aarch64/AArch64HotSpotStrategySwitchOp.java index e12e4b952d96..a13c957c0ef6 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotStrategySwitchOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/aarch64/AArch64HotSpotStrategySwitchOp.java @@ -22,21 +22,21 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.aarch64; +package jdk.graal.compiler.hotspot.aarch64; import static jdk.vm.ci.code.ValueUtil.asRegister; import java.util.function.Function; -import jdk.compiler.graal.asm.aarch64.AArch64Assembler; -import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler; -import jdk.compiler.graal.core.common.calc.Condition; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.LabelRef; -import jdk.compiler.graal.lir.SwitchStrategy; -import jdk.compiler.graal.lir.aarch64.AArch64ControlFlow; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.asm.aarch64.AArch64Assembler; +import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler; +import jdk.graal.compiler.core.common.calc.Condition; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.LabelRef; +import jdk.graal.compiler.lir.SwitchStrategy; +import jdk.graal.compiler.lir.aarch64.AArch64ControlFlow; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; import jdk.vm.ci.code.Register; import jdk.vm.ci.hotspot.HotSpotMetaspaceConstant; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotSuitesCreator.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/aarch64/AArch64HotSpotSuitesCreator.java similarity index 80% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotSuitesCreator.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/aarch64/AArch64HotSpotSuitesCreator.java index b4f6270a63a8..4767d0064b65 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotSuitesCreator.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/aarch64/AArch64HotSpotSuitesCreator.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.aarch64; +package jdk.graal.compiler.hotspot.aarch64; -import jdk.compiler.graal.core.aarch64.AArch64SuitesCreator; -import jdk.compiler.graal.hotspot.HotSpotGraphBuilderPhase; -import jdk.compiler.graal.java.GraphBuilderPhase; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins; -import jdk.compiler.graal.phases.tiers.CompilerConfiguration; +import jdk.graal.compiler.core.aarch64.AArch64SuitesCreator; +import jdk.graal.compiler.hotspot.HotSpotGraphBuilderPhase; +import jdk.graal.compiler.java.GraphBuilderPhase; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins; +import jdk.graal.compiler.phases.tiers.CompilerConfiguration; public class AArch64HotSpotSuitesCreator extends AArch64SuitesCreator { diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotUnwindOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/aarch64/AArch64HotSpotUnwindOp.java similarity index 83% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotUnwindOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/aarch64/AArch64HotSpotUnwindOp.java index 099f4f9d43d0..0441c9b7b15a 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotUnwindOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/aarch64/AArch64HotSpotUnwindOp.java @@ -22,20 +22,20 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.aarch64; +package jdk.graal.compiler.hotspot.aarch64; import static jdk.vm.ci.aarch64.AArch64.lr; import static jdk.vm.ci.code.ValueUtil.asRegister; -import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler; -import jdk.compiler.graal.core.common.spi.ForeignCallLinkage; -import jdk.compiler.graal.hotspot.GraalHotSpotVMConfig; -import jdk.compiler.graal.hotspot.HotSpotBackend; -import jdk.compiler.graal.hotspot.stubs.UnwindExceptionToCallerStub; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.Opcode; -import jdk.compiler.graal.lir.aarch64.AArch64Call; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler; +import jdk.graal.compiler.core.common.spi.ForeignCallLinkage; +import jdk.graal.compiler.hotspot.GraalHotSpotVMConfig; +import jdk.graal.compiler.hotspot.HotSpotBackend; +import jdk.graal.compiler.hotspot.stubs.UnwindExceptionToCallerStub; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.Opcode; +import jdk.graal.compiler.lir.aarch64.AArch64Call; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; import jdk.vm.ci.code.CallingConvention; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotZAtomicReadAndWriteOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/aarch64/AArch64HotSpotZAtomicReadAndWriteOp.java similarity index 83% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotZAtomicReadAndWriteOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/aarch64/AArch64HotSpotZAtomicReadAndWriteOp.java index b7aa62259e6f..e555ef636f08 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotZAtomicReadAndWriteOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/aarch64/AArch64HotSpotZAtomicReadAndWriteOp.java @@ -22,18 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.aarch64; +package jdk.graal.compiler.hotspot.aarch64; import static jdk.vm.ci.code.ValueUtil.asRegister; -import jdk.compiler.graal.asm.aarch64.AArch64Address; -import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler; -import jdk.compiler.graal.core.common.spi.ForeignCallLinkage; -import jdk.compiler.graal.hotspot.GraalHotSpotVMConfig; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.Variable; -import jdk.compiler.graal.lir.aarch64.AArch64AtomicMove; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.asm.aarch64.AArch64Address; +import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler; +import jdk.graal.compiler.core.common.spi.ForeignCallLinkage; +import jdk.graal.compiler.hotspot.GraalHotSpotVMConfig; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.Variable; +import jdk.graal.compiler.lir.aarch64.AArch64AtomicMove; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; import jdk.vm.ci.aarch64.AArch64Kind; import jdk.vm.ci.meta.AllocatableValue; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotZBarrierSetLIRGenerator.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/aarch64/AArch64HotSpotZBarrierSetLIRGenerator.java similarity index 88% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotZBarrierSetLIRGenerator.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/aarch64/AArch64HotSpotZBarrierSetLIRGenerator.java index 46be0b649d5c..ba6b5c53fa70 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotZBarrierSetLIRGenerator.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/aarch64/AArch64HotSpotZBarrierSetLIRGenerator.java @@ -22,30 +22,30 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.aarch64; - -import jdk.compiler.graal.asm.Label; -import jdk.compiler.graal.asm.aarch64.AArch64Address; -import jdk.compiler.graal.asm.aarch64.AArch64Assembler; -import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler; -import jdk.compiler.graal.core.aarch64.AArch64BarrierSetLIRGenerator; -import jdk.compiler.graal.core.aarch64.AArch64LIRGenerator; -import jdk.compiler.graal.core.common.LIRKind; -import jdk.compiler.graal.core.common.memory.BarrierType; -import jdk.compiler.graal.core.common.memory.MemoryOrderMode; -import jdk.compiler.graal.core.common.spi.ForeignCallLinkage; -import jdk.compiler.graal.core.common.spi.ForeignCallsProvider; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.hotspot.GraalHotSpotVMConfig; -import jdk.compiler.graal.hotspot.meta.HotSpotHostForeignCallsProvider; -import jdk.compiler.graal.hotspot.meta.HotSpotProviders; -import jdk.compiler.graal.lir.LIRFrameState; -import jdk.compiler.graal.lir.LIRInstruction; -import jdk.compiler.graal.lir.Variable; -import jdk.compiler.graal.lir.aarch64.AArch64AddressValue; -import jdk.compiler.graal.lir.aarch64.AArch64Call; -import jdk.compiler.graal.lir.aarch64.AArch64FrameMap; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; +package jdk.graal.compiler.hotspot.aarch64; + +import jdk.graal.compiler.asm.Label; +import jdk.graal.compiler.asm.aarch64.AArch64Address; +import jdk.graal.compiler.asm.aarch64.AArch64Assembler; +import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler; +import jdk.graal.compiler.core.aarch64.AArch64BarrierSetLIRGenerator; +import jdk.graal.compiler.core.aarch64.AArch64LIRGenerator; +import jdk.graal.compiler.core.common.LIRKind; +import jdk.graal.compiler.core.common.memory.BarrierType; +import jdk.graal.compiler.core.common.memory.MemoryOrderMode; +import jdk.graal.compiler.core.common.spi.ForeignCallLinkage; +import jdk.graal.compiler.core.common.spi.ForeignCallsProvider; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.hotspot.GraalHotSpotVMConfig; +import jdk.graal.compiler.hotspot.meta.HotSpotHostForeignCallsProvider; +import jdk.graal.compiler.hotspot.meta.HotSpotProviders; +import jdk.graal.compiler.lir.LIRFrameState; +import jdk.graal.compiler.lir.LIRInstruction; +import jdk.graal.compiler.lir.Variable; +import jdk.graal.compiler.lir.aarch64.AArch64AddressValue; +import jdk.graal.compiler.lir.aarch64.AArch64Call; +import jdk.graal.compiler.lir.aarch64.AArch64FrameMap; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; import jdk.vm.ci.aarch64.AArch64Kind; import jdk.vm.ci.code.CallingConvention; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotZBarrieredOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/aarch64/AArch64HotSpotZBarrieredOp.java similarity index 81% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotZBarrieredOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/aarch64/AArch64HotSpotZBarrieredOp.java index 3ac4d3f356ab..21c054ffc31c 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotZBarrieredOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/aarch64/AArch64HotSpotZBarrieredOp.java @@ -22,19 +22,19 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.aarch64; +package jdk.graal.compiler.hotspot.aarch64; import static jdk.vm.ci.code.ValueUtil.asRegister; -import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.COMPOSITE; -import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.REG; +import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.COMPOSITE; +import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.REG; -import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler; -import jdk.compiler.graal.core.common.spi.ForeignCallLinkage; -import jdk.compiler.graal.hotspot.GraalHotSpotVMConfig; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.aarch64.AArch64AddressValue; -import jdk.compiler.graal.lir.aarch64.AArch64LIRInstruction; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler; +import jdk.graal.compiler.core.common.spi.ForeignCallLinkage; +import jdk.graal.compiler.hotspot.GraalHotSpotVMConfig; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.aarch64.AArch64AddressValue; +import jdk.graal.compiler.lir.aarch64.AArch64LIRInstruction; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; import jdk.vm.ci.meta.AllocatableValue; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotZCompareAndSwapOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/aarch64/AArch64HotSpotZCompareAndSwapOp.java similarity index 82% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotZCompareAndSwapOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/aarch64/AArch64HotSpotZCompareAndSwapOp.java index 9977e33afdb4..b78470f7a072 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotZCompareAndSwapOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/aarch64/AArch64HotSpotZCompareAndSwapOp.java @@ -22,20 +22,20 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.aarch64; +package jdk.graal.compiler.hotspot.aarch64; import static jdk.vm.ci.code.ValueUtil.asRegister; -import jdk.compiler.graal.asm.Label; -import jdk.compiler.graal.asm.aarch64.AArch64Address; -import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler; -import jdk.compiler.graal.core.common.memory.MemoryOrderMode; -import jdk.compiler.graal.core.common.spi.ForeignCallLinkage; -import jdk.compiler.graal.hotspot.GraalHotSpotVMConfig; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.Opcode; -import jdk.compiler.graal.lir.aarch64.AArch64AtomicMove; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.asm.Label; +import jdk.graal.compiler.asm.aarch64.AArch64Address; +import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler; +import jdk.graal.compiler.core.common.memory.MemoryOrderMode; +import jdk.graal.compiler.core.common.spi.ForeignCallLinkage; +import jdk.graal.compiler.hotspot.GraalHotSpotVMConfig; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.Opcode; +import jdk.graal.compiler.lir.aarch64.AArch64AtomicMove; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; import jdk.vm.ci.aarch64.AArch64Kind; import jdk.vm.ci.meta.AllocatableValue; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotZReadBarrierOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/aarch64/AArch64HotSpotZReadBarrierOp.java similarity index 84% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotZReadBarrierOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/aarch64/AArch64HotSpotZReadBarrierOp.java index cdaabdfa421b..e2bd000a6cc4 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotZReadBarrierOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/aarch64/AArch64HotSpotZReadBarrierOp.java @@ -22,21 +22,21 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.aarch64; +package jdk.graal.compiler.hotspot.aarch64; import static jdk.vm.ci.code.ValueUtil.asRegister; -import jdk.compiler.graal.asm.aarch64.AArch64Address; -import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler; -import jdk.compiler.graal.core.common.memory.MemoryOrderMode; -import jdk.compiler.graal.core.common.spi.ForeignCallLinkage; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.hotspot.GraalHotSpotVMConfig; -import jdk.compiler.graal.lir.LIRFrameState; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.Variable; -import jdk.compiler.graal.lir.aarch64.AArch64AddressValue; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.asm.aarch64.AArch64Address; +import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler; +import jdk.graal.compiler.core.common.memory.MemoryOrderMode; +import jdk.graal.compiler.core.common.spi.ForeignCallLinkage; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.hotspot.GraalHotSpotVMConfig; +import jdk.graal.compiler.lir.LIRFrameState; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.Variable; +import jdk.graal.compiler.lir.aarch64.AArch64AddressValue; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64IndirectCallOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/aarch64/AArch64IndirectCallOp.java similarity index 84% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64IndirectCallOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/aarch64/AArch64IndirectCallOp.java index 0515d4065fb4..ba211cc0a61e 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64IndirectCallOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/aarch64/AArch64IndirectCallOp.java @@ -22,20 +22,20 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.aarch64; +package jdk.graal.compiler.hotspot.aarch64; import static jdk.vm.ci.aarch64.AArch64.r12; import static jdk.vm.ci.code.ValueUtil.asRegister; -import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.REG; +import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.REG; -import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler; -import jdk.compiler.graal.hotspot.HotSpotMarkId; -import jdk.compiler.graal.lir.LIRFrameState; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.Opcode; -import jdk.compiler.graal.lir.aarch64.AArch64Call; -import jdk.compiler.graal.lir.aarch64.AArch64Call.IndirectCallOp; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler; +import jdk.graal.compiler.hotspot.HotSpotMarkId; +import jdk.graal.compiler.lir.LIRFrameState; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.Opcode; +import jdk.graal.compiler.lir.aarch64.AArch64Call; +import jdk.graal.compiler.lir.aarch64.AArch64Call.IndirectCallOp; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; import jdk.vm.ci.code.Register; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64DeoptimizeOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64DeoptimizeOp.java similarity index 78% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64DeoptimizeOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64DeoptimizeOp.java index 558f3c212995..5617afed38ba 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64DeoptimizeOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64DeoptimizeOp.java @@ -22,18 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.amd64; +package jdk.graal.compiler.hotspot.amd64; -import static jdk.compiler.graal.hotspot.HotSpotHostBackend.DEOPT_BLOB_UNCOMMON_TRAP; +import static jdk.graal.compiler.hotspot.HotSpotHostBackend.DEOPT_BLOB_UNCOMMON_TRAP; -import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler; -import jdk.compiler.graal.lir.LIRFrameState; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.Opcode; -import jdk.compiler.graal.lir.StandardOp.BlockEndOp; -import jdk.compiler.graal.lir.amd64.AMD64BlockEndOp; -import jdk.compiler.graal.lir.amd64.AMD64Call; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler; +import jdk.graal.compiler.lir.LIRFrameState; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.Opcode; +import jdk.graal.compiler.lir.StandardOp.BlockEndOp; +import jdk.graal.compiler.lir.amd64.AMD64BlockEndOp; +import jdk.graal.compiler.lir.amd64.AMD64Call; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; @Opcode("DEOPT") final class AMD64DeoptimizeOp extends AMD64BlockEndOp implements BlockEndOp { diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotAddressLowering.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotSpotAddressLowering.java similarity index 85% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotAddressLowering.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotSpotAddressLowering.java index b63e2a74068f..3920bd3b1d9b 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotAddressLowering.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotSpotAddressLowering.java @@ -23,35 +23,35 @@ * questions. */ -package jdk.compiler.graal.hotspot.amd64; +package jdk.graal.compiler.hotspot.amd64; -import jdk.compiler.graal.hotspot.GraalHotSpotVMConfig; +import jdk.graal.compiler.hotspot.GraalHotSpotVMConfig; import org.graalvm.collections.EconomicMap; -import jdk.compiler.graal.asm.amd64.AMD64Address; -import jdk.compiler.graal.core.common.Stride; -import jdk.compiler.graal.core.amd64.AMD64AddressNode; -import jdk.compiler.graal.core.amd64.AMD64CompressAddressLowering; -import jdk.compiler.graal.core.common.CompressEncoding; -import jdk.compiler.graal.core.common.type.IntegerStamp; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.nodes.CompressionNode; -import jdk.compiler.graal.nodes.ConstantNode; -import jdk.compiler.graal.nodes.NodeView; -import jdk.compiler.graal.nodes.PhiNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.calc.AddNode; -import jdk.compiler.graal.nodes.calc.SignExtendNode; -import jdk.compiler.graal.nodes.calc.ZeroExtendNode; -import jdk.compiler.graal.nodes.loop.BasicInductionVariable; -import jdk.compiler.graal.nodes.loop.CountedLoopInfo; -import jdk.compiler.graal.nodes.loop.DerivedInductionVariable; -import jdk.compiler.graal.nodes.loop.InductionVariable; -import jdk.compiler.graal.nodes.loop.LoopEx; -import jdk.compiler.graal.nodes.loop.LoopsData; -import jdk.compiler.graal.nodes.memory.address.AddressNode; -import jdk.compiler.graal.nodes.memory.address.OffsetAddressNode; -import jdk.compiler.graal.nodes.spi.LoopsDataProvider; +import jdk.graal.compiler.asm.amd64.AMD64Address; +import jdk.graal.compiler.core.common.Stride; +import jdk.graal.compiler.core.amd64.AMD64AddressNode; +import jdk.graal.compiler.core.amd64.AMD64CompressAddressLowering; +import jdk.graal.compiler.core.common.CompressEncoding; +import jdk.graal.compiler.core.common.type.IntegerStamp; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.nodes.CompressionNode; +import jdk.graal.compiler.nodes.ConstantNode; +import jdk.graal.compiler.nodes.NodeView; +import jdk.graal.compiler.nodes.PhiNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.calc.AddNode; +import jdk.graal.compiler.nodes.calc.SignExtendNode; +import jdk.graal.compiler.nodes.calc.ZeroExtendNode; +import jdk.graal.compiler.nodes.loop.BasicInductionVariable; +import jdk.graal.compiler.nodes.loop.CountedLoopInfo; +import jdk.graal.compiler.nodes.loop.DerivedInductionVariable; +import jdk.graal.compiler.nodes.loop.InductionVariable; +import jdk.graal.compiler.nodes.loop.LoopEx; +import jdk.graal.compiler.nodes.loop.LoopsData; +import jdk.graal.compiler.nodes.memory.address.AddressNode; +import jdk.graal.compiler.nodes.memory.address.OffsetAddressNode; +import jdk.graal.compiler.nodes.spi.LoopsDataProvider; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotBackend.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotSpotBackend.java similarity index 89% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotBackend.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotSpotBackend.java index 3808534bd9fd..e6878f92ce4b 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotBackend.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotSpotBackend.java @@ -22,54 +22,54 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.amd64; +package jdk.graal.compiler.hotspot.amd64; import static jdk.vm.ci.amd64.AMD64.r10; import static jdk.vm.ci.amd64.AMD64.rax; import static jdk.vm.ci.amd64.AMD64.rbp; import static jdk.vm.ci.amd64.AMD64.rsp; import static jdk.vm.ci.code.ValueUtil.asRegister; -import static jdk.compiler.graal.core.common.GraalOptions.ZapStackOnMethodEntry; - -import jdk.compiler.graal.asm.Label; -import jdk.compiler.graal.asm.amd64.AMD64Address; -import jdk.compiler.graal.asm.amd64.AMD64Assembler; -import jdk.compiler.graal.asm.amd64.AMD64Assembler.ConditionFlag; -import jdk.compiler.graal.asm.amd64.AMD64BaseAssembler; -import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler; -import jdk.compiler.graal.code.CompilationResult; -import jdk.compiler.graal.core.amd64.AMD64NodeMatchRules; -import jdk.compiler.graal.core.common.NumUtil; -import jdk.compiler.graal.core.common.alloc.RegisterAllocationConfig; -import jdk.compiler.graal.core.common.spi.ForeignCallLinkage; -import jdk.compiler.graal.core.gen.LIRGenerationProvider; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.hotspot.GraalHotSpotVMConfig; -import jdk.compiler.graal.hotspot.HotSpotDataBuilder; -import jdk.compiler.graal.hotspot.HotSpotGraalRuntimeProvider; -import jdk.compiler.graal.hotspot.HotSpotHostBackend; -import jdk.compiler.graal.hotspot.HotSpotLIRGenerationResult; -import jdk.compiler.graal.hotspot.HotSpotMarkId; -import jdk.compiler.graal.hotspot.meta.HotSpotForeignCallsProvider; -import jdk.compiler.graal.hotspot.meta.HotSpotHostForeignCallsProvider; -import jdk.compiler.graal.hotspot.meta.HotSpotProviders; -import jdk.compiler.graal.hotspot.stubs.Stub; -import jdk.compiler.graal.lir.LIR; -import jdk.compiler.graal.lir.amd64.AMD64Call; -import jdk.compiler.graal.lir.amd64.AMD64FrameMap; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; -import jdk.compiler.graal.lir.asm.CompilationResultBuilderFactory; -import jdk.compiler.graal.lir.asm.DataBuilder; -import jdk.compiler.graal.lir.asm.EntryPointDecorator; -import jdk.compiler.graal.lir.asm.FrameContext; -import jdk.compiler.graal.lir.framemap.FrameMap; -import jdk.compiler.graal.lir.framemap.FrameMapBuilder; -import jdk.compiler.graal.lir.gen.LIRGenerationResult; -import jdk.compiler.graal.lir.gen.LIRGeneratorTool; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool; -import jdk.compiler.graal.options.OptionValues; +import static jdk.graal.compiler.core.common.GraalOptions.ZapStackOnMethodEntry; + +import jdk.graal.compiler.asm.Label; +import jdk.graal.compiler.asm.amd64.AMD64Address; +import jdk.graal.compiler.asm.amd64.AMD64Assembler; +import jdk.graal.compiler.asm.amd64.AMD64Assembler.ConditionFlag; +import jdk.graal.compiler.asm.amd64.AMD64BaseAssembler; +import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler; +import jdk.graal.compiler.code.CompilationResult; +import jdk.graal.compiler.core.amd64.AMD64NodeMatchRules; +import jdk.graal.compiler.core.common.NumUtil; +import jdk.graal.compiler.core.common.alloc.RegisterAllocationConfig; +import jdk.graal.compiler.core.common.spi.ForeignCallLinkage; +import jdk.graal.compiler.core.gen.LIRGenerationProvider; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.hotspot.GraalHotSpotVMConfig; +import jdk.graal.compiler.hotspot.HotSpotDataBuilder; +import jdk.graal.compiler.hotspot.HotSpotGraalRuntimeProvider; +import jdk.graal.compiler.hotspot.HotSpotHostBackend; +import jdk.graal.compiler.hotspot.HotSpotLIRGenerationResult; +import jdk.graal.compiler.hotspot.HotSpotMarkId; +import jdk.graal.compiler.hotspot.meta.HotSpotForeignCallsProvider; +import jdk.graal.compiler.hotspot.meta.HotSpotHostForeignCallsProvider; +import jdk.graal.compiler.hotspot.meta.HotSpotProviders; +import jdk.graal.compiler.hotspot.stubs.Stub; +import jdk.graal.compiler.lir.LIR; +import jdk.graal.compiler.lir.amd64.AMD64Call; +import jdk.graal.compiler.lir.amd64.AMD64FrameMap; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.lir.asm.CompilationResultBuilderFactory; +import jdk.graal.compiler.lir.asm.DataBuilder; +import jdk.graal.compiler.lir.asm.EntryPointDecorator; +import jdk.graal.compiler.lir.asm.FrameContext; +import jdk.graal.compiler.lir.framemap.FrameMap; +import jdk.graal.compiler.lir.framemap.FrameMapBuilder; +import jdk.graal.compiler.lir.gen.LIRGenerationResult; +import jdk.graal.compiler.lir.gen.LIRGeneratorTool; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool; +import jdk.graal.compiler.options.OptionValues; import jdk.vm.ci.amd64.AMD64; import jdk.vm.ci.code.CallingConvention; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotBackendFactory.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotSpotBackendFactory.java similarity index 84% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotBackendFactory.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotSpotBackendFactory.java index 98103ca7d8e6..c09c6447fa2c 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotBackendFactory.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotSpotBackendFactory.java @@ -22,34 +22,34 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.amd64; +package jdk.graal.compiler.hotspot.amd64; import java.util.ArrayList; import java.util.List; -import jdk.compiler.graal.hotspot.GraalHotSpotVMConfig; -import jdk.compiler.graal.hotspot.HotSpotBackendFactory; -import jdk.compiler.graal.hotspot.HotSpotGraalRuntimeProvider; -import jdk.compiler.graal.hotspot.HotSpotReplacementsImpl; -import jdk.compiler.graal.hotspot.meta.AddressLoweringHotSpotSuitesProvider; -import jdk.compiler.graal.hotspot.meta.HotSpotGraphBuilderPlugins; -import jdk.compiler.graal.hotspot.meta.HotSpotHostForeignCallsProvider; -import jdk.compiler.graal.hotspot.meta.HotSpotLoweringProvider; -import jdk.compiler.graal.hotspot.meta.HotSpotMetaAccessExtensionProvider; -import jdk.compiler.graal.hotspot.meta.HotSpotPlatformConfigurationProvider; -import jdk.compiler.graal.hotspot.meta.HotSpotProviders; -import jdk.compiler.graal.hotspot.meta.HotSpotRegisters; -import jdk.compiler.graal.hotspot.meta.HotSpotRegistersProvider; -import jdk.compiler.graal.hotspot.meta.HotSpotSnippetReflectionProvider; -import jdk.compiler.graal.hotspot.meta.HotSpotSuitesProvider; -import jdk.compiler.graal.hotspot.word.HotSpotWordTypes; -import jdk.compiler.graal.nodes.gc.BarrierSet; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.phases.common.AddressLoweringByNodePhase; -import jdk.compiler.graal.phases.tiers.CompilerConfiguration; -import jdk.compiler.graal.replacements.amd64.AMD64GraphBuilderPlugins; -import jdk.compiler.graal.serviceprovider.ServiceProvider; +import jdk.graal.compiler.hotspot.GraalHotSpotVMConfig; +import jdk.graal.compiler.hotspot.HotSpotBackendFactory; +import jdk.graal.compiler.hotspot.HotSpotGraalRuntimeProvider; +import jdk.graal.compiler.hotspot.HotSpotReplacementsImpl; +import jdk.graal.compiler.hotspot.meta.AddressLoweringHotSpotSuitesProvider; +import jdk.graal.compiler.hotspot.meta.HotSpotGraphBuilderPlugins; +import jdk.graal.compiler.hotspot.meta.HotSpotHostForeignCallsProvider; +import jdk.graal.compiler.hotspot.meta.HotSpotLoweringProvider; +import jdk.graal.compiler.hotspot.meta.HotSpotMetaAccessExtensionProvider; +import jdk.graal.compiler.hotspot.meta.HotSpotPlatformConfigurationProvider; +import jdk.graal.compiler.hotspot.meta.HotSpotProviders; +import jdk.graal.compiler.hotspot.meta.HotSpotRegisters; +import jdk.graal.compiler.hotspot.meta.HotSpotRegistersProvider; +import jdk.graal.compiler.hotspot.meta.HotSpotSnippetReflectionProvider; +import jdk.graal.compiler.hotspot.meta.HotSpotSuitesProvider; +import jdk.graal.compiler.hotspot.word.HotSpotWordTypes; +import jdk.graal.compiler.nodes.gc.BarrierSet; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.phases.common.AddressLoweringByNodePhase; +import jdk.graal.compiler.phases.tiers.CompilerConfiguration; +import jdk.graal.compiler.replacements.amd64.AMD64GraphBuilderPlugins; +import jdk.graal.compiler.serviceprovider.ServiceProvider; import jdk.vm.ci.amd64.AMD64; import jdk.vm.ci.code.Architecture; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotCRuntimeCallEpilogueOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotSpotCRuntimeCallEpilogueOp.java similarity index 87% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotCRuntimeCallEpilogueOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotSpotCRuntimeCallEpilogueOp.java index c1ab7ceae1b6..b1d38148d483 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotCRuntimeCallEpilogueOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotSpotCRuntimeCallEpilogueOp.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.amd64; +package jdk.graal.compiler.hotspot.amd64; -import jdk.compiler.graal.asm.amd64.AMD64Address; -import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.Opcode; -import jdk.compiler.graal.lir.amd64.AMD64LIRInstruction; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.asm.amd64.AMD64Address; +import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.Opcode; +import jdk.graal.compiler.lir.amd64.AMD64LIRInstruction; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotCRuntimeCallPrologueOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotSpotCRuntimeCallPrologueOp.java similarity index 85% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotCRuntimeCallPrologueOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotSpotCRuntimeCallPrologueOp.java index bbbecedba1c5..260a3e9e2d06 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotCRuntimeCallPrologueOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotSpotCRuntimeCallPrologueOp.java @@ -22,16 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.amd64; +package jdk.graal.compiler.hotspot.amd64; import static jdk.vm.ci.amd64.AMD64.rsp; -import jdk.compiler.graal.asm.amd64.AMD64Address; -import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.Opcode; -import jdk.compiler.graal.lir.amd64.AMD64LIRInstruction; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.asm.amd64.AMD64Address; +import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.Opcode; +import jdk.graal.compiler.lir.amd64.AMD64LIRInstruction; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotCounterOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotSpotCounterOp.java similarity index 87% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotCounterOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotSpotCounterOp.java index e88330a3803f..aac01619f841 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotCounterOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotSpotCounterOp.java @@ -22,27 +22,27 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.amd64; +package jdk.graal.compiler.hotspot.amd64; import static jdk.vm.ci.amd64.AMD64.rax; import static jdk.vm.ci.amd64.AMD64.rbx; import static jdk.vm.ci.code.ValueUtil.asRegister; import static jdk.vm.ci.code.ValueUtil.isRegister; -import static jdk.compiler.graal.lir.LIRValueUtil.asJavaConstant; -import static jdk.compiler.graal.lir.LIRValueUtil.isJavaConstant; +import static jdk.graal.compiler.lir.LIRValueUtil.asJavaConstant; +import static jdk.graal.compiler.lir.LIRValueUtil.isJavaConstant; -import jdk.compiler.graal.asm.Label; -import jdk.compiler.graal.asm.amd64.AMD64Address; -import jdk.compiler.graal.asm.amd64.AMD64Assembler; -import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.hotspot.GraalHotSpotVMConfig; -import jdk.compiler.graal.hotspot.HotSpotCounterOp; -import jdk.compiler.graal.hotspot.debug.BenchmarkCounters; -import jdk.compiler.graal.hotspot.meta.HotSpotRegistersProvider; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.Opcode; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.asm.Label; +import jdk.graal.compiler.asm.amd64.AMD64Address; +import jdk.graal.compiler.asm.amd64.AMD64Assembler; +import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.hotspot.GraalHotSpotVMConfig; +import jdk.graal.compiler.hotspot.HotSpotCounterOp; +import jdk.graal.compiler.hotspot.debug.BenchmarkCounters; +import jdk.graal.compiler.hotspot.meta.HotSpotRegistersProvider; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.Opcode; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; import jdk.vm.ci.code.Register; import jdk.vm.ci.code.TargetDescription; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotDeoptimizeCallerOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotSpotDeoptimizeCallerOp.java similarity index 84% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotDeoptimizeCallerOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotSpotDeoptimizeCallerOp.java index 006a94c0c745..d6d4bd48c52a 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotDeoptimizeCallerOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotSpotDeoptimizeCallerOp.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.amd64; +package jdk.graal.compiler.hotspot.amd64; -import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler; -import jdk.compiler.graal.hotspot.HotSpotHostBackend; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.Opcode; -import jdk.compiler.graal.lir.amd64.AMD64Call; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler; +import jdk.graal.compiler.hotspot.HotSpotHostBackend; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.Opcode; +import jdk.graal.compiler.lir.amd64.AMD64Call; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; /** * Removes the current frame and tail calls the uncommon trap routine. diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotDeoptimizeWithExceptionCallerOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotSpotDeoptimizeWithExceptionCallerOp.java similarity index 86% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotDeoptimizeWithExceptionCallerOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotSpotDeoptimizeWithExceptionCallerOp.java index 914847fb0aaa..b3040e284817 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotDeoptimizeWithExceptionCallerOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotSpotDeoptimizeWithExceptionCallerOp.java @@ -22,18 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.amd64; +package jdk.graal.compiler.hotspot.amd64; import static jdk.vm.ci.code.ValueUtil.asRegister; -import static jdk.compiler.graal.hotspot.HotSpotHostBackend.DEOPT_BLOB_UNPACK_WITH_EXCEPTION_IN_TLS; +import static jdk.graal.compiler.hotspot.HotSpotHostBackend.DEOPT_BLOB_UNPACK_WITH_EXCEPTION_IN_TLS; -import jdk.compiler.graal.asm.amd64.AMD64Address; -import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler; -import jdk.compiler.graal.hotspot.GraalHotSpotVMConfig; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.Opcode; -import jdk.compiler.graal.lir.amd64.AMD64Call; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.asm.amd64.AMD64Address; +import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler; +import jdk.graal.compiler.hotspot.GraalHotSpotVMConfig; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.Opcode; +import jdk.graal.compiler.lir.amd64.AMD64Call; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; import jdk.vm.ci.amd64.AMD64; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotDirectStaticCallOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotSpotDirectStaticCallOp.java similarity index 82% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotDirectStaticCallOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotSpotDirectStaticCallOp.java index 089971799c78..a3e57e612281 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotDirectStaticCallOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotSpotDirectStaticCallOp.java @@ -22,18 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.amd64; +package jdk.graal.compiler.hotspot.amd64; -import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler; -import jdk.compiler.graal.hotspot.GraalHotSpotVMConfig; -import jdk.compiler.graal.hotspot.HotSpotMarkId; -import jdk.compiler.graal.lir.LIRFrameState; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.Opcode; -import jdk.compiler.graal.lir.amd64.AMD64Call; -import jdk.compiler.graal.lir.amd64.AMD64Call.DirectCallOp; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; -import jdk.compiler.graal.nodes.CallTargetNode.InvokeKind; +import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler; +import jdk.graal.compiler.hotspot.GraalHotSpotVMConfig; +import jdk.graal.compiler.hotspot.HotSpotMarkId; +import jdk.graal.compiler.lir.LIRFrameState; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.Opcode; +import jdk.graal.compiler.lir.amd64.AMD64Call; +import jdk.graal.compiler.lir.amd64.AMD64Call.DirectCallOp; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.nodes.CallTargetNode.InvokeKind; import jdk.vm.ci.hotspot.HotSpotResolvedJavaMethod; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotEpilogueBlockEndOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotSpotEpilogueBlockEndOp.java similarity index 83% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotEpilogueBlockEndOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotSpotEpilogueBlockEndOp.java index 10fee44a61c3..a3a3a849a4bf 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotEpilogueBlockEndOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotSpotEpilogueBlockEndOp.java @@ -22,21 +22,21 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.amd64; +package jdk.graal.compiler.hotspot.amd64; import static jdk.vm.ci.amd64.AMD64.rbp; import static jdk.vm.ci.code.ValueUtil.asRegister; import static jdk.vm.ci.code.ValueUtil.isStackSlot; -import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.ILLEGAL; -import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.REG; -import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.STACK; +import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.ILLEGAL; +import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.REG; +import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.STACK; -import jdk.compiler.graal.asm.amd64.AMD64Address; -import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.amd64.AMD64BlockEndOp; -import jdk.compiler.graal.lir.amd64.AMD64FrameMap; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.asm.amd64.AMD64Address; +import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.amd64.AMD64BlockEndOp; +import jdk.graal.compiler.lir.amd64.AMD64FrameMap; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; import jdk.vm.ci.code.Register; import jdk.vm.ci.meta.AllocatableValue; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotForeignCallsProvider.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotSpotForeignCallsProvider.java similarity index 83% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotForeignCallsProvider.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotSpotForeignCallsProvider.java index 3a6cfb4693c2..ae88f7413530 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotForeignCallsProvider.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotSpotForeignCallsProvider.java @@ -22,33 +22,33 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.amd64; +package jdk.graal.compiler.hotspot.amd64; import static jdk.vm.ci.amd64.AMD64.rax; import static jdk.vm.ci.amd64.AMD64.rdx; import static jdk.vm.ci.meta.Value.ILLEGAL; -import static jdk.compiler.graal.replacements.nodes.BinaryMathIntrinsicNode.BinaryOperation.POW; -import static jdk.compiler.graal.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation.COS; -import static jdk.compiler.graal.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation.EXP; -import static jdk.compiler.graal.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation.LOG; -import static jdk.compiler.graal.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation.LOG10; -import static jdk.compiler.graal.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation.SIN; -import static jdk.compiler.graal.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation.TAN; +import static jdk.graal.compiler.replacements.nodes.BinaryMathIntrinsicNode.BinaryOperation.POW; +import static jdk.graal.compiler.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation.COS; +import static jdk.graal.compiler.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation.EXP; +import static jdk.graal.compiler.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation.LOG; +import static jdk.graal.compiler.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation.LOG10; +import static jdk.graal.compiler.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation.SIN; +import static jdk.graal.compiler.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation.TAN; -import jdk.compiler.graal.core.common.LIRKind; -import jdk.compiler.graal.hotspot.GraalHotSpotVMConfig; -import jdk.compiler.graal.hotspot.HotSpotBackend; -import jdk.compiler.graal.hotspot.HotSpotForeignCallLinkage; -import jdk.compiler.graal.hotspot.HotSpotForeignCallLinkageImpl; -import jdk.compiler.graal.hotspot.HotSpotGraalRuntimeProvider; -import jdk.compiler.graal.hotspot.meta.HotSpotForeignCallDescriptor; -import jdk.compiler.graal.hotspot.meta.HotSpotHostForeignCallsProvider; -import jdk.compiler.graal.hotspot.meta.HotSpotProviders; -import jdk.compiler.graal.hotspot.stubs.IntrinsicStubsGen; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.replacements.nodes.ArrayEqualsForeignCalls; -import jdk.compiler.graal.replacements.nodes.VectorizedHashCodeNode; -import jdk.compiler.graal.word.WordTypes; +import jdk.graal.compiler.core.common.LIRKind; +import jdk.graal.compiler.hotspot.GraalHotSpotVMConfig; +import jdk.graal.compiler.hotspot.HotSpotBackend; +import jdk.graal.compiler.hotspot.HotSpotForeignCallLinkage; +import jdk.graal.compiler.hotspot.HotSpotForeignCallLinkageImpl; +import jdk.graal.compiler.hotspot.HotSpotGraalRuntimeProvider; +import jdk.graal.compiler.hotspot.meta.HotSpotForeignCallDescriptor; +import jdk.graal.compiler.hotspot.meta.HotSpotHostForeignCallsProvider; +import jdk.graal.compiler.hotspot.meta.HotSpotProviders; +import jdk.graal.compiler.hotspot.stubs.IntrinsicStubsGen; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.replacements.nodes.ArrayEqualsForeignCalls; +import jdk.graal.compiler.replacements.nodes.VectorizedHashCodeNode; +import jdk.graal.compiler.word.WordTypes; import jdk.vm.ci.code.CallingConvention; import jdk.vm.ci.code.CodeCacheProvider; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotFrameMap.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotSpotFrameMap.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotFrameMap.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotSpotFrameMap.java index d9f31cb054bb..6da266604e84 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotFrameMap.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotSpotFrameMap.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.amd64; +package jdk.graal.compiler.hotspot.amd64; import static jdk.vm.ci.amd64.AMD64.MASK; import static jdk.vm.ci.code.ValueUtil.asStackSlot; -import jdk.compiler.graal.core.common.LIRKind; -import jdk.compiler.graal.hotspot.GraalHotSpotVMConfig; -import jdk.compiler.graal.lir.amd64.AMD64FrameMap; +import jdk.graal.compiler.core.common.LIRKind; +import jdk.graal.compiler.hotspot.GraalHotSpotVMConfig; +import jdk.graal.compiler.lir.amd64.AMD64FrameMap; import jdk.vm.ci.amd64.AMD64Kind; import jdk.vm.ci.code.CodeCacheProvider; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotFrameMapBuilder.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotSpotFrameMapBuilder.java similarity index 93% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotFrameMapBuilder.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotSpotFrameMapBuilder.java index bd325eadb269..dd75a1f5b506 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotFrameMapBuilder.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotSpotFrameMapBuilder.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.amd64; +package jdk.graal.compiler.hotspot.amd64; -import jdk.compiler.graal.lir.amd64.AMD64FrameMapBuilder; -import jdk.compiler.graal.lir.framemap.FrameMap; +import jdk.graal.compiler.lir.amd64.AMD64FrameMapBuilder; +import jdk.graal.compiler.lir.framemap.FrameMap; import jdk.vm.ci.code.CodeCacheProvider; import jdk.vm.ci.code.RegisterConfig; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotIndirectCallOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotSpotIndirectCallOp.java similarity index 85% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotIndirectCallOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotSpotIndirectCallOp.java index 50673bb2b6f1..73a338e69ad9 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotIndirectCallOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotSpotIndirectCallOp.java @@ -22,19 +22,19 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.amd64; +package jdk.graal.compiler.hotspot.amd64; import static jdk.vm.ci.code.ValueUtil.asRegister; -import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.REG; +import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.REG; -import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler; -import jdk.compiler.graal.hotspot.HotSpotMarkId; -import jdk.compiler.graal.lir.LIRFrameState; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.Opcode; -import jdk.compiler.graal.lir.amd64.AMD64Call; -import jdk.compiler.graal.lir.amd64.AMD64Call.IndirectCallOp; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler; +import jdk.graal.compiler.hotspot.HotSpotMarkId; +import jdk.graal.compiler.lir.LIRFrameState; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.Opcode; +import jdk.graal.compiler.lir.amd64.AMD64Call; +import jdk.graal.compiler.lir.amd64.AMD64Call.IndirectCallOp; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; import jdk.vm.ci.amd64.AMD64; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotJumpToExceptionHandlerInCallerOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotSpotJumpToExceptionHandlerInCallerOp.java similarity index 89% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotJumpToExceptionHandlerInCallerOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotSpotJumpToExceptionHandlerInCallerOp.java index 9ea4143835f8..d8029217695b 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotJumpToExceptionHandlerInCallerOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotSpotJumpToExceptionHandlerInCallerOp.java @@ -22,16 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.amd64; +package jdk.graal.compiler.hotspot.amd64; import static jdk.vm.ci.amd64.AMD64.rsp; import static jdk.vm.ci.code.ValueUtil.asRegister; -import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.REG; +import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.REG; -import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.Opcode; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.Opcode; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; import jdk.vm.ci.meta.AllocatableValue; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotLIRGenerator.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotSpotLIRGenerator.java similarity index 90% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotLIRGenerator.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotSpotLIRGenerator.java index f1f251858f2d..7b885f39b99c 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotLIRGenerator.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotSpotLIRGenerator.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.amd64; +package jdk.graal.compiler.hotspot.amd64; import static jdk.vm.ci.amd64.AMD64.rbp; import static jdk.vm.ci.code.ValueUtil.isStackSlot; @@ -31,55 +31,55 @@ import java.util.EnumSet; import java.util.List; -import jdk.compiler.graal.asm.amd64.AMD64Address; -import jdk.compiler.graal.asm.amd64.AVXKind.AVXSize; -import jdk.compiler.graal.core.amd64.AMD64ArithmeticLIRGenerator; -import jdk.compiler.graal.core.amd64.AMD64LIRGenerator; -import jdk.compiler.graal.core.common.CompressEncoding; -import jdk.compiler.graal.core.common.LIRKind; -import jdk.compiler.graal.core.common.Stride; -import jdk.compiler.graal.core.common.memory.MemoryOrderMode; -import jdk.compiler.graal.core.common.spi.ForeignCallLinkage; -import jdk.compiler.graal.core.common.spi.LIRKindTool; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.hotspot.GraalHotSpotVMConfig; -import jdk.compiler.graal.hotspot.HotSpotBackend; -import jdk.compiler.graal.hotspot.HotSpotDebugInfoBuilder; -import jdk.compiler.graal.hotspot.HotSpotForeignCallLinkage; -import jdk.compiler.graal.hotspot.HotSpotGraalRuntime; -import jdk.compiler.graal.hotspot.HotSpotLIRGenerationResult; -import jdk.compiler.graal.hotspot.HotSpotLIRGenerator; -import jdk.compiler.graal.hotspot.HotSpotLockStack; -import jdk.compiler.graal.hotspot.debug.BenchmarkCounters; -import jdk.compiler.graal.hotspot.meta.HotSpotForeignCallDescriptor; -import jdk.compiler.graal.hotspot.meta.HotSpotProviders; -import jdk.compiler.graal.hotspot.stubs.Stub; -import jdk.compiler.graal.lir.LIR; -import jdk.compiler.graal.lir.LIRFrameState; -import jdk.compiler.graal.lir.LIRInstruction; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.LabelRef; -import jdk.compiler.graal.lir.StandardOp.NoOp; -import jdk.compiler.graal.lir.SwitchStrategy; -import jdk.compiler.graal.lir.Variable; -import jdk.compiler.graal.lir.VirtualStackSlot; -import jdk.compiler.graal.lir.amd64.AMD64AddressValue; -import jdk.compiler.graal.lir.amd64.AMD64ControlFlow.StrategySwitchOp; -import jdk.compiler.graal.lir.amd64.AMD64Move; -import jdk.compiler.graal.lir.amd64.AMD64Move.MoveFromRegOp; -import jdk.compiler.graal.lir.amd64.AMD64PrefetchOp; -import jdk.compiler.graal.lir.amd64.AMD64ReadTimestampCounterWithProcid; -import jdk.compiler.graal.lir.amd64.AMD64RestoreRegistersOp; -import jdk.compiler.graal.lir.amd64.AMD64SaveRegistersOp; -import jdk.compiler.graal.lir.amd64.AMD64VZeroUpper; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; -import jdk.compiler.graal.lir.framemap.FrameMapBuilder; -import jdk.compiler.graal.lir.gen.BarrierSetLIRGenerator; -import jdk.compiler.graal.lir.gen.LIRGenerationResult; -import jdk.compiler.graal.lir.gen.MoveFactory; -import jdk.compiler.graal.lir.gen.MoveFactory.BackupSlotProvider; -import jdk.compiler.graal.phases.util.Providers; +import jdk.graal.compiler.asm.amd64.AMD64Address; +import jdk.graal.compiler.asm.amd64.AVXKind.AVXSize; +import jdk.graal.compiler.core.amd64.AMD64ArithmeticLIRGenerator; +import jdk.graal.compiler.core.amd64.AMD64LIRGenerator; +import jdk.graal.compiler.core.common.CompressEncoding; +import jdk.graal.compiler.core.common.LIRKind; +import jdk.graal.compiler.core.common.Stride; +import jdk.graal.compiler.core.common.memory.MemoryOrderMode; +import jdk.graal.compiler.core.common.spi.ForeignCallLinkage; +import jdk.graal.compiler.core.common.spi.LIRKindTool; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.hotspot.GraalHotSpotVMConfig; +import jdk.graal.compiler.hotspot.HotSpotBackend; +import jdk.graal.compiler.hotspot.HotSpotDebugInfoBuilder; +import jdk.graal.compiler.hotspot.HotSpotForeignCallLinkage; +import jdk.graal.compiler.hotspot.HotSpotGraalRuntime; +import jdk.graal.compiler.hotspot.HotSpotLIRGenerationResult; +import jdk.graal.compiler.hotspot.HotSpotLIRGenerator; +import jdk.graal.compiler.hotspot.HotSpotLockStack; +import jdk.graal.compiler.hotspot.debug.BenchmarkCounters; +import jdk.graal.compiler.hotspot.meta.HotSpotForeignCallDescriptor; +import jdk.graal.compiler.hotspot.meta.HotSpotProviders; +import jdk.graal.compiler.hotspot.stubs.Stub; +import jdk.graal.compiler.lir.LIR; +import jdk.graal.compiler.lir.LIRFrameState; +import jdk.graal.compiler.lir.LIRInstruction; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.LabelRef; +import jdk.graal.compiler.lir.StandardOp.NoOp; +import jdk.graal.compiler.lir.SwitchStrategy; +import jdk.graal.compiler.lir.Variable; +import jdk.graal.compiler.lir.VirtualStackSlot; +import jdk.graal.compiler.lir.amd64.AMD64AddressValue; +import jdk.graal.compiler.lir.amd64.AMD64ControlFlow.StrategySwitchOp; +import jdk.graal.compiler.lir.amd64.AMD64Move; +import jdk.graal.compiler.lir.amd64.AMD64Move.MoveFromRegOp; +import jdk.graal.compiler.lir.amd64.AMD64PrefetchOp; +import jdk.graal.compiler.lir.amd64.AMD64ReadTimestampCounterWithProcid; +import jdk.graal.compiler.lir.amd64.AMD64RestoreRegistersOp; +import jdk.graal.compiler.lir.amd64.AMD64SaveRegistersOp; +import jdk.graal.compiler.lir.amd64.AMD64VZeroUpper; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.lir.framemap.FrameMapBuilder; +import jdk.graal.compiler.lir.gen.BarrierSetLIRGenerator; +import jdk.graal.compiler.lir.gen.LIRGenerationResult; +import jdk.graal.compiler.lir.gen.MoveFactory; +import jdk.graal.compiler.lir.gen.MoveFactory.BackupSlotProvider; +import jdk.graal.compiler.phases.util.Providers; import jdk.vm.ci.amd64.AMD64; import jdk.vm.ci.amd64.AMD64.CPUFeature; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotLIRKindTool.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotSpotLIRKindTool.java similarity index 91% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotLIRKindTool.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotSpotLIRKindTool.java index 68ba0fd070a9..b37979d0fc7b 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotLIRKindTool.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotSpotLIRKindTool.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.amd64; +package jdk.graal.compiler.hotspot.amd64; -import jdk.compiler.graal.core.amd64.AMD64LIRKindTool; -import jdk.compiler.graal.core.common.LIRKind; +import jdk.graal.compiler.core.amd64.AMD64LIRKindTool; +import jdk.graal.compiler.core.common.LIRKind; import jdk.vm.ci.amd64.AMD64Kind; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotLoweringProvider.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotSpotLoweringProvider.java similarity index 80% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotLoweringProvider.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotSpotLoweringProvider.java index 9ede4ac681e9..ab531453149e 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotLoweringProvider.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotSpotLoweringProvider.java @@ -22,30 +22,30 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.amd64; +package jdk.graal.compiler.hotspot.amd64; -import jdk.compiler.graal.core.amd64.AMD64LoweringProviderMixin; -import jdk.compiler.graal.core.common.spi.ForeignCallsProvider; -import jdk.compiler.graal.core.common.spi.MetaAccessExtensionProvider; -import jdk.compiler.graal.debug.DebugHandlersFactory; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.hotspot.GraalHotSpotVMConfig; -import jdk.compiler.graal.hotspot.HotSpotBackend; -import jdk.compiler.graal.hotspot.HotSpotGraalRuntimeProvider; -import jdk.compiler.graal.hotspot.meta.DefaultHotSpotLoweringProvider; -import jdk.compiler.graal.hotspot.meta.HotSpotProviders; -import jdk.compiler.graal.hotspot.meta.HotSpotRegistersProvider; -import jdk.compiler.graal.hotspot.replacements.HotSpotAllocationSnippets; -import jdk.compiler.graal.hotspot.replacements.arraycopy.HotSpotArraycopySnippets; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.calc.FloatConvertNode; -import jdk.compiler.graal.nodes.extended.ForeignCallNode; -import jdk.compiler.graal.nodes.spi.LoweringTool; -import jdk.compiler.graal.nodes.spi.PlatformConfigurationProvider; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.replacements.amd64.AMD64ConvertSnippets; -import jdk.compiler.graal.replacements.nodes.UnaryMathIntrinsicNode; -import jdk.compiler.graal.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation; +import jdk.graal.compiler.core.amd64.AMD64LoweringProviderMixin; +import jdk.graal.compiler.core.common.spi.ForeignCallsProvider; +import jdk.graal.compiler.core.common.spi.MetaAccessExtensionProvider; +import jdk.graal.compiler.debug.DebugHandlersFactory; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.hotspot.GraalHotSpotVMConfig; +import jdk.graal.compiler.hotspot.HotSpotBackend; +import jdk.graal.compiler.hotspot.HotSpotGraalRuntimeProvider; +import jdk.graal.compiler.hotspot.meta.DefaultHotSpotLoweringProvider; +import jdk.graal.compiler.hotspot.meta.HotSpotProviders; +import jdk.graal.compiler.hotspot.meta.HotSpotRegistersProvider; +import jdk.graal.compiler.hotspot.replacements.HotSpotAllocationSnippets; +import jdk.graal.compiler.hotspot.replacements.arraycopy.HotSpotArraycopySnippets; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.calc.FloatConvertNode; +import jdk.graal.compiler.nodes.extended.ForeignCallNode; +import jdk.graal.compiler.nodes.spi.LoweringTool; +import jdk.graal.compiler.nodes.spi.PlatformConfigurationProvider; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.replacements.amd64.AMD64ConvertSnippets; +import jdk.graal.compiler.replacements.nodes.UnaryMathIntrinsicNode; +import jdk.graal.compiler.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation; import jdk.vm.ci.amd64.AMD64; import jdk.vm.ci.code.TargetDescription; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotMacroAssembler.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotSpotMacroAssembler.java similarity index 91% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotMacroAssembler.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotSpotMacroAssembler.java index f8370702079c..0f0c312f3cb2 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotMacroAssembler.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotSpotMacroAssembler.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.amd64; +package jdk.graal.compiler.hotspot.amd64; -import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler; -import jdk.compiler.graal.core.common.NumUtil; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.hotspot.GraalHotSpotVMConfig; -import jdk.compiler.graal.options.OptionValues; +import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler; +import jdk.graal.compiler.core.common.NumUtil; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.hotspot.GraalHotSpotVMConfig; +import jdk.graal.compiler.options.OptionValues; import jdk.vm.ci.code.TargetDescription; import jdk.vm.ci.code.site.Call; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotMathIntrinsicOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotSpotMathIntrinsicOp.java similarity index 87% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotMathIntrinsicOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotSpotMathIntrinsicOp.java index 843185334991..a6ce94cebdab 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotMathIntrinsicOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotSpotMathIntrinsicOp.java @@ -22,18 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.amd64; +package jdk.graal.compiler.hotspot.amd64; import static jdk.vm.ci.code.ValueUtil.asRegister; -import jdk.compiler.graal.asm.amd64.AMD64Address; -import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.Opcode; -import jdk.compiler.graal.lir.amd64.AMD64LIRInstruction; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; -import jdk.compiler.graal.replacements.nodes.UnaryMathIntrinsicNode; +import jdk.graal.compiler.asm.amd64.AMD64Address; +import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.Opcode; +import jdk.graal.compiler.lir.amd64.AMD64LIRInstruction; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.replacements.nodes.UnaryMathIntrinsicNode; import jdk.vm.ci.amd64.AMD64Kind; import jdk.vm.ci.meta.Value; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotMove.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotSpotMove.java similarity index 89% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotMove.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotSpotMove.java index 30214d28c938..09a4bd811feb 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotMove.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotSpotMove.java @@ -22,25 +22,25 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.amd64; +package jdk.graal.compiler.hotspot.amd64; import static jdk.vm.ci.code.ValueUtil.asRegister; import static jdk.vm.ci.code.ValueUtil.isRegister; import static jdk.vm.ci.code.ValueUtil.isStackSlot; -import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.HINT; -import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.REG; -import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.STACK; - -import jdk.compiler.graal.asm.amd64.AMD64Address; -import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler; -import jdk.compiler.graal.core.common.CompressEncoding; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.hotspot.GraalHotSpotVMConfig; -import jdk.compiler.graal.hotspot.HotSpotMarkId; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.StandardOp.LoadConstantOp; -import jdk.compiler.graal.lir.amd64.AMD64LIRInstruction; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; +import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.HINT; +import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.REG; +import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.STACK; + +import jdk.graal.compiler.asm.amd64.AMD64Address; +import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler; +import jdk.graal.compiler.core.common.CompressEncoding; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.hotspot.GraalHotSpotVMConfig; +import jdk.graal.compiler.hotspot.HotSpotMarkId; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.StandardOp.LoadConstantOp; +import jdk.graal.compiler.lir.amd64.AMD64LIRInstruction; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; import jdk.vm.ci.code.Register; import jdk.vm.ci.hotspot.HotSpotMetaspaceConstant; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotMoveFactory.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotSpotMoveFactory.java similarity index 95% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotMoveFactory.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotSpotMoveFactory.java index 7c7d055f0881..2dff563ee7f8 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotMoveFactory.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotSpotMoveFactory.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.amd64; +package jdk.graal.compiler.hotspot.amd64; -import jdk.compiler.graal.core.amd64.AMD64MoveFactory; -import jdk.compiler.graal.lir.LIRInstruction; -import jdk.compiler.graal.lir.amd64.AMD64LIRInstruction; +import jdk.graal.compiler.core.amd64.AMD64MoveFactory; +import jdk.graal.compiler.lir.LIRInstruction; +import jdk.graal.compiler.lir.amd64.AMD64LIRInstruction; import jdk.vm.ci.hotspot.HotSpotCompressedNullConstant; import jdk.vm.ci.hotspot.HotSpotConstant; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotNodeLIRBuilder.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotSpotNodeLIRBuilder.java similarity index 84% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotNodeLIRBuilder.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotSpotNodeLIRBuilder.java index 960dc3e86bca..f68b5df1931e 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotNodeLIRBuilder.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotSpotNodeLIRBuilder.java @@ -22,37 +22,37 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.amd64; +package jdk.graal.compiler.hotspot.amd64; import static jdk.vm.ci.amd64.AMD64.rbp; -import static jdk.compiler.graal.hotspot.HotSpotBackend.EXCEPTION_HANDLER_IN_CALLER; - -import jdk.compiler.graal.core.amd64.AMD64NodeLIRBuilder; -import jdk.compiler.graal.core.amd64.AMD64NodeMatchRules; -import jdk.compiler.graal.core.common.LIRKind; -import jdk.compiler.graal.core.common.spi.ForeignCallDescriptor; -import jdk.compiler.graal.core.common.spi.ForeignCallLinkage; -import jdk.compiler.graal.core.gen.DebugInfoBuilder; -import jdk.compiler.graal.hotspot.HotSpotDebugInfoBuilder; -import jdk.compiler.graal.hotspot.HotSpotLIRGenerator; -import jdk.compiler.graal.hotspot.HotSpotLockStack; -import jdk.compiler.graal.hotspot.HotSpotNodeLIRBuilder; -import jdk.compiler.graal.hotspot.nodes.HotSpotDirectCallTargetNode; -import jdk.compiler.graal.hotspot.nodes.HotSpotIndirectCallTargetNode; -import jdk.compiler.graal.lir.LIRFrameState; -import jdk.compiler.graal.lir.amd64.AMD64BreakpointOp; -import jdk.compiler.graal.lir.gen.LIRGeneratorTool; -import jdk.compiler.graal.nodes.BreakpointNode; -import jdk.compiler.graal.nodes.CallTargetNode.InvokeKind; -import jdk.compiler.graal.nodes.DirectCallTargetNode; -import jdk.compiler.graal.nodes.FullInfopointNode; -import jdk.compiler.graal.nodes.IndirectCallTargetNode; -import jdk.compiler.graal.nodes.NodeView; -import jdk.compiler.graal.nodes.SafepointNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.spi.NodeValueMap; -import jdk.compiler.graal.replacements.amd64.AMD64IntrinsicStubs; +import static jdk.graal.compiler.hotspot.HotSpotBackend.EXCEPTION_HANDLER_IN_CALLER; + +import jdk.graal.compiler.core.amd64.AMD64NodeLIRBuilder; +import jdk.graal.compiler.core.amd64.AMD64NodeMatchRules; +import jdk.graal.compiler.core.common.LIRKind; +import jdk.graal.compiler.core.common.spi.ForeignCallDescriptor; +import jdk.graal.compiler.core.common.spi.ForeignCallLinkage; +import jdk.graal.compiler.core.gen.DebugInfoBuilder; +import jdk.graal.compiler.hotspot.HotSpotDebugInfoBuilder; +import jdk.graal.compiler.hotspot.HotSpotLIRGenerator; +import jdk.graal.compiler.hotspot.HotSpotLockStack; +import jdk.graal.compiler.hotspot.HotSpotNodeLIRBuilder; +import jdk.graal.compiler.hotspot.nodes.HotSpotDirectCallTargetNode; +import jdk.graal.compiler.hotspot.nodes.HotSpotIndirectCallTargetNode; +import jdk.graal.compiler.lir.LIRFrameState; +import jdk.graal.compiler.lir.amd64.AMD64BreakpointOp; +import jdk.graal.compiler.lir.gen.LIRGeneratorTool; +import jdk.graal.compiler.nodes.BreakpointNode; +import jdk.graal.compiler.nodes.CallTargetNode.InvokeKind; +import jdk.graal.compiler.nodes.DirectCallTargetNode; +import jdk.graal.compiler.nodes.FullInfopointNode; +import jdk.graal.compiler.nodes.IndirectCallTargetNode; +import jdk.graal.compiler.nodes.NodeView; +import jdk.graal.compiler.nodes.SafepointNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.spi.NodeValueMap; +import jdk.graal.compiler.replacements.amd64.AMD64IntrinsicStubs; import jdk.vm.ci.amd64.AMD64; import jdk.vm.ci.amd64.AMD64Kind; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotPatchReturnAddressOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotSpotPatchReturnAddressOp.java similarity index 83% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotPatchReturnAddressOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotSpotPatchReturnAddressOp.java index d93e036ded5a..b23bae27e638 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotPatchReturnAddressOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotSpotPatchReturnAddressOp.java @@ -22,18 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.amd64; +package jdk.graal.compiler.hotspot.amd64; import static jdk.vm.ci.amd64.AMD64.rsp; import static jdk.vm.ci.code.ValueUtil.asRegister; -import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.REG; +import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.REG; -import jdk.compiler.graal.asm.amd64.AMD64Address; -import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.Opcode; -import jdk.compiler.graal.lir.amd64.AMD64LIRInstruction; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.asm.amd64.AMD64Address; +import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.Opcode; +import jdk.graal.compiler.lir.amd64.AMD64LIRInstruction; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; import jdk.vm.ci.meta.AllocatableValue; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotPushInterpreterFrameOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotSpotPushInterpreterFrameOp.java similarity index 87% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotPushInterpreterFrameOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotSpotPushInterpreterFrameOp.java index b0e6a211cd85..70a751724a69 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotPushInterpreterFrameOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotSpotPushInterpreterFrameOp.java @@ -22,19 +22,19 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.amd64; +package jdk.graal.compiler.hotspot.amd64; -import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.REG; +import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.REG; import static jdk.vm.ci.amd64.AMD64.rsp; import static jdk.vm.ci.code.ValueUtil.asRegister; -import jdk.compiler.graal.asm.amd64.AMD64Address; -import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler; -import jdk.compiler.graal.hotspot.GraalHotSpotVMConfig; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.Opcode; -import jdk.compiler.graal.lir.amd64.AMD64LIRInstruction; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.asm.amd64.AMD64Address; +import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler; +import jdk.graal.compiler.hotspot.GraalHotSpotVMConfig; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.Opcode; +import jdk.graal.compiler.lir.amd64.AMD64LIRInstruction; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; import jdk.vm.ci.code.Register; import jdk.vm.ci.meta.AllocatableValue; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotRegisterAllocationConfig.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotSpotRegisterAllocationConfig.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotRegisterAllocationConfig.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotSpotRegisterAllocationConfig.java index 44cffa5669e3..2b34b9407563 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotRegisterAllocationConfig.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotSpotRegisterAllocationConfig.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.amd64; +package jdk.graal.compiler.hotspot.amd64; import static jdk.vm.ci.amd64.AMD64.k1; import static jdk.vm.ci.amd64.AMD64.k2; @@ -65,7 +65,7 @@ import java.util.ArrayList; import java.util.BitSet; -import jdk.compiler.graal.core.common.alloc.RegisterAllocationConfig; +import jdk.graal.compiler.core.common.alloc.RegisterAllocationConfig; import jdk.vm.ci.code.Register; import jdk.vm.ci.code.RegisterArray; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotRestoreRbpOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotSpotRestoreRbpOp.java similarity index 96% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotRestoreRbpOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotSpotRestoreRbpOp.java index 67e746f3d12a..65b8932894a9 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotRestoreRbpOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotSpotRestoreRbpOp.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.amd64; +package jdk.graal.compiler.hotspot.amd64; import jdk.vm.ci.meta.AllocatableValue; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotReturnOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotSpotReturnOp.java similarity index 85% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotReturnOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotSpotReturnOp.java index a3553a4df2ae..fc41011643b7 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotReturnOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotSpotReturnOp.java @@ -22,26 +22,26 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.amd64; +package jdk.graal.compiler.hotspot.amd64; import static jdk.vm.ci.amd64.AMD64.r15; import static jdk.vm.ci.amd64.AMD64.rsp; -import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.ILLEGAL; -import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.REG; +import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.ILLEGAL; +import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.REG; -import jdk.compiler.graal.asm.Label; -import jdk.compiler.graal.asm.amd64.AMD64Address; -import jdk.compiler.graal.asm.amd64.AMD64Assembler.ConditionFlag; -import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler; -import jdk.compiler.graal.core.common.spi.ForeignCallLinkage; -import jdk.compiler.graal.hotspot.GraalHotSpotVMConfig; -import jdk.compiler.graal.hotspot.HotSpotHostBackend; -import jdk.compiler.graal.hotspot.meta.HotSpotForeignCallsProvider; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.Opcode; -import jdk.compiler.graal.lir.amd64.AMD64Call; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; -import jdk.compiler.graal.lir.gen.DiagnosticLIRGeneratorTool.ZapStackArgumentSpaceBeforeInstruction; +import jdk.graal.compiler.asm.Label; +import jdk.graal.compiler.asm.amd64.AMD64Address; +import jdk.graal.compiler.asm.amd64.AMD64Assembler.ConditionFlag; +import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler; +import jdk.graal.compiler.core.common.spi.ForeignCallLinkage; +import jdk.graal.compiler.hotspot.GraalHotSpotVMConfig; +import jdk.graal.compiler.hotspot.HotSpotHostBackend; +import jdk.graal.compiler.hotspot.meta.HotSpotForeignCallsProvider; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.Opcode; +import jdk.graal.compiler.lir.amd64.AMD64Call; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.lir.gen.DiagnosticLIRGeneratorTool.ZapStackArgumentSpaceBeforeInstruction; import jdk.vm.ci.amd64.AMD64.CPUFeature; import jdk.vm.ci.code.CallingConvention; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotSafepointOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotSpotSafepointOp.java similarity index 85% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotSafepointOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotSpotSafepointOp.java index eb339b9cdab3..79e18f7dd2eb 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotSafepointOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotSpotSafepointOp.java @@ -22,29 +22,29 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.amd64; +package jdk.graal.compiler.hotspot.amd64; import static jdk.vm.ci.amd64.AMD64.r15; import static jdk.vm.ci.amd64.AMD64.rax; import static jdk.vm.ci.amd64.AMD64.rip; import static jdk.vm.ci.amd64.AMD64.rsp; -import static jdk.compiler.graal.hotspot.HotSpotHostBackend.POLLING_PAGE_RETURN_HANDLER; +import static jdk.graal.compiler.hotspot.HotSpotHostBackend.POLLING_PAGE_RETURN_HANDLER; import java.util.function.IntConsumer; -import jdk.compiler.graal.asm.Label; -import jdk.compiler.graal.asm.amd64.AMD64Address; -import jdk.compiler.graal.asm.amd64.AMD64Assembler; -import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler; -import jdk.compiler.graal.core.common.LIRKind; -import jdk.compiler.graal.hotspot.GraalHotSpotVMConfig; -import jdk.compiler.graal.hotspot.HotSpotMarkId; -import jdk.compiler.graal.lir.LIRFrameState; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.Opcode; -import jdk.compiler.graal.lir.amd64.AMD64Call; -import jdk.compiler.graal.lir.amd64.AMD64LIRInstruction; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; -import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool; +import jdk.graal.compiler.asm.Label; +import jdk.graal.compiler.asm.amd64.AMD64Address; +import jdk.graal.compiler.asm.amd64.AMD64Assembler; +import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler; +import jdk.graal.compiler.core.common.LIRKind; +import jdk.graal.compiler.hotspot.GraalHotSpotVMConfig; +import jdk.graal.compiler.hotspot.HotSpotMarkId; +import jdk.graal.compiler.lir.LIRFrameState; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.Opcode; +import jdk.graal.compiler.lir.amd64.AMD64Call; +import jdk.graal.compiler.lir.amd64.AMD64LIRInstruction; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool; import jdk.vm.ci.code.Register; import jdk.vm.ci.code.RegisterValue; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotStrategySwitchOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotSpotStrategySwitchOp.java similarity index 87% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotStrategySwitchOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotSpotStrategySwitchOp.java index c3dcf433a4a9..e9c5277a3df6 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotStrategySwitchOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotSpotStrategySwitchOp.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.amd64; +package jdk.graal.compiler.hotspot.amd64; -import jdk.compiler.graal.asm.amd64.AMD64Address; -import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.LabelRef; -import jdk.compiler.graal.lir.SwitchStrategy; -import jdk.compiler.graal.lir.amd64.AMD64ControlFlow; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.asm.amd64.AMD64Address; +import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.LabelRef; +import jdk.graal.compiler.lir.SwitchStrategy; +import jdk.graal.compiler.lir.amd64.AMD64ControlFlow; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; import jdk.vm.ci.code.Register; import jdk.vm.ci.code.ValueUtil; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotSuitesCreator.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotSpotSuitesCreator.java similarity index 80% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotSuitesCreator.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotSpotSuitesCreator.java index 880d339aa48e..640305416cad 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotSuitesCreator.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotSpotSuitesCreator.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.amd64; +package jdk.graal.compiler.hotspot.amd64; -import jdk.compiler.graal.core.amd64.AMD64SuitesCreator; -import jdk.compiler.graal.hotspot.HotSpotGraphBuilderPhase; -import jdk.compiler.graal.java.GraphBuilderPhase; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins; -import jdk.compiler.graal.phases.tiers.CompilerConfiguration; +import jdk.graal.compiler.core.amd64.AMD64SuitesCreator; +import jdk.graal.compiler.hotspot.HotSpotGraphBuilderPhase; +import jdk.graal.compiler.java.GraphBuilderPhase; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins; +import jdk.graal.compiler.phases.tiers.CompilerConfiguration; public class AMD64HotSpotSuitesCreator extends AMD64SuitesCreator { diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotUnwindOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotSpotUnwindOp.java similarity index 81% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotUnwindOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotSpotUnwindOp.java index 2e7967967e4b..4394fe7773fd 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotUnwindOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotSpotUnwindOp.java @@ -22,21 +22,21 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.amd64; +package jdk.graal.compiler.hotspot.amd64; -import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.REG; +import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.REG; import static jdk.vm.ci.amd64.AMD64.rsp; import static jdk.vm.ci.code.ValueUtil.asRegister; -import jdk.compiler.graal.asm.amd64.AMD64Address; -import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler; -import jdk.compiler.graal.core.common.spi.ForeignCallLinkage; -import jdk.compiler.graal.hotspot.HotSpotBackend; -import jdk.compiler.graal.hotspot.stubs.UnwindExceptionToCallerStub; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.Opcode; -import jdk.compiler.graal.lir.amd64.AMD64Call; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.asm.amd64.AMD64Address; +import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler; +import jdk.graal.compiler.core.common.spi.ForeignCallLinkage; +import jdk.graal.compiler.hotspot.HotSpotBackend; +import jdk.graal.compiler.hotspot.stubs.UnwindExceptionToCallerStub; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.Opcode; +import jdk.graal.compiler.lir.amd64.AMD64Call; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; import jdk.vm.ci.code.CallingConvention; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotZAtomicReadAndWriteOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotSpotZAtomicReadAndWriteOp.java similarity index 82% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotZAtomicReadAndWriteOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotSpotZAtomicReadAndWriteOp.java index 2b6ef3c3de4d..395eb5c4cbd1 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotZAtomicReadAndWriteOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotSpotZAtomicReadAndWriteOp.java @@ -22,19 +22,19 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.amd64; +package jdk.graal.compiler.hotspot.amd64; import static jdk.vm.ci.amd64.AMD64Kind.QWORD; import static jdk.vm.ci.code.ValueUtil.asRegister; -import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler; -import jdk.compiler.graal.core.common.spi.ForeignCallLinkage; -import jdk.compiler.graal.hotspot.GraalHotSpotVMConfig; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.Variable; -import jdk.compiler.graal.lir.amd64.AMD64AddressValue; -import jdk.compiler.graal.lir.amd64.AMD64Move; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler; +import jdk.graal.compiler.core.common.spi.ForeignCallLinkage; +import jdk.graal.compiler.hotspot.GraalHotSpotVMConfig; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.Variable; +import jdk.graal.compiler.lir.amd64.AMD64AddressValue; +import jdk.graal.compiler.lir.amd64.AMD64Move; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; import jdk.vm.ci.meta.AllocatableValue; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotZBarrierSetLIRGenerator.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotSpotZBarrierSetLIRGenerator.java similarity index 87% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotZBarrierSetLIRGenerator.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotSpotZBarrierSetLIRGenerator.java index 746f8948fc56..480db5da058c 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotZBarrierSetLIRGenerator.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotSpotZBarrierSetLIRGenerator.java @@ -22,34 +22,34 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.amd64; +package jdk.graal.compiler.hotspot.amd64; import static jdk.vm.ci.amd64.AMD64.r15; -import jdk.compiler.graal.asm.Label; -import jdk.compiler.graal.asm.amd64.AMD64Address; -import jdk.compiler.graal.asm.amd64.AMD64Assembler; -import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler; -import jdk.compiler.graal.asm.amd64.AVXKind; -import jdk.compiler.graal.core.amd64.AMD64BarrierSetLIRGenerator; -import jdk.compiler.graal.core.amd64.AMD64LIRGenerator; -import jdk.compiler.graal.core.common.LIRKind; -import jdk.compiler.graal.core.common.memory.BarrierType; -import jdk.compiler.graal.core.common.memory.MemoryOrderMode; -import jdk.compiler.graal.core.common.spi.ForeignCallLinkage; -import jdk.compiler.graal.core.common.spi.ForeignCallsProvider; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.hotspot.GraalHotSpotVMConfig; -import jdk.compiler.graal.hotspot.meta.HotSpotHostForeignCallsProvider; -import jdk.compiler.graal.lir.LIRFrameState; -import jdk.compiler.graal.lir.LIRInstruction; -import jdk.compiler.graal.lir.Variable; -import jdk.compiler.graal.lir.amd64.AMD64AddressValue; -import jdk.compiler.graal.lir.amd64.AMD64Call; -import jdk.compiler.graal.lir.amd64.AMD64FrameMap; -import jdk.compiler.graal.lir.amd64.vector.AMD64VectorMove; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; -import jdk.compiler.graal.phases.util.Providers; +import jdk.graal.compiler.asm.Label; +import jdk.graal.compiler.asm.amd64.AMD64Address; +import jdk.graal.compiler.asm.amd64.AMD64Assembler; +import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler; +import jdk.graal.compiler.asm.amd64.AVXKind; +import jdk.graal.compiler.core.amd64.AMD64BarrierSetLIRGenerator; +import jdk.graal.compiler.core.amd64.AMD64LIRGenerator; +import jdk.graal.compiler.core.common.LIRKind; +import jdk.graal.compiler.core.common.memory.BarrierType; +import jdk.graal.compiler.core.common.memory.MemoryOrderMode; +import jdk.graal.compiler.core.common.spi.ForeignCallLinkage; +import jdk.graal.compiler.core.common.spi.ForeignCallsProvider; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.hotspot.GraalHotSpotVMConfig; +import jdk.graal.compiler.hotspot.meta.HotSpotHostForeignCallsProvider; +import jdk.graal.compiler.lir.LIRFrameState; +import jdk.graal.compiler.lir.LIRInstruction; +import jdk.graal.compiler.lir.Variable; +import jdk.graal.compiler.lir.amd64.AMD64AddressValue; +import jdk.graal.compiler.lir.amd64.AMD64Call; +import jdk.graal.compiler.lir.amd64.AMD64FrameMap; +import jdk.graal.compiler.lir.amd64.vector.AMD64VectorMove; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.phases.util.Providers; import jdk.vm.ci.amd64.AMD64Kind; import jdk.vm.ci.code.CallingConvention; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotZBarrieredOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotSpotZBarrieredOp.java similarity index 82% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotZBarrieredOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotSpotZBarrieredOp.java index 6cd471cd53ee..1a9837dc4aac 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotZBarrieredOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotSpotZBarrieredOp.java @@ -22,20 +22,20 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.amd64; +package jdk.graal.compiler.hotspot.amd64; import static jdk.vm.ci.code.ValueUtil.asRegister; -import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.COMPOSITE; -import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.REG; +import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.COMPOSITE; +import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.REG; -import jdk.compiler.graal.asm.Label; -import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler; -import jdk.compiler.graal.core.common.spi.ForeignCallLinkage; -import jdk.compiler.graal.hotspot.GraalHotSpotVMConfig; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.amd64.AMD64AddressValue; -import jdk.compiler.graal.lir.amd64.AMD64LIRInstruction; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.asm.Label; +import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler; +import jdk.graal.compiler.core.common.spi.ForeignCallLinkage; +import jdk.graal.compiler.hotspot.GraalHotSpotVMConfig; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.amd64.AMD64AddressValue; +import jdk.graal.compiler.lir.amd64.AMD64LIRInstruction; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; import jdk.vm.ci.code.Register; import jdk.vm.ci.meta.AllocatableValue; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotZCompareAndSwapOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotSpotZCompareAndSwapOp.java similarity index 86% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotZCompareAndSwapOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotSpotZCompareAndSwapOp.java index e5720a0348ca..3d735d2d053d 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotZCompareAndSwapOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotSpotZCompareAndSwapOp.java @@ -22,21 +22,21 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.amd64; +package jdk.graal.compiler.hotspot.amd64; import static jdk.vm.ci.code.ValueUtil.asRegister; -import jdk.compiler.graal.asm.Label; -import jdk.compiler.graal.asm.amd64.AMD64Assembler; -import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler; -import jdk.compiler.graal.core.common.spi.ForeignCallLinkage; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.hotspot.GraalHotSpotVMConfig; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.LIRValueUtil; -import jdk.compiler.graal.lir.Opcode; -import jdk.compiler.graal.lir.amd64.AMD64AddressValue; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.asm.Label; +import jdk.graal.compiler.asm.amd64.AMD64Assembler; +import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler; +import jdk.graal.compiler.core.common.spi.ForeignCallLinkage; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.hotspot.GraalHotSpotVMConfig; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.LIRValueUtil; +import jdk.graal.compiler.lir.Opcode; +import jdk.graal.compiler.lir.amd64.AMD64AddressValue; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; import jdk.vm.ci.amd64.AMD64; import jdk.vm.ci.amd64.AMD64Kind; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotZReadBarrierOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotSpotZReadBarrierOp.java similarity index 79% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotZReadBarrierOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotSpotZReadBarrierOp.java index d01db99b1829..d234a0b61b3d 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotZReadBarrierOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotSpotZReadBarrierOp.java @@ -22,20 +22,20 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.amd64; +package jdk.graal.compiler.hotspot.amd64; import static jdk.vm.ci.code.ValueUtil.asRegister; -import static jdk.compiler.graal.asm.amd64.AMD64Assembler.AMD64RMOp.MOV; +import static jdk.graal.compiler.asm.amd64.AMD64Assembler.AMD64RMOp.MOV; -import jdk.compiler.graal.asm.amd64.AMD64BaseAssembler; -import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler; -import jdk.compiler.graal.core.common.spi.ForeignCallLinkage; -import jdk.compiler.graal.hotspot.GraalHotSpotVMConfig; -import jdk.compiler.graal.lir.LIRFrameState; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.Variable; -import jdk.compiler.graal.lir.amd64.AMD64AddressValue; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.asm.amd64.AMD64BaseAssembler; +import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler; +import jdk.graal.compiler.core.common.spi.ForeignCallLinkage; +import jdk.graal.compiler.hotspot.GraalHotSpotVMConfig; +import jdk.graal.compiler.lir.LIRFrameState; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.Variable; +import jdk.graal.compiler.lir.amd64.AMD64AddressValue; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotZVectorReadBarrierOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotSpotZVectorReadBarrierOp.java similarity index 86% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotZVectorReadBarrierOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotSpotZVectorReadBarrierOp.java index 8a0b71c33317..1e175ee70882 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotZVectorReadBarrierOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotSpotZVectorReadBarrierOp.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.amd64; +package jdk.graal.compiler.hotspot.amd64; import static jdk.vm.ci.amd64.AMD64.r15; import static jdk.vm.ci.amd64.AMD64.rax; @@ -30,21 +30,21 @@ import java.util.EnumSet; -import jdk.compiler.graal.asm.Label; -import jdk.compiler.graal.asm.amd64.AMD64Address; -import jdk.compiler.graal.asm.amd64.AMD64Assembler; -import jdk.compiler.graal.asm.amd64.AMD64Assembler.VexRMOp; -import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler; -import jdk.compiler.graal.asm.amd64.AVXKind.AVXSize; -import jdk.compiler.graal.core.common.spi.ForeignCallLinkage; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.hotspot.GraalHotSpotVMConfig; -import jdk.compiler.graal.lir.LIRFrameState; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.Variable; -import jdk.compiler.graal.lir.amd64.AMD64AddressValue; -import jdk.compiler.graal.lir.amd64.AMD64Call; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.asm.Label; +import jdk.graal.compiler.asm.amd64.AMD64Address; +import jdk.graal.compiler.asm.amd64.AMD64Assembler; +import jdk.graal.compiler.asm.amd64.AMD64Assembler.VexRMOp; +import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler; +import jdk.graal.compiler.asm.amd64.AVXKind.AVXSize; +import jdk.graal.compiler.core.common.spi.ForeignCallLinkage; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.hotspot.GraalHotSpotVMConfig; +import jdk.graal.compiler.lir.LIRFrameState; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.Variable; +import jdk.graal.compiler.lir.amd64.AMD64AddressValue; +import jdk.graal.compiler.lir.amd64.AMD64Call; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; import jdk.vm.ci.amd64.AMD64; import jdk.vm.ci.code.CallingConvention; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotspotDirectVirtualCallOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotspotDirectVirtualCallOp.java similarity index 82% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotspotDirectVirtualCallOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotspotDirectVirtualCallOp.java index d3048191f60f..f8e5545cb8ba 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotspotDirectVirtualCallOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64HotspotDirectVirtualCallOp.java @@ -22,18 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.amd64; +package jdk.graal.compiler.hotspot.amd64; -import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler; -import jdk.compiler.graal.hotspot.GraalHotSpotVMConfig; -import jdk.compiler.graal.hotspot.HotSpotMarkId; -import jdk.compiler.graal.lir.LIRFrameState; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.Opcode; -import jdk.compiler.graal.lir.amd64.AMD64Call; -import jdk.compiler.graal.lir.amd64.AMD64Call.DirectCallOp; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; -import jdk.compiler.graal.nodes.CallTargetNode.InvokeKind; +import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler; +import jdk.graal.compiler.hotspot.GraalHotSpotVMConfig; +import jdk.graal.compiler.hotspot.HotSpotMarkId; +import jdk.graal.compiler.lir.LIRFrameState; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.Opcode; +import jdk.graal.compiler.lir.amd64.AMD64Call; +import jdk.graal.compiler.lir.amd64.AMD64Call.DirectCallOp; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.nodes.CallTargetNode.InvokeKind; import jdk.vm.ci.hotspot.HotSpotResolvedJavaMethod; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64MathStub.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64MathStub.java similarity index 85% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64MathStub.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64MathStub.java index 3914a45896ff..d077e98da3eb 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64MathStub.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64MathStub.java @@ -22,18 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.amd64; +package jdk.graal.compiler.hotspot.amd64; -import jdk.compiler.graal.api.replacements.Snippet; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.hotspot.HotSpotForeignCallLinkage; -import jdk.compiler.graal.hotspot.meta.HotSpotProviders; -import jdk.compiler.graal.hotspot.stubs.SnippetStub; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.replacements.nodes.BinaryMathIntrinsicNode; -import jdk.compiler.graal.replacements.nodes.BinaryMathIntrinsicNode.BinaryOperation; -import jdk.compiler.graal.replacements.nodes.UnaryMathIntrinsicNode; -import jdk.compiler.graal.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation; +import jdk.graal.compiler.api.replacements.Snippet; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.hotspot.HotSpotForeignCallLinkage; +import jdk.graal.compiler.hotspot.meta.HotSpotProviders; +import jdk.graal.compiler.hotspot.stubs.SnippetStub; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.replacements.nodes.BinaryMathIntrinsicNode; +import jdk.graal.compiler.replacements.nodes.BinaryMathIntrinsicNode.BinaryOperation; +import jdk.graal.compiler.replacements.nodes.UnaryMathIntrinsicNode; +import jdk.graal.compiler.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation; /** * Stub called to support {@link Math}. diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64TailcallOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64TailcallOp.java similarity index 87% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64TailcallOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64TailcallOp.java index 72947dca8c60..521b46c97122 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64TailcallOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64TailcallOp.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.amd64; +package jdk.graal.compiler.hotspot.amd64; import static jdk.vm.ci.code.ValueUtil.asRegister; -import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.Opcode; -import jdk.compiler.graal.lir.amd64.AMD64LIRInstruction; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.Opcode; +import jdk.graal.compiler.lir.amd64.AMD64LIRInstruction; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; import jdk.vm.ci.code.InstalledCode; import jdk.vm.ci.meta.Value; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64X87MathIntrinsicNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64X87MathIntrinsicNode.java similarity index 75% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64X87MathIntrinsicNode.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64X87MathIntrinsicNode.java index cf34f1ae7dcf..e0a64bc8037f 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64X87MathIntrinsicNode.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64X87MathIntrinsicNode.java @@ -22,29 +22,29 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.amd64; +package jdk.graal.compiler.hotspot.amd64; -import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_64; -import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1; +import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_64; +import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_1; -import jdk.compiler.graal.core.common.LIRKind; -import jdk.compiler.graal.core.common.type.FloatStamp; -import jdk.compiler.graal.core.common.type.PrimitiveStamp; -import jdk.compiler.graal.core.common.type.Stamp; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.graph.NodeClass; -import jdk.compiler.graal.lir.Variable; -import jdk.compiler.graal.lir.VirtualStackSlot; -import jdk.compiler.graal.lir.gen.LIRGeneratorTool; -import jdk.compiler.graal.nodeinfo.NodeInfo; -import jdk.compiler.graal.nodes.ConstantNode; -import jdk.compiler.graal.nodes.NodeView; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.calc.UnaryNode; -import jdk.compiler.graal.nodes.spi.CanonicalizerTool; -import jdk.compiler.graal.nodes.spi.LIRLowerable; -import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool; -import jdk.compiler.graal.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation; +import jdk.graal.compiler.core.common.LIRKind; +import jdk.graal.compiler.core.common.type.FloatStamp; +import jdk.graal.compiler.core.common.type.PrimitiveStamp; +import jdk.graal.compiler.core.common.type.Stamp; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.graph.NodeClass; +import jdk.graal.compiler.lir.Variable; +import jdk.graal.compiler.lir.VirtualStackSlot; +import jdk.graal.compiler.lir.gen.LIRGeneratorTool; +import jdk.graal.compiler.nodeinfo.NodeInfo; +import jdk.graal.compiler.nodes.ConstantNode; +import jdk.graal.compiler.nodes.NodeView; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.calc.UnaryNode; +import jdk.graal.compiler.nodes.spi.CanonicalizerTool; +import jdk.graal.compiler.nodes.spi.LIRLowerable; +import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool; +import jdk.graal.compiler.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation; import jdk.vm.ci.amd64.AMD64Kind; import jdk.vm.ci.meta.Value; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64X87MathSnippets.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64X87MathSnippets.java similarity index 79% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64X87MathSnippets.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64X87MathSnippets.java index faaf08e6ed49..c3baac840c89 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64X87MathSnippets.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/amd64/AMD64X87MathSnippets.java @@ -22,27 +22,27 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.amd64; +package jdk.graal.compiler.hotspot.amd64; -import static jdk.compiler.graal.nodes.extended.BranchProbabilityNode.LIKELY_PROBABILITY; -import static jdk.compiler.graal.nodes.extended.BranchProbabilityNode.probability; -import static jdk.compiler.graal.replacements.SnippetTemplate.DEFAULT_REPLACER; +import static jdk.graal.compiler.nodes.extended.BranchProbabilityNode.LIKELY_PROBABILITY; +import static jdk.graal.compiler.nodes.extended.BranchProbabilityNode.probability; +import static jdk.graal.compiler.replacements.SnippetTemplate.DEFAULT_REPLACER; -import jdk.compiler.graal.api.replacements.Snippet; -import jdk.compiler.graal.core.common.spi.ForeignCallSignature; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.graph.Node.ConstantNodeParameter; -import jdk.compiler.graal.graph.Node.NodeIntrinsic; -import jdk.compiler.graal.nodes.extended.ForeignCallNode; -import jdk.compiler.graal.nodes.spi.LoweringTool; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.phases.util.Providers; -import jdk.compiler.graal.replacements.SnippetTemplate.AbstractTemplates; -import jdk.compiler.graal.replacements.SnippetTemplate.Arguments; -import jdk.compiler.graal.replacements.SnippetTemplate.SnippetInfo; -import jdk.compiler.graal.replacements.Snippets; -import jdk.compiler.graal.replacements.nodes.UnaryMathIntrinsicNode; -import jdk.compiler.graal.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation; +import jdk.graal.compiler.api.replacements.Snippet; +import jdk.graal.compiler.core.common.spi.ForeignCallSignature; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.graph.Node.ConstantNodeParameter; +import jdk.graal.compiler.graph.Node.NodeIntrinsic; +import jdk.graal.compiler.nodes.extended.ForeignCallNode; +import jdk.graal.compiler.nodes.spi.LoweringTool; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.phases.util.Providers; +import jdk.graal.compiler.replacements.SnippetTemplate.AbstractTemplates; +import jdk.graal.compiler.replacements.SnippetTemplate.Arguments; +import jdk.graal.compiler.replacements.SnippetTemplate.SnippetInfo; +import jdk.graal.compiler.replacements.Snippets; +import jdk.graal.compiler.replacements.nodes.UnaryMathIntrinsicNode; +import jdk.graal.compiler.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation; public class AMD64X87MathSnippets implements Snippets { diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/debug/BenchmarkCounters.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/debug/BenchmarkCounters.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/debug/BenchmarkCounters.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/debug/BenchmarkCounters.java index 6ac5a4c3c745..c331da63a0f2 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/debug/BenchmarkCounters.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/debug/BenchmarkCounters.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.debug; +package jdk.graal.compiler.hotspot.debug; -import static jdk.compiler.graal.debug.PathUtilities.getAbsolutePath; +import static jdk.graal.compiler.debug.PathUtilities.getAbsolutePath; import java.io.IOException; import java.io.OutputStream; @@ -39,18 +39,18 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicLong; -import jdk.compiler.graal.core.GraalServiceThread; -import jdk.compiler.graal.core.common.SuppressFBWarnings; -import jdk.compiler.graal.debug.CSVUtil; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.debug.PathUtilities; -import jdk.compiler.graal.debug.TTY; -import jdk.compiler.graal.hotspot.GraalHotSpotVMConfig; -import jdk.compiler.graal.nodes.debug.DynamicCounterNode; -import jdk.compiler.graal.options.Option; -import jdk.compiler.graal.options.OptionKey; -import jdk.compiler.graal.options.OptionType; -import jdk.compiler.graal.options.OptionValues; +import jdk.graal.compiler.core.GraalServiceThread; +import jdk.graal.compiler.core.common.SuppressFBWarnings; +import jdk.graal.compiler.debug.CSVUtil; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.debug.PathUtilities; +import jdk.graal.compiler.debug.TTY; +import jdk.graal.compiler.hotspot.GraalHotSpotVMConfig; +import jdk.graal.compiler.nodes.debug.DynamicCounterNode; +import jdk.graal.compiler.options.Option; +import jdk.graal.compiler.options.OptionKey; +import jdk.graal.compiler.options.OptionType; +import jdk.graal.compiler.options.OptionValues; import jdk.vm.ci.hotspot.HotSpotJVMCIRuntime; import jdk.vm.ci.services.Services; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/debug/doc-files/AbortOnBenchmarkCounterOverflowHelp.txt b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/debug/doc-files/AbortOnBenchmarkCounterOverflowHelp.txt similarity index 100% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/debug/doc-files/AbortOnBenchmarkCounterOverflowHelp.txt rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/debug/doc-files/AbortOnBenchmarkCounterOverflowHelp.txt diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/debug/doc-files/BenchmarkDynamicCountersHelp.txt b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/debug/doc-files/BenchmarkDynamicCountersHelp.txt similarity index 100% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/debug/doc-files/BenchmarkDynamicCountersHelp.txt rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/debug/doc-files/BenchmarkDynamicCountersHelp.txt diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/lir/HotSpotZapRegistersPhase.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/lir/HotSpotZapRegistersPhase.java similarity index 88% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/lir/HotSpotZapRegistersPhase.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/lir/HotSpotZapRegistersPhase.java index 49d61195af72..4fcb0ed515bc 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/lir/HotSpotZapRegistersPhase.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/lir/HotSpotZapRegistersPhase.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.lir; +package jdk.graal.compiler.hotspot.lir; import static jdk.vm.ci.code.ValueUtil.isStackSlot; @@ -30,20 +30,20 @@ import org.graalvm.collections.EconomicSet; import org.graalvm.collections.Equivalence; -import jdk.compiler.graal.core.common.cfg.BasicBlock; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.debug.Indent; -import jdk.compiler.graal.hotspot.HotSpotLIRGenerationResult; -import jdk.compiler.graal.hotspot.stubs.Stub; -import jdk.compiler.graal.lir.LIR; -import jdk.compiler.graal.lir.LIRInsertionBuffer; -import jdk.compiler.graal.lir.LIRInstruction; -import jdk.compiler.graal.lir.ValueConsumer; -import jdk.compiler.graal.lir.gen.DiagnosticLIRGeneratorTool; -import jdk.compiler.graal.lir.gen.DiagnosticLIRGeneratorTool.ZapRegistersAfterInstruction; -import jdk.compiler.graal.lir.gen.DiagnosticLIRGeneratorTool.ZapStackArgumentSpaceBeforeInstruction; -import jdk.compiler.graal.lir.gen.LIRGenerationResult; -import jdk.compiler.graal.lir.phases.PostAllocationOptimizationPhase; +import jdk.graal.compiler.core.common.cfg.BasicBlock; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.debug.Indent; +import jdk.graal.compiler.hotspot.HotSpotLIRGenerationResult; +import jdk.graal.compiler.hotspot.stubs.Stub; +import jdk.graal.compiler.lir.LIR; +import jdk.graal.compiler.lir.LIRInsertionBuffer; +import jdk.graal.compiler.lir.LIRInstruction; +import jdk.graal.compiler.lir.ValueConsumer; +import jdk.graal.compiler.lir.gen.DiagnosticLIRGeneratorTool; +import jdk.graal.compiler.lir.gen.DiagnosticLIRGeneratorTool.ZapRegistersAfterInstruction; +import jdk.graal.compiler.lir.gen.DiagnosticLIRGeneratorTool.ZapStackArgumentSpaceBeforeInstruction; +import jdk.graal.compiler.lir.gen.LIRGenerationResult; +import jdk.graal.compiler.lir.phases.PostAllocationOptimizationPhase; import jdk.vm.ci.code.CallingConvention; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/lir/VerifyMaxRegisterSizePhase.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/lir/VerifyMaxRegisterSizePhase.java similarity index 87% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/lir/VerifyMaxRegisterSizePhase.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/lir/VerifyMaxRegisterSizePhase.java index f04da872455d..65b49631ea02 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/lir/VerifyMaxRegisterSizePhase.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/lir/VerifyMaxRegisterSizePhase.java @@ -22,19 +22,19 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.lir; +package jdk.graal.compiler.hotspot.lir; import static jdk.vm.ci.code.ValueUtil.isRegister; import java.util.EnumSet; -import jdk.compiler.graal.core.common.cfg.BasicBlock; -import jdk.compiler.graal.lir.LIR; -import jdk.compiler.graal.lir.LIRInstruction; -import jdk.compiler.graal.lir.LIRInstruction.OperandFlag; -import jdk.compiler.graal.lir.LIRInstruction.OperandMode; -import jdk.compiler.graal.lir.gen.LIRGenerationResult; -import jdk.compiler.graal.lir.phases.FinalCodeAnalysisPhase; +import jdk.graal.compiler.core.common.cfg.BasicBlock; +import jdk.graal.compiler.lir.LIR; +import jdk.graal.compiler.lir.LIRInstruction; +import jdk.graal.compiler.lir.LIRInstruction.OperandFlag; +import jdk.graal.compiler.lir.LIRInstruction.OperandMode; +import jdk.graal.compiler.lir.gen.LIRGenerationResult; +import jdk.graal.compiler.lir.phases.FinalCodeAnalysisPhase; import jdk.vm.ci.code.TargetDescription; import jdk.vm.ci.meta.Value; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/AddressLoweringHotSpotSuitesProvider.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/meta/AddressLoweringHotSpotSuitesProvider.java similarity index 81% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/AddressLoweringHotSpotSuitesProvider.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/meta/AddressLoweringHotSpotSuitesProvider.java index cadd34c9e05f..0fd939b2fcef 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/AddressLoweringHotSpotSuitesProvider.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/meta/AddressLoweringHotSpotSuitesProvider.java @@ -23,16 +23,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.meta; +package jdk.graal.compiler.hotspot.meta; -import jdk.compiler.graal.hotspot.GraalHotSpotVMConfig; -import jdk.compiler.graal.hotspot.HotSpotGraalRuntimeProvider; -import jdk.compiler.graal.nodes.spi.CoreProviders; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.phases.BasePhase; -import jdk.compiler.graal.phases.common.AddressLoweringPhase; -import jdk.compiler.graal.phases.tiers.Suites; -import jdk.compiler.graal.phases.tiers.SuitesCreator; +import jdk.graal.compiler.hotspot.GraalHotSpotVMConfig; +import jdk.graal.compiler.hotspot.HotSpotGraalRuntimeProvider; +import jdk.graal.compiler.nodes.spi.CoreProviders; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.phases.BasePhase; +import jdk.graal.compiler.phases.common.AddressLoweringPhase; +import jdk.graal.compiler.phases.tiers.Suites; +import jdk.graal.compiler.phases.tiers.SuitesCreator; import jdk.vm.ci.code.Architecture; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/DefaultHotSpotLoweringProvider.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/meta/DefaultHotSpotLoweringProvider.java similarity index 85% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/DefaultHotSpotLoweringProvider.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/meta/DefaultHotSpotLoweringProvider.java index d77e1c2357b5..1df73b10c282 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/DefaultHotSpotLoweringProvider.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/meta/DefaultHotSpotLoweringProvider.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.meta; +package jdk.graal.compiler.hotspot.meta; import static jdk.vm.ci.services.Services.IS_IN_NATIVE_IMAGE; -import static jdk.compiler.graal.core.common.GraalOptions.AlwaysInlineVTableStubs; -import static jdk.compiler.graal.core.common.GraalOptions.InlineVTableStubs; -import static jdk.compiler.graal.core.common.GraalOptions.OmitHotExceptionStacktrace; -import static jdk.compiler.graal.hotspot.meta.HotSpotForeignCallsProviderImpl.OSR_MIGRATION_END; +import static jdk.graal.compiler.core.common.GraalOptions.AlwaysInlineVTableStubs; +import static jdk.graal.compiler.core.common.GraalOptions.InlineVTableStubs; +import static jdk.graal.compiler.core.common.GraalOptions.OmitHotExceptionStacktrace; +import static jdk.graal.compiler.hotspot.meta.HotSpotForeignCallsProviderImpl.OSR_MIGRATION_END; import static org.graalvm.word.LocationIdentity.any; import java.util.Arrays; @@ -37,152 +37,152 @@ import java.util.List; import java.util.Map; -import jdk.compiler.graal.core.common.CompressEncoding; -import jdk.compiler.graal.core.common.GraalOptions; -import jdk.compiler.graal.core.common.NumUtil; -import jdk.compiler.graal.core.common.calc.Condition; -import jdk.compiler.graal.core.common.memory.BarrierType; -import jdk.compiler.graal.core.common.memory.MemoryOrderMode; -import jdk.compiler.graal.core.common.spi.ForeignCallDescriptor; -import jdk.compiler.graal.core.common.spi.ForeignCallSignature; -import jdk.compiler.graal.core.common.spi.ForeignCallsProvider; -import jdk.compiler.graal.core.common.spi.MetaAccessExtensionProvider; -import jdk.compiler.graal.core.common.type.IntegerStamp; -import jdk.compiler.graal.core.common.type.ObjectStamp; -import jdk.compiler.graal.core.common.type.Stamp; -import jdk.compiler.graal.core.common.type.StampFactory; -import jdk.compiler.graal.core.common.type.StampPair; -import jdk.compiler.graal.debug.DebugCloseable; -import jdk.compiler.graal.debug.DebugHandlersFactory; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.graph.NodeInputList; -import jdk.compiler.graal.hotspot.nodes.type.HotSpotNarrowOopStamp; -import jdk.compiler.graal.hotspot.nodes.type.KlassPointerStamp; -import jdk.compiler.graal.hotspot.nodes.type.MethodPointerStamp; -import jdk.compiler.graal.hotspot.replacements.AssertionSnippets; -import jdk.compiler.graal.hotspot.replacements.ClassGetHubNode; -import jdk.compiler.graal.hotspot.replacements.DigestBaseSnippets; -import jdk.compiler.graal.hotspot.replacements.FastNotifyNode; -import jdk.compiler.graal.hotspot.replacements.HotSpotAllocationSnippets; -import jdk.compiler.graal.hotspot.replacements.HotSpotG1WriteBarrierSnippets; -import jdk.compiler.graal.hotspot.replacements.HotSpotHashCodeSnippets; -import jdk.compiler.graal.hotspot.replacements.HotSpotIsArraySnippets; -import jdk.compiler.graal.hotspot.replacements.HotSpotReplacementsUtil; -import jdk.compiler.graal.hotspot.replacements.HotSpotSerialWriteBarrierSnippets; -import jdk.compiler.graal.hotspot.replacements.HubGetClassNode; -import jdk.compiler.graal.hotspot.replacements.InstanceOfSnippets; -import jdk.compiler.graal.hotspot.replacements.KlassLayoutHelperNode; -import jdk.compiler.graal.hotspot.replacements.LoadExceptionObjectSnippets; -import jdk.compiler.graal.hotspot.replacements.LogSnippets; -import jdk.compiler.graal.hotspot.replacements.MonitorSnippets; -import jdk.compiler.graal.hotspot.replacements.ObjectCloneSnippets; -import jdk.compiler.graal.hotspot.replacements.ObjectSnippets; -import jdk.compiler.graal.hotspot.replacements.RegisterFinalizerSnippets; -import jdk.compiler.graal.hotspot.replacements.StringToBytesSnippets; -import jdk.compiler.graal.hotspot.replacements.UnsafeCopyMemoryNode; -import jdk.compiler.graal.hotspot.replacements.UnsafeSnippets; -import jdk.compiler.graal.hotspot.replacements.VirtualThreadUpdateJFRSnippets; -import jdk.compiler.graal.hotspot.GraalHotSpotVMConfig; -import jdk.compiler.graal.hotspot.HotSpotGraalRuntimeProvider; -import jdk.compiler.graal.hotspot.nodes.BeginLockScopeNode; -import jdk.compiler.graal.hotspot.nodes.HotSpotCompressionNode; -import jdk.compiler.graal.hotspot.nodes.HotSpotDirectCallTargetNode; -import jdk.compiler.graal.hotspot.nodes.HotSpotIndirectCallTargetNode; -import jdk.compiler.graal.hotspot.nodes.KlassBeingInitializedCheckNode; -import jdk.compiler.graal.hotspot.nodes.VMErrorNode; -import jdk.compiler.graal.hotspot.nodes.VirtualThreadUpdateJFRNode; -import jdk.compiler.graal.hotspot.replacements.arraycopy.HotSpotArraycopySnippets; -import jdk.compiler.graal.hotspot.stubs.ForeignCallSnippets; -import jdk.compiler.graal.hotspot.word.KlassPointer; -import jdk.compiler.graal.nodes.AbstractBeginNode; -import jdk.compiler.graal.nodes.AbstractDeoptimizeNode; -import jdk.compiler.graal.nodes.CompressionNode.CompressionOp; -import jdk.compiler.graal.nodes.ConstantNode; -import jdk.compiler.graal.nodes.DeadEndNode; -import jdk.compiler.graal.nodes.DeoptimizeNode; -import jdk.compiler.graal.nodes.FixedNode; -import jdk.compiler.graal.nodes.GraphState.GuardsStage; -import jdk.compiler.graal.nodes.Invoke; -import jdk.compiler.graal.nodes.LogicConstantNode; -import jdk.compiler.graal.nodes.LogicNode; -import jdk.compiler.graal.nodes.LoweredCallTargetNode; -import jdk.compiler.graal.nodes.NodeView; -import jdk.compiler.graal.nodes.ParameterNode; -import jdk.compiler.graal.nodes.PiNode; -import jdk.compiler.graal.nodes.SafepointNode; -import jdk.compiler.graal.nodes.StartNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.UnwindNode; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.calc.CompareNode; -import jdk.compiler.graal.nodes.calc.FloatingIntegerDivRemNode; -import jdk.compiler.graal.nodes.calc.FloatingNode; -import jdk.compiler.graal.nodes.calc.IntegerDivRemNode; -import jdk.compiler.graal.nodes.calc.IsNullNode; -import jdk.compiler.graal.nodes.calc.RemNode; -import jdk.compiler.graal.nodes.calc.SignedDivNode; -import jdk.compiler.graal.nodes.calc.SignedFloatingIntegerDivNode; -import jdk.compiler.graal.nodes.calc.SignedFloatingIntegerRemNode; -import jdk.compiler.graal.nodes.calc.SignedRemNode; -import jdk.compiler.graal.nodes.debug.StringToBytesNode; -import jdk.compiler.graal.nodes.debug.VerifyHeapNode; -import jdk.compiler.graal.nodes.extended.BranchProbabilityNode; -import jdk.compiler.graal.nodes.extended.BytecodeExceptionNode; -import jdk.compiler.graal.nodes.extended.BytecodeExceptionNode.BytecodeExceptionKind; -import jdk.compiler.graal.nodes.extended.ForeignCallNode; -import jdk.compiler.graal.nodes.extended.GetClassNode; -import jdk.compiler.graal.nodes.extended.GuardingNode; -import jdk.compiler.graal.nodes.extended.LoadHubNode; -import jdk.compiler.graal.nodes.extended.LoadMethodNode; -import jdk.compiler.graal.nodes.extended.OSRLocalNode; -import jdk.compiler.graal.nodes.extended.OSRLockNode; -import jdk.compiler.graal.nodes.extended.OSRMonitorEnterNode; -import jdk.compiler.graal.nodes.extended.OSRStartNode; -import jdk.compiler.graal.nodes.extended.StoreHubNode; -import jdk.compiler.graal.nodes.gc.G1ArrayRangePostWriteBarrier; -import jdk.compiler.graal.nodes.gc.G1ArrayRangePreWriteBarrier; -import jdk.compiler.graal.nodes.gc.G1PostWriteBarrier; -import jdk.compiler.graal.nodes.gc.G1PreWriteBarrier; -import jdk.compiler.graal.nodes.gc.G1ReferentFieldReadBarrier; -import jdk.compiler.graal.nodes.gc.SerialArrayRangeWriteBarrier; -import jdk.compiler.graal.nodes.gc.SerialWriteBarrier; -import jdk.compiler.graal.nodes.java.ClassIsAssignableFromNode; -import jdk.compiler.graal.nodes.java.DynamicNewArrayNode; -import jdk.compiler.graal.nodes.java.DynamicNewInstanceNode; -import jdk.compiler.graal.nodes.java.InstanceOfDynamicNode; -import jdk.compiler.graal.nodes.java.InstanceOfNode; -import jdk.compiler.graal.nodes.java.LoadExceptionObjectNode; -import jdk.compiler.graal.nodes.java.MethodCallTargetNode; -import jdk.compiler.graal.nodes.java.MonitorEnterNode; -import jdk.compiler.graal.nodes.java.MonitorExitNode; -import jdk.compiler.graal.nodes.java.MonitorIdNode; -import jdk.compiler.graal.nodes.java.NewArrayNode; -import jdk.compiler.graal.nodes.java.NewInstanceNode; -import jdk.compiler.graal.nodes.java.NewMultiArrayNode; -import jdk.compiler.graal.nodes.java.RegisterFinalizerNode; -import jdk.compiler.graal.nodes.java.ValidateNewInstanceClassNode; -import jdk.compiler.graal.nodes.memory.FloatingReadNode; -import jdk.compiler.graal.nodes.memory.ReadNode; -import jdk.compiler.graal.nodes.memory.WriteNode; -import jdk.compiler.graal.nodes.memory.address.AddressNode; -import jdk.compiler.graal.nodes.spi.Lowerable; -import jdk.compiler.graal.nodes.spi.LoweringProvider; -import jdk.compiler.graal.nodes.spi.LoweringTool; -import jdk.compiler.graal.nodes.spi.PlatformConfigurationProvider; -import jdk.compiler.graal.nodes.spi.StampProvider; -import jdk.compiler.graal.nodes.type.StampTool; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.replacements.DefaultJavaLoweringProvider; -import jdk.compiler.graal.replacements.IdentityHashCodeSnippets; -import jdk.compiler.graal.replacements.IsArraySnippets; -import jdk.compiler.graal.replacements.arraycopy.ArrayCopyNode; -import jdk.compiler.graal.replacements.arraycopy.ArrayCopySnippets; -import jdk.compiler.graal.replacements.arraycopy.ArrayCopyWithDelayedLoweringNode; -import jdk.compiler.graal.replacements.nodes.AssertionNode; -import jdk.compiler.graal.replacements.nodes.CStringConstant; -import jdk.compiler.graal.replacements.nodes.LogNode; -import jdk.compiler.graal.serviceprovider.GraalServices; +import jdk.graal.compiler.core.common.CompressEncoding; +import jdk.graal.compiler.core.common.GraalOptions; +import jdk.graal.compiler.core.common.NumUtil; +import jdk.graal.compiler.core.common.calc.Condition; +import jdk.graal.compiler.core.common.memory.BarrierType; +import jdk.graal.compiler.core.common.memory.MemoryOrderMode; +import jdk.graal.compiler.core.common.spi.ForeignCallDescriptor; +import jdk.graal.compiler.core.common.spi.ForeignCallSignature; +import jdk.graal.compiler.core.common.spi.ForeignCallsProvider; +import jdk.graal.compiler.core.common.spi.MetaAccessExtensionProvider; +import jdk.graal.compiler.core.common.type.IntegerStamp; +import jdk.graal.compiler.core.common.type.ObjectStamp; +import jdk.graal.compiler.core.common.type.Stamp; +import jdk.graal.compiler.core.common.type.StampFactory; +import jdk.graal.compiler.core.common.type.StampPair; +import jdk.graal.compiler.debug.DebugCloseable; +import jdk.graal.compiler.debug.DebugHandlersFactory; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.graph.NodeInputList; +import jdk.graal.compiler.hotspot.nodes.type.HotSpotNarrowOopStamp; +import jdk.graal.compiler.hotspot.nodes.type.KlassPointerStamp; +import jdk.graal.compiler.hotspot.nodes.type.MethodPointerStamp; +import jdk.graal.compiler.hotspot.replacements.AssertionSnippets; +import jdk.graal.compiler.hotspot.replacements.ClassGetHubNode; +import jdk.graal.compiler.hotspot.replacements.DigestBaseSnippets; +import jdk.graal.compiler.hotspot.replacements.FastNotifyNode; +import jdk.graal.compiler.hotspot.replacements.HotSpotAllocationSnippets; +import jdk.graal.compiler.hotspot.replacements.HotSpotG1WriteBarrierSnippets; +import jdk.graal.compiler.hotspot.replacements.HotSpotHashCodeSnippets; +import jdk.graal.compiler.hotspot.replacements.HotSpotIsArraySnippets; +import jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil; +import jdk.graal.compiler.hotspot.replacements.HotSpotSerialWriteBarrierSnippets; +import jdk.graal.compiler.hotspot.replacements.HubGetClassNode; +import jdk.graal.compiler.hotspot.replacements.InstanceOfSnippets; +import jdk.graal.compiler.hotspot.replacements.KlassLayoutHelperNode; +import jdk.graal.compiler.hotspot.replacements.LoadExceptionObjectSnippets; +import jdk.graal.compiler.hotspot.replacements.LogSnippets; +import jdk.graal.compiler.hotspot.replacements.MonitorSnippets; +import jdk.graal.compiler.hotspot.replacements.ObjectCloneSnippets; +import jdk.graal.compiler.hotspot.replacements.ObjectSnippets; +import jdk.graal.compiler.hotspot.replacements.RegisterFinalizerSnippets; +import jdk.graal.compiler.hotspot.replacements.StringToBytesSnippets; +import jdk.graal.compiler.hotspot.replacements.UnsafeCopyMemoryNode; +import jdk.graal.compiler.hotspot.replacements.UnsafeSnippets; +import jdk.graal.compiler.hotspot.replacements.VirtualThreadUpdateJFRSnippets; +import jdk.graal.compiler.hotspot.GraalHotSpotVMConfig; +import jdk.graal.compiler.hotspot.HotSpotGraalRuntimeProvider; +import jdk.graal.compiler.hotspot.nodes.BeginLockScopeNode; +import jdk.graal.compiler.hotspot.nodes.HotSpotCompressionNode; +import jdk.graal.compiler.hotspot.nodes.HotSpotDirectCallTargetNode; +import jdk.graal.compiler.hotspot.nodes.HotSpotIndirectCallTargetNode; +import jdk.graal.compiler.hotspot.nodes.KlassBeingInitializedCheckNode; +import jdk.graal.compiler.hotspot.nodes.VMErrorNode; +import jdk.graal.compiler.hotspot.nodes.VirtualThreadUpdateJFRNode; +import jdk.graal.compiler.hotspot.replacements.arraycopy.HotSpotArraycopySnippets; +import jdk.graal.compiler.hotspot.stubs.ForeignCallSnippets; +import jdk.graal.compiler.hotspot.word.KlassPointer; +import jdk.graal.compiler.nodes.AbstractBeginNode; +import jdk.graal.compiler.nodes.AbstractDeoptimizeNode; +import jdk.graal.compiler.nodes.CompressionNode.CompressionOp; +import jdk.graal.compiler.nodes.ConstantNode; +import jdk.graal.compiler.nodes.DeadEndNode; +import jdk.graal.compiler.nodes.DeoptimizeNode; +import jdk.graal.compiler.nodes.FixedNode; +import jdk.graal.compiler.nodes.GraphState.GuardsStage; +import jdk.graal.compiler.nodes.Invoke; +import jdk.graal.compiler.nodes.LogicConstantNode; +import jdk.graal.compiler.nodes.LogicNode; +import jdk.graal.compiler.nodes.LoweredCallTargetNode; +import jdk.graal.compiler.nodes.NodeView; +import jdk.graal.compiler.nodes.ParameterNode; +import jdk.graal.compiler.nodes.PiNode; +import jdk.graal.compiler.nodes.SafepointNode; +import jdk.graal.compiler.nodes.StartNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.UnwindNode; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.calc.CompareNode; +import jdk.graal.compiler.nodes.calc.FloatingIntegerDivRemNode; +import jdk.graal.compiler.nodes.calc.FloatingNode; +import jdk.graal.compiler.nodes.calc.IntegerDivRemNode; +import jdk.graal.compiler.nodes.calc.IsNullNode; +import jdk.graal.compiler.nodes.calc.RemNode; +import jdk.graal.compiler.nodes.calc.SignedDivNode; +import jdk.graal.compiler.nodes.calc.SignedFloatingIntegerDivNode; +import jdk.graal.compiler.nodes.calc.SignedFloatingIntegerRemNode; +import jdk.graal.compiler.nodes.calc.SignedRemNode; +import jdk.graal.compiler.nodes.debug.StringToBytesNode; +import jdk.graal.compiler.nodes.debug.VerifyHeapNode; +import jdk.graal.compiler.nodes.extended.BranchProbabilityNode; +import jdk.graal.compiler.nodes.extended.BytecodeExceptionNode; +import jdk.graal.compiler.nodes.extended.BytecodeExceptionNode.BytecodeExceptionKind; +import jdk.graal.compiler.nodes.extended.ForeignCallNode; +import jdk.graal.compiler.nodes.extended.GetClassNode; +import jdk.graal.compiler.nodes.extended.GuardingNode; +import jdk.graal.compiler.nodes.extended.LoadHubNode; +import jdk.graal.compiler.nodes.extended.LoadMethodNode; +import jdk.graal.compiler.nodes.extended.OSRLocalNode; +import jdk.graal.compiler.nodes.extended.OSRLockNode; +import jdk.graal.compiler.nodes.extended.OSRMonitorEnterNode; +import jdk.graal.compiler.nodes.extended.OSRStartNode; +import jdk.graal.compiler.nodes.extended.StoreHubNode; +import jdk.graal.compiler.nodes.gc.G1ArrayRangePostWriteBarrier; +import jdk.graal.compiler.nodes.gc.G1ArrayRangePreWriteBarrier; +import jdk.graal.compiler.nodes.gc.G1PostWriteBarrier; +import jdk.graal.compiler.nodes.gc.G1PreWriteBarrier; +import jdk.graal.compiler.nodes.gc.G1ReferentFieldReadBarrier; +import jdk.graal.compiler.nodes.gc.SerialArrayRangeWriteBarrier; +import jdk.graal.compiler.nodes.gc.SerialWriteBarrier; +import jdk.graal.compiler.nodes.java.ClassIsAssignableFromNode; +import jdk.graal.compiler.nodes.java.DynamicNewArrayNode; +import jdk.graal.compiler.nodes.java.DynamicNewInstanceNode; +import jdk.graal.compiler.nodes.java.InstanceOfDynamicNode; +import jdk.graal.compiler.nodes.java.InstanceOfNode; +import jdk.graal.compiler.nodes.java.LoadExceptionObjectNode; +import jdk.graal.compiler.nodes.java.MethodCallTargetNode; +import jdk.graal.compiler.nodes.java.MonitorEnterNode; +import jdk.graal.compiler.nodes.java.MonitorExitNode; +import jdk.graal.compiler.nodes.java.MonitorIdNode; +import jdk.graal.compiler.nodes.java.NewArrayNode; +import jdk.graal.compiler.nodes.java.NewInstanceNode; +import jdk.graal.compiler.nodes.java.NewMultiArrayNode; +import jdk.graal.compiler.nodes.java.RegisterFinalizerNode; +import jdk.graal.compiler.nodes.java.ValidateNewInstanceClassNode; +import jdk.graal.compiler.nodes.memory.FloatingReadNode; +import jdk.graal.compiler.nodes.memory.ReadNode; +import jdk.graal.compiler.nodes.memory.WriteNode; +import jdk.graal.compiler.nodes.memory.address.AddressNode; +import jdk.graal.compiler.nodes.spi.Lowerable; +import jdk.graal.compiler.nodes.spi.LoweringProvider; +import jdk.graal.compiler.nodes.spi.LoweringTool; +import jdk.graal.compiler.nodes.spi.PlatformConfigurationProvider; +import jdk.graal.compiler.nodes.spi.StampProvider; +import jdk.graal.compiler.nodes.type.StampTool; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.replacements.DefaultJavaLoweringProvider; +import jdk.graal.compiler.replacements.IdentityHashCodeSnippets; +import jdk.graal.compiler.replacements.IsArraySnippets; +import jdk.graal.compiler.replacements.arraycopy.ArrayCopyNode; +import jdk.graal.compiler.replacements.arraycopy.ArrayCopySnippets; +import jdk.graal.compiler.replacements.arraycopy.ArrayCopyWithDelayedLoweringNode; +import jdk.graal.compiler.replacements.nodes.AssertionNode; +import jdk.graal.compiler.replacements.nodes.CStringConstant; +import jdk.graal.compiler.replacements.nodes.LogNode; +import jdk.graal.compiler.serviceprovider.GraalServices; import org.graalvm.word.LocationIdentity; import jdk.vm.ci.code.TargetDescription; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotConstantFieldProvider.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/meta/HotSpotConstantFieldProvider.java similarity index 93% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotConstantFieldProvider.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/meta/HotSpotConstantFieldProvider.java index 43159d16b3bd..73e9cb4f08e2 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotConstantFieldProvider.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/meta/HotSpotConstantFieldProvider.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.meta; +package jdk.graal.compiler.hotspot.meta; -import jdk.compiler.graal.core.common.spi.JavaConstantFieldProvider; -import jdk.compiler.graal.hotspot.GraalHotSpotVMConfig; -import jdk.compiler.graal.options.OptionValues; +import jdk.graal.compiler.core.common.spi.JavaConstantFieldProvider; +import jdk.graal.compiler.hotspot.GraalHotSpotVMConfig; +import jdk.graal.compiler.options.OptionValues; import jdk.vm.ci.hotspot.HotSpotResolvedJavaField; import jdk.vm.ci.meta.MetaAccessProvider; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotDisassemblerProvider.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/meta/HotSpotDisassemblerProvider.java similarity index 88% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotDisassemblerProvider.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/meta/HotSpotDisassemblerProvider.java index 6fd321405081..195db12bd331 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotDisassemblerProvider.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/meta/HotSpotDisassemblerProvider.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.meta; +package jdk.graal.compiler.hotspot.meta; -import jdk.compiler.graal.code.CompilationResult; -import jdk.compiler.graal.code.DisassemblerProvider; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.serviceprovider.ServiceProvider; +import jdk.graal.compiler.code.CompilationResult; +import jdk.graal.compiler.code.DisassemblerProvider; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.serviceprovider.ServiceProvider; import jdk.vm.ci.code.CodeCacheProvider; import jdk.vm.ci.code.InstalledCode; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotExceptionDispatchPlugin.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/meta/HotSpotExceptionDispatchPlugin.java similarity index 79% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotExceptionDispatchPlugin.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/meta/HotSpotExceptionDispatchPlugin.java index 6bb1b73ade68..360b71fbbb64 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotExceptionDispatchPlugin.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/meta/HotSpotExceptionDispatchPlugin.java @@ -22,38 +22,38 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.meta; +package jdk.graal.compiler.hotspot.meta; import static jdk.vm.ci.meta.DeoptimizationAction.None; import static jdk.vm.ci.meta.DeoptimizationReason.TransferToInterpreter; -import static jdk.compiler.graal.hotspot.meta.HotSpotExceptionDispatchPlugin.Options.HotSpotPostOnExceptions; +import static jdk.graal.compiler.hotspot.meta.HotSpotExceptionDispatchPlugin.Options.HotSpotPostOnExceptions; import java.util.function.Supplier; -import jdk.compiler.graal.core.common.CompilationIdentifier; -import jdk.compiler.graal.core.common.memory.BarrierType; -import jdk.compiler.graal.core.common.memory.MemoryOrderMode; -import jdk.compiler.graal.core.common.type.StampFactory; -import jdk.compiler.graal.hotspot.GraalHotSpotVMConfig; -import jdk.compiler.graal.hotspot.HotSpotCompilationIdentifier; -import jdk.compiler.graal.hotspot.nodes.CurrentJavaThreadNode; -import jdk.compiler.graal.nodes.ConstantNode; -import jdk.compiler.graal.nodes.FixedGuardNode; -import jdk.compiler.graal.nodes.FixedWithNextNode; -import jdk.compiler.graal.nodes.FrameState; -import jdk.compiler.graal.nodes.LogicNode; -import jdk.compiler.graal.nodes.NamedLocationIdentity; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.calc.IntegerEqualsNode; -import jdk.compiler.graal.nodes.graphbuilderconf.NodePlugin; -import jdk.compiler.graal.nodes.memory.ReadNode; -import jdk.compiler.graal.nodes.memory.address.AddressNode; -import jdk.compiler.graal.nodes.memory.address.OffsetAddressNode; -import jdk.compiler.graal.options.Option; -import jdk.compiler.graal.options.OptionKey; -import jdk.compiler.graal.options.OptionType; -import jdk.compiler.graal.serviceprovider.GraalUnsafeAccess; +import jdk.graal.compiler.core.common.CompilationIdentifier; +import jdk.graal.compiler.core.common.memory.BarrierType; +import jdk.graal.compiler.core.common.memory.MemoryOrderMode; +import jdk.graal.compiler.core.common.type.StampFactory; +import jdk.graal.compiler.hotspot.GraalHotSpotVMConfig; +import jdk.graal.compiler.hotspot.HotSpotCompilationIdentifier; +import jdk.graal.compiler.hotspot.nodes.CurrentJavaThreadNode; +import jdk.graal.compiler.nodes.ConstantNode; +import jdk.graal.compiler.nodes.FixedGuardNode; +import jdk.graal.compiler.nodes.FixedWithNextNode; +import jdk.graal.compiler.nodes.FrameState; +import jdk.graal.compiler.nodes.LogicNode; +import jdk.graal.compiler.nodes.NamedLocationIdentity; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.calc.IntegerEqualsNode; +import jdk.graal.compiler.nodes.graphbuilderconf.NodePlugin; +import jdk.graal.compiler.nodes.memory.ReadNode; +import jdk.graal.compiler.nodes.memory.address.AddressNode; +import jdk.graal.compiler.nodes.memory.address.OffsetAddressNode; +import jdk.graal.compiler.options.Option; +import jdk.graal.compiler.options.OptionKey; +import jdk.graal.compiler.options.OptionType; +import jdk.graal.compiler.serviceprovider.GraalUnsafeAccess; import org.graalvm.word.LocationIdentity; import jdk.vm.ci.hotspot.HotSpotCompilationRequest; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotForeignCallDescriptor.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/meta/HotSpotForeignCallDescriptor.java similarity index 96% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotForeignCallDescriptor.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/meta/HotSpotForeignCallDescriptor.java index db1ff87b746a..a2bfb2c6b10c 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotForeignCallDescriptor.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/meta/HotSpotForeignCallDescriptor.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.meta; +package jdk.graal.compiler.hotspot.meta; -import static jdk.compiler.graal.hotspot.meta.HotSpotForeignCallDescriptor.Transition.SAFEPOINT; +import static jdk.graal.compiler.hotspot.meta.HotSpotForeignCallDescriptor.Transition.SAFEPOINT; import java.util.Arrays; -import jdk.compiler.graal.core.common.spi.ForeignCallDescriptor; -import jdk.compiler.graal.core.common.spi.ForeignCallSignature; +import jdk.graal.compiler.core.common.spi.ForeignCallDescriptor; +import jdk.graal.compiler.core.common.spi.ForeignCallSignature; import org.graalvm.word.LocationIdentity; public class HotSpotForeignCallDescriptor extends ForeignCallDescriptor { diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotForeignCallsProvider.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/meta/HotSpotForeignCallsProvider.java similarity index 93% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotForeignCallsProvider.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/meta/HotSpotForeignCallsProvider.java index 8dde68ac3ebf..b6625e361436 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotForeignCallsProvider.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/meta/HotSpotForeignCallsProvider.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.meta; +package jdk.graal.compiler.hotspot.meta; -import jdk.compiler.graal.core.common.spi.ForeignCallsProvider; +import jdk.graal.compiler.core.common.spi.ForeignCallsProvider; import jdk.vm.ci.meta.Value; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotForeignCallsProviderImpl.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/meta/HotSpotForeignCallsProviderImpl.java similarity index 93% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotForeignCallsProviderImpl.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/meta/HotSpotForeignCallsProviderImpl.java index 5e147cafffa5..a27f3867d553 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotForeignCallsProviderImpl.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/meta/HotSpotForeignCallsProviderImpl.java @@ -22,33 +22,33 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.meta; +package jdk.graal.compiler.hotspot.meta; import static jdk.vm.ci.hotspot.HotSpotCallingConventionType.JavaCall; import static jdk.vm.ci.hotspot.HotSpotCallingConventionType.JavaCallee; -import static jdk.compiler.graal.hotspot.HotSpotForeignCallLinkage.RegisterEffect.DESTROYS_ALL_CALLER_SAVE_REGISTERS; -import static jdk.compiler.graal.hotspot.HotSpotForeignCallLinkage.RegisterEffect.KILLS_NO_REGISTERS; +import static jdk.graal.compiler.hotspot.HotSpotForeignCallLinkage.RegisterEffect.DESTROYS_ALL_CALLER_SAVE_REGISTERS; +import static jdk.graal.compiler.hotspot.HotSpotForeignCallLinkage.RegisterEffect.KILLS_NO_REGISTERS; import static org.graalvm.word.LocationIdentity.any; import java.util.function.BiConsumer; -import jdk.compiler.graal.hotspot.replacements.HotSpotReplacementsUtil; +import jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil; import org.graalvm.collections.EconomicMap; import org.graalvm.collections.MapCursor; -import jdk.compiler.graal.core.common.LIRKind; -import jdk.compiler.graal.core.common.spi.ForeignCallDescriptor; -import jdk.compiler.graal.core.common.spi.ForeignCallSignature; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.hotspot.HotSpotForeignCallLinkage; -import jdk.compiler.graal.hotspot.HotSpotForeignCallLinkage.RegisterEffect; -import jdk.compiler.graal.hotspot.HotSpotForeignCallLinkageImpl; -import jdk.compiler.graal.hotspot.HotSpotGraalRuntimeProvider; -import jdk.compiler.graal.hotspot.stubs.ForeignCallStub; -import jdk.compiler.graal.hotspot.stubs.InvokeJavaMethodStub; -import jdk.compiler.graal.hotspot.stubs.Stub; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.word.Word; -import jdk.compiler.graal.word.WordTypes; +import jdk.graal.compiler.core.common.LIRKind; +import jdk.graal.compiler.core.common.spi.ForeignCallDescriptor; +import jdk.graal.compiler.core.common.spi.ForeignCallSignature; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.hotspot.HotSpotForeignCallLinkage; +import jdk.graal.compiler.hotspot.HotSpotForeignCallLinkage.RegisterEffect; +import jdk.graal.compiler.hotspot.HotSpotForeignCallLinkageImpl; +import jdk.graal.compiler.hotspot.HotSpotGraalRuntimeProvider; +import jdk.graal.compiler.hotspot.stubs.ForeignCallStub; +import jdk.graal.compiler.hotspot.stubs.InvokeJavaMethodStub; +import jdk.graal.compiler.hotspot.stubs.Stub; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.word.Word; +import jdk.graal.compiler.word.WordTypes; import org.graalvm.word.LocationIdentity; import jdk.vm.ci.code.CallingConvention; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotFuzzedSuitesProvider.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/meta/HotSpotFuzzedSuitesProvider.java similarity index 88% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotFuzzedSuitesProvider.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/meta/HotSpotFuzzedSuitesProvider.java index a105da26b34c..9795d42190fc 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotFuzzedSuitesProvider.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/meta/HotSpotFuzzedSuitesProvider.java @@ -22,16 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.meta; +package jdk.graal.compiler.hotspot.meta; import java.util.Random; -import jdk.compiler.graal.core.phases.fuzzing.FuzzedSuites; -import jdk.compiler.graal.nodes.GraphState; -import jdk.compiler.graal.nodes.GraphState.MandatoryStages; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.phases.tiers.Suites; -import jdk.compiler.graal.phases.tiers.SuitesProvider; +import jdk.graal.compiler.core.phases.fuzzing.FuzzedSuites; +import jdk.graal.compiler.nodes.GraphState; +import jdk.graal.compiler.nodes.GraphState.MandatoryStages; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.phases.tiers.Suites; +import jdk.graal.compiler.phases.tiers.SuitesProvider; import jdk.vm.ci.code.Architecture; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotGraalConstantFieldProvider.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/meta/HotSpotGraalConstantFieldProvider.java similarity index 94% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotGraalConstantFieldProvider.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/meta/HotSpotGraalConstantFieldProvider.java index 6d7e9a06ff68..955c7f8c3510 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotGraalConstantFieldProvider.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/meta/HotSpotGraalConstantFieldProvider.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.meta; +package jdk.graal.compiler.hotspot.meta; -import jdk.compiler.graal.graph.NodeClass; -import jdk.compiler.graal.hotspot.GraalHotSpotVMConfig; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.replacements.SnippetCounter; +import jdk.graal.compiler.graph.NodeClass; +import jdk.graal.compiler.hotspot.GraalHotSpotVMConfig; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.replacements.SnippetCounter; import jdk.vm.ci.meta.JavaConstant; import jdk.vm.ci.meta.MetaAccessProvider; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotGraphBuilderPlugins.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/meta/HotSpotGraphBuilderPlugins.java similarity index 91% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotGraphBuilderPlugins.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/meta/HotSpotGraphBuilderPlugins.java index 9dbc507c3fe8..9a7bf0e2279e 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotGraphBuilderPlugins.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/meta/HotSpotGraphBuilderPlugins.java @@ -22,26 +22,26 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.meta; +package jdk.graal.compiler.hotspot.meta; import static jdk.vm.ci.services.Services.IS_IN_NATIVE_IMAGE; -import static jdk.compiler.graal.hotspot.HotSpotBackend.BASE64_DECODE_BLOCK; -import static jdk.compiler.graal.hotspot.HotSpotBackend.BASE64_ENCODE_BLOCK; -import static jdk.compiler.graal.hotspot.HotSpotBackend.CHACHA20Block; -import static jdk.compiler.graal.hotspot.HotSpotBackend.CRC_TABLE_LOCATION; -import static jdk.compiler.graal.hotspot.HotSpotBackend.ELECTRONIC_CODEBOOK_DECRYPT_AESCRYPT; -import static jdk.compiler.graal.hotspot.HotSpotBackend.ELECTRONIC_CODEBOOK_ENCRYPT_AESCRYPT; -import static jdk.compiler.graal.hotspot.HotSpotBackend.GALOIS_COUNTER_MODE_CRYPT; -import static jdk.compiler.graal.hotspot.HotSpotBackend.POLY1305_PROCESSBLOCKS; -import static jdk.compiler.graal.hotspot.HotSpotBackend.SHAREDRUNTIME_NOTIFY_JVMTI_VTHREAD_END; -import static jdk.compiler.graal.hotspot.HotSpotBackend.SHAREDRUNTIME_NOTIFY_JVMTI_VTHREAD_MOUNT; -import static jdk.compiler.graal.hotspot.HotSpotBackend.SHAREDRUNTIME_NOTIFY_JVMTI_VTHREAD_START; -import static jdk.compiler.graal.hotspot.HotSpotBackend.SHAREDRUNTIME_NOTIFY_JVMTI_VTHREAD_UNMOUNT; -import static jdk.compiler.graal.hotspot.HotSpotBackend.UPDATE_BYTES_CRC32; -import static jdk.compiler.graal.hotspot.HotSpotBackend.UPDATE_BYTES_CRC32C; -import static jdk.compiler.graal.java.BytecodeParserOptions.InlineDuringParsing; -import static jdk.compiler.graal.nodes.ConstantNode.forBoolean; -import static jdk.compiler.graal.nodes.extended.BranchProbabilityNode.NOT_FREQUENT_PROBABILITY; +import static jdk.graal.compiler.hotspot.HotSpotBackend.BASE64_DECODE_BLOCK; +import static jdk.graal.compiler.hotspot.HotSpotBackend.BASE64_ENCODE_BLOCK; +import static jdk.graal.compiler.hotspot.HotSpotBackend.CHACHA20Block; +import static jdk.graal.compiler.hotspot.HotSpotBackend.CRC_TABLE_LOCATION; +import static jdk.graal.compiler.hotspot.HotSpotBackend.ELECTRONIC_CODEBOOK_DECRYPT_AESCRYPT; +import static jdk.graal.compiler.hotspot.HotSpotBackend.ELECTRONIC_CODEBOOK_ENCRYPT_AESCRYPT; +import static jdk.graal.compiler.hotspot.HotSpotBackend.GALOIS_COUNTER_MODE_CRYPT; +import static jdk.graal.compiler.hotspot.HotSpotBackend.POLY1305_PROCESSBLOCKS; +import static jdk.graal.compiler.hotspot.HotSpotBackend.SHAREDRUNTIME_NOTIFY_JVMTI_VTHREAD_END; +import static jdk.graal.compiler.hotspot.HotSpotBackend.SHAREDRUNTIME_NOTIFY_JVMTI_VTHREAD_MOUNT; +import static jdk.graal.compiler.hotspot.HotSpotBackend.SHAREDRUNTIME_NOTIFY_JVMTI_VTHREAD_START; +import static jdk.graal.compiler.hotspot.HotSpotBackend.SHAREDRUNTIME_NOTIFY_JVMTI_VTHREAD_UNMOUNT; +import static jdk.graal.compiler.hotspot.HotSpotBackend.UPDATE_BYTES_CRC32; +import static jdk.graal.compiler.hotspot.HotSpotBackend.UPDATE_BYTES_CRC32C; +import static jdk.graal.compiler.java.BytecodeParserOptions.InlineDuringParsing; +import static jdk.graal.compiler.nodes.ConstantNode.forBoolean; +import static jdk.graal.compiler.nodes.extended.BranchProbabilityNode.NOT_FREQUENT_PROBABILITY; import java.lang.annotation.Annotation; import java.lang.invoke.ConstantCallSite; @@ -54,112 +54,112 @@ import java.math.BigInteger; import java.util.zip.CRC32; -import jdk.compiler.graal.api.directives.GraalDirectives; -import jdk.compiler.graal.api.replacements.SnippetReflectionProvider; -import jdk.compiler.graal.core.common.calc.Condition; -import jdk.compiler.graal.core.common.memory.BarrierType; -import jdk.compiler.graal.core.common.memory.MemoryOrderMode; -import jdk.compiler.graal.core.common.spi.ForeignCallDescriptor; -import jdk.compiler.graal.core.common.type.StampFactory; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.hotspot.replacements.CallSiteTargetNode; -import jdk.compiler.graal.hotspot.replacements.DigestBaseSnippets; -import jdk.compiler.graal.hotspot.replacements.FastNotifyNode; -import jdk.compiler.graal.hotspot.replacements.HotSpotIdentityHashCodeNode; -import jdk.compiler.graal.hotspot.replacements.HotSpotInvocationPluginHelper; -import jdk.compiler.graal.hotspot.replacements.HotSpotReflectionGetCallerClassNode; -import jdk.compiler.graal.hotspot.replacements.HotSpotReplacementsUtil; -import jdk.compiler.graal.hotspot.replacements.HubGetClassNode; -import jdk.compiler.graal.hotspot.replacements.ObjectCloneNode; -import jdk.compiler.graal.hotspot.replacements.UnsafeCopyMemoryNode; -import jdk.compiler.graal.hotspot.GraalHotSpotVMConfig; -import jdk.compiler.graal.hotspot.HotSpotBackend; -import jdk.compiler.graal.hotspot.HotSpotGraalRuntimeProvider; -import jdk.compiler.graal.hotspot.nodes.CurrentJavaThreadNode; -import jdk.compiler.graal.hotspot.nodes.HotSpotLoadReservedReferenceNode; -import jdk.compiler.graal.hotspot.nodes.HotSpotStoreReservedReferenceNode; -import jdk.compiler.graal.hotspot.word.HotSpotWordTypes; -import jdk.compiler.graal.java.BytecodeParser; -import jdk.compiler.graal.lir.SyncPort; -import jdk.compiler.graal.nodes.BeginNode; -import jdk.compiler.graal.nodes.ComputeObjectAddressNode; -import jdk.compiler.graal.nodes.ConstantNode; -import jdk.compiler.graal.nodes.EndNode; -import jdk.compiler.graal.nodes.FieldLocationIdentity; -import jdk.compiler.graal.nodes.IfNode; -import jdk.compiler.graal.nodes.LogicNode; -import jdk.compiler.graal.nodes.MergeNode; -import jdk.compiler.graal.nodes.NodeView; -import jdk.compiler.graal.nodes.PiNode; -import jdk.compiler.graal.nodes.ProfileData; -import jdk.compiler.graal.nodes.ProfileData.BranchProbabilityData; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.ValuePhiNode; -import jdk.compiler.graal.nodes.calc.AddNode; -import jdk.compiler.graal.nodes.calc.AndNode; -import jdk.compiler.graal.nodes.calc.ConditionalNode; -import jdk.compiler.graal.nodes.calc.IntegerEqualsNode; -import jdk.compiler.graal.nodes.calc.IntegerTestNode; -import jdk.compiler.graal.nodes.calc.IsNullNode; -import jdk.compiler.graal.nodes.calc.LeftShiftNode; -import jdk.compiler.graal.nodes.calc.ObjectEqualsNode; -import jdk.compiler.graal.nodes.calc.SignExtendNode; -import jdk.compiler.graal.nodes.calc.SubNode; -import jdk.compiler.graal.nodes.calc.UnsignedRightShiftNode; -import jdk.compiler.graal.nodes.calc.XorNode; -import jdk.compiler.graal.nodes.extended.BranchProbabilityNode; -import jdk.compiler.graal.nodes.extended.ForeignCallNode; -import jdk.compiler.graal.nodes.extended.JavaReadNode; -import jdk.compiler.graal.nodes.extended.JavaWriteNode; -import jdk.compiler.graal.nodes.extended.LoadHubNode; -import jdk.compiler.graal.nodes.extended.ObjectIsArrayNode; -import jdk.compiler.graal.nodes.gc.BarrierSet; -import jdk.compiler.graal.nodes.graphbuilderconf.ForeignCallPlugin; -import jdk.compiler.graal.nodes.graphbuilderconf.GeneratedPluginFactory; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext; -import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin; -import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin.InlineOnlyInvocationPlugin; -import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin.Receiver; -import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins; -import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins.Registration; -import jdk.compiler.graal.nodes.java.ArrayLengthNode; -import jdk.compiler.graal.nodes.java.DynamicNewArrayNode; -import jdk.compiler.graal.nodes.java.DynamicNewInstanceNode; -import jdk.compiler.graal.nodes.java.NewArrayNode; -import jdk.compiler.graal.nodes.memory.address.AddressNode; -import jdk.compiler.graal.nodes.memory.address.OffsetAddressNode; -import jdk.compiler.graal.nodes.spi.Replacements; -import jdk.compiler.graal.nodes.util.GraphUtil; -import jdk.compiler.graal.options.Option; -import jdk.compiler.graal.options.OptionKey; -import jdk.compiler.graal.options.OptionType; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.phases.tiers.CompilerConfiguration; -import jdk.compiler.graal.replacements.InlineDuringParsingPlugin; -import jdk.compiler.graal.replacements.IntrinsicGraphBuilder; -import jdk.compiler.graal.replacements.InvocationPluginHelper; -import jdk.compiler.graal.replacements.MethodHandlePlugin; -import jdk.compiler.graal.replacements.NodeIntrinsificationProvider; -import jdk.compiler.graal.replacements.ReplacementsImpl; -import jdk.compiler.graal.replacements.SnippetSubstitutionInvocationPlugin; -import jdk.compiler.graal.replacements.SnippetTemplate; -import jdk.compiler.graal.replacements.StandardGraphBuilderPlugins; -import jdk.compiler.graal.replacements.StandardGraphBuilderPlugins.AESCryptDelegatePlugin; -import jdk.compiler.graal.replacements.StandardGraphBuilderPlugins.CounterModeCryptPlugin; -import jdk.compiler.graal.replacements.StandardGraphBuilderPlugins.ReachabilityFencePlugin; -import jdk.compiler.graal.replacements.arraycopy.ArrayCopyCallNode; -import jdk.compiler.graal.replacements.arraycopy.ArrayCopyForeignCalls; -import jdk.compiler.graal.replacements.arraycopy.ArrayCopySnippets; -import jdk.compiler.graal.replacements.nodes.AESNode.CryptMode; -import jdk.compiler.graal.replacements.nodes.CipherBlockChainingAESNode; -import jdk.compiler.graal.replacements.nodes.CounterModeAESNode; -import jdk.compiler.graal.replacements.nodes.MacroNode.MacroParams; -import jdk.compiler.graal.replacements.nodes.VectorizedMismatchNode; -import jdk.compiler.graal.serviceprovider.GraalServices; -import jdk.compiler.graal.serviceprovider.JavaVersionUtil; -import jdk.compiler.graal.word.WordTypes; +import jdk.graal.compiler.api.directives.GraalDirectives; +import jdk.graal.compiler.api.replacements.SnippetReflectionProvider; +import jdk.graal.compiler.core.common.calc.Condition; +import jdk.graal.compiler.core.common.memory.BarrierType; +import jdk.graal.compiler.core.common.memory.MemoryOrderMode; +import jdk.graal.compiler.core.common.spi.ForeignCallDescriptor; +import jdk.graal.compiler.core.common.type.StampFactory; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.hotspot.replacements.CallSiteTargetNode; +import jdk.graal.compiler.hotspot.replacements.DigestBaseSnippets; +import jdk.graal.compiler.hotspot.replacements.FastNotifyNode; +import jdk.graal.compiler.hotspot.replacements.HotSpotIdentityHashCodeNode; +import jdk.graal.compiler.hotspot.replacements.HotSpotInvocationPluginHelper; +import jdk.graal.compiler.hotspot.replacements.HotSpotReflectionGetCallerClassNode; +import jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil; +import jdk.graal.compiler.hotspot.replacements.HubGetClassNode; +import jdk.graal.compiler.hotspot.replacements.ObjectCloneNode; +import jdk.graal.compiler.hotspot.replacements.UnsafeCopyMemoryNode; +import jdk.graal.compiler.hotspot.GraalHotSpotVMConfig; +import jdk.graal.compiler.hotspot.HotSpotBackend; +import jdk.graal.compiler.hotspot.HotSpotGraalRuntimeProvider; +import jdk.graal.compiler.hotspot.nodes.CurrentJavaThreadNode; +import jdk.graal.compiler.hotspot.nodes.HotSpotLoadReservedReferenceNode; +import jdk.graal.compiler.hotspot.nodes.HotSpotStoreReservedReferenceNode; +import jdk.graal.compiler.hotspot.word.HotSpotWordTypes; +import jdk.graal.compiler.java.BytecodeParser; +import jdk.graal.compiler.lir.SyncPort; +import jdk.graal.compiler.nodes.BeginNode; +import jdk.graal.compiler.nodes.ComputeObjectAddressNode; +import jdk.graal.compiler.nodes.ConstantNode; +import jdk.graal.compiler.nodes.EndNode; +import jdk.graal.compiler.nodes.FieldLocationIdentity; +import jdk.graal.compiler.nodes.IfNode; +import jdk.graal.compiler.nodes.LogicNode; +import jdk.graal.compiler.nodes.MergeNode; +import jdk.graal.compiler.nodes.NodeView; +import jdk.graal.compiler.nodes.PiNode; +import jdk.graal.compiler.nodes.ProfileData; +import jdk.graal.compiler.nodes.ProfileData.BranchProbabilityData; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.ValuePhiNode; +import jdk.graal.compiler.nodes.calc.AddNode; +import jdk.graal.compiler.nodes.calc.AndNode; +import jdk.graal.compiler.nodes.calc.ConditionalNode; +import jdk.graal.compiler.nodes.calc.IntegerEqualsNode; +import jdk.graal.compiler.nodes.calc.IntegerTestNode; +import jdk.graal.compiler.nodes.calc.IsNullNode; +import jdk.graal.compiler.nodes.calc.LeftShiftNode; +import jdk.graal.compiler.nodes.calc.ObjectEqualsNode; +import jdk.graal.compiler.nodes.calc.SignExtendNode; +import jdk.graal.compiler.nodes.calc.SubNode; +import jdk.graal.compiler.nodes.calc.UnsignedRightShiftNode; +import jdk.graal.compiler.nodes.calc.XorNode; +import jdk.graal.compiler.nodes.extended.BranchProbabilityNode; +import jdk.graal.compiler.nodes.extended.ForeignCallNode; +import jdk.graal.compiler.nodes.extended.JavaReadNode; +import jdk.graal.compiler.nodes.extended.JavaWriteNode; +import jdk.graal.compiler.nodes.extended.LoadHubNode; +import jdk.graal.compiler.nodes.extended.ObjectIsArrayNode; +import jdk.graal.compiler.nodes.gc.BarrierSet; +import jdk.graal.compiler.nodes.graphbuilderconf.ForeignCallPlugin; +import jdk.graal.compiler.nodes.graphbuilderconf.GeneratedPluginFactory; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext; +import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin; +import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin.InlineOnlyInvocationPlugin; +import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin.Receiver; +import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins; +import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins.Registration; +import jdk.graal.compiler.nodes.java.ArrayLengthNode; +import jdk.graal.compiler.nodes.java.DynamicNewArrayNode; +import jdk.graal.compiler.nodes.java.DynamicNewInstanceNode; +import jdk.graal.compiler.nodes.java.NewArrayNode; +import jdk.graal.compiler.nodes.memory.address.AddressNode; +import jdk.graal.compiler.nodes.memory.address.OffsetAddressNode; +import jdk.graal.compiler.nodes.spi.Replacements; +import jdk.graal.compiler.nodes.util.GraphUtil; +import jdk.graal.compiler.options.Option; +import jdk.graal.compiler.options.OptionKey; +import jdk.graal.compiler.options.OptionType; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.phases.tiers.CompilerConfiguration; +import jdk.graal.compiler.replacements.InlineDuringParsingPlugin; +import jdk.graal.compiler.replacements.IntrinsicGraphBuilder; +import jdk.graal.compiler.replacements.InvocationPluginHelper; +import jdk.graal.compiler.replacements.MethodHandlePlugin; +import jdk.graal.compiler.replacements.NodeIntrinsificationProvider; +import jdk.graal.compiler.replacements.ReplacementsImpl; +import jdk.graal.compiler.replacements.SnippetSubstitutionInvocationPlugin; +import jdk.graal.compiler.replacements.SnippetTemplate; +import jdk.graal.compiler.replacements.StandardGraphBuilderPlugins; +import jdk.graal.compiler.replacements.StandardGraphBuilderPlugins.AESCryptDelegatePlugin; +import jdk.graal.compiler.replacements.StandardGraphBuilderPlugins.CounterModeCryptPlugin; +import jdk.graal.compiler.replacements.StandardGraphBuilderPlugins.ReachabilityFencePlugin; +import jdk.graal.compiler.replacements.arraycopy.ArrayCopyCallNode; +import jdk.graal.compiler.replacements.arraycopy.ArrayCopyForeignCalls; +import jdk.graal.compiler.replacements.arraycopy.ArrayCopySnippets; +import jdk.graal.compiler.replacements.nodes.AESNode.CryptMode; +import jdk.graal.compiler.replacements.nodes.CipherBlockChainingAESNode; +import jdk.graal.compiler.replacements.nodes.CounterModeAESNode; +import jdk.graal.compiler.replacements.nodes.MacroNode.MacroParams; +import jdk.graal.compiler.replacements.nodes.VectorizedMismatchNode; +import jdk.graal.compiler.serviceprovider.GraalServices; +import jdk.graal.compiler.serviceprovider.JavaVersionUtil; +import jdk.graal.compiler.word.WordTypes; import org.graalvm.word.LocationIdentity; import jdk.vm.ci.aarch64.AArch64; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotHostForeignCallsProvider.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/meta/HotSpotHostForeignCallsProvider.java similarity index 86% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotHostForeignCallsProvider.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/meta/HotSpotHostForeignCallsProvider.java index 7f808ea8dd18..1fd253ae1ff7 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotHostForeignCallsProvider.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/meta/HotSpotHostForeignCallsProvider.java @@ -22,124 +22,124 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.meta; +package jdk.graal.compiler.hotspot.meta; import static jdk.vm.ci.hotspot.HotSpotCallingConventionType.NativeCall; import static jdk.vm.ci.services.Services.IS_BUILDING_NATIVE_IMAGE; import static jdk.vm.ci.services.Services.IS_IN_NATIVE_IMAGE; -import static jdk.compiler.graal.core.target.Backend.ARITHMETIC_DREM; -import static jdk.compiler.graal.core.target.Backend.ARITHMETIC_FREM; -import static jdk.compiler.graal.hotspot.HotSpotBackend.BASE64_DECODE_BLOCK; -import static jdk.compiler.graal.hotspot.HotSpotBackend.BASE64_ENCODE_BLOCK; -import static jdk.compiler.graal.hotspot.HotSpotBackend.BIGINTEGER_LEFT_SHIFT_WORKER; -import static jdk.compiler.graal.hotspot.HotSpotBackend.BIGINTEGER_RIGHT_SHIFT_WORKER; -import static jdk.compiler.graal.hotspot.HotSpotBackend.CHACHA20Block; -import static jdk.compiler.graal.hotspot.HotSpotBackend.ELECTRONIC_CODEBOOK_DECRYPT_AESCRYPT; -import static jdk.compiler.graal.hotspot.HotSpotBackend.ELECTRONIC_CODEBOOK_ENCRYPT_AESCRYPT; -import static jdk.compiler.graal.hotspot.HotSpotBackend.EXCEPTION_HANDLER; -import static jdk.compiler.graal.hotspot.HotSpotBackend.GALOIS_COUNTER_MODE_CRYPT; -import static jdk.compiler.graal.hotspot.HotSpotBackend.IC_MISS_HANDLER; -import static jdk.compiler.graal.hotspot.HotSpotBackend.MD5_IMPL_COMPRESS_MB; -import static jdk.compiler.graal.hotspot.HotSpotBackend.MONTGOMERY_MULTIPLY; -import static jdk.compiler.graal.hotspot.HotSpotBackend.MONTGOMERY_SQUARE; -import static jdk.compiler.graal.hotspot.HotSpotBackend.NEW_ARRAY; -import static jdk.compiler.graal.hotspot.HotSpotBackend.NEW_ARRAY_OR_NULL; -import static jdk.compiler.graal.hotspot.HotSpotBackend.NEW_INSTANCE; -import static jdk.compiler.graal.hotspot.HotSpotBackend.NEW_INSTANCE_OR_NULL; -import static jdk.compiler.graal.hotspot.HotSpotBackend.NEW_MULTI_ARRAY; -import static jdk.compiler.graal.hotspot.HotSpotBackend.NEW_MULTI_ARRAY_OR_NULL; -import static jdk.compiler.graal.hotspot.HotSpotBackend.POLY1305_PROCESSBLOCKS; -import static jdk.compiler.graal.hotspot.HotSpotBackend.SHA2_IMPL_COMPRESS_MB; -import static jdk.compiler.graal.hotspot.HotSpotBackend.SHA3_IMPL_COMPRESS_MB; -import static jdk.compiler.graal.hotspot.HotSpotBackend.SHA5_IMPL_COMPRESS_MB; -import static jdk.compiler.graal.hotspot.HotSpotBackend.SHAREDRUNTIME_NOTIFY_JVMTI_VTHREAD_END; -import static jdk.compiler.graal.hotspot.HotSpotBackend.SHAREDRUNTIME_NOTIFY_JVMTI_VTHREAD_MOUNT; -import static jdk.compiler.graal.hotspot.HotSpotBackend.SHAREDRUNTIME_NOTIFY_JVMTI_VTHREAD_START; -import static jdk.compiler.graal.hotspot.HotSpotBackend.SHAREDRUNTIME_NOTIFY_JVMTI_VTHREAD_UNMOUNT; -import static jdk.compiler.graal.hotspot.HotSpotBackend.SHA_IMPL_COMPRESS_MB; -import static jdk.compiler.graal.hotspot.HotSpotBackend.UNWIND_EXCEPTION_TO_CALLER; -import static jdk.compiler.graal.hotspot.HotSpotBackend.UPDATE_BYTES_ADLER32; -import static jdk.compiler.graal.hotspot.HotSpotBackend.UPDATE_BYTES_CRC32; -import static jdk.compiler.graal.hotspot.HotSpotBackend.UPDATE_BYTES_CRC32C; -import static jdk.compiler.graal.hotspot.HotSpotBackend.VM_ERROR; -import static jdk.compiler.graal.hotspot.HotSpotForeignCallLinkage.RegisterEffect.COMPUTES_REGISTERS_KILLED; -import static jdk.compiler.graal.hotspot.HotSpotForeignCallLinkage.RegisterEffect.DESTROYS_ALL_CALLER_SAVE_REGISTERS; -import static jdk.compiler.graal.hotspot.HotSpotHostBackend.DEOPT_BLOB_UNCOMMON_TRAP; -import static jdk.compiler.graal.hotspot.HotSpotHostBackend.DEOPT_BLOB_UNPACK; -import static jdk.compiler.graal.hotspot.HotSpotHostBackend.DEOPT_BLOB_UNPACK_WITH_EXCEPTION_IN_TLS; -import static jdk.compiler.graal.hotspot.HotSpotHostBackend.ENABLE_STACK_RESERVED_ZONE; -import static jdk.compiler.graal.hotspot.HotSpotHostBackend.POLLING_PAGE_RETURN_HANDLER; -import static jdk.compiler.graal.hotspot.HotSpotHostBackend.THROW_DELAYED_STACKOVERFLOW_ERROR; -import static jdk.compiler.graal.hotspot.stubs.ExceptionHandlerStub.EXCEPTION_HANDLER_FOR_PC; -import static jdk.compiler.graal.hotspot.stubs.StubUtil.VM_MESSAGE_C; -import static jdk.compiler.graal.hotspot.stubs.UnwindExceptionToCallerStub.EXCEPTION_HANDLER_FOR_RETURN_ADDRESS; -import static jdk.compiler.graal.nodes.java.ForeignCallDescriptors.REGISTER_FINALIZER; -import static jdk.compiler.graal.replacements.SnippetTemplate.AbstractTemplates.findMethod; -import static jdk.compiler.graal.replacements.nodes.BinaryMathIntrinsicNode.BinaryOperation.POW; -import static jdk.compiler.graal.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation.COS; -import static jdk.compiler.graal.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation.EXP; -import static jdk.compiler.graal.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation.LOG; -import static jdk.compiler.graal.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation.LOG10; -import static jdk.compiler.graal.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation.SIN; -import static jdk.compiler.graal.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation.TAN; +import static jdk.graal.compiler.core.target.Backend.ARITHMETIC_DREM; +import static jdk.graal.compiler.core.target.Backend.ARITHMETIC_FREM; +import static jdk.graal.compiler.hotspot.HotSpotBackend.BASE64_DECODE_BLOCK; +import static jdk.graal.compiler.hotspot.HotSpotBackend.BASE64_ENCODE_BLOCK; +import static jdk.graal.compiler.hotspot.HotSpotBackend.BIGINTEGER_LEFT_SHIFT_WORKER; +import static jdk.graal.compiler.hotspot.HotSpotBackend.BIGINTEGER_RIGHT_SHIFT_WORKER; +import static jdk.graal.compiler.hotspot.HotSpotBackend.CHACHA20Block; +import static jdk.graal.compiler.hotspot.HotSpotBackend.ELECTRONIC_CODEBOOK_DECRYPT_AESCRYPT; +import static jdk.graal.compiler.hotspot.HotSpotBackend.ELECTRONIC_CODEBOOK_ENCRYPT_AESCRYPT; +import static jdk.graal.compiler.hotspot.HotSpotBackend.EXCEPTION_HANDLER; +import static jdk.graal.compiler.hotspot.HotSpotBackend.GALOIS_COUNTER_MODE_CRYPT; +import static jdk.graal.compiler.hotspot.HotSpotBackend.IC_MISS_HANDLER; +import static jdk.graal.compiler.hotspot.HotSpotBackend.MD5_IMPL_COMPRESS_MB; +import static jdk.graal.compiler.hotspot.HotSpotBackend.MONTGOMERY_MULTIPLY; +import static jdk.graal.compiler.hotspot.HotSpotBackend.MONTGOMERY_SQUARE; +import static jdk.graal.compiler.hotspot.HotSpotBackend.NEW_ARRAY; +import static jdk.graal.compiler.hotspot.HotSpotBackend.NEW_ARRAY_OR_NULL; +import static jdk.graal.compiler.hotspot.HotSpotBackend.NEW_INSTANCE; +import static jdk.graal.compiler.hotspot.HotSpotBackend.NEW_INSTANCE_OR_NULL; +import static jdk.graal.compiler.hotspot.HotSpotBackend.NEW_MULTI_ARRAY; +import static jdk.graal.compiler.hotspot.HotSpotBackend.NEW_MULTI_ARRAY_OR_NULL; +import static jdk.graal.compiler.hotspot.HotSpotBackend.POLY1305_PROCESSBLOCKS; +import static jdk.graal.compiler.hotspot.HotSpotBackend.SHA2_IMPL_COMPRESS_MB; +import static jdk.graal.compiler.hotspot.HotSpotBackend.SHA3_IMPL_COMPRESS_MB; +import static jdk.graal.compiler.hotspot.HotSpotBackend.SHA5_IMPL_COMPRESS_MB; +import static jdk.graal.compiler.hotspot.HotSpotBackend.SHAREDRUNTIME_NOTIFY_JVMTI_VTHREAD_END; +import static jdk.graal.compiler.hotspot.HotSpotBackend.SHAREDRUNTIME_NOTIFY_JVMTI_VTHREAD_MOUNT; +import static jdk.graal.compiler.hotspot.HotSpotBackend.SHAREDRUNTIME_NOTIFY_JVMTI_VTHREAD_START; +import static jdk.graal.compiler.hotspot.HotSpotBackend.SHAREDRUNTIME_NOTIFY_JVMTI_VTHREAD_UNMOUNT; +import static jdk.graal.compiler.hotspot.HotSpotBackend.SHA_IMPL_COMPRESS_MB; +import static jdk.graal.compiler.hotspot.HotSpotBackend.UNWIND_EXCEPTION_TO_CALLER; +import static jdk.graal.compiler.hotspot.HotSpotBackend.UPDATE_BYTES_ADLER32; +import static jdk.graal.compiler.hotspot.HotSpotBackend.UPDATE_BYTES_CRC32; +import static jdk.graal.compiler.hotspot.HotSpotBackend.UPDATE_BYTES_CRC32C; +import static jdk.graal.compiler.hotspot.HotSpotBackend.VM_ERROR; +import static jdk.graal.compiler.hotspot.HotSpotForeignCallLinkage.RegisterEffect.COMPUTES_REGISTERS_KILLED; +import static jdk.graal.compiler.hotspot.HotSpotForeignCallLinkage.RegisterEffect.DESTROYS_ALL_CALLER_SAVE_REGISTERS; +import static jdk.graal.compiler.hotspot.HotSpotHostBackend.DEOPT_BLOB_UNCOMMON_TRAP; +import static jdk.graal.compiler.hotspot.HotSpotHostBackend.DEOPT_BLOB_UNPACK; +import static jdk.graal.compiler.hotspot.HotSpotHostBackend.DEOPT_BLOB_UNPACK_WITH_EXCEPTION_IN_TLS; +import static jdk.graal.compiler.hotspot.HotSpotHostBackend.ENABLE_STACK_RESERVED_ZONE; +import static jdk.graal.compiler.hotspot.HotSpotHostBackend.POLLING_PAGE_RETURN_HANDLER; +import static jdk.graal.compiler.hotspot.HotSpotHostBackend.THROW_DELAYED_STACKOVERFLOW_ERROR; +import static jdk.graal.compiler.hotspot.stubs.ExceptionHandlerStub.EXCEPTION_HANDLER_FOR_PC; +import static jdk.graal.compiler.hotspot.stubs.StubUtil.VM_MESSAGE_C; +import static jdk.graal.compiler.hotspot.stubs.UnwindExceptionToCallerStub.EXCEPTION_HANDLER_FOR_RETURN_ADDRESS; +import static jdk.graal.compiler.nodes.java.ForeignCallDescriptors.REGISTER_FINALIZER; +import static jdk.graal.compiler.replacements.SnippetTemplate.AbstractTemplates.findMethod; +import static jdk.graal.compiler.replacements.nodes.BinaryMathIntrinsicNode.BinaryOperation.POW; +import static jdk.graal.compiler.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation.COS; +import static jdk.graal.compiler.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation.EXP; +import static jdk.graal.compiler.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation.LOG; +import static jdk.graal.compiler.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation.LOG10; +import static jdk.graal.compiler.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation.SIN; +import static jdk.graal.compiler.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation.TAN; import static org.graalvm.word.LocationIdentity.any; import java.util.EnumMap; -import jdk.compiler.graal.hotspot.replacements.HotSpotAllocationSnippets; -import jdk.compiler.graal.hotspot.replacements.HotSpotG1WriteBarrierSnippets; -import jdk.compiler.graal.hotspot.replacements.Log; -import jdk.compiler.graal.hotspot.replacements.MonitorSnippets; +import jdk.graal.compiler.hotspot.replacements.HotSpotAllocationSnippets; +import jdk.graal.compiler.hotspot.replacements.HotSpotG1WriteBarrierSnippets; +import jdk.graal.compiler.hotspot.replacements.Log; +import jdk.graal.compiler.hotspot.replacements.MonitorSnippets; import org.graalvm.collections.EconomicMap; -import jdk.compiler.graal.core.common.spi.ForeignCallDescriptor; -import jdk.compiler.graal.core.common.spi.ForeignCallSignature; -import jdk.compiler.graal.core.common.spi.ForeignCallsProvider; -import jdk.compiler.graal.hotspot.GraalHotSpotVMConfig; -import jdk.compiler.graal.hotspot.HotSpotForeignCallLinkage; -import jdk.compiler.graal.hotspot.HotSpotGraalRuntimeProvider; -import jdk.compiler.graal.hotspot.replacements.arraycopy.CheckcastArrayCopyCallNode; -import jdk.compiler.graal.hotspot.stubs.ArrayStoreExceptionStub; -import jdk.compiler.graal.hotspot.stubs.ClassCastExceptionStub; -import jdk.compiler.graal.hotspot.stubs.CreateExceptionStub; -import jdk.compiler.graal.hotspot.stubs.DivisionByZeroExceptionStub; -import jdk.compiler.graal.hotspot.stubs.ExceptionHandlerStub; -import jdk.compiler.graal.hotspot.stubs.IllegalArgumentExceptionArgumentIsNotAnArrayStub; -import jdk.compiler.graal.hotspot.stubs.IntegerExactOverflowExceptionStub; -import jdk.compiler.graal.hotspot.stubs.IntrinsicStubsGen; -import jdk.compiler.graal.hotspot.stubs.LongExactOverflowExceptionStub; -import jdk.compiler.graal.hotspot.stubs.NegativeArraySizeExceptionStub; -import jdk.compiler.graal.hotspot.stubs.NullPointerExceptionStub; -import jdk.compiler.graal.hotspot.stubs.OutOfBoundsExceptionStub; -import jdk.compiler.graal.hotspot.stubs.SnippetStub; -import jdk.compiler.graal.hotspot.stubs.Stub; -import jdk.compiler.graal.hotspot.stubs.UnwindExceptionToCallerStub; -import jdk.compiler.graal.hotspot.stubs.VerifyOopStub; -import jdk.compiler.graal.nodes.NamedLocationIdentity; -import jdk.compiler.graal.nodes.extended.BytecodeExceptionNode.BytecodeExceptionKind; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.replacements.StringLatin1InflateNode; -import jdk.compiler.graal.replacements.StringUTF16CompressNode; -import jdk.compiler.graal.replacements.arraycopy.ArrayCopyForeignCalls; -import jdk.compiler.graal.replacements.nodes.AESNode; -import jdk.compiler.graal.replacements.nodes.ArrayCompareToForeignCalls; -import jdk.compiler.graal.replacements.nodes.ArrayCopyWithConversionsForeignCalls; -import jdk.compiler.graal.replacements.nodes.ArrayEqualsForeignCalls; -import jdk.compiler.graal.replacements.nodes.ArrayEqualsWithMaskForeignCalls; -import jdk.compiler.graal.replacements.nodes.ArrayIndexOfForeignCalls; -import jdk.compiler.graal.replacements.nodes.ArrayRegionCompareToForeignCalls; -import jdk.compiler.graal.replacements.nodes.BigIntegerMulAddNode; -import jdk.compiler.graal.replacements.nodes.BigIntegerMultiplyToLenNode; -import jdk.compiler.graal.replacements.nodes.BigIntegerSquareToLenNode; -import jdk.compiler.graal.replacements.nodes.CalcStringAttributesForeignCalls; -import jdk.compiler.graal.replacements.nodes.CipherBlockChainingAESNode; -import jdk.compiler.graal.replacements.nodes.CountPositivesNode; -import jdk.compiler.graal.replacements.nodes.CounterModeAESNode; -import jdk.compiler.graal.replacements.nodes.EncodeArrayNode; -import jdk.compiler.graal.replacements.nodes.GHASHProcessBlocksNode; -import jdk.compiler.graal.replacements.nodes.MessageDigestNode; -import jdk.compiler.graal.replacements.nodes.VectorizedMismatchNode; -import jdk.compiler.graal.word.Word; -import jdk.compiler.graal.word.WordTypes; +import jdk.graal.compiler.core.common.spi.ForeignCallDescriptor; +import jdk.graal.compiler.core.common.spi.ForeignCallSignature; +import jdk.graal.compiler.core.common.spi.ForeignCallsProvider; +import jdk.graal.compiler.hotspot.GraalHotSpotVMConfig; +import jdk.graal.compiler.hotspot.HotSpotForeignCallLinkage; +import jdk.graal.compiler.hotspot.HotSpotGraalRuntimeProvider; +import jdk.graal.compiler.hotspot.replacements.arraycopy.CheckcastArrayCopyCallNode; +import jdk.graal.compiler.hotspot.stubs.ArrayStoreExceptionStub; +import jdk.graal.compiler.hotspot.stubs.ClassCastExceptionStub; +import jdk.graal.compiler.hotspot.stubs.CreateExceptionStub; +import jdk.graal.compiler.hotspot.stubs.DivisionByZeroExceptionStub; +import jdk.graal.compiler.hotspot.stubs.ExceptionHandlerStub; +import jdk.graal.compiler.hotspot.stubs.IllegalArgumentExceptionArgumentIsNotAnArrayStub; +import jdk.graal.compiler.hotspot.stubs.IntegerExactOverflowExceptionStub; +import jdk.graal.compiler.hotspot.stubs.IntrinsicStubsGen; +import jdk.graal.compiler.hotspot.stubs.LongExactOverflowExceptionStub; +import jdk.graal.compiler.hotspot.stubs.NegativeArraySizeExceptionStub; +import jdk.graal.compiler.hotspot.stubs.NullPointerExceptionStub; +import jdk.graal.compiler.hotspot.stubs.OutOfBoundsExceptionStub; +import jdk.graal.compiler.hotspot.stubs.SnippetStub; +import jdk.graal.compiler.hotspot.stubs.Stub; +import jdk.graal.compiler.hotspot.stubs.UnwindExceptionToCallerStub; +import jdk.graal.compiler.hotspot.stubs.VerifyOopStub; +import jdk.graal.compiler.nodes.NamedLocationIdentity; +import jdk.graal.compiler.nodes.extended.BytecodeExceptionNode.BytecodeExceptionKind; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.replacements.StringLatin1InflateNode; +import jdk.graal.compiler.replacements.StringUTF16CompressNode; +import jdk.graal.compiler.replacements.arraycopy.ArrayCopyForeignCalls; +import jdk.graal.compiler.replacements.nodes.AESNode; +import jdk.graal.compiler.replacements.nodes.ArrayCompareToForeignCalls; +import jdk.graal.compiler.replacements.nodes.ArrayCopyWithConversionsForeignCalls; +import jdk.graal.compiler.replacements.nodes.ArrayEqualsForeignCalls; +import jdk.graal.compiler.replacements.nodes.ArrayEqualsWithMaskForeignCalls; +import jdk.graal.compiler.replacements.nodes.ArrayIndexOfForeignCalls; +import jdk.graal.compiler.replacements.nodes.ArrayRegionCompareToForeignCalls; +import jdk.graal.compiler.replacements.nodes.BigIntegerMulAddNode; +import jdk.graal.compiler.replacements.nodes.BigIntegerMultiplyToLenNode; +import jdk.graal.compiler.replacements.nodes.BigIntegerSquareToLenNode; +import jdk.graal.compiler.replacements.nodes.CalcStringAttributesForeignCalls; +import jdk.graal.compiler.replacements.nodes.CipherBlockChainingAESNode; +import jdk.graal.compiler.replacements.nodes.CountPositivesNode; +import jdk.graal.compiler.replacements.nodes.CounterModeAESNode; +import jdk.graal.compiler.replacements.nodes.EncodeArrayNode; +import jdk.graal.compiler.replacements.nodes.GHASHProcessBlocksNode; +import jdk.graal.compiler.replacements.nodes.MessageDigestNode; +import jdk.graal.compiler.replacements.nodes.VectorizedMismatchNode; +import jdk.graal.compiler.word.Word; +import jdk.graal.compiler.word.WordTypes; import org.graalvm.word.LocationIdentity; import jdk.vm.ci.code.CodeCacheProvider; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotInvocationPluginProvider.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/meta/HotSpotInvocationPluginProvider.java similarity index 87% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotInvocationPluginProvider.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/meta/HotSpotInvocationPluginProvider.java index 25bd433bf647..511a960570db 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotInvocationPluginProvider.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/meta/HotSpotInvocationPluginProvider.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.meta; +package jdk.graal.compiler.hotspot.meta; -import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins; -import jdk.compiler.graal.nodes.spi.Replacements; +import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins; +import jdk.graal.compiler.nodes.spi.Replacements; -import jdk.compiler.graal.serviceprovider.ServiceProvider; +import jdk.graal.compiler.serviceprovider.ServiceProvider; import jdk.vm.ci.code.Architecture; /** diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotInvocationPlugins.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/meta/HotSpotInvocationPlugins.java similarity index 92% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotInvocationPlugins.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/meta/HotSpotInvocationPlugins.java index 428b09d3b867..ac7f2ed9af71 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotInvocationPlugins.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/meta/HotSpotInvocationPlugins.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.meta; +package jdk.graal.compiler.hotspot.meta; import static jdk.vm.ci.hotspot.HotSpotJVMCIRuntime.runtime; -import static jdk.compiler.graal.hotspot.HotSpotGraalServices.isIntrinsicAvailable; +import static jdk.graal.compiler.hotspot.HotSpotGraalServices.isIntrinsicAvailable; import java.lang.reflect.Type; import java.util.ArrayList; @@ -37,18 +37,18 @@ import org.graalvm.collections.EconomicSet; import org.graalvm.collections.MapCursor; import org.graalvm.collections.Pair; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.debug.TTY; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.graph.iterators.NodeIterable; -import jdk.compiler.graal.hotspot.GraalHotSpotVMConfig; -import jdk.compiler.graal.hotspot.HotSpotGraalRuntimeProvider; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext; -import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin; -import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.phases.tiers.CompilerConfiguration; -import jdk.compiler.graal.replacements.nodes.MacroInvokable; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.debug.TTY; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.graph.iterators.NodeIterable; +import jdk.graal.compiler.hotspot.GraalHotSpotVMConfig; +import jdk.graal.compiler.hotspot.HotSpotGraalRuntimeProvider; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext; +import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin; +import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.phases.tiers.CompilerConfiguration; +import jdk.graal.compiler.replacements.nodes.MacroInvokable; import jdk.vm.ci.hotspot.VMIntrinsicMethod; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotJITClassInitializationPlugin.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/meta/HotSpotJITClassInitializationPlugin.java similarity index 79% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotJITClassInitializationPlugin.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/meta/HotSpotJITClassInitializationPlugin.java index 6af9d48c6512..b172708cf364 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotJITClassInitializationPlugin.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/meta/HotSpotJITClassInitializationPlugin.java @@ -22,22 +22,22 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.meta; +package jdk.graal.compiler.hotspot.meta; -import static jdk.compiler.graal.bytecode.Bytecodes.GETSTATIC; -import static jdk.compiler.graal.bytecode.Bytecodes.INVOKESTATIC; -import static jdk.compiler.graal.bytecode.Bytecodes.NEW; -import static jdk.compiler.graal.bytecode.Bytecodes.PUTSTATIC; +import static jdk.graal.compiler.bytecode.Bytecodes.GETSTATIC; +import static jdk.graal.compiler.bytecode.Bytecodes.INVOKESTATIC; +import static jdk.graal.compiler.bytecode.Bytecodes.NEW; +import static jdk.graal.compiler.bytecode.Bytecodes.PUTSTATIC; import java.util.function.Supplier; -import jdk.compiler.graal.hotspot.nodes.type.KlassPointerStamp; -import jdk.compiler.graal.hotspot.nodes.KlassBeingInitializedCheckNode; -import jdk.compiler.graal.nodes.ConstantNode; -import jdk.compiler.graal.nodes.FrameState; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.graphbuilderconf.ClassInitializationPlugin; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext; +import jdk.graal.compiler.hotspot.nodes.type.KlassPointerStamp; +import jdk.graal.compiler.hotspot.nodes.KlassBeingInitializedCheckNode; +import jdk.graal.compiler.nodes.ConstantNode; +import jdk.graal.compiler.nodes.FrameState; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.graphbuilderconf.ClassInitializationPlugin; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext; import jdk.vm.ci.hotspot.HotSpotResolvedObjectType; import jdk.vm.ci.meta.ConstantPool; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotLoadedSuitesProvider.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/meta/HotSpotLoadedSuitesProvider.java similarity index 88% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotLoadedSuitesProvider.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/meta/HotSpotLoadedSuitesProvider.java index ce9b9477a823..580c8299b62f 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotLoadedSuitesProvider.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/meta/HotSpotLoadedSuitesProvider.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.meta; +package jdk.graal.compiler.hotspot.meta; -import jdk.compiler.graal.core.phases.fuzzing.PhasePlanSerializer; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.phases.tiers.Suites; -import jdk.compiler.graal.phases.tiers.SuitesProvider; +import jdk.graal.compiler.core.phases.fuzzing.PhasePlanSerializer; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.phases.tiers.Suites; +import jdk.graal.compiler.phases.tiers.SuitesProvider; import jdk.vm.ci.code.Architecture; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotLoweringProvider.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/meta/HotSpotLoweringProvider.java similarity index 80% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotLoweringProvider.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/meta/HotSpotLoweringProvider.java index e85e75dd8ecc..fe9f13ed017d 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotLoweringProvider.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/meta/HotSpotLoweringProvider.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.meta; +package jdk.graal.compiler.hotspot.meta; -import jdk.compiler.graal.debug.DebugHandlersFactory; -import jdk.compiler.graal.hotspot.replacements.ObjectCloneSnippets; -import jdk.compiler.graal.hotspot.GraalHotSpotVMConfig; -import jdk.compiler.graal.hotspot.meta.DefaultHotSpotLoweringProvider.Extensions; -import jdk.compiler.graal.hotspot.stubs.ForeignCallSnippets; -import jdk.compiler.graal.nodes.spi.LoweringProvider; -import jdk.compiler.graal.options.OptionValues; +import jdk.graal.compiler.debug.DebugHandlersFactory; +import jdk.graal.compiler.hotspot.replacements.ObjectCloneSnippets; +import jdk.graal.compiler.hotspot.GraalHotSpotVMConfig; +import jdk.graal.compiler.hotspot.meta.DefaultHotSpotLoweringProvider.Extensions; +import jdk.graal.compiler.hotspot.stubs.ForeignCallSnippets; +import jdk.graal.compiler.nodes.spi.LoweringProvider; +import jdk.graal.compiler.options.OptionValues; /** * HotSpot implementation of {@link LoweringProvider}. diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotMetaAccessExtensionProvider.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/meta/HotSpotMetaAccessExtensionProvider.java similarity index 95% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotMetaAccessExtensionProvider.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/meta/HotSpotMetaAccessExtensionProvider.java index 5a41f005bc7f..1619ac3a84c7 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotMetaAccessExtensionProvider.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/meta/HotSpotMetaAccessExtensionProvider.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.meta; +package jdk.graal.compiler.hotspot.meta; -import jdk.compiler.graal.core.common.spi.MetaAccessExtensionProvider; +import jdk.graal.compiler.core.common.spi.MetaAccessExtensionProvider; import jdk.vm.ci.meta.JavaKind; import jdk.vm.ci.meta.JavaType; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotNodePlugin.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/meta/HotSpotNodePlugin.java similarity index 90% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotNodePlugin.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/meta/HotSpotNodePlugin.java index fec386a109f5..e68010fd1112 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotNodePlugin.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/meta/HotSpotNodePlugin.java @@ -22,18 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.meta; - -import jdk.compiler.graal.core.common.type.StampPair; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.extended.GuardingNode; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderTool; -import jdk.compiler.graal.nodes.graphbuilderconf.InlineInvokePlugin; -import jdk.compiler.graal.nodes.graphbuilderconf.NodePlugin; -import jdk.compiler.graal.nodes.graphbuilderconf.TypePlugin; -import jdk.compiler.graal.word.Word; -import jdk.compiler.graal.word.WordOperationPlugin; +package jdk.graal.compiler.hotspot.meta; + +import jdk.graal.compiler.core.common.type.StampPair; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.extended.GuardingNode; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderTool; +import jdk.graal.compiler.nodes.graphbuilderconf.InlineInvokePlugin; +import jdk.graal.compiler.nodes.graphbuilderconf.NodePlugin; +import jdk.graal.compiler.nodes.graphbuilderconf.TypePlugin; +import jdk.graal.compiler.word.Word; +import jdk.graal.compiler.word.WordOperationPlugin; import jdk.vm.ci.meta.JavaKind; import jdk.vm.ci.meta.JavaType; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotPlatformConfigurationProvider.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/meta/HotSpotPlatformConfigurationProvider.java similarity index 90% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotPlatformConfigurationProvider.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/meta/HotSpotPlatformConfigurationProvider.java index a613d8c91088..6cf9992398de 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotPlatformConfigurationProvider.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/meta/HotSpotPlatformConfigurationProvider.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.meta; +package jdk.graal.compiler.hotspot.meta; -import jdk.compiler.graal.hotspot.GraalHotSpotVMConfig; -import jdk.compiler.graal.nodes.gc.BarrierSet; -import jdk.compiler.graal.nodes.spi.PlatformConfigurationProvider; +import jdk.graal.compiler.hotspot.GraalHotSpotVMConfig; +import jdk.graal.compiler.nodes.gc.BarrierSet; +import jdk.graal.compiler.nodes.spi.PlatformConfigurationProvider; public class HotSpotPlatformConfigurationProvider implements PlatformConfigurationProvider { private final BarrierSet barrierSet; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotProviders.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/meta/HotSpotProviders.java similarity index 88% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotProviders.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/meta/HotSpotProviders.java index 2fa1cb076b99..1de93b76088b 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotProviders.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/meta/HotSpotProviders.java @@ -22,21 +22,21 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.meta; - -import jdk.compiler.graal.api.replacements.SnippetReflectionProvider; -import jdk.compiler.graal.core.common.spi.ConstantFieldProvider; -import jdk.compiler.graal.core.common.spi.MetaAccessExtensionProvider; -import jdk.compiler.graal.hotspot.GraalHotSpotVMConfig; -import jdk.compiler.graal.hotspot.word.HotSpotWordTypes; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins; -import jdk.compiler.graal.nodes.spi.LoopsDataProvider; -import jdk.compiler.graal.nodes.spi.LoweringProvider; -import jdk.compiler.graal.nodes.spi.PlatformConfigurationProvider; -import jdk.compiler.graal.nodes.spi.Replacements; -import jdk.compiler.graal.nodes.spi.StampProvider; -import jdk.compiler.graal.phases.tiers.SuitesProvider; -import jdk.compiler.graal.phases.util.Providers; +package jdk.graal.compiler.hotspot.meta; + +import jdk.graal.compiler.api.replacements.SnippetReflectionProvider; +import jdk.graal.compiler.core.common.spi.ConstantFieldProvider; +import jdk.graal.compiler.core.common.spi.MetaAccessExtensionProvider; +import jdk.graal.compiler.hotspot.GraalHotSpotVMConfig; +import jdk.graal.compiler.hotspot.word.HotSpotWordTypes; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins; +import jdk.graal.compiler.nodes.spi.LoopsDataProvider; +import jdk.graal.compiler.nodes.spi.LoweringProvider; +import jdk.graal.compiler.nodes.spi.PlatformConfigurationProvider; +import jdk.graal.compiler.nodes.spi.Replacements; +import jdk.graal.compiler.nodes.spi.StampProvider; +import jdk.graal.compiler.phases.tiers.SuitesProvider; +import jdk.graal.compiler.phases.util.Providers; import jdk.vm.ci.hotspot.HotSpotCodeCacheProvider; import jdk.vm.ci.meta.ConstantReflectionProvider; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotRegisters.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/meta/HotSpotRegisters.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotRegisters.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/meta/HotSpotRegisters.java index 4b2306e8cc6c..1b486acca4fd 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotRegisters.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/meta/HotSpotRegisters.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.meta; +package jdk.graal.compiler.hotspot.meta; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotRegistersProvider.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/meta/HotSpotRegistersProvider.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotRegistersProvider.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/meta/HotSpotRegistersProvider.java index 8f7289724069..555c590bce84 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotRegistersProvider.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/meta/HotSpotRegistersProvider.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.meta; +package jdk.graal.compiler.hotspot.meta; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotSnippetReflectionProvider.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/meta/HotSpotSnippetReflectionProvider.java similarity index 93% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotSnippetReflectionProvider.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/meta/HotSpotSnippetReflectionProvider.java index ea58b610588c..3c323232bccf 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotSnippetReflectionProvider.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/meta/HotSpotSnippetReflectionProvider.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.meta; +package jdk.graal.compiler.hotspot.meta; import static jdk.vm.ci.hotspot.HotSpotJVMCIRuntime.runtime; @@ -30,12 +30,12 @@ import java.lang.reflect.Field; import java.util.Objects; -import jdk.compiler.graal.api.replacements.SnippetReflectionProvider; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.hotspot.GraalHotSpotVMConfig; -import jdk.compiler.graal.hotspot.HotSpotGraalRuntimeProvider; -import jdk.compiler.graal.hotspot.SnippetObjectConstant; -import jdk.compiler.graal.word.WordTypes; +import jdk.graal.compiler.api.replacements.SnippetReflectionProvider; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.hotspot.GraalHotSpotVMConfig; +import jdk.graal.compiler.hotspot.HotSpotGraalRuntimeProvider; +import jdk.graal.compiler.hotspot.SnippetObjectConstant; +import jdk.graal.compiler.word.WordTypes; import jdk.vm.ci.hotspot.HotSpotConstantReflectionProvider; import jdk.vm.ci.hotspot.HotSpotObjectConstant; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotStampProvider.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/meta/HotSpotStampProvider.java similarity index 81% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotStampProvider.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/meta/HotSpotStampProvider.java index c968beb3cb02..4e4126da8e1e 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotStampProvider.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/meta/HotSpotStampProvider.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.meta; +package jdk.graal.compiler.hotspot.meta; -import jdk.compiler.graal.core.common.type.AbstractPointerStamp; -import jdk.compiler.graal.core.common.type.ObjectStamp; -import jdk.compiler.graal.hotspot.nodes.type.KlassPointerStamp; -import jdk.compiler.graal.hotspot.nodes.type.MethodPointerStamp; -import jdk.compiler.graal.nodes.spi.StampProvider; +import jdk.graal.compiler.core.common.type.AbstractPointerStamp; +import jdk.graal.compiler.core.common.type.ObjectStamp; +import jdk.graal.compiler.hotspot.nodes.type.KlassPointerStamp; +import jdk.graal.compiler.hotspot.nodes.type.MethodPointerStamp; +import jdk.graal.compiler.nodes.spi.StampProvider; public class HotSpotStampProvider implements StampProvider { diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotSuitesProvider.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/meta/HotSpotSuitesProvider.java similarity index 81% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotSuitesProvider.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/meta/HotSpotSuitesProvider.java index fdd11406cd97..e267e5284fdf 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotSuitesProvider.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/meta/HotSpotSuitesProvider.java @@ -22,40 +22,40 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.meta; +package jdk.graal.compiler.hotspot.meta; import java.util.ListIterator; import java.util.Optional; -import jdk.compiler.graal.debug.Assertions; -import jdk.compiler.graal.hotspot.GraalHotSpotVMConfig; -import jdk.compiler.graal.hotspot.HotSpotGraalRuntime; -import jdk.compiler.graal.hotspot.HotSpotGraalRuntimeProvider; -import jdk.compiler.graal.hotspot.HotSpotGraphBuilderPhase; -import jdk.compiler.graal.hotspot.lir.HotSpotZapRegistersPhase; -import jdk.compiler.graal.hotspot.lir.VerifyMaxRegisterSizePhase; -import jdk.compiler.graal.java.GraphBuilderPhase; -import jdk.compiler.graal.java.SuitesProviderBase; -import jdk.compiler.graal.lir.phases.LIRSuites; -import jdk.compiler.graal.nodes.EncodedGraph; -import jdk.compiler.graal.nodes.GraphEncoder; -import jdk.compiler.graal.nodes.GraphState; -import jdk.compiler.graal.nodes.SimplifyingGraphDecoder; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.phases.BasePhase; -import jdk.compiler.graal.phases.PhaseSuite; -import jdk.compiler.graal.phases.common.AddressLoweringPhase; -import jdk.compiler.graal.phases.common.BarrierSetVerificationPhase; -import jdk.compiler.graal.phases.common.UseTrappingNullChecksPhase; -import jdk.compiler.graal.phases.common.WriteBarrierAdditionPhase; -import jdk.compiler.graal.phases.tiers.HighTierContext; -import jdk.compiler.graal.phases.tiers.LowTierContext; -import jdk.compiler.graal.phases.tiers.MidTierContext; -import jdk.compiler.graal.phases.tiers.Suites; -import jdk.compiler.graal.phases.tiers.SuitesCreator; +import jdk.graal.compiler.debug.Assertions; +import jdk.graal.compiler.hotspot.GraalHotSpotVMConfig; +import jdk.graal.compiler.hotspot.HotSpotGraalRuntime; +import jdk.graal.compiler.hotspot.HotSpotGraalRuntimeProvider; +import jdk.graal.compiler.hotspot.HotSpotGraphBuilderPhase; +import jdk.graal.compiler.hotspot.lir.HotSpotZapRegistersPhase; +import jdk.graal.compiler.hotspot.lir.VerifyMaxRegisterSizePhase; +import jdk.graal.compiler.java.GraphBuilderPhase; +import jdk.graal.compiler.java.SuitesProviderBase; +import jdk.graal.compiler.lir.phases.LIRSuites; +import jdk.graal.compiler.nodes.EncodedGraph; +import jdk.graal.compiler.nodes.GraphEncoder; +import jdk.graal.compiler.nodes.GraphState; +import jdk.graal.compiler.nodes.SimplifyingGraphDecoder; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.StructuredGraph.AllowAssumptions; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.phases.BasePhase; +import jdk.graal.compiler.phases.PhaseSuite; +import jdk.graal.compiler.phases.common.AddressLoweringPhase; +import jdk.graal.compiler.phases.common.BarrierSetVerificationPhase; +import jdk.graal.compiler.phases.common.UseTrappingNullChecksPhase; +import jdk.graal.compiler.phases.common.WriteBarrierAdditionPhase; +import jdk.graal.compiler.phases.tiers.HighTierContext; +import jdk.graal.compiler.phases.tiers.LowTierContext; +import jdk.graal.compiler.phases.tiers.MidTierContext; +import jdk.graal.compiler.phases.tiers.Suites; +import jdk.graal.compiler.phases.tiers.SuitesCreator; import jdk.vm.ci.code.Architecture; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotWordOperationPlugin.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/meta/HotSpotWordOperationPlugin.java similarity index 77% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotWordOperationPlugin.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/meta/HotSpotWordOperationPlugin.java index a4ab15636ba1..e100aaa1a3d6 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotWordOperationPlugin.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/meta/HotSpotWordOperationPlugin.java @@ -22,42 +22,42 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.meta; +package jdk.graal.compiler.hotspot.meta; -import static jdk.compiler.graal.hotspot.word.HotSpotOperation.HotspotOpcode.POINTER_EQ; -import static jdk.compiler.graal.hotspot.word.HotSpotOperation.HotspotOpcode.POINTER_NE; -import static jdk.compiler.graal.nodes.ConstantNode.forBoolean; +import static jdk.graal.compiler.hotspot.word.HotSpotOperation.HotspotOpcode.POINTER_EQ; +import static jdk.graal.compiler.hotspot.word.HotSpotOperation.HotspotOpcode.POINTER_NE; +import static jdk.graal.compiler.nodes.ConstantNode.forBoolean; import static org.graalvm.word.LocationIdentity.any; -import jdk.compiler.graal.api.replacements.SnippetReflectionProvider; -import jdk.compiler.graal.bytecode.BridgeMethodUtils; -import jdk.compiler.graal.core.common.memory.BarrierType; -import jdk.compiler.graal.core.common.memory.MemoryOrderMode; -import jdk.compiler.graal.core.common.type.Stamp; -import jdk.compiler.graal.core.common.type.StampFactory; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.hotspot.nodes.type.KlassPointerStamp; -import jdk.compiler.graal.hotspot.nodes.type.MetaspacePointerStamp; -import jdk.compiler.graal.hotspot.nodes.type.MethodPointerStamp; -import jdk.compiler.graal.hotspot.nodes.LoadIndexedPointerNode; -import jdk.compiler.graal.hotspot.word.HotSpotOperation; -import jdk.compiler.graal.hotspot.word.HotSpotOperation.HotspotOpcode; -import jdk.compiler.graal.hotspot.word.PointerCastNode; -import jdk.compiler.graal.nodes.LogicNode; -import jdk.compiler.graal.nodes.NodeView; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.calc.ConditionalNode; -import jdk.compiler.graal.nodes.calc.IsNullNode; -import jdk.compiler.graal.nodes.calc.PointerEqualsNode; -import jdk.compiler.graal.nodes.extended.GuardingNode; -import jdk.compiler.graal.nodes.gc.BarrierSet; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext; -import jdk.compiler.graal.nodes.java.LoadIndexedNode; -import jdk.compiler.graal.nodes.memory.ReadNode; -import jdk.compiler.graal.nodes.memory.address.AddressNode; -import jdk.compiler.graal.nodes.type.StampTool; -import jdk.compiler.graal.word.WordOperationPlugin; -import jdk.compiler.graal.word.WordTypes; +import jdk.graal.compiler.api.replacements.SnippetReflectionProvider; +import jdk.graal.compiler.bytecode.BridgeMethodUtils; +import jdk.graal.compiler.core.common.memory.BarrierType; +import jdk.graal.compiler.core.common.memory.MemoryOrderMode; +import jdk.graal.compiler.core.common.type.Stamp; +import jdk.graal.compiler.core.common.type.StampFactory; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.hotspot.nodes.type.KlassPointerStamp; +import jdk.graal.compiler.hotspot.nodes.type.MetaspacePointerStamp; +import jdk.graal.compiler.hotspot.nodes.type.MethodPointerStamp; +import jdk.graal.compiler.hotspot.nodes.LoadIndexedPointerNode; +import jdk.graal.compiler.hotspot.word.HotSpotOperation; +import jdk.graal.compiler.hotspot.word.HotSpotOperation.HotspotOpcode; +import jdk.graal.compiler.hotspot.word.PointerCastNode; +import jdk.graal.compiler.nodes.LogicNode; +import jdk.graal.compiler.nodes.NodeView; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.calc.ConditionalNode; +import jdk.graal.compiler.nodes.calc.IsNullNode; +import jdk.graal.compiler.nodes.calc.PointerEqualsNode; +import jdk.graal.compiler.nodes.extended.GuardingNode; +import jdk.graal.compiler.nodes.gc.BarrierSet; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext; +import jdk.graal.compiler.nodes.java.LoadIndexedNode; +import jdk.graal.compiler.nodes.memory.ReadNode; +import jdk.graal.compiler.nodes.memory.address.AddressNode; +import jdk.graal.compiler.nodes.type.StampTool; +import jdk.graal.compiler.word.WordOperationPlugin; +import jdk.graal.compiler.word.WordTypes; import org.graalvm.word.LocationIdentity; import jdk.vm.ci.meta.ConstantReflectionProvider; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/UnimplementedGraalIntrinsics.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/meta/UnimplementedGraalIntrinsics.java similarity index 99% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/UnimplementedGraalIntrinsics.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/meta/UnimplementedGraalIntrinsics.java index 7fbdfbdbd6d4..18f690d8858a 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/UnimplementedGraalIntrinsics.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/meta/UnimplementedGraalIntrinsics.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.meta; +package jdk.graal.compiler.hotspot.meta; import java.util.Arrays; import java.util.Collection; @@ -30,8 +30,8 @@ import java.util.Set; import java.util.TreeSet; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin; /** * This class documents unimplemented Graal intrinsics and categorizes them into 3 categories: diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/AcquiredCASLockNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/nodes/AcquiredCASLockNode.java similarity index 79% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/AcquiredCASLockNode.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/nodes/AcquiredCASLockNode.java index 710a77b723f1..2095a637db56 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/AcquiredCASLockNode.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/nodes/AcquiredCASLockNode.java @@ -22,18 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.nodes; +package jdk.graal.compiler.hotspot.nodes; -import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0; -import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_0; +import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_0; +import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_0; -import jdk.compiler.graal.core.common.type.StampFactory; -import jdk.compiler.graal.graph.NodeClass; -import jdk.compiler.graal.nodeinfo.NodeInfo; -import jdk.compiler.graal.nodes.FixedWithNextNode; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.spi.LIRLowerable; -import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool; +import jdk.graal.compiler.core.common.type.StampFactory; +import jdk.graal.compiler.graph.NodeClass; +import jdk.graal.compiler.nodeinfo.NodeInfo; +import jdk.graal.compiler.nodes.FixedWithNextNode; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.spi.LIRLowerable; +import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool; /** * Marks the control flow path where an object acquired a lightweight lock based on an atomic diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/AllocaNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/nodes/AllocaNode.java similarity index 80% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/AllocaNode.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/nodes/AllocaNode.java index f0de4d933345..3fec92e3afd9 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/AllocaNode.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/nodes/AllocaNode.java @@ -22,20 +22,20 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.nodes; +package jdk.graal.compiler.hotspot.nodes; -import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2; -import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1; +import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_2; +import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_1; -import jdk.compiler.graal.core.common.type.StampFactory; -import jdk.compiler.graal.graph.NodeClass; -import jdk.compiler.graal.lir.VirtualStackSlot; -import jdk.compiler.graal.nodeinfo.NodeInfo; -import jdk.compiler.graal.nodes.FixedWithNextNode; -import jdk.compiler.graal.nodes.spi.LIRLowerable; -import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool; -import jdk.compiler.graal.word.Word; -import jdk.compiler.graal.word.WordTypes; +import jdk.graal.compiler.core.common.type.StampFactory; +import jdk.graal.compiler.graph.NodeClass; +import jdk.graal.compiler.lir.VirtualStackSlot; +import jdk.graal.compiler.nodeinfo.NodeInfo; +import jdk.graal.compiler.nodes.FixedWithNextNode; +import jdk.graal.compiler.nodes.spi.LIRLowerable; +import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool; +import jdk.graal.compiler.word.Word; +import jdk.graal.compiler.word.WordTypes; import jdk.vm.ci.meta.Value; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/BeginLockScopeNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/nodes/BeginLockScopeNode.java similarity index 78% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/BeginLockScopeNode.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/nodes/BeginLockScopeNode.java index b53bf4209abe..85f2bfa3fb96 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/BeginLockScopeNode.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/nodes/BeginLockScopeNode.java @@ -22,24 +22,24 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.nodes; +package jdk.graal.compiler.hotspot.nodes; -import static jdk.compiler.graal.nodeinfo.InputType.Memory; -import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2; -import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1; +import static jdk.graal.compiler.nodeinfo.InputType.Memory; +import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_2; +import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_1; -import jdk.compiler.graal.core.common.type.StampFactory; -import jdk.compiler.graal.graph.NodeClass; -import jdk.compiler.graal.hotspot.HotSpotLIRGenerator; -import jdk.compiler.graal.lir.VirtualStackSlot; -import jdk.compiler.graal.nodeinfo.NodeInfo; -import jdk.compiler.graal.nodes.extended.MonitorEnter; -import jdk.compiler.graal.nodes.memory.AbstractMemoryCheckpoint; -import jdk.compiler.graal.nodes.memory.SingleMemoryKill; -import jdk.compiler.graal.nodes.spi.LIRLowerable; -import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool; -import jdk.compiler.graal.word.Word; -import jdk.compiler.graal.word.WordTypes; +import jdk.graal.compiler.core.common.type.StampFactory; +import jdk.graal.compiler.graph.NodeClass; +import jdk.graal.compiler.hotspot.HotSpotLIRGenerator; +import jdk.graal.compiler.lir.VirtualStackSlot; +import jdk.graal.compiler.nodeinfo.NodeInfo; +import jdk.graal.compiler.nodes.extended.MonitorEnter; +import jdk.graal.compiler.nodes.memory.AbstractMemoryCheckpoint; +import jdk.graal.compiler.nodes.memory.SingleMemoryKill; +import jdk.graal.compiler.nodes.spi.LIRLowerable; +import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool; +import jdk.graal.compiler.word.Word; +import jdk.graal.compiler.word.WordTypes; import org.graalvm.word.LocationIdentity; import jdk.vm.ci.meta.JavaKind; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/CurrentJavaThreadNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/nodes/CurrentJavaThreadNode.java similarity index 78% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/CurrentJavaThreadNode.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/nodes/CurrentJavaThreadNode.java index 62ec62999a8b..5505b73c5f75 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/CurrentJavaThreadNode.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/nodes/CurrentJavaThreadNode.java @@ -22,21 +22,21 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.nodes; +package jdk.graal.compiler.hotspot.nodes; -import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_1; -import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1; +import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_1; +import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_1; -import jdk.compiler.graal.core.common.LIRKind; -import jdk.compiler.graal.core.common.type.StampFactory; -import jdk.compiler.graal.graph.NodeClass; -import jdk.compiler.graal.hotspot.HotSpotLIRGenerator; -import jdk.compiler.graal.nodeinfo.NodeInfo; -import jdk.compiler.graal.nodes.calc.FloatingNode; -import jdk.compiler.graal.nodes.spi.LIRLowerable; -import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool; -import jdk.compiler.graal.word.Word; -import jdk.compiler.graal.word.WordTypes; +import jdk.graal.compiler.core.common.LIRKind; +import jdk.graal.compiler.core.common.type.StampFactory; +import jdk.graal.compiler.graph.NodeClass; +import jdk.graal.compiler.hotspot.HotSpotLIRGenerator; +import jdk.graal.compiler.nodeinfo.NodeInfo; +import jdk.graal.compiler.nodes.calc.FloatingNode; +import jdk.graal.compiler.nodes.spi.LIRLowerable; +import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool; +import jdk.graal.compiler.word.Word; +import jdk.graal.compiler.word.WordTypes; import jdk.vm.ci.code.Register; import jdk.vm.ci.meta.JavaKind; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/CurrentLockNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/nodes/CurrentLockNode.java similarity index 78% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/CurrentLockNode.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/nodes/CurrentLockNode.java index 78ee00bc8d25..c412c58eec0e 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/CurrentLockNode.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/nodes/CurrentLockNode.java @@ -22,21 +22,21 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.nodes; +package jdk.graal.compiler.hotspot.nodes; -import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2; -import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1; +import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_2; +import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_1; -import jdk.compiler.graal.core.common.type.StampFactory; -import jdk.compiler.graal.graph.NodeClass; -import jdk.compiler.graal.hotspot.HotSpotLIRGenerator; -import jdk.compiler.graal.lir.VirtualStackSlot; -import jdk.compiler.graal.nodeinfo.NodeInfo; -import jdk.compiler.graal.nodes.FixedWithNextNode; -import jdk.compiler.graal.nodes.spi.LIRLowerable; -import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool; -import jdk.compiler.graal.word.Word; -import jdk.compiler.graal.word.WordTypes; +import jdk.graal.compiler.core.common.type.StampFactory; +import jdk.graal.compiler.graph.NodeClass; +import jdk.graal.compiler.hotspot.HotSpotLIRGenerator; +import jdk.graal.compiler.lir.VirtualStackSlot; +import jdk.graal.compiler.nodeinfo.NodeInfo; +import jdk.graal.compiler.nodes.FixedWithNextNode; +import jdk.graal.compiler.nodes.spi.LIRLowerable; +import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool; +import jdk.graal.compiler.word.Word; +import jdk.graal.compiler.word.WordTypes; import jdk.vm.ci.meta.Value; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/DeoptimizeCallerNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/nodes/DeoptimizeCallerNode.java similarity index 81% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/DeoptimizeCallerNode.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/nodes/DeoptimizeCallerNode.java index 017167f6972b..3d1e62db7624 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/DeoptimizeCallerNode.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/nodes/DeoptimizeCallerNode.java @@ -22,18 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.nodes; +package jdk.graal.compiler.hotspot.nodes; -import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_8; -import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_8; +import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_8; +import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_8; -import jdk.compiler.graal.core.common.type.StampFactory; -import jdk.compiler.graal.graph.NodeClass; -import jdk.compiler.graal.hotspot.HotSpotLIRGenerator; -import jdk.compiler.graal.nodeinfo.NodeInfo; -import jdk.compiler.graal.nodes.ControlSinkNode; -import jdk.compiler.graal.nodes.spi.LIRLowerable; -import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool; +import jdk.graal.compiler.core.common.type.StampFactory; +import jdk.graal.compiler.graph.NodeClass; +import jdk.graal.compiler.hotspot.HotSpotLIRGenerator; +import jdk.graal.compiler.nodeinfo.NodeInfo; +import jdk.graal.compiler.nodes.ControlSinkNode; +import jdk.graal.compiler.nodes.spi.LIRLowerable; +import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool; import jdk.vm.ci.meta.DeoptimizationAction; import jdk.vm.ci.meta.DeoptimizationReason; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/DeoptimizeWithExceptionInCallerNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/nodes/DeoptimizeWithExceptionInCallerNode.java similarity index 78% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/DeoptimizeWithExceptionInCallerNode.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/nodes/DeoptimizeWithExceptionInCallerNode.java index 1be94a1ef116..e74de9168cbd 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/DeoptimizeWithExceptionInCallerNode.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/nodes/DeoptimizeWithExceptionInCallerNode.java @@ -22,19 +22,19 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.nodes; - -import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_8; -import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_8; - -import jdk.compiler.graal.core.common.type.StampFactory; -import jdk.compiler.graal.graph.NodeClass; -import jdk.compiler.graal.hotspot.HotSpotLIRGenerator; -import jdk.compiler.graal.nodeinfo.NodeInfo; -import jdk.compiler.graal.nodes.ControlSinkNode; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.spi.LIRLowerable; -import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool; +package jdk.graal.compiler.hotspot.nodes; + +import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_8; +import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_8; + +import jdk.graal.compiler.core.common.type.StampFactory; +import jdk.graal.compiler.graph.NodeClass; +import jdk.graal.compiler.hotspot.HotSpotLIRGenerator; +import jdk.graal.compiler.nodeinfo.NodeInfo; +import jdk.graal.compiler.nodes.ControlSinkNode; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.spi.LIRLowerable; +import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool; import jdk.vm.ci.meta.Value; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/DeoptimizingStubCall.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/nodes/DeoptimizingStubCall.java similarity index 81% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/DeoptimizingStubCall.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/nodes/DeoptimizingStubCall.java index 4cdc8b5c96b4..a4c6b318ca11 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/DeoptimizingStubCall.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/nodes/DeoptimizingStubCall.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.nodes; +package jdk.graal.compiler.hotspot.nodes; -import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_UNKNOWN; -import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_UNKNOWN; +import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_UNKNOWN; +import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_UNKNOWN; -import jdk.compiler.graal.core.common.type.Stamp; -import jdk.compiler.graal.graph.NodeClass; -import jdk.compiler.graal.nodeinfo.NodeInfo; -import jdk.compiler.graal.nodes.DeoptimizingFixedWithNextNode; +import jdk.graal.compiler.core.common.type.Stamp; +import jdk.graal.compiler.graph.NodeClass; +import jdk.graal.compiler.nodeinfo.NodeInfo; +import jdk.graal.compiler.nodes.DeoptimizingFixedWithNextNode; @NodeInfo(cycles = CYCLES_UNKNOWN, size = SIZE_UNKNOWN) public abstract class DeoptimizingStubCall extends DeoptimizingFixedWithNextNode { diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/EndLockScopeNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/nodes/EndLockScopeNode.java similarity index 77% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/EndLockScopeNode.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/nodes/EndLockScopeNode.java index b28c4b9fef39..d0a21f6ff2d4 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/EndLockScopeNode.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/nodes/EndLockScopeNode.java @@ -22,19 +22,19 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.nodes; +package jdk.graal.compiler.hotspot.nodes; -import static jdk.compiler.graal.nodeinfo.InputType.Memory; -import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0; -import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_0; +import static jdk.graal.compiler.nodeinfo.InputType.Memory; +import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_0; +import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_0; -import jdk.compiler.graal.core.common.type.StampFactory; -import jdk.compiler.graal.graph.NodeClass; -import jdk.compiler.graal.nodeinfo.NodeInfo; -import jdk.compiler.graal.nodes.extended.MonitorExit; -import jdk.compiler.graal.nodes.memory.AbstractMemoryCheckpoint; -import jdk.compiler.graal.nodes.spi.LIRLowerable; -import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool; +import jdk.graal.compiler.core.common.type.StampFactory; +import jdk.graal.compiler.graph.NodeClass; +import jdk.graal.compiler.nodeinfo.NodeInfo; +import jdk.graal.compiler.nodes.extended.MonitorExit; +import jdk.graal.compiler.nodes.memory.AbstractMemoryCheckpoint; +import jdk.graal.compiler.nodes.spi.LIRLowerable; +import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool; import org.graalvm.word.LocationIdentity; /** diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/FastAcquireBiasedLockNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/nodes/FastAcquireBiasedLockNode.java similarity index 80% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/FastAcquireBiasedLockNode.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/nodes/FastAcquireBiasedLockNode.java index 88dfe0c52bfe..dd088d6f8e00 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/FastAcquireBiasedLockNode.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/nodes/FastAcquireBiasedLockNode.java @@ -22,18 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.nodes; +package jdk.graal.compiler.hotspot.nodes; -import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0; -import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_0; +import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_0; +import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_0; -import jdk.compiler.graal.core.common.type.StampFactory; -import jdk.compiler.graal.graph.NodeClass; -import jdk.compiler.graal.nodeinfo.NodeInfo; -import jdk.compiler.graal.nodes.FixedWithNextNode; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.spi.LIRLowerable; -import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool; +import jdk.graal.compiler.core.common.type.StampFactory; +import jdk.graal.compiler.graph.NodeClass; +import jdk.graal.compiler.nodeinfo.NodeInfo; +import jdk.graal.compiler.nodes.FixedWithNextNode; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.spi.LIRLowerable; +import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool; /** * Marks the control flow path where an object acquired a biased lock because the lock was already diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/HotSpotCompressionNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/nodes/HotSpotCompressionNode.java similarity index 85% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/HotSpotCompressionNode.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/nodes/HotSpotCompressionNode.java index 2a50174833a0..5fb43e859b4c 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/HotSpotCompressionNode.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/nodes/HotSpotCompressionNode.java @@ -22,21 +22,21 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.nodes; +package jdk.graal.compiler.hotspot.nodes; -import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2; -import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_2; +import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_2; +import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_2; -import jdk.compiler.graal.core.common.CompressEncoding; -import jdk.compiler.graal.core.common.type.Stamp; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.graph.NodeClass; -import jdk.compiler.graal.hotspot.nodes.type.HotSpotNarrowOopStamp; -import jdk.compiler.graal.nodeinfo.NodeInfo; -import jdk.compiler.graal.nodes.CompressionNode; -import jdk.compiler.graal.nodes.NodeView; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.ValueNode; +import jdk.graal.compiler.core.common.CompressEncoding; +import jdk.graal.compiler.core.common.type.Stamp; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.graph.NodeClass; +import jdk.graal.compiler.hotspot.nodes.type.HotSpotNarrowOopStamp; +import jdk.graal.compiler.nodeinfo.NodeInfo; +import jdk.graal.compiler.nodes.CompressionNode; +import jdk.graal.compiler.nodes.NodeView; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.ValueNode; import jdk.vm.ci.hotspot.HotSpotCompressedNullConstant; import jdk.vm.ci.hotspot.HotSpotConstant; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/HotSpotDirectCallTargetNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/nodes/HotSpotDirectCallTargetNode.java similarity index 86% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/HotSpotDirectCallTargetNode.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/nodes/HotSpotDirectCallTargetNode.java index 5fe88235f550..2779939f50eb 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/HotSpotDirectCallTargetNode.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/nodes/HotSpotDirectCallTargetNode.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.nodes; +package jdk.graal.compiler.hotspot.nodes; -import jdk.compiler.graal.core.common.type.StampPair; -import jdk.compiler.graal.graph.NodeClass; -import jdk.compiler.graal.nodeinfo.NodeInfo; -import jdk.compiler.graal.nodes.DirectCallTargetNode; -import jdk.compiler.graal.nodes.ValueNode; +import jdk.graal.compiler.core.common.type.StampPair; +import jdk.graal.compiler.graph.NodeClass; +import jdk.graal.compiler.nodeinfo.NodeInfo; +import jdk.graal.compiler.nodes.DirectCallTargetNode; +import jdk.graal.compiler.nodes.ValueNode; import jdk.vm.ci.code.CallingConvention.Type; import jdk.vm.ci.meta.JavaType; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/HotSpotIndirectCallTargetNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/nodes/HotSpotIndirectCallTargetNode.java similarity index 88% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/HotSpotIndirectCallTargetNode.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/nodes/HotSpotIndirectCallTargetNode.java index baed49060f41..f74f96177a27 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/HotSpotIndirectCallTargetNode.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/nodes/HotSpotIndirectCallTargetNode.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.nodes; +package jdk.graal.compiler.hotspot.nodes; -import jdk.compiler.graal.core.common.type.StampPair; -import jdk.compiler.graal.graph.NodeClass; -import jdk.compiler.graal.nodeinfo.NodeInfo; -import jdk.compiler.graal.nodes.IndirectCallTargetNode; -import jdk.compiler.graal.nodes.ValueNode; +import jdk.graal.compiler.core.common.type.StampPair; +import jdk.graal.compiler.graph.NodeClass; +import jdk.graal.compiler.nodeinfo.NodeInfo; +import jdk.graal.compiler.nodes.IndirectCallTargetNode; +import jdk.graal.compiler.nodes.ValueNode; import jdk.vm.ci.code.CallingConvention.Type; import jdk.vm.ci.meta.JavaType; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/HotSpotLoadReservedReferenceNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/nodes/HotSpotLoadReservedReferenceNode.java similarity index 76% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/HotSpotLoadReservedReferenceNode.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/nodes/HotSpotLoadReservedReferenceNode.java index f997020fdb8d..ff7b48bb7fe2 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/HotSpotLoadReservedReferenceNode.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/nodes/HotSpotLoadReservedReferenceNode.java @@ -22,27 +22,27 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.nodes; +package jdk.graal.compiler.hotspot.nodes; -import jdk.compiler.graal.core.common.memory.BarrierType; -import jdk.compiler.graal.core.common.memory.MemoryOrderMode; -import jdk.compiler.graal.core.common.type.StampFactory; -import jdk.compiler.graal.core.common.type.TypeReference; -import jdk.compiler.graal.graph.NodeClass; -import jdk.compiler.graal.nodeinfo.NodeCycles; -import jdk.compiler.graal.nodeinfo.NodeInfo; -import jdk.compiler.graal.nodeinfo.NodeSize; -import jdk.compiler.graal.nodes.ConstantNode; -import jdk.compiler.graal.nodes.FixedWithNextNode; -import jdk.compiler.graal.nodes.NamedLocationIdentity; -import jdk.compiler.graal.nodes.extended.JavaReadNode; -import jdk.compiler.graal.nodes.memory.FloatableThreadLocalAccess; -import jdk.compiler.graal.nodes.memory.MemoryAccess; -import jdk.compiler.graal.nodes.memory.address.AddressNode; -import jdk.compiler.graal.nodes.memory.address.OffsetAddressNode; -import jdk.compiler.graal.nodes.spi.Lowerable; -import jdk.compiler.graal.nodes.spi.LoweringTool; -import jdk.compiler.graal.word.WordTypes; +import jdk.graal.compiler.core.common.memory.BarrierType; +import jdk.graal.compiler.core.common.memory.MemoryOrderMode; +import jdk.graal.compiler.core.common.type.StampFactory; +import jdk.graal.compiler.core.common.type.TypeReference; +import jdk.graal.compiler.graph.NodeClass; +import jdk.graal.compiler.nodeinfo.NodeCycles; +import jdk.graal.compiler.nodeinfo.NodeInfo; +import jdk.graal.compiler.nodeinfo.NodeSize; +import jdk.graal.compiler.nodes.ConstantNode; +import jdk.graal.compiler.nodes.FixedWithNextNode; +import jdk.graal.compiler.nodes.NamedLocationIdentity; +import jdk.graal.compiler.nodes.extended.JavaReadNode; +import jdk.graal.compiler.nodes.memory.FloatableThreadLocalAccess; +import jdk.graal.compiler.nodes.memory.MemoryAccess; +import jdk.graal.compiler.nodes.memory.address.AddressNode; +import jdk.graal.compiler.nodes.memory.address.OffsetAddressNode; +import jdk.graal.compiler.nodes.spi.Lowerable; +import jdk.graal.compiler.nodes.spi.LoweringTool; +import jdk.graal.compiler.word.WordTypes; import org.graalvm.word.LocationIdentity; import jdk.vm.ci.meta.JavaKind; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/HotSpotStoreReservedReferenceNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/nodes/HotSpotStoreReservedReferenceNode.java similarity index 75% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/HotSpotStoreReservedReferenceNode.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/nodes/HotSpotStoreReservedReferenceNode.java index 4da622bf9ceb..622ff686ca7a 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/HotSpotStoreReservedReferenceNode.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/nodes/HotSpotStoreReservedReferenceNode.java @@ -22,26 +22,26 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.nodes; +package jdk.graal.compiler.hotspot.nodes; -import static jdk.compiler.graal.hotspot.nodes.HotSpotLoadReservedReferenceNode.JVMCI_RESERVED_REFERENCE; +import static jdk.graal.compiler.hotspot.nodes.HotSpotLoadReservedReferenceNode.JVMCI_RESERVED_REFERENCE; -import jdk.compiler.graal.core.common.memory.BarrierType; -import jdk.compiler.graal.core.common.type.StampFactory; -import jdk.compiler.graal.graph.NodeClass; -import jdk.compiler.graal.nodeinfo.NodeCycles; -import jdk.compiler.graal.nodeinfo.NodeInfo; -import jdk.compiler.graal.nodeinfo.NodeSize; -import jdk.compiler.graal.nodes.AbstractStateSplit; -import jdk.compiler.graal.nodes.ConstantNode; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.extended.JavaWriteNode; -import jdk.compiler.graal.nodes.memory.SingleMemoryKill; -import jdk.compiler.graal.nodes.memory.address.AddressNode; -import jdk.compiler.graal.nodes.memory.address.OffsetAddressNode; -import jdk.compiler.graal.nodes.spi.Lowerable; -import jdk.compiler.graal.nodes.spi.LoweringTool; -import jdk.compiler.graal.word.WordTypes; +import jdk.graal.compiler.core.common.memory.BarrierType; +import jdk.graal.compiler.core.common.type.StampFactory; +import jdk.graal.compiler.graph.NodeClass; +import jdk.graal.compiler.nodeinfo.NodeCycles; +import jdk.graal.compiler.nodeinfo.NodeInfo; +import jdk.graal.compiler.nodeinfo.NodeSize; +import jdk.graal.compiler.nodes.AbstractStateSplit; +import jdk.graal.compiler.nodes.ConstantNode; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.extended.JavaWriteNode; +import jdk.graal.compiler.nodes.memory.SingleMemoryKill; +import jdk.graal.compiler.nodes.memory.address.AddressNode; +import jdk.graal.compiler.nodes.memory.address.OffsetAddressNode; +import jdk.graal.compiler.nodes.spi.Lowerable; +import jdk.graal.compiler.nodes.spi.LoweringTool; +import jdk.graal.compiler.word.WordTypes; import org.graalvm.word.LocationIdentity; import jdk.vm.ci.meta.JavaKind; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/JumpToExceptionHandlerInCallerNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/nodes/JumpToExceptionHandlerInCallerNode.java similarity index 78% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/JumpToExceptionHandlerInCallerNode.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/nodes/JumpToExceptionHandlerInCallerNode.java index de59b39fcb09..abd6a9d6bf9e 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/JumpToExceptionHandlerInCallerNode.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/nodes/JumpToExceptionHandlerInCallerNode.java @@ -22,21 +22,21 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.nodes; +package jdk.graal.compiler.hotspot.nodes; -import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_8; -import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_8; +import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_8; +import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_8; -import jdk.compiler.graal.core.common.type.StampFactory; -import jdk.compiler.graal.graph.NodeClass; -import jdk.compiler.graal.hotspot.HotSpotBackend; -import jdk.compiler.graal.hotspot.HotSpotNodeLIRBuilder; -import jdk.compiler.graal.nodeinfo.NodeInfo; -import jdk.compiler.graal.nodes.ControlSinkNode; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.spi.LIRLowerable; -import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool; -import jdk.compiler.graal.word.Word; +import jdk.graal.compiler.core.common.type.StampFactory; +import jdk.graal.compiler.graph.NodeClass; +import jdk.graal.compiler.hotspot.HotSpotBackend; +import jdk.graal.compiler.hotspot.HotSpotNodeLIRBuilder; +import jdk.graal.compiler.nodeinfo.NodeInfo; +import jdk.graal.compiler.nodes.ControlSinkNode; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.spi.LIRLowerable; +import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool; +import jdk.graal.compiler.word.Word; /** * Sets up the {@linkplain HotSpotBackend#EXCEPTION_HANDLER_IN_CALLER arguments} expected by an diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/JumpToExceptionHandlerNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/nodes/JumpToExceptionHandlerNode.java similarity index 75% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/JumpToExceptionHandlerNode.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/nodes/JumpToExceptionHandlerNode.java index 6836d631eca1..a673e7ff91cd 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/JumpToExceptionHandlerNode.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/nodes/JumpToExceptionHandlerNode.java @@ -22,21 +22,21 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.nodes; +package jdk.graal.compiler.hotspot.nodes; -import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2; -import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1; +import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_2; +import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_1; -import jdk.compiler.graal.core.common.type.StampFactory; -import jdk.compiler.graal.graph.NodeClass; -import jdk.compiler.graal.hotspot.HotSpotNodeLIRBuilder; -import jdk.compiler.graal.hotspot.stubs.ExceptionHandlerStub; -import jdk.compiler.graal.nodeinfo.NodeInfo; -import jdk.compiler.graal.nodes.FixedWithNextNode; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.spi.LIRLowerable; -import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool; -import jdk.compiler.graal.word.Word; +import jdk.graal.compiler.core.common.type.StampFactory; +import jdk.graal.compiler.graph.NodeClass; +import jdk.graal.compiler.hotspot.HotSpotNodeLIRBuilder; +import jdk.graal.compiler.hotspot.stubs.ExceptionHandlerStub; +import jdk.graal.compiler.nodeinfo.NodeInfo; +import jdk.graal.compiler.nodes.FixedWithNextNode; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.spi.LIRLowerable; +import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool; +import jdk.graal.compiler.word.Word; /** * Jumps to the exception handler specified by {@link #address}. This node is specific for the diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/KlassBeingInitializedCheckNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/nodes/KlassBeingInitializedCheckNode.java similarity index 79% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/KlassBeingInitializedCheckNode.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/nodes/KlassBeingInitializedCheckNode.java index baad33ea53f3..c94475ccc139 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/KlassBeingInitializedCheckNode.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/nodes/KlassBeingInitializedCheckNode.java @@ -22,17 +22,17 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.nodes; +package jdk.graal.compiler.hotspot.nodes; -import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_4; -import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_16; +import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_4; +import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_16; -import jdk.compiler.graal.core.common.type.StampFactory; -import jdk.compiler.graal.graph.NodeClass; -import jdk.compiler.graal.nodeinfo.NodeInfo; -import jdk.compiler.graal.nodes.DeoptimizingFixedWithNextNode; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.spi.Lowerable; +import jdk.graal.compiler.core.common.type.StampFactory; +import jdk.graal.compiler.graph.NodeClass; +import jdk.graal.compiler.nodeinfo.NodeInfo; +import jdk.graal.compiler.nodes.DeoptimizingFixedWithNextNode; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.spi.Lowerable; @NodeInfo(cycles = CYCLES_4, size = SIZE_16) public class KlassBeingInitializedCheckNode extends DeoptimizingFixedWithNextNode implements Lowerable { diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/LoadIndexedPointerNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/nodes/LoadIndexedPointerNode.java similarity index 83% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/LoadIndexedPointerNode.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/nodes/LoadIndexedPointerNode.java index 520a4d01f1c0..d84044b0bb81 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/LoadIndexedPointerNode.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/nodes/LoadIndexedPointerNode.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.nodes; +package jdk.graal.compiler.hotspot.nodes; -import jdk.compiler.graal.core.common.type.Stamp; -import jdk.compiler.graal.graph.NodeClass; -import jdk.compiler.graal.nodeinfo.NodeInfo; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.extended.GuardingNode; -import jdk.compiler.graal.nodes.java.LoadIndexedNode; +import jdk.graal.compiler.core.common.type.Stamp; +import jdk.graal.compiler.graph.NodeClass; +import jdk.graal.compiler.nodeinfo.NodeInfo; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.extended.GuardingNode; +import jdk.graal.compiler.nodes.java.LoadIndexedNode; import jdk.vm.ci.meta.JavaKind; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/MonitorCounterNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/nodes/MonitorCounterNode.java similarity index 78% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/MonitorCounterNode.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/nodes/MonitorCounterNode.java index adb42a2dfb70..aded345dc210 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/MonitorCounterNode.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/nodes/MonitorCounterNode.java @@ -22,21 +22,21 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.nodes; +package jdk.graal.compiler.hotspot.nodes; -import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1; +import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_1; -import jdk.compiler.graal.core.common.type.StampFactory; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.graph.NodeClass; -import jdk.compiler.graal.lir.VirtualStackSlot; -import jdk.compiler.graal.nodeinfo.NodeCycles; -import jdk.compiler.graal.nodeinfo.NodeInfo; -import jdk.compiler.graal.nodes.calc.FloatingNode; -import jdk.compiler.graal.nodes.spi.LIRLowerable; -import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool; -import jdk.compiler.graal.word.Word; -import jdk.compiler.graal.word.WordTypes; +import jdk.graal.compiler.core.common.type.StampFactory; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.graph.NodeClass; +import jdk.graal.compiler.lir.VirtualStackSlot; +import jdk.graal.compiler.nodeinfo.NodeCycles; +import jdk.graal.compiler.nodeinfo.NodeInfo; +import jdk.graal.compiler.nodes.calc.FloatingNode; +import jdk.graal.compiler.nodes.spi.LIRLowerable; +import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool; +import jdk.graal.compiler.word.Word; +import jdk.graal.compiler.word.WordTypes; import jdk.vm.ci.meta.Value; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/PatchReturnAddressNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/nodes/PatchReturnAddressNode.java similarity index 76% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/PatchReturnAddressNode.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/nodes/PatchReturnAddressNode.java index 47d4b2aba78d..e979feabc879 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/PatchReturnAddressNode.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/nodes/PatchReturnAddressNode.java @@ -22,20 +22,20 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.nodes; +package jdk.graal.compiler.hotspot.nodes; -import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2; -import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1; +import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_2; +import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_1; -import jdk.compiler.graal.core.common.type.StampFactory; -import jdk.compiler.graal.graph.NodeClass; -import jdk.compiler.graal.hotspot.HotSpotNodeLIRBuilder; -import jdk.compiler.graal.nodeinfo.NodeInfo; -import jdk.compiler.graal.nodes.FixedWithNextNode; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.spi.LIRLowerable; -import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool; -import jdk.compiler.graal.word.Word; +import jdk.graal.compiler.core.common.type.StampFactory; +import jdk.graal.compiler.graph.NodeClass; +import jdk.graal.compiler.hotspot.HotSpotNodeLIRBuilder; +import jdk.graal.compiler.nodeinfo.NodeInfo; +import jdk.graal.compiler.nodes.FixedWithNextNode; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.spi.LIRLowerable; +import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool; +import jdk.graal.compiler.word.Word; /** * Modifies the return address of the current frame. diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/StubForeignCallNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/nodes/StubForeignCallNode.java similarity index 77% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/StubForeignCallNode.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/nodes/StubForeignCallNode.java index 619ba5509fd0..a6d9aba0062a 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/StubForeignCallNode.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/nodes/StubForeignCallNode.java @@ -22,30 +22,30 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.nodes; +package jdk.graal.compiler.hotspot.nodes; -import static jdk.compiler.graal.nodeinfo.InputType.Memory; -import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_UNKNOWN; -import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_UNKNOWN; -import static jdk.compiler.graal.nodes.Invoke.CYCLES_UNKNOWN_RATIONALE; -import static jdk.compiler.graal.nodes.Invoke.SIZE_UNKNOWN_RATIONALE; +import static jdk.graal.compiler.nodeinfo.InputType.Memory; +import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_UNKNOWN; +import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_UNKNOWN; +import static jdk.graal.compiler.nodes.Invoke.CYCLES_UNKNOWN_RATIONALE; +import static jdk.graal.compiler.nodes.Invoke.SIZE_UNKNOWN_RATIONALE; import java.util.Arrays; -import jdk.compiler.graal.core.common.spi.ForeignCallDescriptor; -import jdk.compiler.graal.core.common.spi.ForeignCallLinkage; -import jdk.compiler.graal.core.common.spi.ForeignCallsProvider; -import jdk.compiler.graal.core.common.type.Stamp; -import jdk.compiler.graal.graph.NodeClass; -import jdk.compiler.graal.graph.NodeInputList; -import jdk.compiler.graal.hotspot.replacements.HotSpotReplacementsUtil; -import jdk.compiler.graal.nodeinfo.NodeInfo; -import jdk.compiler.graal.nodeinfo.Verbosity; -import jdk.compiler.graal.nodes.FixedWithNextNode; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.memory.MultiMemoryKill; -import jdk.compiler.graal.nodes.spi.LIRLowerable; -import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool; +import jdk.graal.compiler.core.common.spi.ForeignCallDescriptor; +import jdk.graal.compiler.core.common.spi.ForeignCallLinkage; +import jdk.graal.compiler.core.common.spi.ForeignCallsProvider; +import jdk.graal.compiler.core.common.type.Stamp; +import jdk.graal.compiler.graph.NodeClass; +import jdk.graal.compiler.graph.NodeInputList; +import jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil; +import jdk.graal.compiler.nodeinfo.NodeInfo; +import jdk.graal.compiler.nodeinfo.Verbosity; +import jdk.graal.compiler.nodes.FixedWithNextNode; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.memory.MultiMemoryKill; +import jdk.graal.compiler.nodes.spi.LIRLowerable; +import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool; import org.graalvm.word.LocationIdentity; import jdk.vm.ci.meta.Value; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/StubStartNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/nodes/StubStartNode.java similarity index 82% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/StubStartNode.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/nodes/StubStartNode.java index 1e4402ec0e37..e2f345df146a 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/StubStartNode.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/nodes/StubStartNode.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.nodes; +package jdk.graal.compiler.hotspot.nodes; -import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0; -import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_0; +import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_0; +import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_0; -import jdk.compiler.graal.graph.NodeClass; -import jdk.compiler.graal.hotspot.stubs.Stub; -import jdk.compiler.graal.nodeinfo.NodeInfo; -import jdk.compiler.graal.nodes.StartNode; +import jdk.graal.compiler.graph.NodeClass; +import jdk.graal.compiler.hotspot.stubs.Stub; +import jdk.graal.compiler.nodeinfo.NodeInfo; +import jdk.graal.compiler.nodes.StartNode; /** * Start node for a {@link Stub}'s graph. diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/VMErrorNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/nodes/VMErrorNode.java similarity index 80% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/VMErrorNode.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/nodes/VMErrorNode.java index e7ded3ed82bf..d5df37a3c25d 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/VMErrorNode.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/nodes/VMErrorNode.java @@ -22,23 +22,23 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.nodes; +package jdk.graal.compiler.hotspot.nodes; -import static jdk.compiler.graal.hotspot.HotSpotBackend.VM_ERROR; -import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_UNKNOWN; -import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_UNKNOWN; +import static jdk.graal.compiler.hotspot.HotSpotBackend.VM_ERROR; +import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_UNKNOWN; +import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_UNKNOWN; -import jdk.compiler.graal.bytecode.Bytecode; -import jdk.compiler.graal.core.common.LIRKind; -import jdk.compiler.graal.core.common.spi.ForeignCallLinkage; -import jdk.compiler.graal.core.common.type.StampFactory; -import jdk.compiler.graal.graph.NodeClass; -import jdk.compiler.graal.nodeinfo.NodeInfo; -import jdk.compiler.graal.nodes.FrameState; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.spi.LIRLowerable; -import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool; -import jdk.compiler.graal.replacements.nodes.CStringConstant; +import jdk.graal.compiler.bytecode.Bytecode; +import jdk.graal.compiler.core.common.LIRKind; +import jdk.graal.compiler.core.common.spi.ForeignCallLinkage; +import jdk.graal.compiler.core.common.type.StampFactory; +import jdk.graal.compiler.graph.NodeClass; +import jdk.graal.compiler.nodeinfo.NodeInfo; +import jdk.graal.compiler.nodes.FrameState; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.spi.LIRLowerable; +import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool; +import jdk.graal.compiler.replacements.nodes.CStringConstant; import jdk.vm.ci.code.CodeUtil; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/VirtualThreadUpdateJFRNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/nodes/VirtualThreadUpdateJFRNode.java similarity index 78% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/VirtualThreadUpdateJFRNode.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/nodes/VirtualThreadUpdateJFRNode.java index c291710b911d..dfae5644817c 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/VirtualThreadUpdateJFRNode.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/nodes/VirtualThreadUpdateJFRNode.java @@ -22,19 +22,19 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.nodes; - -import static jdk.compiler.graal.nodeinfo.InputType.Memory; - -import jdk.compiler.graal.core.common.type.StampFactory; -import jdk.compiler.graal.graph.NodeClass; -import jdk.compiler.graal.nodeinfo.NodeCycles; -import jdk.compiler.graal.nodeinfo.NodeInfo; -import jdk.compiler.graal.nodeinfo.NodeSize; -import jdk.compiler.graal.nodes.FixedWithNextNode; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.memory.SingleMemoryKill; -import jdk.compiler.graal.nodes.spi.Lowerable; +package jdk.graal.compiler.hotspot.nodes; + +import static jdk.graal.compiler.nodeinfo.InputType.Memory; + +import jdk.graal.compiler.core.common.type.StampFactory; +import jdk.graal.compiler.graph.NodeClass; +import jdk.graal.compiler.nodeinfo.NodeCycles; +import jdk.graal.compiler.nodeinfo.NodeInfo; +import jdk.graal.compiler.nodeinfo.NodeSize; +import jdk.graal.compiler.nodes.FixedWithNextNode; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.memory.SingleMemoryKill; +import jdk.graal.compiler.nodes.spi.Lowerable; import org.graalvm.word.LocationIdentity; @NodeInfo(allowedUsageTypes = Memory, cycles = NodeCycles.CYCLES_32, size = NodeSize.SIZE_32) diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/type/HotSpotNarrowOopStamp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/nodes/type/HotSpotNarrowOopStamp.java similarity index 90% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/type/HotSpotNarrowOopStamp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/nodes/type/HotSpotNarrowOopStamp.java index a705107632ac..493c66631f93 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/type/HotSpotNarrowOopStamp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/nodes/type/HotSpotNarrowOopStamp.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.nodes.type; +package jdk.graal.compiler.hotspot.nodes.type; -import jdk.compiler.graal.core.common.CompressEncoding; -import jdk.compiler.graal.core.common.type.AbstractObjectStamp; -import jdk.compiler.graal.core.common.type.ObjectStamp; -import jdk.compiler.graal.core.common.type.Stamp; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.nodes.CompressionNode.CompressionOp; -import jdk.compiler.graal.nodes.type.NarrowOopStamp; +import jdk.graal.compiler.core.common.CompressEncoding; +import jdk.graal.compiler.core.common.type.AbstractObjectStamp; +import jdk.graal.compiler.core.common.type.ObjectStamp; +import jdk.graal.compiler.core.common.type.Stamp; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.nodes.CompressionNode.CompressionOp; +import jdk.graal.compiler.nodes.type.NarrowOopStamp; import jdk.vm.ci.hotspot.HotSpotCompressedNullConstant; import jdk.vm.ci.hotspot.HotSpotMemoryAccessProvider; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/type/KlassPointerStamp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/nodes/type/KlassPointerStamp.java similarity index 95% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/type/KlassPointerStamp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/nodes/type/KlassPointerStamp.java index 466299ed9a77..7ed55741b90c 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/type/KlassPointerStamp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/nodes/type/KlassPointerStamp.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.nodes.type; +package jdk.graal.compiler.hotspot.nodes.type; import java.util.Objects; -import jdk.compiler.graal.core.common.CompressEncoding; -import jdk.compiler.graal.core.common.LIRKind; -import jdk.compiler.graal.core.common.spi.LIRKindTool; -import jdk.compiler.graal.core.common.type.AbstractPointerStamp; -import jdk.compiler.graal.core.common.type.Stamp; +import jdk.graal.compiler.core.common.CompressEncoding; +import jdk.graal.compiler.core.common.LIRKind; +import jdk.graal.compiler.core.common.spi.LIRKindTool; +import jdk.graal.compiler.core.common.type.AbstractPointerStamp; +import jdk.graal.compiler.core.common.type.Stamp; import jdk.vm.ci.hotspot.HotSpotCompressedNullConstant; import jdk.vm.ci.hotspot.HotSpotMemoryAccessProvider; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/type/MetaspacePointerStamp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/nodes/type/MetaspacePointerStamp.java similarity index 88% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/type/MetaspacePointerStamp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/nodes/type/MetaspacePointerStamp.java index f4eca4a28b70..b10847765c54 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/type/MetaspacePointerStamp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/nodes/type/MetaspacePointerStamp.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.nodes.type; +package jdk.graal.compiler.hotspot.nodes.type; -import jdk.compiler.graal.core.common.LIRKind; -import jdk.compiler.graal.core.common.spi.LIRKindTool; -import jdk.compiler.graal.core.common.type.AbstractPointerStamp; -import jdk.compiler.graal.core.common.type.Stamp; -import jdk.compiler.graal.debug.GraalError; +import jdk.graal.compiler.core.common.LIRKind; +import jdk.graal.compiler.core.common.spi.LIRKindTool; +import jdk.graal.compiler.core.common.type.AbstractPointerStamp; +import jdk.graal.compiler.core.common.type.Stamp; +import jdk.graal.compiler.debug.GraalError; import jdk.vm.ci.meta.Constant; import jdk.vm.ci.meta.MetaAccessProvider; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/type/MethodCountersPointerStamp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/nodes/type/MethodCountersPointerStamp.java similarity index 95% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/type/MethodCountersPointerStamp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/nodes/type/MethodCountersPointerStamp.java index 00fa30d803ed..c6b6e5a0ff91 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/type/MethodCountersPointerStamp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/nodes/type/MethodCountersPointerStamp.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.nodes.type; +package jdk.graal.compiler.hotspot.nodes.type; -import jdk.compiler.graal.core.common.type.AbstractPointerStamp; -import jdk.compiler.graal.core.common.type.Stamp; +import jdk.graal.compiler.core.common.type.AbstractPointerStamp; +import jdk.graal.compiler.core.common.type.Stamp; import jdk.vm.ci.hotspot.HotSpotMetaspaceConstant; import jdk.vm.ci.meta.Constant; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/type/MethodPointerStamp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/nodes/type/MethodPointerStamp.java similarity index 95% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/type/MethodPointerStamp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/nodes/type/MethodPointerStamp.java index f8c9d6dfc989..6ea98d5003d1 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/type/MethodPointerStamp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/nodes/type/MethodPointerStamp.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.nodes.type; +package jdk.graal.compiler.hotspot.nodes.type; -import jdk.compiler.graal.core.common.type.AbstractPointerStamp; -import jdk.compiler.graal.core.common.type.Stamp; +import jdk.graal.compiler.core.common.type.AbstractPointerStamp; +import jdk.graal.compiler.core.common.type.Stamp; import jdk.vm.ci.hotspot.HotSpotMemoryAccessProvider; import jdk.vm.ci.hotspot.HotSpotMetaspaceConstant; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/package-info.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/package-info.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/package-info.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/package-info.java index b83cfcbeab27..78f45656bb53 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/package-info.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/package-info.java @@ -22,4 +22,4 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot; +package jdk.graal.compiler.hotspot; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/phases/OnStackReplacementPhase.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/phases/OnStackReplacementPhase.java similarity index 86% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/phases/OnStackReplacementPhase.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/phases/OnStackReplacementPhase.java index f30a57a3db4a..51e9425dd011 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/phases/OnStackReplacementPhase.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/phases/OnStackReplacementPhase.java @@ -22,63 +22,63 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.phases; +package jdk.graal.compiler.hotspot.phases; -import static jdk.compiler.graal.phases.common.DeadCodeEliminationPhase.Optionality.Required; +import static jdk.graal.compiler.phases.common.DeadCodeEliminationPhase.Optionality.Required; import java.util.BitSet; import java.util.Optional; -import jdk.compiler.graal.core.common.PermanentBailoutException; -import jdk.compiler.graal.core.common.cfg.Loop; -import jdk.compiler.graal.core.common.type.ObjectStamp; -import jdk.compiler.graal.core.common.type.Stamp; -import jdk.compiler.graal.debug.CounterKey; -import jdk.compiler.graal.debug.DebugCloseable; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.graph.iterators.NodeIterable; -import jdk.compiler.graal.hotspot.HotSpotGraalServices; -import jdk.compiler.graal.loop.phases.LoopTransformations; -import jdk.compiler.graal.nodeinfo.InputType; -import jdk.compiler.graal.nodeinfo.Verbosity; -import jdk.compiler.graal.nodes.ConstantNode; -import jdk.compiler.graal.nodes.EntryMarkerNode; -import jdk.compiler.graal.nodes.EntryProxyNode; -import jdk.compiler.graal.nodes.FixedGuardNode; -import jdk.compiler.graal.nodes.FixedNode; -import jdk.compiler.graal.nodes.FrameState; -import jdk.compiler.graal.nodes.GraphState; -import jdk.compiler.graal.nodes.LogicNode; -import jdk.compiler.graal.nodes.LoopBeginNode; -import jdk.compiler.graal.nodes.NodeView; -import jdk.compiler.graal.nodes.ParameterNode; -import jdk.compiler.graal.nodes.PiNode; -import jdk.compiler.graal.nodes.StartNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.cfg.HIRBlock; -import jdk.compiler.graal.nodes.extended.OSRLocalNode; -import jdk.compiler.graal.nodes.extended.OSRLockNode; -import jdk.compiler.graal.nodes.extended.OSRMonitorEnterNode; -import jdk.compiler.graal.nodes.extended.OSRStartNode; -import jdk.compiler.graal.nodes.java.AccessMonitorNode; -import jdk.compiler.graal.nodes.java.InstanceOfNode; -import jdk.compiler.graal.nodes.java.MonitorEnterNode; -import jdk.compiler.graal.nodes.java.MonitorExitNode; -import jdk.compiler.graal.nodes.java.MonitorIdNode; -import jdk.compiler.graal.nodes.loop.LoopEx; -import jdk.compiler.graal.nodes.loop.LoopsData; -import jdk.compiler.graal.nodes.spi.CoreProviders; -import jdk.compiler.graal.nodes.util.GraphUtil; -import jdk.compiler.graal.options.Option; -import jdk.compiler.graal.options.OptionKey; -import jdk.compiler.graal.options.OptionType; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.phases.BasePhase; -import jdk.compiler.graal.phases.common.DeadCodeEliminationPhase; -import jdk.compiler.graal.serviceprovider.SpeculationReasonGroup; +import jdk.graal.compiler.core.common.PermanentBailoutException; +import jdk.graal.compiler.core.common.cfg.Loop; +import jdk.graal.compiler.core.common.type.ObjectStamp; +import jdk.graal.compiler.core.common.type.Stamp; +import jdk.graal.compiler.debug.CounterKey; +import jdk.graal.compiler.debug.DebugCloseable; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.graph.iterators.NodeIterable; +import jdk.graal.compiler.hotspot.HotSpotGraalServices; +import jdk.graal.compiler.loop.phases.LoopTransformations; +import jdk.graal.compiler.nodeinfo.InputType; +import jdk.graal.compiler.nodeinfo.Verbosity; +import jdk.graal.compiler.nodes.ConstantNode; +import jdk.graal.compiler.nodes.EntryMarkerNode; +import jdk.graal.compiler.nodes.EntryProxyNode; +import jdk.graal.compiler.nodes.FixedGuardNode; +import jdk.graal.compiler.nodes.FixedNode; +import jdk.graal.compiler.nodes.FrameState; +import jdk.graal.compiler.nodes.GraphState; +import jdk.graal.compiler.nodes.LogicNode; +import jdk.graal.compiler.nodes.LoopBeginNode; +import jdk.graal.compiler.nodes.NodeView; +import jdk.graal.compiler.nodes.ParameterNode; +import jdk.graal.compiler.nodes.PiNode; +import jdk.graal.compiler.nodes.StartNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.cfg.HIRBlock; +import jdk.graal.compiler.nodes.extended.OSRLocalNode; +import jdk.graal.compiler.nodes.extended.OSRLockNode; +import jdk.graal.compiler.nodes.extended.OSRMonitorEnterNode; +import jdk.graal.compiler.nodes.extended.OSRStartNode; +import jdk.graal.compiler.nodes.java.AccessMonitorNode; +import jdk.graal.compiler.nodes.java.InstanceOfNode; +import jdk.graal.compiler.nodes.java.MonitorEnterNode; +import jdk.graal.compiler.nodes.java.MonitorExitNode; +import jdk.graal.compiler.nodes.java.MonitorIdNode; +import jdk.graal.compiler.nodes.loop.LoopEx; +import jdk.graal.compiler.nodes.loop.LoopsData; +import jdk.graal.compiler.nodes.spi.CoreProviders; +import jdk.graal.compiler.nodes.util.GraphUtil; +import jdk.graal.compiler.options.Option; +import jdk.graal.compiler.options.OptionKey; +import jdk.graal.compiler.options.OptionType; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.phases.BasePhase; +import jdk.graal.compiler.phases.common.DeadCodeEliminationPhase; +import jdk.graal.compiler.serviceprovider.SpeculationReasonGroup; import jdk.vm.ci.meta.DeoptimizationAction; import jdk.vm.ci.meta.DeoptimizationReason; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/AssertionSnippets.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/AssertionSnippets.java similarity index 71% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/AssertionSnippets.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/AssertionSnippets.java index ea378f8618d5..fe197e0993c4 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/AssertionSnippets.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/AssertionSnippets.java @@ -22,34 +22,34 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.replacements; +package jdk.graal.compiler.hotspot.replacements; -import static jdk.compiler.graal.api.directives.GraalDirectives.SLOWPATH_PROBABILITY; -import static jdk.compiler.graal.api.directives.GraalDirectives.injectBranchProbability; -import static jdk.compiler.graal.hotspot.stubs.StubUtil.VM_MESSAGE_C; -import static jdk.compiler.graal.replacements.SnippetTemplate.DEFAULT_REPLACER; +import static jdk.graal.compiler.api.directives.GraalDirectives.SLOWPATH_PROBABILITY; +import static jdk.graal.compiler.api.directives.GraalDirectives.injectBranchProbability; +import static jdk.graal.compiler.hotspot.stubs.StubUtil.VM_MESSAGE_C; +import static jdk.graal.compiler.replacements.SnippetTemplate.DEFAULT_REPLACER; -import jdk.compiler.graal.api.replacements.Snippet; -import jdk.compiler.graal.api.replacements.Snippet.ConstantParameter; -import jdk.compiler.graal.core.common.spi.ForeignCallDescriptor; -import jdk.compiler.graal.core.common.type.StampFactory; -import jdk.compiler.graal.graph.Node.ConstantNodeParameter; -import jdk.compiler.graal.graph.Node.NodeIntrinsic; -import jdk.compiler.graal.hotspot.meta.HotSpotProviders; -import jdk.compiler.graal.hotspot.nodes.StubForeignCallNode; -import jdk.compiler.graal.hotspot.nodes.StubStartNode; -import jdk.compiler.graal.nodes.ConstantNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.extended.ForeignCallNode; -import jdk.compiler.graal.nodes.spi.LoweringTool; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.replacements.SnippetTemplate.AbstractTemplates; -import jdk.compiler.graal.replacements.SnippetTemplate.Arguments; -import jdk.compiler.graal.replacements.SnippetTemplate.SnippetInfo; -import jdk.compiler.graal.replacements.Snippets; -import jdk.compiler.graal.replacements.nodes.AssertionNode; -import jdk.compiler.graal.replacements.nodes.CStringConstant; -import jdk.compiler.graal.word.Word; +import jdk.graal.compiler.api.replacements.Snippet; +import jdk.graal.compiler.api.replacements.Snippet.ConstantParameter; +import jdk.graal.compiler.core.common.spi.ForeignCallDescriptor; +import jdk.graal.compiler.core.common.type.StampFactory; +import jdk.graal.compiler.graph.Node.ConstantNodeParameter; +import jdk.graal.compiler.graph.Node.NodeIntrinsic; +import jdk.graal.compiler.hotspot.meta.HotSpotProviders; +import jdk.graal.compiler.hotspot.nodes.StubForeignCallNode; +import jdk.graal.compiler.hotspot.nodes.StubStartNode; +import jdk.graal.compiler.nodes.ConstantNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.extended.ForeignCallNode; +import jdk.graal.compiler.nodes.spi.LoweringTool; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.replacements.SnippetTemplate.AbstractTemplates; +import jdk.graal.compiler.replacements.SnippetTemplate.Arguments; +import jdk.graal.compiler.replacements.SnippetTemplate.SnippetInfo; +import jdk.graal.compiler.replacements.Snippets; +import jdk.graal.compiler.replacements.nodes.AssertionNode; +import jdk.graal.compiler.replacements.nodes.CStringConstant; +import jdk.graal.compiler.word.Word; public class AssertionSnippets implements Snippets { diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/CallSiteTargetNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/CallSiteTargetNode.java similarity index 84% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/CallSiteTargetNode.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/CallSiteTargetNode.java index fa837bfbfaea..b1d6e44871c4 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/CallSiteTargetNode.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/CallSiteTargetNode.java @@ -22,18 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.replacements; +package jdk.graal.compiler.hotspot.replacements; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.graph.NodeClass; -import jdk.compiler.graal.nodeinfo.NodeInfo; -import jdk.compiler.graal.nodes.ConstantNode; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.spi.Canonicalizable; -import jdk.compiler.graal.nodes.spi.CanonicalizerTool; -import jdk.compiler.graal.nodes.spi.Lowerable; -import jdk.compiler.graal.nodes.spi.LoweringTool; -import jdk.compiler.graal.replacements.nodes.MacroNode; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.graph.NodeClass; +import jdk.graal.compiler.nodeinfo.NodeInfo; +import jdk.graal.compiler.nodes.ConstantNode; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.spi.Canonicalizable; +import jdk.graal.compiler.nodes.spi.CanonicalizerTool; +import jdk.graal.compiler.nodes.spi.Lowerable; +import jdk.graal.compiler.nodes.spi.LoweringTool; +import jdk.graal.compiler.replacements.nodes.MacroNode; import jdk.vm.ci.hotspot.HotSpotObjectConstant; import jdk.vm.ci.meta.Assumptions; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/ClassGetHubNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/ClassGetHubNode.java similarity index 82% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/ClassGetHubNode.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/ClassGetHubNode.java index 7f47308d161f..bafcf367e7b8 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/ClassGetHubNode.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/ClassGetHubNode.java @@ -22,34 +22,34 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.replacements; - -import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_1; -import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1; - -import jdk.compiler.graal.core.common.calc.CanonicalCondition; -import jdk.compiler.graal.core.common.type.Stamp; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.graph.Node.NodeIntrinsicFactory; -import jdk.compiler.graal.graph.NodeClass; -import jdk.compiler.graal.hotspot.nodes.type.KlassPointerStamp; -import jdk.compiler.graal.hotspot.word.KlassPointer; -import jdk.compiler.graal.nodeinfo.NodeInfo; -import jdk.compiler.graal.nodes.ConstantNode; -import jdk.compiler.graal.nodes.NodeView; -import jdk.compiler.graal.nodes.PiNode; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.calc.ConvertNode; -import jdk.compiler.graal.nodes.calc.FloatingNode; -import jdk.compiler.graal.nodes.extended.GetClassNode; -import jdk.compiler.graal.nodes.extended.GuardingNode; -import jdk.compiler.graal.nodes.extended.LoadHubNode; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext; -import jdk.compiler.graal.nodes.memory.ReadNode; -import jdk.compiler.graal.nodes.memory.address.AddressNode; -import jdk.compiler.graal.nodes.spi.Canonicalizable; -import jdk.compiler.graal.nodes.spi.CanonicalizerTool; -import jdk.compiler.graal.nodes.spi.Lowerable; +package jdk.graal.compiler.hotspot.replacements; + +import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_1; +import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_1; + +import jdk.graal.compiler.core.common.calc.CanonicalCondition; +import jdk.graal.compiler.core.common.type.Stamp; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.graph.Node.NodeIntrinsicFactory; +import jdk.graal.compiler.graph.NodeClass; +import jdk.graal.compiler.hotspot.nodes.type.KlassPointerStamp; +import jdk.graal.compiler.hotspot.word.KlassPointer; +import jdk.graal.compiler.nodeinfo.NodeInfo; +import jdk.graal.compiler.nodes.ConstantNode; +import jdk.graal.compiler.nodes.NodeView; +import jdk.graal.compiler.nodes.PiNode; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.calc.ConvertNode; +import jdk.graal.compiler.nodes.calc.FloatingNode; +import jdk.graal.compiler.nodes.extended.GetClassNode; +import jdk.graal.compiler.nodes.extended.GuardingNode; +import jdk.graal.compiler.nodes.extended.LoadHubNode; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext; +import jdk.graal.compiler.nodes.memory.ReadNode; +import jdk.graal.compiler.nodes.memory.address.AddressNode; +import jdk.graal.compiler.nodes.spi.Canonicalizable; +import jdk.graal.compiler.nodes.spi.CanonicalizerTool; +import jdk.graal.compiler.nodes.spi.Lowerable; import org.graalvm.word.LocationIdentity; import jdk.vm.ci.meta.Constant; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/DigestBaseSnippets.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/DigestBaseSnippets.java similarity index 87% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/DigestBaseSnippets.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/DigestBaseSnippets.java index c8373f746d92..3eca041374a4 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/DigestBaseSnippets.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/DigestBaseSnippets.java @@ -22,27 +22,27 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.replacements; +package jdk.graal.compiler.hotspot.replacements; -import static jdk.compiler.graal.hotspot.GraalHotSpotVMConfig.INJECTED_METAACCESS; -import static jdk.compiler.graal.hotspot.GraalHotSpotVMConfig.INJECTED_VMCONFIG; -import static jdk.compiler.graal.nodes.java.InstanceOfNode.doInstanceof; +import static jdk.graal.compiler.hotspot.GraalHotSpotVMConfig.INJECTED_METAACCESS; +import static jdk.graal.compiler.hotspot.GraalHotSpotVMConfig.INJECTED_VMCONFIG; +import static jdk.graal.compiler.nodes.java.InstanceOfNode.doInstanceof; -import jdk.compiler.graal.api.replacements.Fold; -import jdk.compiler.graal.api.replacements.Snippet; -import jdk.compiler.graal.hotspot.GraalHotSpotVMConfig; -import jdk.compiler.graal.hotspot.HotSpotBackend; -import jdk.compiler.graal.nodes.ComputeObjectAddressNode; -import jdk.compiler.graal.nodes.PiNode; -import jdk.compiler.graal.nodes.SnippetAnchorNode; -import jdk.compiler.graal.nodes.extended.RawLoadNode; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.phases.util.Providers; -import jdk.compiler.graal.replacements.ReplacementsUtil; -import jdk.compiler.graal.replacements.SnippetTemplate; -import jdk.compiler.graal.replacements.Snippets; -import jdk.compiler.graal.replacements.nodes.FallbackInvokeWithExceptionNode; -import jdk.compiler.graal.word.Word; +import jdk.graal.compiler.api.replacements.Fold; +import jdk.graal.compiler.api.replacements.Snippet; +import jdk.graal.compiler.hotspot.GraalHotSpotVMConfig; +import jdk.graal.compiler.hotspot.HotSpotBackend; +import jdk.graal.compiler.nodes.ComputeObjectAddressNode; +import jdk.graal.compiler.nodes.PiNode; +import jdk.graal.compiler.nodes.SnippetAnchorNode; +import jdk.graal.compiler.nodes.extended.RawLoadNode; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.phases.util.Providers; +import jdk.graal.compiler.replacements.ReplacementsUtil; +import jdk.graal.compiler.replacements.SnippetTemplate; +import jdk.graal.compiler.replacements.Snippets; +import jdk.graal.compiler.replacements.nodes.FallbackInvokeWithExceptionNode; +import jdk.graal.compiler.word.Word; import org.graalvm.word.LocationIdentity; import org.graalvm.word.WordFactory; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/FastNotifyNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/FastNotifyNode.java similarity index 78% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/FastNotifyNode.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/FastNotifyNode.java index 5033f4f55964..2eb3f04de1db 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/FastNotifyNode.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/FastNotifyNode.java @@ -22,22 +22,22 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.replacements; +package jdk.graal.compiler.hotspot.replacements; -import static jdk.compiler.graal.nodeinfo.InputType.Memory; -import static jdk.compiler.graal.nodeinfo.InputType.State; -import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2; -import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_0; +import static jdk.graal.compiler.nodeinfo.InputType.Memory; +import static jdk.graal.compiler.nodeinfo.InputType.State; +import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_2; +import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_0; -import jdk.compiler.graal.core.common.type.StampFactory; -import jdk.compiler.graal.graph.NodeClass; -import jdk.compiler.graal.nodeinfo.NodeInfo; -import jdk.compiler.graal.nodes.DeoptimizingNode; -import jdk.compiler.graal.nodes.FrameState; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.memory.AbstractMemoryCheckpoint; -import jdk.compiler.graal.nodes.memory.SingleMemoryKill; -import jdk.compiler.graal.nodes.spi.Lowerable; +import jdk.graal.compiler.core.common.type.StampFactory; +import jdk.graal.compiler.graph.NodeClass; +import jdk.graal.compiler.nodeinfo.NodeInfo; +import jdk.graal.compiler.nodes.DeoptimizingNode; +import jdk.graal.compiler.nodes.FrameState; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.memory.AbstractMemoryCheckpoint; +import jdk.graal.compiler.nodes.memory.SingleMemoryKill; +import jdk.graal.compiler.nodes.spi.Lowerable; import org.graalvm.word.LocationIdentity; @NodeInfo(cycles = CYCLES_2, size = SIZE_0, allowedUsageTypes = Memory) diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/HotSpotAllocationSnippets.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/HotSpotAllocationSnippets.java similarity index 86% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/HotSpotAllocationSnippets.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/HotSpotAllocationSnippets.java index 996cebb0ddf4..f5c579b542be 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/HotSpotAllocationSnippets.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/HotSpotAllocationSnippets.java @@ -22,102 +22,102 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.replacements; +package jdk.graal.compiler.hotspot.replacements; import static jdk.vm.ci.meta.DeoptimizationAction.InvalidateRecompile; import static jdk.vm.ci.meta.DeoptimizationAction.None; import static jdk.vm.ci.meta.DeoptimizationReason.RuntimeConstraint; -import static jdk.compiler.graal.core.common.GraalOptions.MinimalBulkZeroingSize; -import static jdk.compiler.graal.hotspot.GraalHotSpotVMConfig.INJECTED_OPTIONVALUES; -import static jdk.compiler.graal.hotspot.GraalHotSpotVMConfig.INJECTED_VMCONFIG; -import static jdk.compiler.graal.hotspot.HotSpotBackend.NEW_ARRAY; -import static jdk.compiler.graal.hotspot.HotSpotBackend.NEW_ARRAY_OR_NULL; -import static jdk.compiler.graal.hotspot.HotSpotBackend.NEW_INSTANCE; -import static jdk.compiler.graal.hotspot.HotSpotBackend.NEW_INSTANCE_OR_NULL; -import static jdk.compiler.graal.hotspot.HotSpotBackend.NEW_MULTI_ARRAY; -import static jdk.compiler.graal.hotspot.HotSpotBackend.NEW_MULTI_ARRAY_OR_NULL; -import static jdk.compiler.graal.hotspot.meta.HotSpotForeignCallDescriptor.Reexecutability.REEXECUTABLE; -import static jdk.compiler.graal.hotspot.meta.HotSpotForeignCallDescriptor.Transition.SAFEPOINT; -import static jdk.compiler.graal.hotspot.meta.HotSpotForeignCallsProviderImpl.NO_LOCATIONS; -import static jdk.compiler.graal.hotspot.replacements.HotSpotReplacementsUtil.CLASS_ARRAY_KLASS_LOCATION; -import static jdk.compiler.graal.hotspot.replacements.HotSpotReplacementsUtil.CLASS_INIT_STATE_LOCATION; -import static jdk.compiler.graal.hotspot.replacements.HotSpotReplacementsUtil.CLASS_INIT_THREAD_LOCATION; -import static jdk.compiler.graal.hotspot.replacements.HotSpotReplacementsUtil.HUB_WRITE_LOCATION; -import static jdk.compiler.graal.hotspot.replacements.HotSpotReplacementsUtil.MARK_WORD_LOCATION; -import static jdk.compiler.graal.hotspot.replacements.HotSpotReplacementsUtil.PROTOTYPE_MARK_WORD_LOCATION; -import static jdk.compiler.graal.hotspot.replacements.HotSpotReplacementsUtil.TLAB_END_LOCATION; -import static jdk.compiler.graal.hotspot.replacements.HotSpotReplacementsUtil.TLAB_TOP_LOCATION; -import static jdk.compiler.graal.hotspot.replacements.HotSpotReplacementsUtil.arrayKlassOffset; -import static jdk.compiler.graal.hotspot.replacements.HotSpotReplacementsUtil.instanceKlassStateBeingInitialized; -import static jdk.compiler.graal.hotspot.replacements.HotSpotReplacementsUtil.isInstanceKlassFullyInitialized; -import static jdk.compiler.graal.hotspot.replacements.HotSpotReplacementsUtil.layoutHelperHeaderSizeMask; -import static jdk.compiler.graal.hotspot.replacements.HotSpotReplacementsUtil.layoutHelperHeaderSizeShift; -import static jdk.compiler.graal.hotspot.replacements.HotSpotReplacementsUtil.layoutHelperLog2ElementSizeMask; -import static jdk.compiler.graal.hotspot.replacements.HotSpotReplacementsUtil.layoutHelperLog2ElementSizeShift; -import static jdk.compiler.graal.hotspot.replacements.HotSpotReplacementsUtil.loadKlassFromObject; -import static jdk.compiler.graal.hotspot.replacements.HotSpotReplacementsUtil.readInstanceKlassInitState; -import static jdk.compiler.graal.hotspot.replacements.HotSpotReplacementsUtil.readInstanceKlassInitThread; -import static jdk.compiler.graal.hotspot.replacements.HotSpotReplacementsUtil.readLayoutHelper; -import static jdk.compiler.graal.hotspot.replacements.HotSpotReplacementsUtil.registerAsWord; -import static jdk.compiler.graal.hotspot.replacements.HotspotSnippetsOptions.ProfileAllocations; -import static jdk.compiler.graal.hotspot.replacements.HotspotSnippetsOptions.ProfileAllocationsContext; -import static jdk.compiler.graal.hotspot.stubs.StubUtil.VM_MESSAGE_C; -import static jdk.compiler.graal.nodes.PiArrayNode.piArrayCastToSnippetReplaceeStamp; -import static jdk.compiler.graal.nodes.PiNode.piCastToSnippetReplaceeStamp; -import static jdk.compiler.graal.nodes.extended.BranchProbabilityNode.DEOPT_PROBABILITY; -import static jdk.compiler.graal.nodes.extended.BranchProbabilityNode.FAST_PATH_PROBABILITY; -import static jdk.compiler.graal.nodes.extended.BranchProbabilityNode.SLOW_PATH_PROBABILITY; -import static jdk.compiler.graal.nodes.extended.BranchProbabilityNode.VERY_FAST_PATH_PROBABILITY; -import static jdk.compiler.graal.nodes.extended.BranchProbabilityNode.probability; -import static jdk.compiler.graal.replacements.ReplacementsUtil.dynamicAssert; -import static jdk.compiler.graal.replacements.ReplacementsUtil.staticAssert; -import static jdk.compiler.graal.replacements.SnippetTemplate.DEFAULT_REPLACER; -import static jdk.compiler.graal.replacements.nodes.CStringConstant.cstring; - -import jdk.compiler.graal.api.replacements.Fold; -import jdk.compiler.graal.api.replacements.Fold.InjectedParameter; -import jdk.compiler.graal.api.replacements.Snippet; -import jdk.compiler.graal.api.replacements.Snippet.ConstantParameter; -import jdk.compiler.graal.api.replacements.Snippet.NonNullParameter; -import jdk.compiler.graal.api.replacements.Snippet.VarargsParameter; -import jdk.compiler.graal.core.common.spi.ForeignCallDescriptor; -import jdk.compiler.graal.core.common.type.StampFactory; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.graph.Node.ConstantNodeParameter; -import jdk.compiler.graal.graph.Node.NodeIntrinsic; -import jdk.compiler.graal.hotspot.GraalHotSpotVMConfig; -import jdk.compiler.graal.hotspot.meta.HotSpotForeignCallDescriptor; -import jdk.compiler.graal.hotspot.meta.HotSpotProviders; -import jdk.compiler.graal.hotspot.meta.HotSpotRegistersProvider; -import jdk.compiler.graal.hotspot.nodes.KlassBeingInitializedCheckNode; -import jdk.compiler.graal.hotspot.nodes.type.KlassPointerStamp; -import jdk.compiler.graal.hotspot.word.KlassPointer; -import jdk.compiler.graal.nodes.ConstantNode; -import jdk.compiler.graal.nodes.DeoptimizeNode; -import jdk.compiler.graal.nodes.PiNode; -import jdk.compiler.graal.nodes.SnippetAnchorNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.debug.DynamicCounterNode; -import jdk.compiler.graal.nodes.debug.VerifyHeapNode; -import jdk.compiler.graal.nodes.extended.BranchProbabilityNode; -import jdk.compiler.graal.nodes.extended.ForeignCallNode; -import jdk.compiler.graal.nodes.java.DynamicNewArrayNode; -import jdk.compiler.graal.nodes.java.DynamicNewInstanceNode; -import jdk.compiler.graal.nodes.java.NewArrayNode; -import jdk.compiler.graal.nodes.java.NewInstanceNode; -import jdk.compiler.graal.nodes.java.NewMultiArrayNode; -import jdk.compiler.graal.nodes.java.ValidateNewInstanceClassNode; -import jdk.compiler.graal.nodes.spi.LoweringTool; -import jdk.compiler.graal.nodes.util.GraphUtil; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.replacements.AllocationSnippets; -import jdk.compiler.graal.replacements.SnippetCounter; -import jdk.compiler.graal.replacements.SnippetTemplate; -import jdk.compiler.graal.replacements.SnippetTemplate.AbstractTemplates; -import jdk.compiler.graal.replacements.SnippetTemplate.Arguments; -import jdk.compiler.graal.replacements.SnippetTemplate.SnippetInfo; -import jdk.compiler.graal.word.Word; +import static jdk.graal.compiler.core.common.GraalOptions.MinimalBulkZeroingSize; +import static jdk.graal.compiler.hotspot.GraalHotSpotVMConfig.INJECTED_OPTIONVALUES; +import static jdk.graal.compiler.hotspot.GraalHotSpotVMConfig.INJECTED_VMCONFIG; +import static jdk.graal.compiler.hotspot.HotSpotBackend.NEW_ARRAY; +import static jdk.graal.compiler.hotspot.HotSpotBackend.NEW_ARRAY_OR_NULL; +import static jdk.graal.compiler.hotspot.HotSpotBackend.NEW_INSTANCE; +import static jdk.graal.compiler.hotspot.HotSpotBackend.NEW_INSTANCE_OR_NULL; +import static jdk.graal.compiler.hotspot.HotSpotBackend.NEW_MULTI_ARRAY; +import static jdk.graal.compiler.hotspot.HotSpotBackend.NEW_MULTI_ARRAY_OR_NULL; +import static jdk.graal.compiler.hotspot.meta.HotSpotForeignCallDescriptor.Reexecutability.REEXECUTABLE; +import static jdk.graal.compiler.hotspot.meta.HotSpotForeignCallDescriptor.Transition.SAFEPOINT; +import static jdk.graal.compiler.hotspot.meta.HotSpotForeignCallsProviderImpl.NO_LOCATIONS; +import static jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil.CLASS_ARRAY_KLASS_LOCATION; +import static jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil.CLASS_INIT_STATE_LOCATION; +import static jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil.CLASS_INIT_THREAD_LOCATION; +import static jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil.HUB_WRITE_LOCATION; +import static jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil.MARK_WORD_LOCATION; +import static jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil.PROTOTYPE_MARK_WORD_LOCATION; +import static jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil.TLAB_END_LOCATION; +import static jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil.TLAB_TOP_LOCATION; +import static jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil.arrayKlassOffset; +import static jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil.instanceKlassStateBeingInitialized; +import static jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil.isInstanceKlassFullyInitialized; +import static jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil.layoutHelperHeaderSizeMask; +import static jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil.layoutHelperHeaderSizeShift; +import static jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil.layoutHelperLog2ElementSizeMask; +import static jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil.layoutHelperLog2ElementSizeShift; +import static jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil.loadKlassFromObject; +import static jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil.readInstanceKlassInitState; +import static jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil.readInstanceKlassInitThread; +import static jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil.readLayoutHelper; +import static jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil.registerAsWord; +import static jdk.graal.compiler.hotspot.replacements.HotspotSnippetsOptions.ProfileAllocations; +import static jdk.graal.compiler.hotspot.replacements.HotspotSnippetsOptions.ProfileAllocationsContext; +import static jdk.graal.compiler.hotspot.stubs.StubUtil.VM_MESSAGE_C; +import static jdk.graal.compiler.nodes.PiArrayNode.piArrayCastToSnippetReplaceeStamp; +import static jdk.graal.compiler.nodes.PiNode.piCastToSnippetReplaceeStamp; +import static jdk.graal.compiler.nodes.extended.BranchProbabilityNode.DEOPT_PROBABILITY; +import static jdk.graal.compiler.nodes.extended.BranchProbabilityNode.FAST_PATH_PROBABILITY; +import static jdk.graal.compiler.nodes.extended.BranchProbabilityNode.SLOW_PATH_PROBABILITY; +import static jdk.graal.compiler.nodes.extended.BranchProbabilityNode.VERY_FAST_PATH_PROBABILITY; +import static jdk.graal.compiler.nodes.extended.BranchProbabilityNode.probability; +import static jdk.graal.compiler.replacements.ReplacementsUtil.dynamicAssert; +import static jdk.graal.compiler.replacements.ReplacementsUtil.staticAssert; +import static jdk.graal.compiler.replacements.SnippetTemplate.DEFAULT_REPLACER; +import static jdk.graal.compiler.replacements.nodes.CStringConstant.cstring; + +import jdk.graal.compiler.api.replacements.Fold; +import jdk.graal.compiler.api.replacements.Fold.InjectedParameter; +import jdk.graal.compiler.api.replacements.Snippet; +import jdk.graal.compiler.api.replacements.Snippet.ConstantParameter; +import jdk.graal.compiler.api.replacements.Snippet.NonNullParameter; +import jdk.graal.compiler.api.replacements.Snippet.VarargsParameter; +import jdk.graal.compiler.core.common.spi.ForeignCallDescriptor; +import jdk.graal.compiler.core.common.type.StampFactory; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.graph.Node.ConstantNodeParameter; +import jdk.graal.compiler.graph.Node.NodeIntrinsic; +import jdk.graal.compiler.hotspot.GraalHotSpotVMConfig; +import jdk.graal.compiler.hotspot.meta.HotSpotForeignCallDescriptor; +import jdk.graal.compiler.hotspot.meta.HotSpotProviders; +import jdk.graal.compiler.hotspot.meta.HotSpotRegistersProvider; +import jdk.graal.compiler.hotspot.nodes.KlassBeingInitializedCheckNode; +import jdk.graal.compiler.hotspot.nodes.type.KlassPointerStamp; +import jdk.graal.compiler.hotspot.word.KlassPointer; +import jdk.graal.compiler.nodes.ConstantNode; +import jdk.graal.compiler.nodes.DeoptimizeNode; +import jdk.graal.compiler.nodes.PiNode; +import jdk.graal.compiler.nodes.SnippetAnchorNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.debug.DynamicCounterNode; +import jdk.graal.compiler.nodes.debug.VerifyHeapNode; +import jdk.graal.compiler.nodes.extended.BranchProbabilityNode; +import jdk.graal.compiler.nodes.extended.ForeignCallNode; +import jdk.graal.compiler.nodes.java.DynamicNewArrayNode; +import jdk.graal.compiler.nodes.java.DynamicNewInstanceNode; +import jdk.graal.compiler.nodes.java.NewArrayNode; +import jdk.graal.compiler.nodes.java.NewInstanceNode; +import jdk.graal.compiler.nodes.java.NewMultiArrayNode; +import jdk.graal.compiler.nodes.java.ValidateNewInstanceClassNode; +import jdk.graal.compiler.nodes.spi.LoweringTool; +import jdk.graal.compiler.nodes.util.GraphUtil; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.replacements.AllocationSnippets; +import jdk.graal.compiler.replacements.SnippetCounter; +import jdk.graal.compiler.replacements.SnippetTemplate; +import jdk.graal.compiler.replacements.SnippetTemplate.AbstractTemplates; +import jdk.graal.compiler.replacements.SnippetTemplate.Arguments; +import jdk.graal.compiler.replacements.SnippetTemplate.SnippetInfo; +import jdk.graal.compiler.word.Word; import org.graalvm.word.UnsignedWord; import org.graalvm.word.WordFactory; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/HotSpotG1WriteBarrierSnippets.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/HotSpotG1WriteBarrierSnippets.java similarity index 85% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/HotSpotG1WriteBarrierSnippets.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/HotSpotG1WriteBarrierSnippets.java index b7b7370f8da3..df3980675e45 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/HotSpotG1WriteBarrierSnippets.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/HotSpotG1WriteBarrierSnippets.java @@ -22,37 +22,37 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.replacements; - -import static jdk.compiler.graal.hotspot.GraalHotSpotVMConfig.INJECTED_METAACCESS; -import static jdk.compiler.graal.hotspot.GraalHotSpotVMConfig.INJECTED_VMCONFIG; -import static jdk.compiler.graal.hotspot.meta.HotSpotForeignCallDescriptor.Reexecutability.REEXECUTABLE; -import static jdk.compiler.graal.hotspot.meta.HotSpotForeignCallDescriptor.Transition.LEAF_NO_VZERO; -import static jdk.compiler.graal.hotspot.meta.HotSpotForeignCallsProviderImpl.NO_LOCATIONS; - -import jdk.compiler.graal.core.common.CompressEncoding; -import jdk.compiler.graal.core.common.spi.ForeignCallDescriptor; -import jdk.compiler.graal.hotspot.GraalHotSpotVMConfig; -import jdk.compiler.graal.hotspot.meta.HotSpotForeignCallDescriptor; -import jdk.compiler.graal.hotspot.meta.HotSpotForeignCallsProviderImpl; -import jdk.compiler.graal.hotspot.meta.HotSpotProviders; -import jdk.compiler.graal.hotspot.meta.HotSpotRegistersProvider; -import jdk.compiler.graal.hotspot.nodes.HotSpotCompressionNode; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.gc.G1ArrayRangePostWriteBarrier; -import jdk.compiler.graal.nodes.gc.G1ArrayRangePreWriteBarrier; -import jdk.compiler.graal.nodes.gc.G1PostWriteBarrier; -import jdk.compiler.graal.nodes.gc.G1PreWriteBarrier; -import jdk.compiler.graal.nodes.gc.G1ReferentFieldReadBarrier; -import jdk.compiler.graal.nodes.spi.LoweringTool; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.replacements.ReplacementsUtil; -import jdk.compiler.graal.replacements.SnippetCounter.Group; -import jdk.compiler.graal.replacements.SnippetCounter.Group.Factory; -import jdk.compiler.graal.replacements.SnippetTemplate.AbstractTemplates; -import jdk.compiler.graal.replacements.SnippetTemplate.SnippetInfo; -import jdk.compiler.graal.replacements.gc.G1WriteBarrierSnippets; -import jdk.compiler.graal.word.Word; +package jdk.graal.compiler.hotspot.replacements; + +import static jdk.graal.compiler.hotspot.GraalHotSpotVMConfig.INJECTED_METAACCESS; +import static jdk.graal.compiler.hotspot.GraalHotSpotVMConfig.INJECTED_VMCONFIG; +import static jdk.graal.compiler.hotspot.meta.HotSpotForeignCallDescriptor.Reexecutability.REEXECUTABLE; +import static jdk.graal.compiler.hotspot.meta.HotSpotForeignCallDescriptor.Transition.LEAF_NO_VZERO; +import static jdk.graal.compiler.hotspot.meta.HotSpotForeignCallsProviderImpl.NO_LOCATIONS; + +import jdk.graal.compiler.core.common.CompressEncoding; +import jdk.graal.compiler.core.common.spi.ForeignCallDescriptor; +import jdk.graal.compiler.hotspot.GraalHotSpotVMConfig; +import jdk.graal.compiler.hotspot.meta.HotSpotForeignCallDescriptor; +import jdk.graal.compiler.hotspot.meta.HotSpotForeignCallsProviderImpl; +import jdk.graal.compiler.hotspot.meta.HotSpotProviders; +import jdk.graal.compiler.hotspot.meta.HotSpotRegistersProvider; +import jdk.graal.compiler.hotspot.nodes.HotSpotCompressionNode; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.gc.G1ArrayRangePostWriteBarrier; +import jdk.graal.compiler.nodes.gc.G1ArrayRangePreWriteBarrier; +import jdk.graal.compiler.nodes.gc.G1PostWriteBarrier; +import jdk.graal.compiler.nodes.gc.G1PreWriteBarrier; +import jdk.graal.compiler.nodes.gc.G1ReferentFieldReadBarrier; +import jdk.graal.compiler.nodes.spi.LoweringTool; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.replacements.ReplacementsUtil; +import jdk.graal.compiler.replacements.SnippetCounter.Group; +import jdk.graal.compiler.replacements.SnippetCounter.Group.Factory; +import jdk.graal.compiler.replacements.SnippetTemplate.AbstractTemplates; +import jdk.graal.compiler.replacements.SnippetTemplate.SnippetInfo; +import jdk.graal.compiler.replacements.gc.G1WriteBarrierSnippets; +import jdk.graal.compiler.word.Word; import org.graalvm.word.Pointer; import org.graalvm.word.WordFactory; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/HotSpotHashCodeSnippets.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/HotSpotHashCodeSnippets.java similarity index 79% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/HotSpotHashCodeSnippets.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/HotSpotHashCodeSnippets.java index 0ddfc378a47a..1e690fc940df 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/HotSpotHashCodeSnippets.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/HotSpotHashCodeSnippets.java @@ -22,23 +22,23 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.replacements; +package jdk.graal.compiler.hotspot.replacements; -import static jdk.compiler.graal.hotspot.GraalHotSpotVMConfig.INJECTED_VMCONFIG; -import static jdk.compiler.graal.hotspot.meta.HotSpotForeignCallsProviderImpl.IDENTITY_HASHCODE; -import static jdk.compiler.graal.hotspot.replacements.HotSpotReplacementsUtil.identityHashCode; -import static jdk.compiler.graal.hotspot.replacements.HotSpotReplacementsUtil.identityHashCodeShift; -import static jdk.compiler.graal.hotspot.replacements.HotSpotReplacementsUtil.loadWordFromObject; -import static jdk.compiler.graal.hotspot.replacements.HotSpotReplacementsUtil.lockMaskInPlace; -import static jdk.compiler.graal.hotspot.replacements.HotSpotReplacementsUtil.markOffset; -import static jdk.compiler.graal.hotspot.replacements.HotSpotReplacementsUtil.uninitializedIdentityHashCodeValue; -import static jdk.compiler.graal.hotspot.replacements.HotSpotReplacementsUtil.unlockedMask; -import static jdk.compiler.graal.nodes.extended.BranchProbabilityNode.FAST_PATH_PROBABILITY; -import static jdk.compiler.graal.nodes.extended.BranchProbabilityNode.probability; +import static jdk.graal.compiler.hotspot.GraalHotSpotVMConfig.INJECTED_VMCONFIG; +import static jdk.graal.compiler.hotspot.meta.HotSpotForeignCallsProviderImpl.IDENTITY_HASHCODE; +import static jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil.identityHashCode; +import static jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil.identityHashCodeShift; +import static jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil.loadWordFromObject; +import static jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil.lockMaskInPlace; +import static jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil.markOffset; +import static jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil.uninitializedIdentityHashCodeValue; +import static jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil.unlockedMask; +import static jdk.graal.compiler.nodes.extended.BranchProbabilityNode.FAST_PATH_PROBABILITY; +import static jdk.graal.compiler.nodes.extended.BranchProbabilityNode.probability; -import jdk.compiler.graal.lir.SyncPort; -import jdk.compiler.graal.replacements.IdentityHashCodeSnippets; -import jdk.compiler.graal.word.Word; +import jdk.graal.compiler.lir.SyncPort; +import jdk.graal.compiler.replacements.IdentityHashCodeSnippets; +import jdk.graal.compiler.word.Word; import org.graalvm.word.WordFactory; // @formatter:off diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/HotSpotIdentityHashCodeNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/HotSpotIdentityHashCodeNode.java similarity index 85% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/HotSpotIdentityHashCodeNode.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/HotSpotIdentityHashCodeNode.java index 1e3346c2d46c..067a47e5db59 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/HotSpotIdentityHashCodeNode.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/HotSpotIdentityHashCodeNode.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.replacements; +package jdk.graal.compiler.hotspot.replacements; -import jdk.compiler.graal.graph.NodeClass; -import jdk.compiler.graal.nodeinfo.NodeCycles; -import jdk.compiler.graal.nodeinfo.NodeInfo; -import jdk.compiler.graal.nodeinfo.NodeSize; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.replacements.nodes.IdentityHashCodeNode; +import jdk.graal.compiler.graph.NodeClass; +import jdk.graal.compiler.nodeinfo.NodeCycles; +import jdk.graal.compiler.nodeinfo.NodeInfo; +import jdk.graal.compiler.nodeinfo.NodeSize; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.replacements.nodes.IdentityHashCodeNode; import org.graalvm.word.LocationIdentity; import jdk.vm.ci.hotspot.HotSpotObjectConstant; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/HotSpotInvocationPluginHelper.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/HotSpotInvocationPluginHelper.java similarity index 85% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/HotSpotInvocationPluginHelper.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/HotSpotInvocationPluginHelper.java index 062b58f51ea2..a1a73cbac06d 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/HotSpotInvocationPluginHelper.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/HotSpotInvocationPluginHelper.java @@ -22,46 +22,46 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.replacements; - -import static jdk.compiler.graal.hotspot.replacements.HotSpotReplacementsUtil.ARRAY_KLASS_COMPONENT_MIRROR; -import static jdk.compiler.graal.hotspot.replacements.HotSpotReplacementsUtil.CLASS_ARRAY_KLASS_LOCATION; -import static jdk.compiler.graal.hotspot.replacements.HotSpotReplacementsUtil.HOTSPOT_CURRENT_THREAD_OOP_HANDLE_LOCATION; -import static jdk.compiler.graal.hotspot.replacements.HotSpotReplacementsUtil.HOTSPOT_JAVA_THREAD_SCOPED_VALUE_CACHE_HANDLE_LOCATION; -import static jdk.compiler.graal.hotspot.replacements.HotSpotReplacementsUtil.HOTSPOT_OOP_HANDLE_LOCATION; -import static jdk.compiler.graal.hotspot.replacements.HotSpotReplacementsUtil.JAVA_THREAD_CARRIER_THREAD_OBJECT_LOCATION; -import static jdk.compiler.graal.hotspot.replacements.HotSpotReplacementsUtil.JAVA_THREAD_CURRENT_THREAD_OBJECT_LOCATION; -import static jdk.compiler.graal.hotspot.replacements.HotSpotReplacementsUtil.JAVA_THREAD_OSTHREAD_LOCATION; -import static jdk.compiler.graal.hotspot.replacements.HotSpotReplacementsUtil.JAVA_THREAD_SCOPED_VALUE_CACHE_LOCATION; -import static jdk.compiler.graal.hotspot.replacements.HotSpotReplacementsUtil.KLASS_ACCESS_FLAGS_LOCATION; -import static jdk.compiler.graal.hotspot.replacements.HotSpotReplacementsUtil.KLASS_MODIFIER_FLAGS_LOCATION; -import static jdk.compiler.graal.hotspot.replacements.HotSpotReplacementsUtil.KLASS_SUPER_KLASS_LOCATION; +package jdk.graal.compiler.hotspot.replacements; + +import static jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil.ARRAY_KLASS_COMPONENT_MIRROR; +import static jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil.CLASS_ARRAY_KLASS_LOCATION; +import static jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil.HOTSPOT_CURRENT_THREAD_OOP_HANDLE_LOCATION; +import static jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil.HOTSPOT_JAVA_THREAD_SCOPED_VALUE_CACHE_HANDLE_LOCATION; +import static jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil.HOTSPOT_OOP_HANDLE_LOCATION; +import static jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil.JAVA_THREAD_CARRIER_THREAD_OBJECT_LOCATION; +import static jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil.JAVA_THREAD_CURRENT_THREAD_OBJECT_LOCATION; +import static jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil.JAVA_THREAD_OSTHREAD_LOCATION; +import static jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil.JAVA_THREAD_SCOPED_VALUE_CACHE_LOCATION; +import static jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil.KLASS_ACCESS_FLAGS_LOCATION; +import static jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil.KLASS_MODIFIER_FLAGS_LOCATION; +import static jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil.KLASS_SUPER_KLASS_LOCATION; import java.util.function.Function; -import jdk.compiler.graal.core.common.memory.BarrierType; -import jdk.compiler.graal.core.common.memory.MemoryOrderMode; -import jdk.compiler.graal.core.common.type.ObjectStamp; -import jdk.compiler.graal.core.common.type.Stamp; -import jdk.compiler.graal.core.common.type.StampFactory; -import jdk.compiler.graal.core.common.type.TypeReference; -import jdk.compiler.graal.hotspot.GraalHotSpotVMConfig; -import jdk.compiler.graal.hotspot.nodes.CurrentJavaThreadNode; -import jdk.compiler.graal.hotspot.nodes.VirtualThreadUpdateJFRNode; -import jdk.compiler.graal.hotspot.nodes.type.KlassPointerStamp; -import jdk.compiler.graal.nodes.NodeView; -import jdk.compiler.graal.nodes.PiNode; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.calc.IsNullNode; -import jdk.compiler.graal.nodes.extended.GuardingNode; -import jdk.compiler.graal.nodes.gc.BarrierSet; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext; -import jdk.compiler.graal.nodes.memory.ReadNode; -import jdk.compiler.graal.nodes.memory.WriteNode; -import jdk.compiler.graal.nodes.memory.address.AddressNode; -import jdk.compiler.graal.nodes.memory.address.OffsetAddressNode; -import jdk.compiler.graal.nodes.type.StampTool; -import jdk.compiler.graal.replacements.InvocationPluginHelper; +import jdk.graal.compiler.core.common.memory.BarrierType; +import jdk.graal.compiler.core.common.memory.MemoryOrderMode; +import jdk.graal.compiler.core.common.type.ObjectStamp; +import jdk.graal.compiler.core.common.type.Stamp; +import jdk.graal.compiler.core.common.type.StampFactory; +import jdk.graal.compiler.core.common.type.TypeReference; +import jdk.graal.compiler.hotspot.GraalHotSpotVMConfig; +import jdk.graal.compiler.hotspot.nodes.CurrentJavaThreadNode; +import jdk.graal.compiler.hotspot.nodes.VirtualThreadUpdateJFRNode; +import jdk.graal.compiler.hotspot.nodes.type.KlassPointerStamp; +import jdk.graal.compiler.nodes.NodeView; +import jdk.graal.compiler.nodes.PiNode; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.calc.IsNullNode; +import jdk.graal.compiler.nodes.extended.GuardingNode; +import jdk.graal.compiler.nodes.gc.BarrierSet; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext; +import jdk.graal.compiler.nodes.memory.ReadNode; +import jdk.graal.compiler.nodes.memory.WriteNode; +import jdk.graal.compiler.nodes.memory.address.AddressNode; +import jdk.graal.compiler.nodes.memory.address.OffsetAddressNode; +import jdk.graal.compiler.nodes.type.StampTool; +import jdk.graal.compiler.replacements.InvocationPluginHelper; import org.graalvm.word.LocationIdentity; import jdk.vm.ci.meta.JavaKind; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/HotSpotIsArraySnippets.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/HotSpotIsArraySnippets.java similarity index 81% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/HotSpotIsArraySnippets.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/HotSpotIsArraySnippets.java index 7cc159eb68ce..1382cfd5cd87 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/HotSpotIsArraySnippets.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/HotSpotIsArraySnippets.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.replacements; +package jdk.graal.compiler.hotspot.replacements; -import static jdk.compiler.graal.hotspot.replacements.HotSpotReplacementsUtil.klassIsArray; -import static jdk.compiler.graal.nodes.extended.BranchProbabilityNode.NOT_FREQUENT_PROBABILITY; -import static jdk.compiler.graal.nodes.extended.BranchProbabilityNode.probability; +import static jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil.klassIsArray; +import static jdk.graal.compiler.nodes.extended.BranchProbabilityNode.NOT_FREQUENT_PROBABILITY; +import static jdk.graal.compiler.nodes.extended.BranchProbabilityNode.probability; -import jdk.compiler.graal.hotspot.word.KlassPointer; -import jdk.compiler.graal.nodes.SnippetAnchorNode; -import jdk.compiler.graal.replacements.IsArraySnippets; +import jdk.graal.compiler.hotspot.word.KlassPointer; +import jdk.graal.compiler.nodes.SnippetAnchorNode; +import jdk.graal.compiler.replacements.IsArraySnippets; public class HotSpotIsArraySnippets extends IsArraySnippets { diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/HotSpotReflectionGetCallerClassNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/HotSpotReflectionGetCallerClassNode.java similarity index 91% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/HotSpotReflectionGetCallerClassNode.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/HotSpotReflectionGetCallerClassNode.java index 20d9d8d26cc1..3aba53c2475f 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/HotSpotReflectionGetCallerClassNode.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/HotSpotReflectionGetCallerClassNode.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.replacements; +package jdk.graal.compiler.hotspot.replacements; -import jdk.compiler.graal.graph.NodeClass; -import jdk.compiler.graal.nodeinfo.NodeInfo; -import jdk.compiler.graal.replacements.nodes.ReflectionGetCallerClassNode; +import jdk.graal.compiler.graph.NodeClass; +import jdk.graal.compiler.nodeinfo.NodeInfo; +import jdk.graal.compiler.replacements.nodes.ReflectionGetCallerClassNode; import jdk.vm.ci.hotspot.HotSpotResolvedJavaMethod; import jdk.vm.ci.meta.MetaAccessProvider; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/HotSpotReplacementsUtil.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/HotSpotReplacementsUtil.java similarity index 95% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/HotSpotReplacementsUtil.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/HotSpotReplacementsUtil.java index 274b6be8c396..e125d8120d6a 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/HotSpotReplacementsUtil.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/HotSpotReplacementsUtil.java @@ -22,44 +22,44 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.replacements; +package jdk.graal.compiler.hotspot.replacements; -import static jdk.compiler.graal.hotspot.GraalHotSpotVMConfig.INJECTED_VMCONFIG; -import static jdk.compiler.graal.hotspot.meta.HotSpotForeignCallsProviderImpl.VERIFY_OOP; +import static jdk.graal.compiler.hotspot.GraalHotSpotVMConfig.INJECTED_VMCONFIG; +import static jdk.graal.compiler.hotspot.meta.HotSpotForeignCallsProviderImpl.VERIFY_OOP; import java.lang.ref.Reference; -import jdk.compiler.graal.api.replacements.Fold; -import jdk.compiler.graal.api.replacements.Fold.InjectedParameter; -import jdk.compiler.graal.core.common.SuppressFBWarnings; -import jdk.compiler.graal.core.common.spi.ForeignCallDescriptor; -import jdk.compiler.graal.core.common.type.ObjectStamp; -import jdk.compiler.graal.core.common.type.TypeReference; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.graph.Node.ConstantNodeParameter; -import jdk.compiler.graal.graph.Node.NodeIntrinsic; -import jdk.compiler.graal.hotspot.GraalHotSpotVMConfig; -import jdk.compiler.graal.hotspot.word.KlassPointer; -import jdk.compiler.graal.nodes.CanonicalizableLocation; -import jdk.compiler.graal.nodes.CompressionNode; -import jdk.compiler.graal.nodes.ConstantNode; -import jdk.compiler.graal.nodes.NamedLocationIdentity; -import jdk.compiler.graal.nodes.NodeView; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.extended.ForeignCallNode; -import jdk.compiler.graal.nodes.extended.LoadHubNode; -import jdk.compiler.graal.nodes.extended.LoadHubOrNullNode; -import jdk.compiler.graal.nodes.extended.RawLoadNode; -import jdk.compiler.graal.nodes.extended.StoreHubNode; -import jdk.compiler.graal.nodes.memory.AddressableMemoryAccess; -import jdk.compiler.graal.nodes.memory.address.AddressNode; -import jdk.compiler.graal.nodes.memory.address.OffsetAddressNode; -import jdk.compiler.graal.nodes.spi.CoreProviders; -import jdk.compiler.graal.nodes.type.StampTool; -import jdk.compiler.graal.replacements.ReplacementsUtil; -import jdk.compiler.graal.replacements.nodes.ReadRegisterNode; -import jdk.compiler.graal.serviceprovider.JavaVersionUtil; -import jdk.compiler.graal.word.Word; +import jdk.graal.compiler.api.replacements.Fold; +import jdk.graal.compiler.api.replacements.Fold.InjectedParameter; +import jdk.graal.compiler.core.common.SuppressFBWarnings; +import jdk.graal.compiler.core.common.spi.ForeignCallDescriptor; +import jdk.graal.compiler.core.common.type.ObjectStamp; +import jdk.graal.compiler.core.common.type.TypeReference; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.graph.Node.ConstantNodeParameter; +import jdk.graal.compiler.graph.Node.NodeIntrinsic; +import jdk.graal.compiler.hotspot.GraalHotSpotVMConfig; +import jdk.graal.compiler.hotspot.word.KlassPointer; +import jdk.graal.compiler.nodes.CanonicalizableLocation; +import jdk.graal.compiler.nodes.CompressionNode; +import jdk.graal.compiler.nodes.ConstantNode; +import jdk.graal.compiler.nodes.NamedLocationIdentity; +import jdk.graal.compiler.nodes.NodeView; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.extended.ForeignCallNode; +import jdk.graal.compiler.nodes.extended.LoadHubNode; +import jdk.graal.compiler.nodes.extended.LoadHubOrNullNode; +import jdk.graal.compiler.nodes.extended.RawLoadNode; +import jdk.graal.compiler.nodes.extended.StoreHubNode; +import jdk.graal.compiler.nodes.memory.AddressableMemoryAccess; +import jdk.graal.compiler.nodes.memory.address.AddressNode; +import jdk.graal.compiler.nodes.memory.address.OffsetAddressNode; +import jdk.graal.compiler.nodes.spi.CoreProviders; +import jdk.graal.compiler.nodes.type.StampTool; +import jdk.graal.compiler.replacements.ReplacementsUtil; +import jdk.graal.compiler.replacements.nodes.ReadRegisterNode; +import jdk.graal.compiler.serviceprovider.JavaVersionUtil; +import jdk.graal.compiler.word.Word; import org.graalvm.word.LocationIdentity; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/HotSpotSerialWriteBarrierSnippets.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/HotSpotSerialWriteBarrierSnippets.java similarity index 84% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/HotSpotSerialWriteBarrierSnippets.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/HotSpotSerialWriteBarrierSnippets.java index 83ee4fbd49d4..347bb1153a7c 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/HotSpotSerialWriteBarrierSnippets.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/HotSpotSerialWriteBarrierSnippets.java @@ -22,21 +22,21 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.replacements; +package jdk.graal.compiler.hotspot.replacements; -import static jdk.compiler.graal.hotspot.GraalHotSpotVMConfig.INJECTED_VMCONFIG; +import static jdk.graal.compiler.hotspot.GraalHotSpotVMConfig.INJECTED_VMCONFIG; -import jdk.compiler.graal.hotspot.meta.HotSpotProviders; -import jdk.compiler.graal.nodes.gc.SerialArrayRangeWriteBarrier; -import jdk.compiler.graal.nodes.gc.SerialWriteBarrier; -import jdk.compiler.graal.nodes.spi.LoweringTool; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.replacements.ReplacementsUtil; -import jdk.compiler.graal.replacements.SnippetCounter.Group; -import jdk.compiler.graal.replacements.SnippetTemplate.AbstractTemplates; -import jdk.compiler.graal.replacements.SnippetTemplate.SnippetInfo; -import jdk.compiler.graal.replacements.gc.SerialWriteBarrierSnippets; -import jdk.compiler.graal.word.Word; +import jdk.graal.compiler.hotspot.meta.HotSpotProviders; +import jdk.graal.compiler.nodes.gc.SerialArrayRangeWriteBarrier; +import jdk.graal.compiler.nodes.gc.SerialWriteBarrier; +import jdk.graal.compiler.nodes.spi.LoweringTool; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.replacements.ReplacementsUtil; +import jdk.graal.compiler.replacements.SnippetCounter.Group; +import jdk.graal.compiler.replacements.SnippetTemplate.AbstractTemplates; +import jdk.graal.compiler.replacements.SnippetTemplate.SnippetInfo; +import jdk.graal.compiler.replacements.gc.SerialWriteBarrierSnippets; +import jdk.graal.compiler.word.Word; import org.graalvm.word.WordFactory; public class HotSpotSerialWriteBarrierSnippets extends SerialWriteBarrierSnippets { diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/HotspotSnippetsOptions.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/HotspotSnippetsOptions.java similarity index 94% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/HotspotSnippetsOptions.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/HotspotSnippetsOptions.java index c98dc7a235c1..b8822b358f45 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/HotspotSnippetsOptions.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/HotspotSnippetsOptions.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.replacements; +package jdk.graal.compiler.hotspot.replacements; -import jdk.compiler.graal.options.EnumOptionKey; -import jdk.compiler.graal.options.Option; -import jdk.compiler.graal.options.OptionType; -import jdk.compiler.graal.options.OptionKey; +import jdk.graal.compiler.options.EnumOptionKey; +import jdk.graal.compiler.options.Option; +import jdk.graal.compiler.options.OptionType; +import jdk.graal.compiler.options.OptionKey; /** * Options related to HotSpot snippets in this package. diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/HubGetClassNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/HubGetClassNode.java similarity index 82% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/HubGetClassNode.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/HubGetClassNode.java index 656a310928b6..f50f2e31c247 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/HubGetClassNode.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/HubGetClassNode.java @@ -22,25 +22,25 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.replacements; +package jdk.graal.compiler.hotspot.replacements; -import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_1; -import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1; +import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_1; +import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_1; -import jdk.compiler.graal.core.common.type.StampFactory; -import jdk.compiler.graal.core.common.type.TypeReference; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.graph.NodeClass; -import jdk.compiler.graal.nodes.spi.Canonicalizable; -import jdk.compiler.graal.nodes.spi.CanonicalizerTool; -import jdk.compiler.graal.hotspot.word.KlassPointer; -import jdk.compiler.graal.nodeinfo.NodeInfo; -import jdk.compiler.graal.nodes.ConstantNode; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.calc.ConvertNode; -import jdk.compiler.graal.nodes.calc.FloatingNode; -import jdk.compiler.graal.nodes.extended.HubGetClassNodeInterface; -import jdk.compiler.graal.nodes.spi.Lowerable; +import jdk.graal.compiler.core.common.type.StampFactory; +import jdk.graal.compiler.core.common.type.TypeReference; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.graph.NodeClass; +import jdk.graal.compiler.nodes.spi.Canonicalizable; +import jdk.graal.compiler.nodes.spi.CanonicalizerTool; +import jdk.graal.compiler.hotspot.word.KlassPointer; +import jdk.graal.compiler.nodeinfo.NodeInfo; +import jdk.graal.compiler.nodes.ConstantNode; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.calc.ConvertNode; +import jdk.graal.compiler.nodes.calc.FloatingNode; +import jdk.graal.compiler.nodes.extended.HubGetClassNodeInterface; +import jdk.graal.compiler.nodes.spi.Lowerable; import jdk.vm.ci.meta.Constant; import jdk.vm.ci.meta.ConstantReflectionProvider; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/InstanceOfSnippets.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/InstanceOfSnippets.java similarity index 85% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/InstanceOfSnippets.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/InstanceOfSnippets.java index b5bbdbc3b16c..d09b86ac29e8 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/InstanceOfSnippets.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/InstanceOfSnippets.java @@ -22,58 +22,58 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.replacements; +package jdk.graal.compiler.hotspot.replacements; import static jdk.vm.ci.meta.DeoptimizationAction.InvalidateReprofile; import static jdk.vm.ci.meta.DeoptimizationReason.OptimizedTypeCheckViolated; -import static jdk.compiler.graal.hotspot.replacements.HotSpotReplacementsUtil.PRIMARY_SUPERS_LOCATION; -import static jdk.compiler.graal.hotspot.replacements.HotSpotReplacementsUtil.SECONDARY_SUPER_CACHE_LOCATION; -import static jdk.compiler.graal.hotspot.replacements.HotSpotReplacementsUtil.loadHubIntrinsic; -import static jdk.compiler.graal.hotspot.replacements.HotSpotReplacementsUtil.loadHubOrNullIntrinsic; -import static jdk.compiler.graal.hotspot.replacements.HotspotSnippetsOptions.TypeCheckMaxHints; -import static jdk.compiler.graal.hotspot.replacements.HotspotSnippetsOptions.TypeCheckMinProfileHitProbability; -import static jdk.compiler.graal.hotspot.replacements.TypeCheckSnippetUtils.checkSecondarySubType; -import static jdk.compiler.graal.hotspot.replacements.TypeCheckSnippetUtils.checkUnknownSubType; -import static jdk.compiler.graal.hotspot.replacements.TypeCheckSnippetUtils.createHints; -import static jdk.compiler.graal.nodes.extended.BranchProbabilityNode.FAST_PATH_PROBABILITY; -import static jdk.compiler.graal.nodes.extended.BranchProbabilityNode.LIKELY_PROBABILITY; -import static jdk.compiler.graal.nodes.extended.BranchProbabilityNode.NOT_FREQUENT_PROBABILITY; -import static jdk.compiler.graal.nodes.extended.BranchProbabilityNode.NOT_LIKELY_PROBABILITY; -import static jdk.compiler.graal.nodes.extended.BranchProbabilityNode.probability; -import static jdk.compiler.graal.nodes.extended.BranchProbabilityNode.unknownProbability; +import static jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil.PRIMARY_SUPERS_LOCATION; +import static jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil.SECONDARY_SUPER_CACHE_LOCATION; +import static jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil.loadHubIntrinsic; +import static jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil.loadHubOrNullIntrinsic; +import static jdk.graal.compiler.hotspot.replacements.HotspotSnippetsOptions.TypeCheckMaxHints; +import static jdk.graal.compiler.hotspot.replacements.HotspotSnippetsOptions.TypeCheckMinProfileHitProbability; +import static jdk.graal.compiler.hotspot.replacements.TypeCheckSnippetUtils.checkSecondarySubType; +import static jdk.graal.compiler.hotspot.replacements.TypeCheckSnippetUtils.checkUnknownSubType; +import static jdk.graal.compiler.hotspot.replacements.TypeCheckSnippetUtils.createHints; +import static jdk.graal.compiler.nodes.extended.BranchProbabilityNode.FAST_PATH_PROBABILITY; +import static jdk.graal.compiler.nodes.extended.BranchProbabilityNode.LIKELY_PROBABILITY; +import static jdk.graal.compiler.nodes.extended.BranchProbabilityNode.NOT_FREQUENT_PROBABILITY; +import static jdk.graal.compiler.nodes.extended.BranchProbabilityNode.NOT_LIKELY_PROBABILITY; +import static jdk.graal.compiler.nodes.extended.BranchProbabilityNode.probability; +import static jdk.graal.compiler.nodes.extended.BranchProbabilityNode.unknownProbability; -import jdk.compiler.graal.api.replacements.Snippet; -import jdk.compiler.graal.api.replacements.Snippet.ConstantParameter; -import jdk.compiler.graal.api.replacements.Snippet.NonNullParameter; -import jdk.compiler.graal.api.replacements.Snippet.VarargsParameter; -import jdk.compiler.graal.core.common.type.ObjectStamp; -import jdk.compiler.graal.core.common.type.StampFactory; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.hotspot.meta.HotSpotProviders; -import jdk.compiler.graal.hotspot.nodes.type.KlassPointerStamp; -import jdk.compiler.graal.hotspot.replacements.TypeCheckSnippetUtils.Counters; -import jdk.compiler.graal.hotspot.replacements.TypeCheckSnippetUtils.Hints; -import jdk.compiler.graal.hotspot.word.KlassPointer; -import jdk.compiler.graal.nodes.ConstantNode; -import jdk.compiler.graal.nodes.DeoptimizeNode; -import jdk.compiler.graal.nodes.NodeView; -import jdk.compiler.graal.nodes.PiNode; -import jdk.compiler.graal.nodes.SnippetAnchorNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.TypeCheckHints; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.extended.GuardingNode; -import jdk.compiler.graal.nodes.java.ClassIsAssignableFromNode; -import jdk.compiler.graal.nodes.java.InstanceOfDynamicNode; -import jdk.compiler.graal.nodes.java.InstanceOfNode; -import jdk.compiler.graal.nodes.spi.LoweringTool; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.replacements.InstanceOfSnippetsTemplates; -import jdk.compiler.graal.replacements.SnippetCounter; -import jdk.compiler.graal.replacements.SnippetTemplate.Arguments; -import jdk.compiler.graal.replacements.SnippetTemplate.SnippetInfo; -import jdk.compiler.graal.replacements.Snippets; -import jdk.compiler.graal.replacements.nodes.ExplodeLoopNode; +import jdk.graal.compiler.api.replacements.Snippet; +import jdk.graal.compiler.api.replacements.Snippet.ConstantParameter; +import jdk.graal.compiler.api.replacements.Snippet.NonNullParameter; +import jdk.graal.compiler.api.replacements.Snippet.VarargsParameter; +import jdk.graal.compiler.core.common.type.ObjectStamp; +import jdk.graal.compiler.core.common.type.StampFactory; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.hotspot.meta.HotSpotProviders; +import jdk.graal.compiler.hotspot.nodes.type.KlassPointerStamp; +import jdk.graal.compiler.hotspot.replacements.TypeCheckSnippetUtils.Counters; +import jdk.graal.compiler.hotspot.replacements.TypeCheckSnippetUtils.Hints; +import jdk.graal.compiler.hotspot.word.KlassPointer; +import jdk.graal.compiler.nodes.ConstantNode; +import jdk.graal.compiler.nodes.DeoptimizeNode; +import jdk.graal.compiler.nodes.NodeView; +import jdk.graal.compiler.nodes.PiNode; +import jdk.graal.compiler.nodes.SnippetAnchorNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.TypeCheckHints; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.extended.GuardingNode; +import jdk.graal.compiler.nodes.java.ClassIsAssignableFromNode; +import jdk.graal.compiler.nodes.java.InstanceOfDynamicNode; +import jdk.graal.compiler.nodes.java.InstanceOfNode; +import jdk.graal.compiler.nodes.spi.LoweringTool; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.replacements.InstanceOfSnippetsTemplates; +import jdk.graal.compiler.replacements.SnippetCounter; +import jdk.graal.compiler.replacements.SnippetTemplate.Arguments; +import jdk.graal.compiler.replacements.SnippetTemplate.SnippetInfo; +import jdk.graal.compiler.replacements.Snippets; +import jdk.graal.compiler.replacements.nodes.ExplodeLoopNode; import jdk.vm.ci.hotspot.HotSpotResolvedObjectType; import jdk.vm.ci.meta.Assumptions; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/KlassLayoutHelperNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/KlassLayoutHelperNode.java similarity index 85% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/KlassLayoutHelperNode.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/KlassLayoutHelperNode.java index 5f08cb70cb62..59eded2ad28d 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/KlassLayoutHelperNode.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/KlassLayoutHelperNode.java @@ -22,28 +22,28 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.replacements; +package jdk.graal.compiler.hotspot.replacements; -import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_1; -import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1; +import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_1; +import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_1; -import jdk.compiler.graal.core.common.type.ObjectStamp; -import jdk.compiler.graal.core.common.type.Stamp; -import jdk.compiler.graal.core.common.type.StampFactory; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.graph.Node.NodeIntrinsicFactory; -import jdk.compiler.graal.graph.NodeClass; -import jdk.compiler.graal.nodes.spi.Canonicalizable; -import jdk.compiler.graal.nodes.spi.CanonicalizerTool; -import jdk.compiler.graal.hotspot.GraalHotSpotVMConfig; -import jdk.compiler.graal.nodeinfo.NodeInfo; -import jdk.compiler.graal.nodes.ConstantNode; -import jdk.compiler.graal.nodes.NodeView; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.calc.FloatingNode; -import jdk.compiler.graal.nodes.extended.LoadHubNode; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext; -import jdk.compiler.graal.nodes.spi.Lowerable; +import jdk.graal.compiler.core.common.type.ObjectStamp; +import jdk.graal.compiler.core.common.type.Stamp; +import jdk.graal.compiler.core.common.type.StampFactory; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.graph.Node.NodeIntrinsicFactory; +import jdk.graal.compiler.graph.NodeClass; +import jdk.graal.compiler.nodes.spi.Canonicalizable; +import jdk.graal.compiler.nodes.spi.CanonicalizerTool; +import jdk.graal.compiler.hotspot.GraalHotSpotVMConfig; +import jdk.graal.compiler.nodeinfo.NodeInfo; +import jdk.graal.compiler.nodes.ConstantNode; +import jdk.graal.compiler.nodes.NodeView; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.calc.FloatingNode; +import jdk.graal.compiler.nodes.extended.LoadHubNode; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext; +import jdk.graal.compiler.nodes.spi.Lowerable; import jdk.vm.ci.hotspot.HotSpotResolvedObjectType; import jdk.vm.ci.meta.Constant; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/LoadExceptionObjectSnippets.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/LoadExceptionObjectSnippets.java similarity index 74% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/LoadExceptionObjectSnippets.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/LoadExceptionObjectSnippets.java index 98da9263fb67..2ddd0173ee2d 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/LoadExceptionObjectSnippets.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/LoadExceptionObjectSnippets.java @@ -22,36 +22,36 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.replacements; +package jdk.graal.compiler.hotspot.replacements; -import static jdk.compiler.graal.hotspot.meta.HotSpotForeignCallsProviderImpl.LOAD_AND_CLEAR_EXCEPTION; -import static jdk.compiler.graal.hotspot.replacements.HotSpotReplacementsUtil.EXCEPTION_OOP_LOCATION; -import static jdk.compiler.graal.hotspot.replacements.HotSpotReplacementsUtil.EXCEPTION_PC_LOCATION; -import static jdk.compiler.graal.hotspot.replacements.HotSpotReplacementsUtil.readExceptionOop; -import static jdk.compiler.graal.hotspot.replacements.HotSpotReplacementsUtil.registerAsWord; -import static jdk.compiler.graal.hotspot.replacements.HotSpotReplacementsUtil.writeExceptionOop; -import static jdk.compiler.graal.hotspot.replacements.HotSpotReplacementsUtil.writeExceptionPc; -import static jdk.compiler.graal.hotspot.replacements.HotspotSnippetsOptions.LoadExceptionObjectInVM; -import static jdk.compiler.graal.nodes.PiNode.piCastToSnippetReplaceeStamp; -import static jdk.compiler.graal.replacements.SnippetTemplate.DEFAULT_REPLACER; +import static jdk.graal.compiler.hotspot.meta.HotSpotForeignCallsProviderImpl.LOAD_AND_CLEAR_EXCEPTION; +import static jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil.EXCEPTION_OOP_LOCATION; +import static jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil.EXCEPTION_PC_LOCATION; +import static jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil.readExceptionOop; +import static jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil.registerAsWord; +import static jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil.writeExceptionOop; +import static jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil.writeExceptionPc; +import static jdk.graal.compiler.hotspot.replacements.HotspotSnippetsOptions.LoadExceptionObjectInVM; +import static jdk.graal.compiler.nodes.PiNode.piCastToSnippetReplaceeStamp; +import static jdk.graal.compiler.replacements.SnippetTemplate.DEFAULT_REPLACER; -import jdk.compiler.graal.api.replacements.Snippet; -import jdk.compiler.graal.api.replacements.Snippet.ConstantParameter; -import jdk.compiler.graal.core.common.type.Stamp; -import jdk.compiler.graal.hotspot.meta.HotSpotProviders; -import jdk.compiler.graal.hotspot.meta.HotSpotRegistersProvider; -import jdk.compiler.graal.hotspot.word.HotSpotWordTypes; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.extended.ForeignCallNode; -import jdk.compiler.graal.nodes.java.LoadExceptionObjectNode; -import jdk.compiler.graal.nodes.spi.LoweringTool; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.replacements.SnippetTemplate.AbstractTemplates; -import jdk.compiler.graal.replacements.SnippetTemplate.Arguments; -import jdk.compiler.graal.replacements.SnippetTemplate.SnippetInfo; -import jdk.compiler.graal.replacements.Snippets; -import jdk.compiler.graal.replacements.nodes.ReadRegisterNode; -import jdk.compiler.graal.word.Word; +import jdk.graal.compiler.api.replacements.Snippet; +import jdk.graal.compiler.api.replacements.Snippet.ConstantParameter; +import jdk.graal.compiler.core.common.type.Stamp; +import jdk.graal.compiler.hotspot.meta.HotSpotProviders; +import jdk.graal.compiler.hotspot.meta.HotSpotRegistersProvider; +import jdk.graal.compiler.hotspot.word.HotSpotWordTypes; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.extended.ForeignCallNode; +import jdk.graal.compiler.nodes.java.LoadExceptionObjectNode; +import jdk.graal.compiler.nodes.spi.LoweringTool; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.replacements.SnippetTemplate.AbstractTemplates; +import jdk.graal.compiler.replacements.SnippetTemplate.Arguments; +import jdk.graal.compiler.replacements.SnippetTemplate.SnippetInfo; +import jdk.graal.compiler.replacements.Snippets; +import jdk.graal.compiler.replacements.nodes.ReadRegisterNode; +import jdk.graal.compiler.word.Word; import org.graalvm.word.WordFactory; import jdk.vm.ci.code.BytecodeFrame; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/Log.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/Log.java similarity index 92% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/Log.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/Log.java index 7fe3e19d5f27..c1986e37e18d 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/Log.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/Log.java @@ -22,21 +22,21 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.replacements; +package jdk.graal.compiler.hotspot.replacements; -import static jdk.compiler.graal.hotspot.meta.HotSpotForeignCallDescriptor.Reexecutability.REEXECUTABLE; -import static jdk.compiler.graal.hotspot.meta.HotSpotForeignCallDescriptor.Transition.LEAF; -import static jdk.compiler.graal.hotspot.meta.HotSpotForeignCallsProviderImpl.NO_LOCATIONS; -import static jdk.compiler.graal.replacements.nodes.CStringConstant.cstring; +import static jdk.graal.compiler.hotspot.meta.HotSpotForeignCallDescriptor.Reexecutability.REEXECUTABLE; +import static jdk.graal.compiler.hotspot.meta.HotSpotForeignCallDescriptor.Transition.LEAF; +import static jdk.graal.compiler.hotspot.meta.HotSpotForeignCallsProviderImpl.NO_LOCATIONS; +import static jdk.graal.compiler.replacements.nodes.CStringConstant.cstring; import java.io.PrintStream; -import jdk.compiler.graal.core.common.spi.ForeignCallDescriptor; -import jdk.compiler.graal.graph.Node.ConstantNodeParameter; -import jdk.compiler.graal.graph.Node.NodeIntrinsic; -import jdk.compiler.graal.hotspot.meta.HotSpotForeignCallDescriptor; -import jdk.compiler.graal.nodes.extended.ForeignCallNode; -import jdk.compiler.graal.word.Word; +import jdk.graal.compiler.core.common.spi.ForeignCallDescriptor; +import jdk.graal.compiler.graph.Node.ConstantNodeParameter; +import jdk.graal.compiler.graph.Node.NodeIntrinsic; +import jdk.graal.compiler.hotspot.meta.HotSpotForeignCallDescriptor; +import jdk.graal.compiler.nodes.extended.ForeignCallNode; +import jdk.graal.compiler.word.Word; import jdk.vm.ci.meta.JavaKind; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/LogSnippets.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/LogSnippets.java similarity index 80% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/LogSnippets.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/LogSnippets.java index 82d2ebbf849a..4d9bf13eeb7b 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/LogSnippets.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/LogSnippets.java @@ -22,25 +22,25 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.replacements; +package jdk.graal.compiler.hotspot.replacements; -import static jdk.compiler.graal.replacements.SnippetTemplate.DEFAULT_REPLACER; +import static jdk.graal.compiler.replacements.SnippetTemplate.DEFAULT_REPLACER; -import jdk.compiler.graal.api.replacements.Snippet; -import jdk.compiler.graal.api.replacements.Snippet.ConstantParameter; -import jdk.compiler.graal.core.common.type.StampFactory; -import jdk.compiler.graal.hotspot.meta.HotSpotProviders; -import jdk.compiler.graal.nodes.ConstantNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.spi.LoweringTool; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.replacements.SnippetTemplate.AbstractTemplates; -import jdk.compiler.graal.replacements.SnippetTemplate.Arguments; -import jdk.compiler.graal.replacements.SnippetTemplate.SnippetInfo; -import jdk.compiler.graal.replacements.Snippets; -import jdk.compiler.graal.replacements.nodes.CStringConstant; -import jdk.compiler.graal.replacements.nodes.LogNode; -import jdk.compiler.graal.word.Word; +import jdk.graal.compiler.api.replacements.Snippet; +import jdk.graal.compiler.api.replacements.Snippet.ConstantParameter; +import jdk.graal.compiler.core.common.type.StampFactory; +import jdk.graal.compiler.hotspot.meta.HotSpotProviders; +import jdk.graal.compiler.nodes.ConstantNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.spi.LoweringTool; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.replacements.SnippetTemplate.AbstractTemplates; +import jdk.graal.compiler.replacements.SnippetTemplate.Arguments; +import jdk.graal.compiler.replacements.SnippetTemplate.SnippetInfo; +import jdk.graal.compiler.replacements.Snippets; +import jdk.graal.compiler.replacements.nodes.CStringConstant; +import jdk.graal.compiler.replacements.nodes.LogNode; +import jdk.graal.compiler.word.Word; /** * Collection of snippets to lower {@link LogNode} with different input edge constellations. diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/MonitorSnippets.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/MonitorSnippets.java similarity index 87% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/MonitorSnippets.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/MonitorSnippets.java index 20c9691fa264..16f7a1f71c42 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/MonitorSnippets.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/MonitorSnippets.java @@ -22,58 +22,58 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.replacements; - -import static jdk.compiler.graal.hotspot.GraalHotSpotVMConfig.INJECTED_OPTIONVALUES; -import static jdk.compiler.graal.hotspot.GraalHotSpotVMConfig.INJECTED_VMCONFIG; -import static jdk.compiler.graal.hotspot.meta.HotSpotForeignCallDescriptor.Reexecutability.NOT_REEXECUTABLE; -import static jdk.compiler.graal.hotspot.meta.HotSpotForeignCallDescriptor.Transition.SAFEPOINT; -import static jdk.compiler.graal.hotspot.meta.HotSpotForeignCallDescriptor.Transition.STACK_INSPECTABLE_LEAF; -import static jdk.compiler.graal.hotspot.nodes.AcquiredCASLockNode.mark; -import static jdk.compiler.graal.hotspot.nodes.BeginLockScopeNode.beginLockScope; -import static jdk.compiler.graal.hotspot.nodes.EndLockScopeNode.endLockScope; -import static jdk.compiler.graal.hotspot.nodes.VMErrorNode.vmError; -import static jdk.compiler.graal.hotspot.replacements.HotSpotReplacementsUtil.DISPLACED_MARK_WORD_LOCATION; -import static jdk.compiler.graal.hotspot.replacements.HotSpotReplacementsUtil.JAVA_THREAD_HOLD_MONITOR_COUNT_LOCATION; -import static jdk.compiler.graal.hotspot.replacements.HotSpotReplacementsUtil.JAVA_THREAD_LOCK_STACK_LOCATION; -import static jdk.compiler.graal.hotspot.replacements.HotSpotReplacementsUtil.JAVA_THREAD_LOCK_STACK_TOP_LOCATION; -import static jdk.compiler.graal.hotspot.replacements.HotSpotReplacementsUtil.MARK_WORD_LOCATION; -import static jdk.compiler.graal.hotspot.replacements.HotSpotReplacementsUtil.OBJECT_MONITOR_CXQ_LOCATION; -import static jdk.compiler.graal.hotspot.replacements.HotSpotReplacementsUtil.OBJECT_MONITOR_ENTRY_LIST_LOCATION; -import static jdk.compiler.graal.hotspot.replacements.HotSpotReplacementsUtil.OBJECT_MONITOR_OWNER_LOCATION; -import static jdk.compiler.graal.hotspot.replacements.HotSpotReplacementsUtil.OBJECT_MONITOR_RECURSION_LOCATION; -import static jdk.compiler.graal.hotspot.replacements.HotSpotReplacementsUtil.OBJECT_MONITOR_SUCC_LOCATION; -import static jdk.compiler.graal.hotspot.replacements.HotSpotReplacementsUtil.isCAssertEnabled; -import static jdk.compiler.graal.hotspot.replacements.HotSpotReplacementsUtil.javaThreadLockStackEndOffset; -import static jdk.compiler.graal.hotspot.replacements.HotSpotReplacementsUtil.javaThreadLockStackTopOffset; -import static jdk.compiler.graal.hotspot.replacements.HotSpotReplacementsUtil.loadWordFromObject; -import static jdk.compiler.graal.hotspot.replacements.HotSpotReplacementsUtil.lockDisplacedMarkOffset; -import static jdk.compiler.graal.hotspot.replacements.HotSpotReplacementsUtil.lockMaskInPlace; -import static jdk.compiler.graal.hotspot.replacements.HotSpotReplacementsUtil.markOffset; -import static jdk.compiler.graal.hotspot.replacements.HotSpotReplacementsUtil.monitorMask; -import static jdk.compiler.graal.hotspot.replacements.HotSpotReplacementsUtil.objectMonitorAnonymousOwner; -import static jdk.compiler.graal.hotspot.replacements.HotSpotReplacementsUtil.objectMonitorCxqOffset; -import static jdk.compiler.graal.hotspot.replacements.HotSpotReplacementsUtil.objectMonitorEntryListOffset; -import static jdk.compiler.graal.hotspot.replacements.HotSpotReplacementsUtil.objectMonitorOwnerOffset; -import static jdk.compiler.graal.hotspot.replacements.HotSpotReplacementsUtil.objectMonitorRecursionsOffset; -import static jdk.compiler.graal.hotspot.replacements.HotSpotReplacementsUtil.objectMonitorSuccOffset; -import static jdk.compiler.graal.hotspot.replacements.HotSpotReplacementsUtil.pageSize; -import static jdk.compiler.graal.hotspot.replacements.HotSpotReplacementsUtil.registerAsWord; -import static jdk.compiler.graal.hotspot.replacements.HotSpotReplacementsUtil.unlockedMask; -import static jdk.compiler.graal.hotspot.replacements.HotSpotReplacementsUtil.useLightweightLocking; -import static jdk.compiler.graal.hotspot.replacements.HotSpotReplacementsUtil.useStackLocking; -import static jdk.compiler.graal.hotspot.replacements.HotSpotReplacementsUtil.verifyOop; -import static jdk.compiler.graal.hotspot.replacements.HotSpotReplacementsUtil.wordSize; -import static jdk.compiler.graal.hotspot.replacements.HotspotSnippetsOptions.ProfileMonitors; -import static jdk.compiler.graal.nodes.extended.BranchProbabilityNode.FAST_PATH_PROBABILITY; -import static jdk.compiler.graal.nodes.extended.BranchProbabilityNode.FREQUENT_PROBABILITY; -import static jdk.compiler.graal.nodes.extended.BranchProbabilityNode.NOT_FREQUENT_PROBABILITY; -import static jdk.compiler.graal.nodes.extended.BranchProbabilityNode.NOT_LIKELY_PROBABILITY; -import static jdk.compiler.graal.nodes.extended.BranchProbabilityNode.SLOW_PATH_PROBABILITY; -import static jdk.compiler.graal.nodes.extended.BranchProbabilityNode.VERY_FAST_PATH_PROBABILITY; -import static jdk.compiler.graal.nodes.extended.BranchProbabilityNode.probability; -import static jdk.compiler.graal.nodes.extended.MembarNode.memoryBarrier; -import static jdk.compiler.graal.replacements.SnippetTemplate.DEFAULT_REPLACER; +package jdk.graal.compiler.hotspot.replacements; + +import static jdk.graal.compiler.hotspot.GraalHotSpotVMConfig.INJECTED_OPTIONVALUES; +import static jdk.graal.compiler.hotspot.GraalHotSpotVMConfig.INJECTED_VMCONFIG; +import static jdk.graal.compiler.hotspot.meta.HotSpotForeignCallDescriptor.Reexecutability.NOT_REEXECUTABLE; +import static jdk.graal.compiler.hotspot.meta.HotSpotForeignCallDescriptor.Transition.SAFEPOINT; +import static jdk.graal.compiler.hotspot.meta.HotSpotForeignCallDescriptor.Transition.STACK_INSPECTABLE_LEAF; +import static jdk.graal.compiler.hotspot.nodes.AcquiredCASLockNode.mark; +import static jdk.graal.compiler.hotspot.nodes.BeginLockScopeNode.beginLockScope; +import static jdk.graal.compiler.hotspot.nodes.EndLockScopeNode.endLockScope; +import static jdk.graal.compiler.hotspot.nodes.VMErrorNode.vmError; +import static jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil.DISPLACED_MARK_WORD_LOCATION; +import static jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil.JAVA_THREAD_HOLD_MONITOR_COUNT_LOCATION; +import static jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil.JAVA_THREAD_LOCK_STACK_LOCATION; +import static jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil.JAVA_THREAD_LOCK_STACK_TOP_LOCATION; +import static jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil.MARK_WORD_LOCATION; +import static jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil.OBJECT_MONITOR_CXQ_LOCATION; +import static jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil.OBJECT_MONITOR_ENTRY_LIST_LOCATION; +import static jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil.OBJECT_MONITOR_OWNER_LOCATION; +import static jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil.OBJECT_MONITOR_RECURSION_LOCATION; +import static jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil.OBJECT_MONITOR_SUCC_LOCATION; +import static jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil.isCAssertEnabled; +import static jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil.javaThreadLockStackEndOffset; +import static jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil.javaThreadLockStackTopOffset; +import static jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil.loadWordFromObject; +import static jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil.lockDisplacedMarkOffset; +import static jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil.lockMaskInPlace; +import static jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil.markOffset; +import static jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil.monitorMask; +import static jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil.objectMonitorAnonymousOwner; +import static jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil.objectMonitorCxqOffset; +import static jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil.objectMonitorEntryListOffset; +import static jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil.objectMonitorOwnerOffset; +import static jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil.objectMonitorRecursionsOffset; +import static jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil.objectMonitorSuccOffset; +import static jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil.pageSize; +import static jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil.registerAsWord; +import static jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil.unlockedMask; +import static jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil.useLightweightLocking; +import static jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil.useStackLocking; +import static jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil.verifyOop; +import static jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil.wordSize; +import static jdk.graal.compiler.hotspot.replacements.HotspotSnippetsOptions.ProfileMonitors; +import static jdk.graal.compiler.nodes.extended.BranchProbabilityNode.FAST_PATH_PROBABILITY; +import static jdk.graal.compiler.nodes.extended.BranchProbabilityNode.FREQUENT_PROBABILITY; +import static jdk.graal.compiler.nodes.extended.BranchProbabilityNode.NOT_FREQUENT_PROBABILITY; +import static jdk.graal.compiler.nodes.extended.BranchProbabilityNode.NOT_LIKELY_PROBABILITY; +import static jdk.graal.compiler.nodes.extended.BranchProbabilityNode.SLOW_PATH_PROBABILITY; +import static jdk.graal.compiler.nodes.extended.BranchProbabilityNode.VERY_FAST_PATH_PROBABILITY; +import static jdk.graal.compiler.nodes.extended.BranchProbabilityNode.probability; +import static jdk.graal.compiler.nodes.extended.MembarNode.memoryBarrier; +import static jdk.graal.compiler.replacements.SnippetTemplate.DEFAULT_REPLACER; import static org.graalvm.word.LocationIdentity.any; import static org.graalvm.word.WordFactory.unsigned; import static org.graalvm.word.WordFactory.zero; @@ -81,52 +81,52 @@ import java.util.List; import java.util.Objects; -import jdk.compiler.graal.api.replacements.Fold; -import jdk.compiler.graal.api.replacements.Snippet; -import jdk.compiler.graal.api.replacements.Snippet.ConstantParameter; -import jdk.compiler.graal.bytecode.Bytecode; -import jdk.compiler.graal.bytecode.ResolvedJavaMethodBytecode; -import jdk.compiler.graal.core.common.spi.ForeignCallDescriptor; -import jdk.compiler.graal.core.common.type.ObjectStamp; -import jdk.compiler.graal.core.common.type.StampFactory; -import jdk.compiler.graal.core.common.type.StampPair; -import jdk.compiler.graal.graph.Node.ConstantNodeParameter; -import jdk.compiler.graal.graph.Node.NodeIntrinsic; -import jdk.compiler.graal.graph.iterators.NodeIterable; -import jdk.compiler.graal.hotspot.GraalHotSpotVMConfig; -import jdk.compiler.graal.hotspot.meta.HotSpotForeignCallDescriptor; -import jdk.compiler.graal.hotspot.meta.HotSpotProviders; -import jdk.compiler.graal.hotspot.meta.HotSpotRegistersProvider; -import jdk.compiler.graal.hotspot.nodes.CurrentLockNode; -import jdk.compiler.graal.hotspot.nodes.MonitorCounterNode; -import jdk.compiler.graal.hotspot.word.KlassPointer; -import jdk.compiler.graal.lir.SyncPort; -import jdk.compiler.graal.nodes.CallTargetNode.InvokeKind; -import jdk.compiler.graal.nodes.ConstantNode; -import jdk.compiler.graal.nodes.FrameState; -import jdk.compiler.graal.nodes.InvokeNode; -import jdk.compiler.graal.nodes.NamedLocationIdentity; -import jdk.compiler.graal.nodes.NodeView; -import jdk.compiler.graal.nodes.ReturnNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.debug.DynamicCounterNode; -import jdk.compiler.graal.nodes.extended.ForeignCallNode; -import jdk.compiler.graal.nodes.extended.MembarNode; -import jdk.compiler.graal.nodes.java.MethodCallTargetNode; -import jdk.compiler.graal.nodes.java.MonitorEnterNode; -import jdk.compiler.graal.nodes.java.MonitorExitNode; -import jdk.compiler.graal.nodes.spi.LoweringTool; -import jdk.compiler.graal.nodes.type.StampTool; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.phases.common.inlining.InliningUtil; -import jdk.compiler.graal.replacements.SnippetCounter; -import jdk.compiler.graal.replacements.SnippetTemplate.AbstractTemplates; -import jdk.compiler.graal.replacements.SnippetTemplate.Arguments; -import jdk.compiler.graal.replacements.SnippetTemplate.SnippetInfo; -import jdk.compiler.graal.replacements.Snippets; -import jdk.compiler.graal.replacements.nodes.CStringConstant; -import jdk.compiler.graal.word.Word; +import jdk.graal.compiler.api.replacements.Fold; +import jdk.graal.compiler.api.replacements.Snippet; +import jdk.graal.compiler.api.replacements.Snippet.ConstantParameter; +import jdk.graal.compiler.bytecode.Bytecode; +import jdk.graal.compiler.bytecode.ResolvedJavaMethodBytecode; +import jdk.graal.compiler.core.common.spi.ForeignCallDescriptor; +import jdk.graal.compiler.core.common.type.ObjectStamp; +import jdk.graal.compiler.core.common.type.StampFactory; +import jdk.graal.compiler.core.common.type.StampPair; +import jdk.graal.compiler.graph.Node.ConstantNodeParameter; +import jdk.graal.compiler.graph.Node.NodeIntrinsic; +import jdk.graal.compiler.graph.iterators.NodeIterable; +import jdk.graal.compiler.hotspot.GraalHotSpotVMConfig; +import jdk.graal.compiler.hotspot.meta.HotSpotForeignCallDescriptor; +import jdk.graal.compiler.hotspot.meta.HotSpotProviders; +import jdk.graal.compiler.hotspot.meta.HotSpotRegistersProvider; +import jdk.graal.compiler.hotspot.nodes.CurrentLockNode; +import jdk.graal.compiler.hotspot.nodes.MonitorCounterNode; +import jdk.graal.compiler.hotspot.word.KlassPointer; +import jdk.graal.compiler.lir.SyncPort; +import jdk.graal.compiler.nodes.CallTargetNode.InvokeKind; +import jdk.graal.compiler.nodes.ConstantNode; +import jdk.graal.compiler.nodes.FrameState; +import jdk.graal.compiler.nodes.InvokeNode; +import jdk.graal.compiler.nodes.NamedLocationIdentity; +import jdk.graal.compiler.nodes.NodeView; +import jdk.graal.compiler.nodes.ReturnNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.debug.DynamicCounterNode; +import jdk.graal.compiler.nodes.extended.ForeignCallNode; +import jdk.graal.compiler.nodes.extended.MembarNode; +import jdk.graal.compiler.nodes.java.MethodCallTargetNode; +import jdk.graal.compiler.nodes.java.MonitorEnterNode; +import jdk.graal.compiler.nodes.java.MonitorExitNode; +import jdk.graal.compiler.nodes.spi.LoweringTool; +import jdk.graal.compiler.nodes.type.StampTool; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.phases.common.inlining.InliningUtil; +import jdk.graal.compiler.replacements.SnippetCounter; +import jdk.graal.compiler.replacements.SnippetTemplate.AbstractTemplates; +import jdk.graal.compiler.replacements.SnippetTemplate.Arguments; +import jdk.graal.compiler.replacements.SnippetTemplate.SnippetInfo; +import jdk.graal.compiler.replacements.Snippets; +import jdk.graal.compiler.replacements.nodes.CStringConstant; +import jdk.graal.compiler.word.Word; import org.graalvm.word.LocationIdentity; import org.graalvm.word.Pointer; import org.graalvm.word.WordBase; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/ObjectCloneNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/ObjectCloneNode.java similarity index 84% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/ObjectCloneNode.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/ObjectCloneNode.java index eff739e968b0..80334c271f3f 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/ObjectCloneNode.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/ObjectCloneNode.java @@ -22,41 +22,41 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.replacements; +package jdk.graal.compiler.hotspot.replacements; import java.util.Collections; import java.util.List; -import jdk.compiler.graal.core.common.type.ObjectStamp; -import jdk.compiler.graal.core.common.type.StampPair; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.graph.NodeClass; -import jdk.compiler.graal.hotspot.meta.HotSpotLoweringProvider; -import jdk.compiler.graal.nodeinfo.NodeInfo; -import jdk.compiler.graal.nodes.FrameState; -import jdk.compiler.graal.nodes.InliningLog; -import jdk.compiler.graal.nodes.InvokeNode; -import jdk.compiler.graal.nodes.NodeView; -import jdk.compiler.graal.nodes.ParameterNode; -import jdk.compiler.graal.nodes.ReturnNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.java.LoadFieldNode; -import jdk.compiler.graal.nodes.spi.Lowerable; -import jdk.compiler.graal.nodes.spi.LoweringTool; -import jdk.compiler.graal.nodes.spi.Replacements; -import jdk.compiler.graal.nodes.type.StampTool; -import jdk.compiler.graal.nodes.virtual.AllocatedObjectNode; -import jdk.compiler.graal.nodes.virtual.CommitAllocationNode; -import jdk.compiler.graal.nodes.virtual.VirtualInstanceNode; -import jdk.compiler.graal.nodes.virtual.VirtualObjectNode; -import jdk.compiler.graal.phases.common.inlining.InliningUtil; -import jdk.compiler.graal.replacements.SnippetTemplate.SnippetInfo; -import jdk.compiler.graal.replacements.nodes.BasicObjectCloneNode; -import jdk.compiler.graal.replacements.nodes.MacroInvokable; -import jdk.compiler.graal.replacements.nodes.ObjectClone; +import jdk.graal.compiler.core.common.type.ObjectStamp; +import jdk.graal.compiler.core.common.type.StampPair; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.graph.NodeClass; +import jdk.graal.compiler.hotspot.meta.HotSpotLoweringProvider; +import jdk.graal.compiler.nodeinfo.NodeInfo; +import jdk.graal.compiler.nodes.FrameState; +import jdk.graal.compiler.nodes.InliningLog; +import jdk.graal.compiler.nodes.InvokeNode; +import jdk.graal.compiler.nodes.NodeView; +import jdk.graal.compiler.nodes.ParameterNode; +import jdk.graal.compiler.nodes.ReturnNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.StructuredGraph.AllowAssumptions; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.java.LoadFieldNode; +import jdk.graal.compiler.nodes.spi.Lowerable; +import jdk.graal.compiler.nodes.spi.LoweringTool; +import jdk.graal.compiler.nodes.spi.Replacements; +import jdk.graal.compiler.nodes.type.StampTool; +import jdk.graal.compiler.nodes.virtual.AllocatedObjectNode; +import jdk.graal.compiler.nodes.virtual.CommitAllocationNode; +import jdk.graal.compiler.nodes.virtual.VirtualInstanceNode; +import jdk.graal.compiler.nodes.virtual.VirtualObjectNode; +import jdk.graal.compiler.phases.common.inlining.InliningUtil; +import jdk.graal.compiler.replacements.SnippetTemplate.SnippetInfo; +import jdk.graal.compiler.replacements.nodes.BasicObjectCloneNode; +import jdk.graal.compiler.replacements.nodes.MacroInvokable; +import jdk.graal.compiler.replacements.nodes.ObjectClone; import jdk.vm.ci.meta.Assumptions; import jdk.vm.ci.meta.ResolvedJavaField; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/ObjectCloneSnippets.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/ObjectCloneSnippets.java similarity index 89% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/ObjectCloneSnippets.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/ObjectCloneSnippets.java index f4375fa4e46d..e91e818aa06e 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/ObjectCloneSnippets.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/ObjectCloneSnippets.java @@ -22,22 +22,22 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.replacements; +package jdk.graal.compiler.hotspot.replacements; -import static jdk.compiler.graal.hotspot.GraalHotSpotVMConfig.INJECTED_VMCONFIG; +import static jdk.graal.compiler.hotspot.GraalHotSpotVMConfig.INJECTED_VMCONFIG; import java.util.EnumMap; -import jdk.compiler.graal.api.directives.GraalDirectives; -import jdk.compiler.graal.api.replacements.Snippet; -import jdk.compiler.graal.hotspot.meta.HotSpotProviders; -import jdk.compiler.graal.nodes.java.DynamicNewArrayNode; -import jdk.compiler.graal.nodes.java.NewArrayNode; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.replacements.SnippetTemplate.AbstractTemplates; -import jdk.compiler.graal.replacements.SnippetTemplate.SnippetInfo; -import jdk.compiler.graal.replacements.Snippets; -import jdk.compiler.graal.replacements.arraycopy.ArrayCopyCallNode; +import jdk.graal.compiler.api.directives.GraalDirectives; +import jdk.graal.compiler.api.replacements.Snippet; +import jdk.graal.compiler.hotspot.meta.HotSpotProviders; +import jdk.graal.compiler.nodes.java.DynamicNewArrayNode; +import jdk.graal.compiler.nodes.java.NewArrayNode; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.replacements.SnippetTemplate.AbstractTemplates; +import jdk.graal.compiler.replacements.SnippetTemplate.SnippetInfo; +import jdk.graal.compiler.replacements.Snippets; +import jdk.graal.compiler.replacements.arraycopy.ArrayCopyCallNode; import jdk.vm.ci.meta.JavaKind; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/ObjectSnippets.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/ObjectSnippets.java similarity index 77% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/ObjectSnippets.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/ObjectSnippets.java index 7ac58c796873..2c691e9efb5d 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/ObjectSnippets.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/ObjectSnippets.java @@ -22,37 +22,37 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.replacements; +package jdk.graal.compiler.hotspot.replacements; -import static jdk.compiler.graal.nodes.extended.BranchProbabilityNode.FAST_PATH_PROBABILITY; -import static jdk.compiler.graal.nodes.extended.BranchProbabilityNode.probability; -import static jdk.compiler.graal.replacements.SnippetTemplate.DEFAULT_REPLACER; +import static jdk.graal.compiler.nodes.extended.BranchProbabilityNode.FAST_PATH_PROBABILITY; +import static jdk.graal.compiler.nodes.extended.BranchProbabilityNode.probability; +import static jdk.graal.compiler.replacements.SnippetTemplate.DEFAULT_REPLACER; import org.graalvm.collections.UnmodifiableEconomicMap; -import jdk.compiler.graal.api.replacements.Snippet; -import jdk.compiler.graal.core.common.spi.ForeignCallDescriptor; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.graph.Node.ConstantNodeParameter; -import jdk.compiler.graal.graph.Node.NodeIntrinsic; -import jdk.compiler.graal.hotspot.meta.HotSpotHostForeignCallsProvider; -import jdk.compiler.graal.hotspot.meta.HotSpotProviders; -import jdk.compiler.graal.hotspot.nodes.CurrentJavaThreadNode; -import jdk.compiler.graal.nodes.FrameState; -import jdk.compiler.graal.nodes.InvokeNode; -import jdk.compiler.graal.nodes.InvokeWithExceptionNode; -import jdk.compiler.graal.nodes.PiNode; -import jdk.compiler.graal.nodes.SnippetAnchorNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.extended.ForeignCallNode; -import jdk.compiler.graal.nodes.spi.LoweringTool; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.replacements.SnippetTemplate; -import jdk.compiler.graal.replacements.SnippetTemplate.AbstractTemplates; -import jdk.compiler.graal.replacements.SnippetTemplate.Arguments; -import jdk.compiler.graal.replacements.SnippetTemplate.SnippetInfo; -import jdk.compiler.graal.replacements.Snippets; -import jdk.compiler.graal.word.Word; +import jdk.graal.compiler.api.replacements.Snippet; +import jdk.graal.compiler.core.common.spi.ForeignCallDescriptor; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.graph.Node.ConstantNodeParameter; +import jdk.graal.compiler.graph.Node.NodeIntrinsic; +import jdk.graal.compiler.hotspot.meta.HotSpotHostForeignCallsProvider; +import jdk.graal.compiler.hotspot.meta.HotSpotProviders; +import jdk.graal.compiler.hotspot.nodes.CurrentJavaThreadNode; +import jdk.graal.compiler.nodes.FrameState; +import jdk.graal.compiler.nodes.InvokeNode; +import jdk.graal.compiler.nodes.InvokeWithExceptionNode; +import jdk.graal.compiler.nodes.PiNode; +import jdk.graal.compiler.nodes.SnippetAnchorNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.extended.ForeignCallNode; +import jdk.graal.compiler.nodes.spi.LoweringTool; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.replacements.SnippetTemplate; +import jdk.graal.compiler.replacements.SnippetTemplate.AbstractTemplates; +import jdk.graal.compiler.replacements.SnippetTemplate.Arguments; +import jdk.graal.compiler.replacements.SnippetTemplate.SnippetInfo; +import jdk.graal.compiler.replacements.Snippets; +import jdk.graal.compiler.word.Word; public class ObjectSnippets implements Snippets { diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/RegisterFinalizerSnippets.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/RegisterFinalizerSnippets.java similarity index 76% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/RegisterFinalizerSnippets.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/RegisterFinalizerSnippets.java index db4455289c2c..81af8dcfc850 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/RegisterFinalizerSnippets.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/RegisterFinalizerSnippets.java @@ -22,25 +22,25 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.replacements; +package jdk.graal.compiler.hotspot.replacements; -import static jdk.compiler.graal.hotspot.GraalHotSpotVMConfig.INJECTED_VMCONFIG; -import static jdk.compiler.graal.nodes.extended.BranchProbabilityNode.SLOW_PATH_PROBABILITY; -import static jdk.compiler.graal.nodes.extended.BranchProbabilityNode.probability; +import static jdk.graal.compiler.hotspot.GraalHotSpotVMConfig.INJECTED_VMCONFIG; +import static jdk.graal.compiler.nodes.extended.BranchProbabilityNode.SLOW_PATH_PROBABILITY; +import static jdk.graal.compiler.nodes.extended.BranchProbabilityNode.probability; -import jdk.compiler.graal.api.replacements.Snippet; -import jdk.compiler.graal.hotspot.meta.HotSpotProviders; -import jdk.compiler.graal.hotspot.word.KlassPointer; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.java.LoweredRegisterFinalizerNode; -import jdk.compiler.graal.nodes.java.RegisterFinalizerNode; -import jdk.compiler.graal.nodes.spi.LoweringTool; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.replacements.SnippetTemplate; -import jdk.compiler.graal.replacements.SnippetTemplate.AbstractTemplates; -import jdk.compiler.graal.replacements.SnippetTemplate.Arguments; -import jdk.compiler.graal.replacements.SnippetTemplate.SnippetInfo; -import jdk.compiler.graal.replacements.Snippets; +import jdk.graal.compiler.api.replacements.Snippet; +import jdk.graal.compiler.hotspot.meta.HotSpotProviders; +import jdk.graal.compiler.hotspot.word.KlassPointer; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.java.LoweredRegisterFinalizerNode; +import jdk.graal.compiler.nodes.java.RegisterFinalizerNode; +import jdk.graal.compiler.nodes.spi.LoweringTool; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.replacements.SnippetTemplate; +import jdk.graal.compiler.replacements.SnippetTemplate.AbstractTemplates; +import jdk.graal.compiler.replacements.SnippetTemplate.Arguments; +import jdk.graal.compiler.replacements.SnippetTemplate.SnippetInfo; +import jdk.graal.compiler.replacements.Snippets; /** * Performs conditional finalizer registration via a runtime call. The condition will be constant diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/StringToBytesSnippets.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/StringToBytesSnippets.java similarity index 73% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/StringToBytesSnippets.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/StringToBytesSnippets.java index 4d978a82a020..2e75a7b4250e 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/StringToBytesSnippets.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/StringToBytesSnippets.java @@ -22,29 +22,29 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.replacements; +package jdk.graal.compiler.hotspot.replacements; -import static jdk.compiler.graal.hotspot.GraalHotSpotVMConfig.INJECTED_METAACCESS; -import static jdk.compiler.graal.replacements.ReplacementsUtil.getArrayBaseOffset; -import static jdk.compiler.graal.replacements.SnippetTemplate.DEFAULT_REPLACER; +import static jdk.graal.compiler.hotspot.GraalHotSpotVMConfig.INJECTED_METAACCESS; +import static jdk.graal.compiler.replacements.ReplacementsUtil.getArrayBaseOffset; +import static jdk.graal.compiler.replacements.SnippetTemplate.DEFAULT_REPLACER; -import jdk.compiler.graal.api.directives.GraalDirectives; -import jdk.compiler.graal.api.replacements.Snippet; -import jdk.compiler.graal.api.replacements.Snippet.ConstantParameter; -import jdk.compiler.graal.hotspot.meta.HotSpotProviders; -import jdk.compiler.graal.nodes.NamedLocationIdentity; -import jdk.compiler.graal.nodes.debug.StringToBytesNode; -import jdk.compiler.graal.nodes.extended.RawStoreNode; -import jdk.compiler.graal.nodes.java.NewArrayNode; -import jdk.compiler.graal.nodes.spi.LoweringTool; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.replacements.SnippetTemplate; -import jdk.compiler.graal.replacements.SnippetTemplate.AbstractTemplates; -import jdk.compiler.graal.replacements.SnippetTemplate.Arguments; -import jdk.compiler.graal.replacements.SnippetTemplate.SnippetInfo; -import jdk.compiler.graal.replacements.Snippets; -import jdk.compiler.graal.replacements.nodes.CStringConstant; -import jdk.compiler.graal.word.Word; +import jdk.graal.compiler.api.directives.GraalDirectives; +import jdk.graal.compiler.api.replacements.Snippet; +import jdk.graal.compiler.api.replacements.Snippet.ConstantParameter; +import jdk.graal.compiler.hotspot.meta.HotSpotProviders; +import jdk.graal.compiler.nodes.NamedLocationIdentity; +import jdk.graal.compiler.nodes.debug.StringToBytesNode; +import jdk.graal.compiler.nodes.extended.RawStoreNode; +import jdk.graal.compiler.nodes.java.NewArrayNode; +import jdk.graal.compiler.nodes.spi.LoweringTool; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.replacements.SnippetTemplate; +import jdk.graal.compiler.replacements.SnippetTemplate.AbstractTemplates; +import jdk.graal.compiler.replacements.SnippetTemplate.Arguments; +import jdk.graal.compiler.replacements.SnippetTemplate.SnippetInfo; +import jdk.graal.compiler.replacements.Snippets; +import jdk.graal.compiler.replacements.nodes.CStringConstant; +import jdk.graal.compiler.word.Word; import org.graalvm.word.LocationIdentity; import jdk.vm.ci.meta.JavaKind; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/TypeCheckSnippetUtils.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/TypeCheckSnippetUtils.java similarity index 92% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/TypeCheckSnippetUtils.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/TypeCheckSnippetUtils.java index 9ff6c8e10640..b5a5bf2f644e 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/TypeCheckSnippetUtils.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/TypeCheckSnippetUtils.java @@ -22,22 +22,22 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.replacements; +package jdk.graal.compiler.hotspot.replacements; -import static jdk.compiler.graal.hotspot.GraalHotSpotVMConfig.INJECTED_VMCONFIG; -import static jdk.compiler.graal.nodes.extended.BranchProbabilityNode.NOT_LIKELY_PROBABILITY; -import static jdk.compiler.graal.nodes.extended.BranchProbabilityNode.probability; +import static jdk.graal.compiler.hotspot.GraalHotSpotVMConfig.INJECTED_VMCONFIG; +import static jdk.graal.compiler.nodes.extended.BranchProbabilityNode.NOT_LIKELY_PROBABILITY; +import static jdk.graal.compiler.nodes.extended.BranchProbabilityNode.probability; import java.util.Arrays; -import jdk.compiler.graal.hotspot.nodes.type.KlassPointerStamp; -import jdk.compiler.graal.hotspot.word.KlassPointer; -import jdk.compiler.graal.nodes.ConstantNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.TypeCheckHints; -import jdk.compiler.graal.replacements.SnippetCounter; -import jdk.compiler.graal.replacements.SnippetCounter.Group; -import jdk.compiler.graal.word.Word; +import jdk.graal.compiler.hotspot.nodes.type.KlassPointerStamp; +import jdk.graal.compiler.hotspot.word.KlassPointer; +import jdk.graal.compiler.nodes.ConstantNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.TypeCheckHints; +import jdk.graal.compiler.replacements.SnippetCounter; +import jdk.graal.compiler.replacements.SnippetCounter.Group; +import jdk.graal.compiler.word.Word; import jdk.vm.ci.hotspot.HotSpotResolvedObjectType; import jdk.vm.ci.meta.MetaAccessProvider; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/UnsafeCopyMemoryNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/UnsafeCopyMemoryNode.java similarity index 80% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/UnsafeCopyMemoryNode.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/UnsafeCopyMemoryNode.java index 34a2d431dcd1..43f8d2f0be0e 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/UnsafeCopyMemoryNode.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/UnsafeCopyMemoryNode.java @@ -22,21 +22,21 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.replacements; +package jdk.graal.compiler.hotspot.replacements; -import static jdk.compiler.graal.nodeinfo.InputType.Memory; -import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_64; -import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_16; +import static jdk.graal.compiler.nodeinfo.InputType.Memory; +import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_64; +import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_16; -import jdk.compiler.graal.core.common.type.StampFactory; -import jdk.compiler.graal.graph.NodeClass; -import jdk.compiler.graal.nodeinfo.NodeInfo; -import jdk.compiler.graal.nodes.AbstractStateSplit; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.memory.MemoryAccess; -import jdk.compiler.graal.nodes.memory.MemoryKill; -import jdk.compiler.graal.nodes.memory.SingleMemoryKill; -import jdk.compiler.graal.nodes.spi.Lowerable; +import jdk.graal.compiler.core.common.type.StampFactory; +import jdk.graal.compiler.graph.NodeClass; +import jdk.graal.compiler.nodeinfo.NodeInfo; +import jdk.graal.compiler.nodes.AbstractStateSplit; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.memory.MemoryAccess; +import jdk.graal.compiler.nodes.memory.MemoryKill; +import jdk.graal.compiler.nodes.memory.SingleMemoryKill; +import jdk.graal.compiler.nodes.spi.Lowerable; import org.graalvm.word.LocationIdentity; @NodeInfo(cycles = CYCLES_64, size = SIZE_16, allowedUsageTypes = {Memory}) diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/UnsafeSnippets.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/UnsafeSnippets.java similarity index 78% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/UnsafeSnippets.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/UnsafeSnippets.java index 1c1f1a712f49..e92003045a3f 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/UnsafeSnippets.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/UnsafeSnippets.java @@ -22,25 +22,25 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.replacements; +package jdk.graal.compiler.hotspot.replacements; -import static jdk.compiler.graal.hotspot.GraalHotSpotVMConfig.INJECTED_VMCONFIG; -import static jdk.compiler.graal.replacements.SnippetTemplate.DEFAULT_REPLACER; +import static jdk.graal.compiler.hotspot.GraalHotSpotVMConfig.INJECTED_VMCONFIG; +import static jdk.graal.compiler.replacements.SnippetTemplate.DEFAULT_REPLACER; -import jdk.compiler.graal.api.replacements.Snippet; -import jdk.compiler.graal.hotspot.HotSpotBackend; -import jdk.compiler.graal.hotspot.meta.HotSpotProviders; -import jdk.compiler.graal.hotspot.nodes.CurrentJavaThreadNode; -import jdk.compiler.graal.nodes.ComputeObjectAddressNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.spi.LoweringTool; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.replacements.SnippetTemplate; -import jdk.compiler.graal.replacements.SnippetTemplate.AbstractTemplates; -import jdk.compiler.graal.replacements.SnippetTemplate.Arguments; -import jdk.compiler.graal.replacements.SnippetTemplate.SnippetInfo; -import jdk.compiler.graal.replacements.Snippets; -import jdk.compiler.graal.word.Word; +import jdk.graal.compiler.api.replacements.Snippet; +import jdk.graal.compiler.hotspot.HotSpotBackend; +import jdk.graal.compiler.hotspot.meta.HotSpotProviders; +import jdk.graal.compiler.hotspot.nodes.CurrentJavaThreadNode; +import jdk.graal.compiler.nodes.ComputeObjectAddressNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.spi.LoweringTool; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.replacements.SnippetTemplate; +import jdk.graal.compiler.replacements.SnippetTemplate.AbstractTemplates; +import jdk.graal.compiler.replacements.SnippetTemplate.Arguments; +import jdk.graal.compiler.replacements.SnippetTemplate.SnippetInfo; +import jdk.graal.compiler.replacements.Snippets; +import jdk.graal.compiler.word.Word; import org.graalvm.word.LocationIdentity; import org.graalvm.word.WordFactory; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/VirtualThreadUpdateJFRSnippets.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/VirtualThreadUpdateJFRSnippets.java similarity index 80% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/VirtualThreadUpdateJFRSnippets.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/VirtualThreadUpdateJFRSnippets.java index 367c743cc097..5aa2a619894f 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/VirtualThreadUpdateJFRSnippets.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/VirtualThreadUpdateJFRSnippets.java @@ -22,40 +22,40 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.replacements; - -import static jdk.compiler.graal.hotspot.GraalHotSpotVMConfig.INJECTED_VMCONFIG; -import static jdk.compiler.graal.hotspot.replacements.HotSpotReplacementsUtil.HOTSPOT_CARRIER_THREAD_OOP_HANDLE_LOCATION; -import static jdk.compiler.graal.hotspot.replacements.HotSpotReplacementsUtil.JAVA_THREAD_CARRIER_THREAD_OBJECT_LOCATION; -import static jdk.compiler.graal.hotspot.replacements.HotSpotReplacementsUtil.javaLangThreadJFREpochOffset; -import static jdk.compiler.graal.hotspot.replacements.HotSpotReplacementsUtil.javaLangThreadTIDOffset; -import static jdk.compiler.graal.hotspot.replacements.HotSpotReplacementsUtil.jfrThreadLocalVthreadEpochOffset; -import static jdk.compiler.graal.hotspot.replacements.HotSpotReplacementsUtil.jfrThreadLocalVthreadExcludedOffset; -import static jdk.compiler.graal.hotspot.replacements.HotSpotReplacementsUtil.jfrThreadLocalVthreadIDOffset; -import static jdk.compiler.graal.hotspot.replacements.HotSpotReplacementsUtil.jfrThreadLocalVthreadOffset; -import static jdk.compiler.graal.hotspot.replacements.HotSpotReplacementsUtil.registerAsWord; -import static jdk.compiler.graal.hotspot.replacements.HotSpotReplacementsUtil.threadCarrierThreadOffset; -import static jdk.compiler.graal.nodes.extended.BranchProbabilityNode.LIKELY_PROBABILITY; -import static jdk.compiler.graal.nodes.extended.BranchProbabilityNode.probability; -import static jdk.compiler.graal.nodes.extended.MembarNode.memoryBarrier; -import static jdk.compiler.graal.replacements.SnippetTemplate.DEFAULT_REPLACER; -import static jdk.compiler.graal.word.Word.objectToTrackedPointer; - -import jdk.compiler.graal.api.replacements.Snippet; -import jdk.compiler.graal.api.replacements.Snippet.ConstantParameter; -import jdk.compiler.graal.hotspot.meta.HotSpotProviders; -import jdk.compiler.graal.hotspot.meta.HotSpotRegistersProvider; -import jdk.compiler.graal.hotspot.nodes.VirtualThreadUpdateJFRNode; -import jdk.compiler.graal.lir.SyncPort; -import jdk.compiler.graal.nodes.NamedLocationIdentity; -import jdk.compiler.graal.nodes.extended.MembarNode; -import jdk.compiler.graal.nodes.spi.LoweringTool; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.replacements.SnippetTemplate.AbstractTemplates; -import jdk.compiler.graal.replacements.SnippetTemplate.Arguments; -import jdk.compiler.graal.replacements.SnippetTemplate.SnippetInfo; -import jdk.compiler.graal.replacements.Snippets; -import jdk.compiler.graal.word.Word; +package jdk.graal.compiler.hotspot.replacements; + +import static jdk.graal.compiler.hotspot.GraalHotSpotVMConfig.INJECTED_VMCONFIG; +import static jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil.HOTSPOT_CARRIER_THREAD_OOP_HANDLE_LOCATION; +import static jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil.JAVA_THREAD_CARRIER_THREAD_OBJECT_LOCATION; +import static jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil.javaLangThreadJFREpochOffset; +import static jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil.javaLangThreadTIDOffset; +import static jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil.jfrThreadLocalVthreadEpochOffset; +import static jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil.jfrThreadLocalVthreadExcludedOffset; +import static jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil.jfrThreadLocalVthreadIDOffset; +import static jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil.jfrThreadLocalVthreadOffset; +import static jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil.registerAsWord; +import static jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil.threadCarrierThreadOffset; +import static jdk.graal.compiler.nodes.extended.BranchProbabilityNode.LIKELY_PROBABILITY; +import static jdk.graal.compiler.nodes.extended.BranchProbabilityNode.probability; +import static jdk.graal.compiler.nodes.extended.MembarNode.memoryBarrier; +import static jdk.graal.compiler.replacements.SnippetTemplate.DEFAULT_REPLACER; +import static jdk.graal.compiler.word.Word.objectToTrackedPointer; + +import jdk.graal.compiler.api.replacements.Snippet; +import jdk.graal.compiler.api.replacements.Snippet.ConstantParameter; +import jdk.graal.compiler.hotspot.meta.HotSpotProviders; +import jdk.graal.compiler.hotspot.meta.HotSpotRegistersProvider; +import jdk.graal.compiler.hotspot.nodes.VirtualThreadUpdateJFRNode; +import jdk.graal.compiler.lir.SyncPort; +import jdk.graal.compiler.nodes.NamedLocationIdentity; +import jdk.graal.compiler.nodes.extended.MembarNode; +import jdk.graal.compiler.nodes.spi.LoweringTool; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.replacements.SnippetTemplate.AbstractTemplates; +import jdk.graal.compiler.replacements.SnippetTemplate.Arguments; +import jdk.graal.compiler.replacements.SnippetTemplate.SnippetInfo; +import jdk.graal.compiler.replacements.Snippets; +import jdk.graal.compiler.word.Word; import org.graalvm.word.LocationIdentity; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/arraycopy/CheckcastArrayCopyCallNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/arraycopy/CheckcastArrayCopyCallNode.java similarity index 80% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/arraycopy/CheckcastArrayCopyCallNode.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/arraycopy/CheckcastArrayCopyCallNode.java index 30d38337f189..7704c7a0c3e1 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/arraycopy/CheckcastArrayCopyCallNode.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/arraycopy/CheckcastArrayCopyCallNode.java @@ -23,37 +23,37 @@ * questions. */ //JaCoCo Exclude -package jdk.compiler.graal.hotspot.replacements.arraycopy; - -import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_UNKNOWN; -import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_UNKNOWN; - -import jdk.compiler.graal.core.common.spi.ForeignCallDescriptor; -import jdk.compiler.graal.core.common.type.PrimitiveStamp; -import jdk.compiler.graal.core.common.type.StampFactory; -import jdk.compiler.graal.graph.NodeClass; -import jdk.compiler.graal.hotspot.meta.HotSpotHostForeignCallsProvider; -import jdk.compiler.graal.nodeinfo.InputType; -import jdk.compiler.graal.nodeinfo.NodeInfo; -import jdk.compiler.graal.nodes.ConstantNode; -import jdk.compiler.graal.nodes.FixedWithNextNode; -import jdk.compiler.graal.nodes.GetObjectAddressNode; -import jdk.compiler.graal.nodes.NodeView; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.calc.AddNode; -import jdk.compiler.graal.nodes.calc.IntegerConvertNode; -import jdk.compiler.graal.nodes.calc.LeftShiftNode; -import jdk.compiler.graal.nodes.extended.ForeignCallNode; -import jdk.compiler.graal.nodes.memory.AbstractMemoryCheckpoint; -import jdk.compiler.graal.nodes.memory.SingleMemoryKill; -import jdk.compiler.graal.nodes.memory.address.OffsetAddressNode; -import jdk.compiler.graal.nodes.spi.Lowerable; -import jdk.compiler.graal.nodes.spi.LoweringTool; -import jdk.compiler.graal.replacements.arraycopy.ArrayCopyCallNode; -import jdk.compiler.graal.replacements.arraycopy.ArrayCopyForeignCalls; -import jdk.compiler.graal.word.Word; -import jdk.compiler.graal.word.WordTypes; +package jdk.graal.compiler.hotspot.replacements.arraycopy; + +import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_UNKNOWN; +import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_UNKNOWN; + +import jdk.graal.compiler.core.common.spi.ForeignCallDescriptor; +import jdk.graal.compiler.core.common.type.PrimitiveStamp; +import jdk.graal.compiler.core.common.type.StampFactory; +import jdk.graal.compiler.graph.NodeClass; +import jdk.graal.compiler.hotspot.meta.HotSpotHostForeignCallsProvider; +import jdk.graal.compiler.nodeinfo.InputType; +import jdk.graal.compiler.nodeinfo.NodeInfo; +import jdk.graal.compiler.nodes.ConstantNode; +import jdk.graal.compiler.nodes.FixedWithNextNode; +import jdk.graal.compiler.nodes.GetObjectAddressNode; +import jdk.graal.compiler.nodes.NodeView; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.calc.AddNode; +import jdk.graal.compiler.nodes.calc.IntegerConvertNode; +import jdk.graal.compiler.nodes.calc.LeftShiftNode; +import jdk.graal.compiler.nodes.extended.ForeignCallNode; +import jdk.graal.compiler.nodes.memory.AbstractMemoryCheckpoint; +import jdk.graal.compiler.nodes.memory.SingleMemoryKill; +import jdk.graal.compiler.nodes.memory.address.OffsetAddressNode; +import jdk.graal.compiler.nodes.spi.Lowerable; +import jdk.graal.compiler.nodes.spi.LoweringTool; +import jdk.graal.compiler.replacements.arraycopy.ArrayCopyCallNode; +import jdk.graal.compiler.replacements.arraycopy.ArrayCopyForeignCalls; +import jdk.graal.compiler.word.Word; +import jdk.graal.compiler.word.WordTypes; import org.graalvm.word.LocationIdentity; import jdk.vm.ci.code.CodeUtil; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/arraycopy/GenericArrayCopyCallNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/arraycopy/GenericArrayCopyCallNode.java similarity index 81% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/arraycopy/GenericArrayCopyCallNode.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/arraycopy/GenericArrayCopyCallNode.java index 116f447d403c..c44a751d6239 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/arraycopy/GenericArrayCopyCallNode.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/arraycopy/GenericArrayCopyCallNode.java @@ -23,26 +23,26 @@ * questions. */ //JaCoCo Exclude -package jdk.compiler.graal.hotspot.replacements.arraycopy; +package jdk.graal.compiler.hotspot.replacements.arraycopy; -import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_UNKNOWN; -import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_UNKNOWN; +import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_UNKNOWN; +import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_UNKNOWN; -import jdk.compiler.graal.core.common.spi.ForeignCallsProvider; -import jdk.compiler.graal.core.common.type.StampFactory; -import jdk.compiler.graal.graph.NodeClass; -import jdk.compiler.graal.hotspot.meta.HotSpotHostForeignCallsProvider; -import jdk.compiler.graal.nodeinfo.InputType; -import jdk.compiler.graal.nodeinfo.NodeInfo; -import jdk.compiler.graal.nodes.GetObjectAddressNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.extended.ForeignCallNode; -import jdk.compiler.graal.nodes.memory.AbstractMemoryCheckpoint; -import jdk.compiler.graal.nodes.memory.SingleMemoryKill; -import jdk.compiler.graal.nodes.spi.Lowerable; -import jdk.compiler.graal.nodes.spi.LoweringTool; -import jdk.compiler.graal.replacements.arraycopy.ArrayCopyCallNode; +import jdk.graal.compiler.core.common.spi.ForeignCallsProvider; +import jdk.graal.compiler.core.common.type.StampFactory; +import jdk.graal.compiler.graph.NodeClass; +import jdk.graal.compiler.hotspot.meta.HotSpotHostForeignCallsProvider; +import jdk.graal.compiler.nodeinfo.InputType; +import jdk.graal.compiler.nodeinfo.NodeInfo; +import jdk.graal.compiler.nodes.GetObjectAddressNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.extended.ForeignCallNode; +import jdk.graal.compiler.nodes.memory.AbstractMemoryCheckpoint; +import jdk.graal.compiler.nodes.memory.SingleMemoryKill; +import jdk.graal.compiler.nodes.spi.Lowerable; +import jdk.graal.compiler.nodes.spi.LoweringTool; +import jdk.graal.compiler.replacements.arraycopy.ArrayCopyCallNode; import org.graalvm.word.LocationIdentity; import jdk.vm.ci.meta.JavaKind; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/arraycopy/HotSpotArraycopySnippets.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/arraycopy/HotSpotArraycopySnippets.java similarity index 88% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/arraycopy/HotSpotArraycopySnippets.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/arraycopy/HotSpotArraycopySnippets.java index bbfe258e5e13..8150760ab16e 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/arraycopy/HotSpotArraycopySnippets.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/arraycopy/HotSpotArraycopySnippets.java @@ -23,21 +23,21 @@ * questions. */ -package jdk.compiler.graal.hotspot.replacements.arraycopy; - -import static jdk.compiler.graal.hotspot.GraalHotSpotVMConfig.INJECTED_VMCONFIG; -import static jdk.compiler.graal.nodes.extended.BranchProbabilityNode.FREQUENT_PROBABILITY; -import static jdk.compiler.graal.nodes.extended.BranchProbabilityNode.LIKELY_PROBABILITY; -import static jdk.compiler.graal.nodes.extended.BranchProbabilityNode.SLOW_PATH_PROBABILITY; -import static jdk.compiler.graal.nodes.extended.BranchProbabilityNode.probability; - -import jdk.compiler.graal.hotspot.replacements.HotSpotReplacementsUtil; -import jdk.compiler.graal.hotspot.word.KlassPointer; -import jdk.compiler.graal.nodes.PiNode; -import jdk.compiler.graal.nodes.SnippetAnchorNode; -import jdk.compiler.graal.replacements.arraycopy.ArrayCopyCallNode; -import jdk.compiler.graal.replacements.arraycopy.ArrayCopySnippets; -import jdk.compiler.graal.word.Word; +package jdk.graal.compiler.hotspot.replacements.arraycopy; + +import static jdk.graal.compiler.hotspot.GraalHotSpotVMConfig.INJECTED_VMCONFIG; +import static jdk.graal.compiler.nodes.extended.BranchProbabilityNode.FREQUENT_PROBABILITY; +import static jdk.graal.compiler.nodes.extended.BranchProbabilityNode.LIKELY_PROBABILITY; +import static jdk.graal.compiler.nodes.extended.BranchProbabilityNode.SLOW_PATH_PROBABILITY; +import static jdk.graal.compiler.nodes.extended.BranchProbabilityNode.probability; + +import jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil; +import jdk.graal.compiler.hotspot.word.KlassPointer; +import jdk.graal.compiler.nodes.PiNode; +import jdk.graal.compiler.nodes.SnippetAnchorNode; +import jdk.graal.compiler.replacements.arraycopy.ArrayCopyCallNode; +import jdk.graal.compiler.replacements.arraycopy.ArrayCopySnippets; +import jdk.graal.compiler.word.Word; import org.graalvm.word.LocationIdentity; import org.graalvm.word.Pointer; import org.graalvm.word.WordFactory; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/doc-files/ProfileAllocationsContextHelp.txt b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/doc-files/ProfileAllocationsContextHelp.txt similarity index 100% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/doc-files/ProfileAllocationsContextHelp.txt rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/replacements/doc-files/ProfileAllocationsContextHelp.txt diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/riscv64/RISCV64HotSpotBackendFactory.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/riscv64/RISCV64HotSpotBackendFactory.java similarity index 81% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/riscv64/RISCV64HotSpotBackendFactory.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/riscv64/RISCV64HotSpotBackendFactory.java index 16f4a7de8de7..74e462a0df77 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/riscv64/RISCV64HotSpotBackendFactory.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/riscv64/RISCV64HotSpotBackendFactory.java @@ -22,43 +22,43 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.riscv64; +package jdk.graal.compiler.hotspot.riscv64; import java.util.ArrayList; import java.util.List; -import jdk.compiler.graal.core.common.alloc.RegisterAllocationConfig; -import jdk.compiler.graal.core.riscv64.RISCV64ReflectionUtil; -import jdk.compiler.graal.core.riscv64.ShadowedRISCV64; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.hotspot.GraalHotSpotVMConfig; -import jdk.compiler.graal.hotspot.HotSpotBackend; -import jdk.compiler.graal.hotspot.HotSpotBackendFactory; -import jdk.compiler.graal.hotspot.HotSpotGraalRuntimeProvider; -import jdk.compiler.graal.hotspot.HotSpotReplacementsImpl; -import jdk.compiler.graal.hotspot.meta.AddressLoweringHotSpotSuitesProvider; -import jdk.compiler.graal.hotspot.meta.HotSpotGraphBuilderPlugins; -import jdk.compiler.graal.hotspot.meta.HotSpotHostForeignCallsProvider; -import jdk.compiler.graal.hotspot.meta.HotSpotLoweringProvider; -import jdk.compiler.graal.hotspot.meta.HotSpotMetaAccessExtensionProvider; -import jdk.compiler.graal.hotspot.meta.HotSpotPlatformConfigurationProvider; -import jdk.compiler.graal.hotspot.meta.HotSpotProviders; -import jdk.compiler.graal.hotspot.meta.HotSpotRegisters; -import jdk.compiler.graal.hotspot.meta.HotSpotRegistersProvider; -import jdk.compiler.graal.hotspot.meta.HotSpotSnippetReflectionProvider; -import jdk.compiler.graal.hotspot.meta.HotSpotSuitesProvider; -import jdk.compiler.graal.hotspot.word.HotSpotWordTypes; -import jdk.compiler.graal.java.DefaultSuitesCreator; -import jdk.compiler.graal.lir.framemap.ReferenceMapBuilder; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.gc.BarrierSet; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins; -import jdk.compiler.graal.nodes.spi.CoreProviders; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.phases.BasePhase; -import jdk.compiler.graal.phases.common.AddressLoweringPhase; -import jdk.compiler.graal.phases.tiers.CompilerConfiguration; -import jdk.compiler.graal.serviceprovider.ServiceProvider; +import jdk.graal.compiler.core.common.alloc.RegisterAllocationConfig; +import jdk.graal.compiler.core.riscv64.RISCV64ReflectionUtil; +import jdk.graal.compiler.core.riscv64.ShadowedRISCV64; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.hotspot.GraalHotSpotVMConfig; +import jdk.graal.compiler.hotspot.HotSpotBackend; +import jdk.graal.compiler.hotspot.HotSpotBackendFactory; +import jdk.graal.compiler.hotspot.HotSpotGraalRuntimeProvider; +import jdk.graal.compiler.hotspot.HotSpotReplacementsImpl; +import jdk.graal.compiler.hotspot.meta.AddressLoweringHotSpotSuitesProvider; +import jdk.graal.compiler.hotspot.meta.HotSpotGraphBuilderPlugins; +import jdk.graal.compiler.hotspot.meta.HotSpotHostForeignCallsProvider; +import jdk.graal.compiler.hotspot.meta.HotSpotLoweringProvider; +import jdk.graal.compiler.hotspot.meta.HotSpotMetaAccessExtensionProvider; +import jdk.graal.compiler.hotspot.meta.HotSpotPlatformConfigurationProvider; +import jdk.graal.compiler.hotspot.meta.HotSpotProviders; +import jdk.graal.compiler.hotspot.meta.HotSpotRegisters; +import jdk.graal.compiler.hotspot.meta.HotSpotRegistersProvider; +import jdk.graal.compiler.hotspot.meta.HotSpotSnippetReflectionProvider; +import jdk.graal.compiler.hotspot.meta.HotSpotSuitesProvider; +import jdk.graal.compiler.hotspot.word.HotSpotWordTypes; +import jdk.graal.compiler.java.DefaultSuitesCreator; +import jdk.graal.compiler.lir.framemap.ReferenceMapBuilder; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.gc.BarrierSet; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins; +import jdk.graal.compiler.nodes.spi.CoreProviders; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.phases.BasePhase; +import jdk.graal.compiler.phases.common.AddressLoweringPhase; +import jdk.graal.compiler.phases.tiers.CompilerConfiguration; +import jdk.graal.compiler.serviceprovider.ServiceProvider; import jdk.vm.ci.code.Architecture; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/riscv64/RISCV64HotSpotForeignCallsProvider.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/riscv64/RISCV64HotSpotForeignCallsProvider.java similarity index 81% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/riscv64/RISCV64HotSpotForeignCallsProvider.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/riscv64/RISCV64HotSpotForeignCallsProvider.java index 4a8dc8f72374..c67749cbdfe3 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/riscv64/RISCV64HotSpotForeignCallsProvider.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/riscv64/RISCV64HotSpotForeignCallsProvider.java @@ -22,22 +22,22 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.riscv64; +package jdk.graal.compiler.hotspot.riscv64; import static jdk.vm.ci.meta.Value.ILLEGAL; -import static jdk.compiler.graal.hotspot.HotSpotBackend.EXCEPTION_HANDLER; -import static jdk.compiler.graal.hotspot.HotSpotBackend.EXCEPTION_HANDLER_IN_CALLER; -import static jdk.compiler.graal.hotspot.HotSpotForeignCallLinkage.JUMP_ADDRESS; -import static jdk.compiler.graal.hotspot.HotSpotForeignCallLinkage.RegisterEffect.DESTROYS_ALL_CALLER_SAVE_REGISTERS; +import static jdk.graal.compiler.hotspot.HotSpotBackend.EXCEPTION_HANDLER; +import static jdk.graal.compiler.hotspot.HotSpotBackend.EXCEPTION_HANDLER_IN_CALLER; +import static jdk.graal.compiler.hotspot.HotSpotForeignCallLinkage.JUMP_ADDRESS; +import static jdk.graal.compiler.hotspot.HotSpotForeignCallLinkage.RegisterEffect.DESTROYS_ALL_CALLER_SAVE_REGISTERS; -import jdk.compiler.graal.core.common.LIRKind; -import jdk.compiler.graal.core.riscv64.ShadowedRISCV64; -import jdk.compiler.graal.hotspot.HotSpotForeignCallLinkageImpl; -import jdk.compiler.graal.hotspot.HotSpotGraalRuntimeProvider; -import jdk.compiler.graal.hotspot.meta.HotSpotHostForeignCallsProvider; -import jdk.compiler.graal.hotspot.meta.HotSpotProviders; -import jdk.compiler.graal.hotspot.word.HotSpotWordTypes; -import jdk.compiler.graal.options.OptionValues; +import jdk.graal.compiler.core.common.LIRKind; +import jdk.graal.compiler.core.riscv64.ShadowedRISCV64; +import jdk.graal.compiler.hotspot.HotSpotForeignCallLinkageImpl; +import jdk.graal.compiler.hotspot.HotSpotGraalRuntimeProvider; +import jdk.graal.compiler.hotspot.meta.HotSpotHostForeignCallsProvider; +import jdk.graal.compiler.hotspot.meta.HotSpotProviders; +import jdk.graal.compiler.hotspot.word.HotSpotWordTypes; +import jdk.graal.compiler.options.OptionValues; import jdk.vm.ci.code.CallingConvention; import jdk.vm.ci.code.RegisterValue; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/riscv64/RISCV64HotSpotLoweringProvider.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/riscv64/RISCV64HotSpotLoweringProvider.java similarity index 73% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/riscv64/RISCV64HotSpotLoweringProvider.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/riscv64/RISCV64HotSpotLoweringProvider.java index d2e2416bb9e1..6658394c61de 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/riscv64/RISCV64HotSpotLoweringProvider.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/riscv64/RISCV64HotSpotLoweringProvider.java @@ -22,24 +22,24 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.riscv64; +package jdk.graal.compiler.hotspot.riscv64; -import jdk.compiler.graal.core.riscv64.RISCV64LoweringProviderMixin; -import jdk.compiler.graal.debug.DebugHandlersFactory; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.hotspot.replacements.HotSpotAllocationSnippets; -import jdk.compiler.graal.hotspot.GraalHotSpotVMConfig; -import jdk.compiler.graal.hotspot.HotSpotGraalRuntimeProvider; -import jdk.compiler.graal.hotspot.meta.DefaultHotSpotLoweringProvider; -import jdk.compiler.graal.hotspot.meta.HotSpotHostForeignCallsProvider; -import jdk.compiler.graal.hotspot.meta.HotSpotMetaAccessExtensionProvider; -import jdk.compiler.graal.hotspot.meta.HotSpotPlatformConfigurationProvider; -import jdk.compiler.graal.hotspot.meta.HotSpotProviders; -import jdk.compiler.graal.hotspot.meta.HotSpotRegistersProvider; -import jdk.compiler.graal.hotspot.replacements.arraycopy.HotSpotArraycopySnippets; -import jdk.compiler.graal.nodes.spi.LoweringTool; -import jdk.compiler.graal.options.OptionValues; +import jdk.graal.compiler.core.riscv64.RISCV64LoweringProviderMixin; +import jdk.graal.compiler.debug.DebugHandlersFactory; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.hotspot.replacements.HotSpotAllocationSnippets; +import jdk.graal.compiler.hotspot.GraalHotSpotVMConfig; +import jdk.graal.compiler.hotspot.HotSpotGraalRuntimeProvider; +import jdk.graal.compiler.hotspot.meta.DefaultHotSpotLoweringProvider; +import jdk.graal.compiler.hotspot.meta.HotSpotHostForeignCallsProvider; +import jdk.graal.compiler.hotspot.meta.HotSpotMetaAccessExtensionProvider; +import jdk.graal.compiler.hotspot.meta.HotSpotPlatformConfigurationProvider; +import jdk.graal.compiler.hotspot.meta.HotSpotProviders; +import jdk.graal.compiler.hotspot.meta.HotSpotRegistersProvider; +import jdk.graal.compiler.hotspot.replacements.arraycopy.HotSpotArraycopySnippets; +import jdk.graal.compiler.nodes.spi.LoweringTool; +import jdk.graal.compiler.options.OptionValues; import jdk.vm.ci.code.TargetDescription; import jdk.vm.ci.hotspot.HotSpotConstantReflectionProvider; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/riscv64/RISCV64HotSpotSuitesCreator.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/riscv64/RISCV64HotSpotSuitesCreator.java similarity index 80% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/riscv64/RISCV64HotSpotSuitesCreator.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/riscv64/RISCV64HotSpotSuitesCreator.java index 6b128fe5cb4e..8ca37939e155 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/riscv64/RISCV64HotSpotSuitesCreator.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/riscv64/RISCV64HotSpotSuitesCreator.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.riscv64; +package jdk.graal.compiler.hotspot.riscv64; -import jdk.compiler.graal.hotspot.HotSpotGraphBuilderPhase; -import jdk.compiler.graal.java.DefaultSuitesCreator; -import jdk.compiler.graal.java.GraphBuilderPhase; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins; -import jdk.compiler.graal.phases.tiers.CompilerConfiguration; +import jdk.graal.compiler.hotspot.HotSpotGraphBuilderPhase; +import jdk.graal.compiler.java.DefaultSuitesCreator; +import jdk.graal.compiler.java.GraphBuilderPhase; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins; +import jdk.graal.compiler.phases.tiers.CompilerConfiguration; public class RISCV64HotSpotSuitesCreator extends DefaultSuitesCreator { diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/AbstractForeignCallStub.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/stubs/AbstractForeignCallStub.java similarity index 91% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/AbstractForeignCallStub.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/stubs/AbstractForeignCallStub.java index b573b4d56b69..5d277aaae6df 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/AbstractForeignCallStub.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/stubs/AbstractForeignCallStub.java @@ -22,36 +22,36 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.stubs; +package jdk.graal.compiler.hotspot.stubs; import static jdk.vm.ci.hotspot.HotSpotCallingConventionType.JavaCall; import static jdk.vm.ci.hotspot.HotSpotCallingConventionType.JavaCallee; import static jdk.vm.ci.hotspot.HotSpotCallingConventionType.NativeCall; import static jdk.vm.ci.services.Services.IS_BUILDING_NATIVE_IMAGE; -import static jdk.compiler.graal.nodes.ConstantNode.forBoolean; +import static jdk.graal.compiler.nodes.ConstantNode.forBoolean; -import jdk.compiler.graal.core.common.CompilationIdentifier; -import jdk.compiler.graal.core.common.spi.ForeignCallDescriptor; -import jdk.compiler.graal.core.common.type.StampFactory; -import jdk.compiler.graal.core.common.type.StampPair; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.debug.JavaMethodContext; -import jdk.compiler.graal.hotspot.HotSpotForeignCallLinkage; -import jdk.compiler.graal.hotspot.HotSpotForeignCallLinkageImpl; -import jdk.compiler.graal.hotspot.HotSpotReplacementsImpl; -import jdk.compiler.graal.hotspot.meta.HotSpotForeignCallDescriptor; -import jdk.compiler.graal.hotspot.meta.HotSpotLoweringProvider; -import jdk.compiler.graal.hotspot.meta.HotSpotProviders; -import jdk.compiler.graal.nodes.InvokeNode; -import jdk.compiler.graal.nodes.ParameterNode; -import jdk.compiler.graal.nodes.ReturnNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.replacements.GraphKit; -import jdk.compiler.graal.replacements.nodes.ReadRegisterNode; -import jdk.compiler.graal.word.WordTypes; +import jdk.graal.compiler.core.common.CompilationIdentifier; +import jdk.graal.compiler.core.common.spi.ForeignCallDescriptor; +import jdk.graal.compiler.core.common.type.StampFactory; +import jdk.graal.compiler.core.common.type.StampPair; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.debug.JavaMethodContext; +import jdk.graal.compiler.hotspot.HotSpotForeignCallLinkage; +import jdk.graal.compiler.hotspot.HotSpotForeignCallLinkageImpl; +import jdk.graal.compiler.hotspot.HotSpotReplacementsImpl; +import jdk.graal.compiler.hotspot.meta.HotSpotForeignCallDescriptor; +import jdk.graal.compiler.hotspot.meta.HotSpotLoweringProvider; +import jdk.graal.compiler.hotspot.meta.HotSpotProviders; +import jdk.graal.compiler.nodes.InvokeNode; +import jdk.graal.compiler.nodes.ParameterNode; +import jdk.graal.compiler.nodes.ReturnNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.replacements.GraphKit; +import jdk.graal.compiler.replacements.nodes.ReadRegisterNode; +import jdk.graal.compiler.word.WordTypes; import jdk.vm.ci.hotspot.HotSpotJVMCIRuntime; import jdk.vm.ci.hotspot.HotSpotSignature; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/ArrayStoreExceptionStub.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/stubs/ArrayStoreExceptionStub.java similarity index 81% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/ArrayStoreExceptionStub.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/stubs/ArrayStoreExceptionStub.java index a9f89aaf0db9..26e4d161a552 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/ArrayStoreExceptionStub.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/stubs/ArrayStoreExceptionStub.java @@ -22,16 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.stubs; +package jdk.graal.compiler.hotspot.stubs; -import jdk.compiler.graal.api.replacements.Snippet; -import jdk.compiler.graal.api.replacements.Snippet.ConstantParameter; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.hotspot.HotSpotForeignCallLinkage; -import jdk.compiler.graal.hotspot.meta.HotSpotProviders; -import jdk.compiler.graal.hotspot.replacements.HotSpotReplacementsUtil; -import jdk.compiler.graal.hotspot.word.KlassPointer; -import jdk.compiler.graal.options.OptionValues; +import jdk.graal.compiler.api.replacements.Snippet; +import jdk.graal.compiler.api.replacements.Snippet.ConstantParameter; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.hotspot.HotSpotForeignCallLinkage; +import jdk.graal.compiler.hotspot.meta.HotSpotProviders; +import jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil; +import jdk.graal.compiler.hotspot.word.KlassPointer; +import jdk.graal.compiler.options.OptionValues; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/ClassCastExceptionStub.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/stubs/ClassCastExceptionStub.java similarity index 84% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/ClassCastExceptionStub.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/stubs/ClassCastExceptionStub.java index 182f8baed040..e9e9e4d09025 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/ClassCastExceptionStub.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/stubs/ClassCastExceptionStub.java @@ -22,16 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.stubs; +package jdk.graal.compiler.hotspot.stubs; -import jdk.compiler.graal.api.replacements.Snippet; -import jdk.compiler.graal.api.replacements.Snippet.ConstantParameter; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.hotspot.HotSpotForeignCallLinkage; -import jdk.compiler.graal.hotspot.meta.HotSpotProviders; -import jdk.compiler.graal.hotspot.replacements.HotSpotReplacementsUtil; -import jdk.compiler.graal.hotspot.word.KlassPointer; -import jdk.compiler.graal.options.OptionValues; +import jdk.graal.compiler.api.replacements.Snippet; +import jdk.graal.compiler.api.replacements.Snippet.ConstantParameter; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.hotspot.HotSpotForeignCallLinkage; +import jdk.graal.compiler.hotspot.meta.HotSpotProviders; +import jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil; +import jdk.graal.compiler.hotspot.word.KlassPointer; +import jdk.graal.compiler.options.OptionValues; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/CreateExceptionStub.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/stubs/CreateExceptionStub.java similarity index 86% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/CreateExceptionStub.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/stubs/CreateExceptionStub.java index e98a5207c442..4e1d21371a7d 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/CreateExceptionStub.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/stubs/CreateExceptionStub.java @@ -22,30 +22,30 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.stubs; +package jdk.graal.compiler.hotspot.stubs; import static jdk.vm.ci.hotspot.HotSpotCallingConventionType.NativeCall; import static org.graalvm.word.LocationIdentity.any; -import jdk.compiler.graal.api.replacements.Fold; -import jdk.compiler.graal.core.common.spi.ForeignCallDescriptor; -import jdk.compiler.graal.graph.Node.ConstantNodeParameter; -import jdk.compiler.graal.graph.Node.NodeIntrinsic; -import jdk.compiler.graal.hotspot.GraalHotSpotVMConfig; -import jdk.compiler.graal.hotspot.HotSpotForeignCallLinkage; -import jdk.compiler.graal.hotspot.meta.HotSpotForeignCallDescriptor; -import jdk.compiler.graal.hotspot.meta.HotSpotForeignCallsProviderImpl; -import jdk.compiler.graal.hotspot.meta.HotSpotProviders; -import jdk.compiler.graal.hotspot.nodes.DeoptimizeWithExceptionInCallerNode; -import jdk.compiler.graal.hotspot.nodes.StubForeignCallNode; -import jdk.compiler.graal.hotspot.replacements.HotSpotReplacementsUtil; -import jdk.compiler.graal.hotspot.word.KlassPointer; -import jdk.compiler.graal.options.Option; -import jdk.compiler.graal.options.OptionKey; -import jdk.compiler.graal.options.OptionType; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.replacements.nodes.CStringConstant; -import jdk.compiler.graal.word.Word; +import jdk.graal.compiler.api.replacements.Fold; +import jdk.graal.compiler.core.common.spi.ForeignCallDescriptor; +import jdk.graal.compiler.graph.Node.ConstantNodeParameter; +import jdk.graal.compiler.graph.Node.NodeIntrinsic; +import jdk.graal.compiler.hotspot.GraalHotSpotVMConfig; +import jdk.graal.compiler.hotspot.HotSpotForeignCallLinkage; +import jdk.graal.compiler.hotspot.meta.HotSpotForeignCallDescriptor; +import jdk.graal.compiler.hotspot.meta.HotSpotForeignCallsProviderImpl; +import jdk.graal.compiler.hotspot.meta.HotSpotProviders; +import jdk.graal.compiler.hotspot.nodes.DeoptimizeWithExceptionInCallerNode; +import jdk.graal.compiler.hotspot.nodes.StubForeignCallNode; +import jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil; +import jdk.graal.compiler.hotspot.word.KlassPointer; +import jdk.graal.compiler.options.Option; +import jdk.graal.compiler.options.OptionKey; +import jdk.graal.compiler.options.OptionType; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.replacements.nodes.CStringConstant; +import jdk.graal.compiler.word.Word; import org.graalvm.word.WordFactory; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/DivisionByZeroExceptionStub.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/stubs/DivisionByZeroExceptionStub.java similarity index 82% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/DivisionByZeroExceptionStub.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/stubs/DivisionByZeroExceptionStub.java index 6bf33b3f9822..d11650d52408 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/DivisionByZeroExceptionStub.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/stubs/DivisionByZeroExceptionStub.java @@ -22,16 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.stubs; +package jdk.graal.compiler.hotspot.stubs; -import jdk.compiler.graal.api.replacements.Snippet; -import jdk.compiler.graal.api.replacements.Snippet.ConstantParameter; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.hotspot.HotSpotForeignCallLinkage; -import jdk.compiler.graal.hotspot.meta.HotSpotProviders; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.replacements.nodes.CStringConstant; -import jdk.compiler.graal.word.Word; +import jdk.graal.compiler.api.replacements.Snippet; +import jdk.graal.compiler.api.replacements.Snippet.ConstantParameter; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.hotspot.HotSpotForeignCallLinkage; +import jdk.graal.compiler.hotspot.meta.HotSpotProviders; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.replacements.nodes.CStringConstant; +import jdk.graal.compiler.word.Word; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/ExceptionHandlerStub.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/stubs/ExceptionHandlerStub.java similarity index 80% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/ExceptionHandlerStub.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/stubs/ExceptionHandlerStub.java index 755a15ab4437..cb387228b349 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/ExceptionHandlerStub.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/stubs/ExceptionHandlerStub.java @@ -22,35 +22,35 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.stubs; +package jdk.graal.compiler.hotspot.stubs; -import static jdk.compiler.graal.hotspot.stubs.StubUtil.cAssertionsEnabled; -import static jdk.compiler.graal.hotspot.stubs.StubUtil.decipher; -import static jdk.compiler.graal.hotspot.stubs.StubUtil.fatal; -import static jdk.compiler.graal.hotspot.stubs.StubUtil.newDescriptor; -import static jdk.compiler.graal.hotspot.stubs.StubUtil.printf; +import static jdk.graal.compiler.hotspot.stubs.StubUtil.cAssertionsEnabled; +import static jdk.graal.compiler.hotspot.stubs.StubUtil.decipher; +import static jdk.graal.compiler.hotspot.stubs.StubUtil.fatal; +import static jdk.graal.compiler.hotspot.stubs.StubUtil.newDescriptor; +import static jdk.graal.compiler.hotspot.stubs.StubUtil.printf; import static org.graalvm.word.LocationIdentity.any; -import jdk.compiler.graal.api.replacements.Fold; -import jdk.compiler.graal.api.replacements.Fold.InjectedParameter; -import jdk.compiler.graal.api.replacements.Snippet; -import jdk.compiler.graal.api.replacements.Snippet.ConstantParameter; -import jdk.compiler.graal.core.common.spi.ForeignCallDescriptor; -import jdk.compiler.graal.debug.Assertions; -import jdk.compiler.graal.graph.Node.ConstantNodeParameter; -import jdk.compiler.graal.graph.Node.NodeIntrinsic; -import jdk.compiler.graal.hotspot.GraalHotSpotVMConfig; -import jdk.compiler.graal.hotspot.HotSpotBackend; -import jdk.compiler.graal.hotspot.HotSpotForeignCallLinkage; -import jdk.compiler.graal.hotspot.HotSpotMarkId; -import jdk.compiler.graal.hotspot.meta.HotSpotForeignCallDescriptor; -import jdk.compiler.graal.hotspot.meta.HotSpotProviders; -import jdk.compiler.graal.hotspot.nodes.JumpToExceptionHandlerNode; -import jdk.compiler.graal.hotspot.nodes.PatchReturnAddressNode; -import jdk.compiler.graal.hotspot.nodes.StubForeignCallNode; -import jdk.compiler.graal.hotspot.replacements.HotSpotReplacementsUtil; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.word.Word; +import jdk.graal.compiler.api.replacements.Fold; +import jdk.graal.compiler.api.replacements.Fold.InjectedParameter; +import jdk.graal.compiler.api.replacements.Snippet; +import jdk.graal.compiler.api.replacements.Snippet.ConstantParameter; +import jdk.graal.compiler.core.common.spi.ForeignCallDescriptor; +import jdk.graal.compiler.debug.Assertions; +import jdk.graal.compiler.graph.Node.ConstantNodeParameter; +import jdk.graal.compiler.graph.Node.NodeIntrinsic; +import jdk.graal.compiler.hotspot.GraalHotSpotVMConfig; +import jdk.graal.compiler.hotspot.HotSpotBackend; +import jdk.graal.compiler.hotspot.HotSpotForeignCallLinkage; +import jdk.graal.compiler.hotspot.HotSpotMarkId; +import jdk.graal.compiler.hotspot.meta.HotSpotForeignCallDescriptor; +import jdk.graal.compiler.hotspot.meta.HotSpotProviders; +import jdk.graal.compiler.hotspot.nodes.JumpToExceptionHandlerNode; +import jdk.graal.compiler.hotspot.nodes.PatchReturnAddressNode; +import jdk.graal.compiler.hotspot.nodes.StubForeignCallNode; +import jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.word.Word; import org.graalvm.word.WordFactory; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/ForeignCallSnippets.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/stubs/ForeignCallSnippets.java similarity index 83% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/ForeignCallSnippets.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/stubs/ForeignCallSnippets.java index e1ef19637b38..c2afab422660 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/ForeignCallSnippets.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/stubs/ForeignCallSnippets.java @@ -22,28 +22,28 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.stubs; +package jdk.graal.compiler.hotspot.stubs; import static jdk.vm.ci.meta.DeoptimizationReason.RuntimeConstraint; -import static jdk.compiler.graal.hotspot.stubs.StubUtil.fatal; - -import jdk.compiler.graal.api.replacements.Fold; -import jdk.compiler.graal.api.replacements.Fold.InjectedParameter; -import jdk.compiler.graal.api.replacements.Snippet; -import jdk.compiler.graal.hotspot.GraalHotSpotVMConfig; -import jdk.compiler.graal.hotspot.meta.HotSpotProviders; -import jdk.compiler.graal.hotspot.nodes.DeoptimizeCallerNode; -import jdk.compiler.graal.hotspot.replacements.HotSpotReplacementsUtil; -import jdk.compiler.graal.hotspot.word.KlassPointer; -import jdk.compiler.graal.nodes.NamedLocationIdentity; -import jdk.compiler.graal.nodes.PiNode; -import jdk.compiler.graal.nodes.SnippetAnchorNode; -import jdk.compiler.graal.nodes.extended.GuardingNode; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.replacements.SnippetTemplate.AbstractTemplates; -import jdk.compiler.graal.replacements.SnippetTemplate.SnippetInfo; -import jdk.compiler.graal.replacements.Snippets; -import jdk.compiler.graal.word.Word; +import static jdk.graal.compiler.hotspot.stubs.StubUtil.fatal; + +import jdk.graal.compiler.api.replacements.Fold; +import jdk.graal.compiler.api.replacements.Fold.InjectedParameter; +import jdk.graal.compiler.api.replacements.Snippet; +import jdk.graal.compiler.hotspot.GraalHotSpotVMConfig; +import jdk.graal.compiler.hotspot.meta.HotSpotProviders; +import jdk.graal.compiler.hotspot.nodes.DeoptimizeCallerNode; +import jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil; +import jdk.graal.compiler.hotspot.word.KlassPointer; +import jdk.graal.compiler.nodes.NamedLocationIdentity; +import jdk.graal.compiler.nodes.PiNode; +import jdk.graal.compiler.nodes.SnippetAnchorNode; +import jdk.graal.compiler.nodes.extended.GuardingNode; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.replacements.SnippetTemplate.AbstractTemplates; +import jdk.graal.compiler.replacements.SnippetTemplate.SnippetInfo; +import jdk.graal.compiler.replacements.Snippets; +import jdk.graal.compiler.word.Word; import org.graalvm.word.LocationIdentity; import org.graalvm.word.Pointer; import org.graalvm.word.WordFactory; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/ForeignCallStub.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/stubs/ForeignCallStub.java similarity index 86% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/ForeignCallStub.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/stubs/ForeignCallStub.java index 1de94e45583c..d027f1a30671 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/ForeignCallStub.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/stubs/ForeignCallStub.java @@ -22,22 +22,22 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.stubs; +package jdk.graal.compiler.hotspot.stubs; -import jdk.compiler.graal.core.common.LIRKind; -import jdk.compiler.graal.core.common.spi.ForeignCallDescriptor; -import jdk.compiler.graal.core.common.type.Stamp; -import jdk.compiler.graal.core.common.type.StampFactory; -import jdk.compiler.graal.hotspot.HotSpotForeignCallLinkage; -import jdk.compiler.graal.hotspot.meta.HotSpotForeignCallDescriptor; -import jdk.compiler.graal.hotspot.meta.HotSpotProviders; -import jdk.compiler.graal.hotspot.nodes.StubForeignCallNode; -import jdk.compiler.graal.nodes.ParameterNode; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.replacements.GraphKit; -import jdk.compiler.graal.replacements.nodes.ReadRegisterNode; -import jdk.compiler.graal.word.Word; +import jdk.graal.compiler.core.common.LIRKind; +import jdk.graal.compiler.core.common.spi.ForeignCallDescriptor; +import jdk.graal.compiler.core.common.type.Stamp; +import jdk.graal.compiler.core.common.type.StampFactory; +import jdk.graal.compiler.hotspot.HotSpotForeignCallLinkage; +import jdk.graal.compiler.hotspot.meta.HotSpotForeignCallDescriptor; +import jdk.graal.compiler.hotspot.meta.HotSpotProviders; +import jdk.graal.compiler.hotspot.nodes.StubForeignCallNode; +import jdk.graal.compiler.nodes.ParameterNode; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.replacements.GraphKit; +import jdk.graal.compiler.replacements.nodes.ReadRegisterNode; +import jdk.graal.compiler.word.Word; import jdk.vm.ci.hotspot.HotSpotJVMCIRuntime; import jdk.vm.ci.meta.JavaKind; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/HotSpotGraphKit.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/stubs/HotSpotGraphKit.java similarity index 82% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/HotSpotGraphKit.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/stubs/HotSpotGraphKit.java index 678d01eda83f..d154a9894ace 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/HotSpotGraphKit.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/stubs/HotSpotGraphKit.java @@ -22,28 +22,28 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.stubs; +package jdk.graal.compiler.hotspot.stubs; import static jdk.vm.ci.services.Services.IS_IN_NATIVE_IMAGE; -import static jdk.compiler.graal.nodes.graphbuilderconf.IntrinsicContext.CompilationContext.INLINE_AFTER_PARSING; +import static jdk.graal.compiler.nodes.graphbuilderconf.IntrinsicContext.CompilationContext.INLINE_AFTER_PARSING; -import jdk.compiler.graal.core.common.CompilationIdentifier; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.hotspot.HotSpotGraphBuilderInstance; -import jdk.compiler.graal.java.GraphBuilderPhase; -import jdk.compiler.graal.nodes.Invoke; -import jdk.compiler.graal.nodes.InvokeNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins; -import jdk.compiler.graal.nodes.graphbuilderconf.IntrinsicContext; -import jdk.compiler.graal.phases.OptimisticOptimizations; -import jdk.compiler.graal.phases.common.DeadCodeEliminationPhase; -import jdk.compiler.graal.phases.common.inlining.InliningUtil; -import jdk.compiler.graal.phases.util.Providers; -import jdk.compiler.graal.replacements.GraphKit; -import jdk.compiler.graal.word.WordTypes; +import jdk.graal.compiler.core.common.CompilationIdentifier; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.hotspot.HotSpotGraphBuilderInstance; +import jdk.graal.compiler.java.GraphBuilderPhase; +import jdk.graal.compiler.nodes.Invoke; +import jdk.graal.compiler.nodes.InvokeNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins; +import jdk.graal.compiler.nodes.graphbuilderconf.IntrinsicContext; +import jdk.graal.compiler.phases.OptimisticOptimizations; +import jdk.graal.compiler.phases.common.DeadCodeEliminationPhase; +import jdk.graal.compiler.phases.common.inlining.InliningUtil; +import jdk.graal.compiler.phases.util.Providers; +import jdk.graal.compiler.replacements.GraphKit; +import jdk.graal.compiler.word.WordTypes; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/IllegalArgumentExceptionArgumentIsNotAnArrayStub.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/stubs/IllegalArgumentExceptionArgumentIsNotAnArrayStub.java similarity index 81% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/IllegalArgumentExceptionArgumentIsNotAnArrayStub.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/stubs/IllegalArgumentExceptionArgumentIsNotAnArrayStub.java index c13bc7a661b5..5d05bf0b880d 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/IllegalArgumentExceptionArgumentIsNotAnArrayStub.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/stubs/IllegalArgumentExceptionArgumentIsNotAnArrayStub.java @@ -22,17 +22,17 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.stubs; +package jdk.graal.compiler.hotspot.stubs; -import jdk.compiler.graal.api.replacements.Snippet; -import jdk.compiler.graal.api.replacements.Snippet.ConstantParameter; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.hotspot.HotSpotForeignCallLinkage; -import jdk.compiler.graal.hotspot.meta.HotSpotProviders; -import jdk.compiler.graal.nodes.extended.BytecodeExceptionNode; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.replacements.nodes.CStringConstant; -import jdk.compiler.graal.word.Word; +import jdk.graal.compiler.api.replacements.Snippet; +import jdk.graal.compiler.api.replacements.Snippet.ConstantParameter; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.hotspot.HotSpotForeignCallLinkage; +import jdk.graal.compiler.hotspot.meta.HotSpotProviders; +import jdk.graal.compiler.nodes.extended.BytecodeExceptionNode; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.replacements.nodes.CStringConstant; +import jdk.graal.compiler.word.Word; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/IntegerExactOverflowExceptionStub.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/stubs/IntegerExactOverflowExceptionStub.java similarity index 81% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/IntegerExactOverflowExceptionStub.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/stubs/IntegerExactOverflowExceptionStub.java index e15cf648fea1..8a82248ef868 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/IntegerExactOverflowExceptionStub.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/stubs/IntegerExactOverflowExceptionStub.java @@ -22,16 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.stubs; +package jdk.graal.compiler.hotspot.stubs; -import jdk.compiler.graal.api.replacements.Snippet; -import jdk.compiler.graal.api.replacements.Snippet.ConstantParameter; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.hotspot.HotSpotForeignCallLinkage; -import jdk.compiler.graal.hotspot.meta.HotSpotProviders; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.replacements.nodes.CStringConstant; -import jdk.compiler.graal.word.Word; +import jdk.graal.compiler.api.replacements.Snippet; +import jdk.graal.compiler.api.replacements.Snippet.ConstantParameter; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.hotspot.HotSpotForeignCallLinkage; +import jdk.graal.compiler.hotspot.meta.HotSpotProviders; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.replacements.nodes.CStringConstant; +import jdk.graal.compiler.word.Word; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/IntrinsicStubs.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/stubs/IntrinsicStubs.java similarity index 59% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/IntrinsicStubs.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/stubs/IntrinsicStubs.java index af162c1ebe63..28fe0569432b 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/IntrinsicStubs.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/stubs/IntrinsicStubs.java @@ -22,35 +22,35 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.stubs; +package jdk.graal.compiler.hotspot.stubs; -import jdk.compiler.graal.lir.GeneratedStubsHolder; -import jdk.compiler.graal.replacements.StringLatin1InflateNode; -import jdk.compiler.graal.replacements.StringUTF16CompressNode; -import jdk.compiler.graal.replacements.nodes.AESNode; -import jdk.compiler.graal.replacements.nodes.ArrayCompareToNode; -import jdk.compiler.graal.replacements.nodes.ArrayCopyWithConversionsNode; -import jdk.compiler.graal.replacements.nodes.ArrayEqualsNode; -import jdk.compiler.graal.replacements.nodes.ArrayIndexOfNode; -import jdk.compiler.graal.replacements.nodes.ArrayRegionCompareToNode; -import jdk.compiler.graal.replacements.nodes.ArrayRegionEqualsNode; -import jdk.compiler.graal.replacements.nodes.ArrayRegionEqualsWithMaskNode; -import jdk.compiler.graal.replacements.nodes.BigIntegerMulAddNode; -import jdk.compiler.graal.replacements.nodes.BigIntegerMultiplyToLenNode; -import jdk.compiler.graal.replacements.nodes.BigIntegerSquareToLenNode; -import jdk.compiler.graal.replacements.nodes.CalcStringAttributesNode; -import jdk.compiler.graal.replacements.nodes.CipherBlockChainingAESNode; -import jdk.compiler.graal.replacements.nodes.CountPositivesNode; -import jdk.compiler.graal.replacements.nodes.CounterModeAESNode; -import jdk.compiler.graal.replacements.nodes.EncodeArrayNode; -import jdk.compiler.graal.replacements.nodes.GHASHProcessBlocksNode; -import jdk.compiler.graal.replacements.nodes.MessageDigestNode.MD5Node; -import jdk.compiler.graal.replacements.nodes.MessageDigestNode.SHA1Node; -import jdk.compiler.graal.replacements.nodes.MessageDigestNode.SHA256Node; -import jdk.compiler.graal.replacements.nodes.MessageDigestNode.SHA3Node; -import jdk.compiler.graal.replacements.nodes.MessageDigestNode.SHA512Node; -import jdk.compiler.graal.replacements.nodes.VectorizedHashCodeNode; -import jdk.compiler.graal.replacements.nodes.VectorizedMismatchNode; +import jdk.graal.compiler.lir.GeneratedStubsHolder; +import jdk.graal.compiler.replacements.StringLatin1InflateNode; +import jdk.graal.compiler.replacements.StringUTF16CompressNode; +import jdk.graal.compiler.replacements.nodes.AESNode; +import jdk.graal.compiler.replacements.nodes.ArrayCompareToNode; +import jdk.graal.compiler.replacements.nodes.ArrayCopyWithConversionsNode; +import jdk.graal.compiler.replacements.nodes.ArrayEqualsNode; +import jdk.graal.compiler.replacements.nodes.ArrayIndexOfNode; +import jdk.graal.compiler.replacements.nodes.ArrayRegionCompareToNode; +import jdk.graal.compiler.replacements.nodes.ArrayRegionEqualsNode; +import jdk.graal.compiler.replacements.nodes.ArrayRegionEqualsWithMaskNode; +import jdk.graal.compiler.replacements.nodes.BigIntegerMulAddNode; +import jdk.graal.compiler.replacements.nodes.BigIntegerMultiplyToLenNode; +import jdk.graal.compiler.replacements.nodes.BigIntegerSquareToLenNode; +import jdk.graal.compiler.replacements.nodes.CalcStringAttributesNode; +import jdk.graal.compiler.replacements.nodes.CipherBlockChainingAESNode; +import jdk.graal.compiler.replacements.nodes.CountPositivesNode; +import jdk.graal.compiler.replacements.nodes.CounterModeAESNode; +import jdk.graal.compiler.replacements.nodes.EncodeArrayNode; +import jdk.graal.compiler.replacements.nodes.GHASHProcessBlocksNode; +import jdk.graal.compiler.replacements.nodes.MessageDigestNode.MD5Node; +import jdk.graal.compiler.replacements.nodes.MessageDigestNode.SHA1Node; +import jdk.graal.compiler.replacements.nodes.MessageDigestNode.SHA256Node; +import jdk.graal.compiler.replacements.nodes.MessageDigestNode.SHA3Node; +import jdk.graal.compiler.replacements.nodes.MessageDigestNode.SHA512Node; +import jdk.graal.compiler.replacements.nodes.VectorizedHashCodeNode; +import jdk.graal.compiler.replacements.nodes.VectorizedMismatchNode; @GeneratedStubsHolder(targetVM = "hotspot", sources = { ArrayIndexOfNode.class, diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/InvokeJavaMethodStub.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/stubs/InvokeJavaMethodStub.java similarity index 83% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/InvokeJavaMethodStub.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/stubs/InvokeJavaMethodStub.java index 7fe3d048a80a..bcd3e77a8a1f 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/InvokeJavaMethodStub.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/stubs/InvokeJavaMethodStub.java @@ -22,31 +22,31 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.stubs; +package jdk.graal.compiler.hotspot.stubs; -import static jdk.compiler.graal.core.common.type.PrimitiveStamp.getBits; +import static jdk.graal.compiler.core.common.type.PrimitiveStamp.getBits; -import jdk.compiler.graal.core.common.type.FloatStamp; -import jdk.compiler.graal.core.common.type.ObjectStamp; -import jdk.compiler.graal.core.common.type.PrimitiveStamp; -import jdk.compiler.graal.core.common.type.Stamp; -import jdk.compiler.graal.core.common.type.StampFactory; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.hotspot.HotSpotForeignCallLinkage; -import jdk.compiler.graal.hotspot.meta.HotSpotForeignCallDescriptor; -import jdk.compiler.graal.hotspot.meta.HotSpotHostForeignCallsProvider; -import jdk.compiler.graal.hotspot.meta.HotSpotProviders; -import jdk.compiler.graal.hotspot.nodes.StubForeignCallNode; -import jdk.compiler.graal.nodes.ConstantNode; -import jdk.compiler.graal.nodes.NodeView; -import jdk.compiler.graal.nodes.ParameterNode; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.calc.ReinterpretNode; -import jdk.compiler.graal.nodes.calc.ZeroExtendNode; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.replacements.GraphKit; -import jdk.compiler.graal.replacements.nodes.ReadRegisterNode; -import jdk.compiler.graal.word.WordCastNode; +import jdk.graal.compiler.core.common.type.FloatStamp; +import jdk.graal.compiler.core.common.type.ObjectStamp; +import jdk.graal.compiler.core.common.type.PrimitiveStamp; +import jdk.graal.compiler.core.common.type.Stamp; +import jdk.graal.compiler.core.common.type.StampFactory; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.hotspot.HotSpotForeignCallLinkage; +import jdk.graal.compiler.hotspot.meta.HotSpotForeignCallDescriptor; +import jdk.graal.compiler.hotspot.meta.HotSpotHostForeignCallsProvider; +import jdk.graal.compiler.hotspot.meta.HotSpotProviders; +import jdk.graal.compiler.hotspot.nodes.StubForeignCallNode; +import jdk.graal.compiler.nodes.ConstantNode; +import jdk.graal.compiler.nodes.NodeView; +import jdk.graal.compiler.nodes.ParameterNode; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.calc.ReinterpretNode; +import jdk.graal.compiler.nodes.calc.ZeroExtendNode; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.replacements.GraphKit; +import jdk.graal.compiler.replacements.nodes.ReadRegisterNode; +import jdk.graal.compiler.word.WordCastNode; import jdk.vm.ci.code.site.ConstantReference; import jdk.vm.ci.code.site.DataPatch; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/LongExactOverflowExceptionStub.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/stubs/LongExactOverflowExceptionStub.java similarity index 81% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/LongExactOverflowExceptionStub.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/stubs/LongExactOverflowExceptionStub.java index c9fd365314b2..371714f5844e 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/LongExactOverflowExceptionStub.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/stubs/LongExactOverflowExceptionStub.java @@ -22,16 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.stubs; +package jdk.graal.compiler.hotspot.stubs; -import jdk.compiler.graal.api.replacements.Snippet; -import jdk.compiler.graal.api.replacements.Snippet.ConstantParameter; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.hotspot.HotSpotForeignCallLinkage; -import jdk.compiler.graal.hotspot.meta.HotSpotProviders; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.replacements.nodes.CStringConstant; -import jdk.compiler.graal.word.Word; +import jdk.graal.compiler.api.replacements.Snippet; +import jdk.graal.compiler.api.replacements.Snippet.ConstantParameter; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.hotspot.HotSpotForeignCallLinkage; +import jdk.graal.compiler.hotspot.meta.HotSpotProviders; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.replacements.nodes.CStringConstant; +import jdk.graal.compiler.word.Word; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/NegativeArraySizeExceptionStub.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/stubs/NegativeArraySizeExceptionStub.java similarity index 83% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/NegativeArraySizeExceptionStub.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/stubs/NegativeArraySizeExceptionStub.java index a1a5c655f52c..cdd48687a611 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/NegativeArraySizeExceptionStub.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/stubs/NegativeArraySizeExceptionStub.java @@ -22,19 +22,19 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.stubs; +package jdk.graal.compiler.hotspot.stubs; -import static jdk.compiler.graal.hotspot.stubs.StubUtil.printNumber; +import static jdk.graal.compiler.hotspot.stubs.StubUtil.printNumber; -import jdk.compiler.graal.api.replacements.Snippet; -import jdk.compiler.graal.api.replacements.Snippet.ConstantParameter; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.hotspot.HotSpotForeignCallLinkage; -import jdk.compiler.graal.hotspot.meta.HotSpotProviders; -import jdk.compiler.graal.hotspot.nodes.AllocaNode; -import jdk.compiler.graal.hotspot.replacements.HotSpotReplacementsUtil; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.word.Word; +import jdk.graal.compiler.api.replacements.Snippet; +import jdk.graal.compiler.api.replacements.Snippet.ConstantParameter; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.hotspot.HotSpotForeignCallLinkage; +import jdk.graal.compiler.hotspot.meta.HotSpotProviders; +import jdk.graal.compiler.hotspot.nodes.AllocaNode; +import jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.word.Word; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/NullPointerExceptionStub.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/stubs/NullPointerExceptionStub.java similarity index 84% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/NullPointerExceptionStub.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/stubs/NullPointerExceptionStub.java index 36c10cddff4c..f5f7972747b7 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/NullPointerExceptionStub.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/stubs/NullPointerExceptionStub.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.stubs; +package jdk.graal.compiler.hotspot.stubs; -import jdk.compiler.graal.api.replacements.Snippet; -import jdk.compiler.graal.api.replacements.Snippet.ConstantParameter; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.hotspot.HotSpotForeignCallLinkage; -import jdk.compiler.graal.hotspot.meta.HotSpotProviders; -import jdk.compiler.graal.options.OptionValues; +import jdk.graal.compiler.api.replacements.Snippet; +import jdk.graal.compiler.api.replacements.Snippet.ConstantParameter; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.hotspot.HotSpotForeignCallLinkage; +import jdk.graal.compiler.hotspot.meta.HotSpotProviders; +import jdk.graal.compiler.options.OptionValues; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/OutOfBoundsExceptionStub.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/stubs/OutOfBoundsExceptionStub.java similarity index 86% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/OutOfBoundsExceptionStub.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/stubs/OutOfBoundsExceptionStub.java index c243000bbbf4..8be317a4e033 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/OutOfBoundsExceptionStub.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/stubs/OutOfBoundsExceptionStub.java @@ -22,17 +22,17 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.stubs; +package jdk.graal.compiler.hotspot.stubs; -import jdk.compiler.graal.api.replacements.Snippet; -import jdk.compiler.graal.api.replacements.Snippet.ConstantParameter; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.hotspot.HotSpotForeignCallLinkage; -import jdk.compiler.graal.hotspot.meta.HotSpotProviders; -import jdk.compiler.graal.hotspot.nodes.AllocaNode; -import jdk.compiler.graal.hotspot.replacements.HotSpotReplacementsUtil; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.word.Word; +import jdk.graal.compiler.api.replacements.Snippet; +import jdk.graal.compiler.api.replacements.Snippet.ConstantParameter; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.hotspot.HotSpotForeignCallLinkage; +import jdk.graal.compiler.hotspot.meta.HotSpotProviders; +import jdk.graal.compiler.hotspot.nodes.AllocaNode; +import jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.word.Word; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/SnippetStub.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/stubs/SnippetStub.java similarity index 85% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/SnippetStub.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/stubs/SnippetStub.java index 1b0d9facbcdb..5d9ddf9b19db 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/SnippetStub.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/stubs/SnippetStub.java @@ -22,27 +22,27 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.stubs; +package jdk.graal.compiler.hotspot.stubs; import java.util.BitSet; -import jdk.compiler.graal.api.replacements.Snippet; -import jdk.compiler.graal.core.common.CompilationIdentifier; -import jdk.compiler.graal.core.common.type.StampFactory; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.hotspot.HotSpotForeignCallLinkage; -import jdk.compiler.graal.hotspot.meta.HotSpotProviders; -import jdk.compiler.graal.nodes.GraphState.GuardsStage; -import jdk.compiler.graal.nodes.NodeView; -import jdk.compiler.graal.nodes.ParameterNode; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.spi.SnippetParameterInfo; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.phases.common.CanonicalizerPhase; -import jdk.compiler.graal.phases.common.HighTierLoweringPhase; -import jdk.compiler.graal.replacements.SnippetTemplate; -import jdk.compiler.graal.replacements.Snippets; +import jdk.graal.compiler.api.replacements.Snippet; +import jdk.graal.compiler.core.common.CompilationIdentifier; +import jdk.graal.compiler.core.common.type.StampFactory; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.hotspot.HotSpotForeignCallLinkage; +import jdk.graal.compiler.hotspot.meta.HotSpotProviders; +import jdk.graal.compiler.nodes.GraphState.GuardsStage; +import jdk.graal.compiler.nodes.NodeView; +import jdk.graal.compiler.nodes.ParameterNode; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.spi.SnippetParameterInfo; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.phases.common.CanonicalizerPhase; +import jdk.graal.compiler.phases.common.HighTierLoweringPhase; +import jdk.graal.compiler.replacements.SnippetTemplate; +import jdk.graal.compiler.replacements.Snippets; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/Stub.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/stubs/Stub.java similarity index 87% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/Stub.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/stubs/Stub.java index 0efa7920f34c..698563930261 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/Stub.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/stubs/Stub.java @@ -22,48 +22,48 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.stubs; +package jdk.graal.compiler.hotspot.stubs; -import static jdk.compiler.graal.core.GraalCompiler.emitFrontEnd; -import static jdk.compiler.graal.core.common.GraalOptions.RegisterPressure; -import static jdk.compiler.graal.debug.DebugOptions.DebugStubsAndSnippets; -import static jdk.compiler.graal.util.CollectionsUtil.allMatch; +import static jdk.graal.compiler.core.GraalCompiler.emitFrontEnd; +import static jdk.graal.compiler.core.common.GraalOptions.RegisterPressure; +import static jdk.graal.compiler.debug.DebugOptions.DebugStubsAndSnippets; +import static jdk.graal.compiler.util.CollectionsUtil.allMatch; import java.util.ListIterator; import java.util.Optional; import java.util.concurrent.atomic.AtomicInteger; -import jdk.compiler.graal.hotspot.HotSpotCompiledCodeBuilder; -import jdk.compiler.graal.hotspot.HotSpotForeignCallLinkage; -import jdk.compiler.graal.hotspot.HotSpotHostBackend; -import jdk.compiler.graal.hotspot.meta.HotSpotProviders; -import jdk.compiler.graal.hotspot.nodes.StubStartNode; +import jdk.graal.compiler.hotspot.HotSpotCompiledCodeBuilder; +import jdk.graal.compiler.hotspot.HotSpotForeignCallLinkage; +import jdk.graal.compiler.hotspot.HotSpotHostBackend; +import jdk.graal.compiler.hotspot.meta.HotSpotProviders; +import jdk.graal.compiler.hotspot.nodes.StubStartNode; import org.graalvm.collections.EconomicSet; -import jdk.compiler.graal.code.CompilationResult; -import jdk.compiler.graal.core.CompilationPrinter; -import jdk.compiler.graal.core.common.CompilationIdentifier; -import jdk.compiler.graal.core.common.GraalOptions; -import jdk.compiler.graal.core.target.Backend; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.debug.DebugContext.Builder; -import jdk.compiler.graal.debug.DebugContext.Description; -import jdk.compiler.graal.debug.DebugOptions; -import jdk.compiler.graal.lir.asm.CompilationResultBuilderFactory; -import jdk.compiler.graal.lir.phases.LIRPhase; -import jdk.compiler.graal.lir.phases.LIRSuites; -import jdk.compiler.graal.lir.phases.PostAllocationOptimizationPhase.PostAllocationOptimizationContext; -import jdk.compiler.graal.lir.profiling.MoveProfilingPhase; -import jdk.compiler.graal.nodes.GraphState; -import jdk.compiler.graal.nodes.GraphState.StageFlag; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.phases.BasePhase; -import jdk.compiler.graal.phases.OptimisticOptimizations; -import jdk.compiler.graal.phases.PhaseSuite; -import jdk.compiler.graal.phases.Speculative; -import jdk.compiler.graal.phases.tiers.HighTierContext; -import jdk.compiler.graal.phases.tiers.Suites; -import jdk.compiler.graal.printer.GraalDebugHandlersFactory; +import jdk.graal.compiler.code.CompilationResult; +import jdk.graal.compiler.core.CompilationPrinter; +import jdk.graal.compiler.core.common.CompilationIdentifier; +import jdk.graal.compiler.core.common.GraalOptions; +import jdk.graal.compiler.core.target.Backend; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.debug.DebugContext.Builder; +import jdk.graal.compiler.debug.DebugContext.Description; +import jdk.graal.compiler.debug.DebugOptions; +import jdk.graal.compiler.lir.asm.CompilationResultBuilderFactory; +import jdk.graal.compiler.lir.phases.LIRPhase; +import jdk.graal.compiler.lir.phases.LIRSuites; +import jdk.graal.compiler.lir.phases.PostAllocationOptimizationPhase.PostAllocationOptimizationContext; +import jdk.graal.compiler.lir.profiling.MoveProfilingPhase; +import jdk.graal.compiler.nodes.GraphState; +import jdk.graal.compiler.nodes.GraphState.StageFlag; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.phases.BasePhase; +import jdk.graal.compiler.phases.OptimisticOptimizations; +import jdk.graal.compiler.phases.PhaseSuite; +import jdk.graal.compiler.phases.Speculative; +import jdk.graal.compiler.phases.tiers.HighTierContext; +import jdk.graal.compiler.phases.tiers.Suites; +import jdk.graal.compiler.printer.GraalDebugHandlersFactory; import jdk.vm.ci.code.CodeCacheProvider; import jdk.vm.ci.code.InstalledCode; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/StubCompilationIdentifier.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/stubs/StubCompilationIdentifier.java similarity index 94% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/StubCompilationIdentifier.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/stubs/StubCompilationIdentifier.java index b8026c3782a4..6f807dcaa87a 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/StubCompilationIdentifier.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/stubs/StubCompilationIdentifier.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.stubs; +package jdk.graal.compiler.hotspot.stubs; import java.util.concurrent.atomic.AtomicLong; -import jdk.compiler.graal.core.common.CompilationIdentifier; -import jdk.compiler.graal.debug.GraalError; +import jdk.graal.compiler.core.common.CompilationIdentifier; +import jdk.graal.compiler.debug.GraalError; /** * {@link CompilationIdentifier} for {@linkplain Stub stub compilations}. diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/StubOptions.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/stubs/StubOptions.java similarity index 91% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/StubOptions.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/stubs/StubOptions.java index c9d5a3c3df58..e07a74baeec5 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/StubOptions.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/stubs/StubOptions.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.stubs; +package jdk.graal.compiler.hotspot.stubs; -import jdk.compiler.graal.options.Option; -import jdk.compiler.graal.options.OptionKey; -import jdk.compiler.graal.options.OptionType; +import jdk.graal.compiler.options.Option; +import jdk.graal.compiler.options.OptionKey; +import jdk.graal.compiler.options.OptionType; //JaCoCo Exclude diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/StubUtil.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/stubs/StubUtil.java similarity index 93% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/StubUtil.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/stubs/StubUtil.java index a0ec596dd024..c0e6c6a1ac78 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/StubUtil.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/stubs/StubUtil.java @@ -22,26 +22,26 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.stubs; +package jdk.graal.compiler.hotspot.stubs; -import static jdk.compiler.graal.replacements.nodes.CStringConstant.cstring; +import static jdk.graal.compiler.replacements.nodes.CStringConstant.cstring; import java.lang.reflect.Method; import java.lang.reflect.Modifier; import java.util.Arrays; import java.util.List; -import jdk.compiler.graal.api.replacements.Fold; -import jdk.compiler.graal.api.replacements.Fold.InjectedParameter; -import jdk.compiler.graal.core.common.spi.ForeignCallDescriptor; -import jdk.compiler.graal.graph.Node.ConstantNodeParameter; -import jdk.compiler.graal.graph.Node.NodeIntrinsic; -import jdk.compiler.graal.hotspot.GraalHotSpotVMConfig; -import jdk.compiler.graal.hotspot.meta.HotSpotForeignCallDescriptor; -import jdk.compiler.graal.hotspot.nodes.StubForeignCallNode; -import jdk.compiler.graal.hotspot.nodes.VMErrorNode; -import jdk.compiler.graal.hotspot.replacements.Log; -import jdk.compiler.graal.word.Word; +import jdk.graal.compiler.api.replacements.Fold; +import jdk.graal.compiler.api.replacements.Fold.InjectedParameter; +import jdk.graal.compiler.core.common.spi.ForeignCallDescriptor; +import jdk.graal.compiler.graph.Node.ConstantNodeParameter; +import jdk.graal.compiler.graph.Node.NodeIntrinsic; +import jdk.graal.compiler.hotspot.GraalHotSpotVMConfig; +import jdk.graal.compiler.hotspot.meta.HotSpotForeignCallDescriptor; +import jdk.graal.compiler.hotspot.nodes.StubForeignCallNode; +import jdk.graal.compiler.hotspot.nodes.VMErrorNode; +import jdk.graal.compiler.hotspot.replacements.Log; +import jdk.graal.compiler.word.Word; import org.graalvm.word.LocationIdentity; import org.graalvm.word.WordFactory; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/UnwindExceptionToCallerStub.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/stubs/UnwindExceptionToCallerStub.java similarity index 76% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/UnwindExceptionToCallerStub.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/stubs/UnwindExceptionToCallerStub.java index 12ce21f8834a..a0802da4af2a 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/UnwindExceptionToCallerStub.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/stubs/UnwindExceptionToCallerStub.java @@ -22,34 +22,34 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.stubs; +package jdk.graal.compiler.hotspot.stubs; -import static jdk.compiler.graal.hotspot.stubs.ExceptionHandlerStub.checkExceptionNotNull; -import static jdk.compiler.graal.hotspot.stubs.ExceptionHandlerStub.checkNoExceptionInThread; -import static jdk.compiler.graal.hotspot.stubs.StubUtil.cAssertionsEnabled; -import static jdk.compiler.graal.hotspot.stubs.StubUtil.decipher; -import static jdk.compiler.graal.hotspot.stubs.StubUtil.newDescriptor; -import static jdk.compiler.graal.hotspot.stubs.StubUtil.printf; +import static jdk.graal.compiler.hotspot.stubs.ExceptionHandlerStub.checkExceptionNotNull; +import static jdk.graal.compiler.hotspot.stubs.ExceptionHandlerStub.checkNoExceptionInThread; +import static jdk.graal.compiler.hotspot.stubs.StubUtil.cAssertionsEnabled; +import static jdk.graal.compiler.hotspot.stubs.StubUtil.decipher; +import static jdk.graal.compiler.hotspot.stubs.StubUtil.newDescriptor; +import static jdk.graal.compiler.hotspot.stubs.StubUtil.printf; import static org.graalvm.word.LocationIdentity.any; -import jdk.compiler.graal.api.replacements.Fold; -import jdk.compiler.graal.api.replacements.Fold.InjectedParameter; -import jdk.compiler.graal.api.replacements.Snippet; -import jdk.compiler.graal.api.replacements.Snippet.ConstantParameter; -import jdk.compiler.graal.core.common.spi.ForeignCallDescriptor; -import jdk.compiler.graal.debug.Assertions; -import jdk.compiler.graal.graph.Node.ConstantNodeParameter; -import jdk.compiler.graal.graph.Node.NodeIntrinsic; -import jdk.compiler.graal.hotspot.GraalHotSpotVMConfig; -import jdk.compiler.graal.hotspot.HotSpotForeignCallLinkage; -import jdk.compiler.graal.hotspot.meta.HotSpotForeignCallDescriptor; -import jdk.compiler.graal.hotspot.meta.HotSpotProviders; -import jdk.compiler.graal.hotspot.nodes.JumpToExceptionHandlerInCallerNode; -import jdk.compiler.graal.hotspot.nodes.StubForeignCallNode; -import jdk.compiler.graal.hotspot.replacements.HotSpotReplacementsUtil; -import jdk.compiler.graal.nodes.UnwindNode; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.word.Word; +import jdk.graal.compiler.api.replacements.Fold; +import jdk.graal.compiler.api.replacements.Fold.InjectedParameter; +import jdk.graal.compiler.api.replacements.Snippet; +import jdk.graal.compiler.api.replacements.Snippet.ConstantParameter; +import jdk.graal.compiler.core.common.spi.ForeignCallDescriptor; +import jdk.graal.compiler.debug.Assertions; +import jdk.graal.compiler.graph.Node.ConstantNodeParameter; +import jdk.graal.compiler.graph.Node.NodeIntrinsic; +import jdk.graal.compiler.hotspot.GraalHotSpotVMConfig; +import jdk.graal.compiler.hotspot.HotSpotForeignCallLinkage; +import jdk.graal.compiler.hotspot.meta.HotSpotForeignCallDescriptor; +import jdk.graal.compiler.hotspot.meta.HotSpotProviders; +import jdk.graal.compiler.hotspot.nodes.JumpToExceptionHandlerInCallerNode; +import jdk.graal.compiler.hotspot.nodes.StubForeignCallNode; +import jdk.graal.compiler.hotspot.replacements.HotSpotReplacementsUtil; +import jdk.graal.compiler.nodes.UnwindNode; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.word.Word; import org.graalvm.word.Pointer; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/VerifyOopStub.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/stubs/VerifyOopStub.java similarity index 83% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/VerifyOopStub.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/stubs/VerifyOopStub.java index 14a71b8c2f83..509abbae2f8e 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/VerifyOopStub.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/stubs/VerifyOopStub.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.stubs; +package jdk.graal.compiler.hotspot.stubs; -import jdk.compiler.graal.api.replacements.Snippet; -import jdk.compiler.graal.hotspot.HotSpotForeignCallLinkage; -import jdk.compiler.graal.hotspot.meta.HotSpotHostForeignCallsProvider; -import jdk.compiler.graal.hotspot.meta.HotSpotProviders; -import jdk.compiler.graal.options.OptionValues; +import jdk.graal.compiler.api.replacements.Snippet; +import jdk.graal.compiler.hotspot.HotSpotForeignCallLinkage; +import jdk.graal.compiler.hotspot.meta.HotSpotHostForeignCallsProvider; +import jdk.graal.compiler.hotspot.meta.HotSpotProviders; +import jdk.graal.compiler.options.OptionValues; /** * Stub called via {@link HotSpotHostForeignCallsProvider#VERIFY_OOP}. diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/word/HotSpotOperation.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/word/HotSpotOperation.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/word/HotSpotOperation.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/word/HotSpotOperation.java index 7c684e1e178d..3b1c02665350 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/word/HotSpotOperation.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/word/HotSpotOperation.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.word; +package jdk.graal.compiler.hotspot.word; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/word/HotSpotWordTypes.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/word/HotSpotWordTypes.java similarity index 93% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/word/HotSpotWordTypes.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/word/HotSpotWordTypes.java index b4060576d489..6796245d9633 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/word/HotSpotWordTypes.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/word/HotSpotWordTypes.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.word; +package jdk.graal.compiler.hotspot.word; -import jdk.compiler.graal.core.common.type.Stamp; -import jdk.compiler.graal.hotspot.nodes.type.KlassPointerStamp; -import jdk.compiler.graal.hotspot.nodes.type.MethodCountersPointerStamp; -import jdk.compiler.graal.hotspot.nodes.type.MethodPointerStamp; -import jdk.compiler.graal.word.WordTypes; +import jdk.graal.compiler.core.common.type.Stamp; +import jdk.graal.compiler.hotspot.nodes.type.KlassPointerStamp; +import jdk.graal.compiler.hotspot.nodes.type.MethodCountersPointerStamp; +import jdk.graal.compiler.hotspot.nodes.type.MethodPointerStamp; +import jdk.graal.compiler.word.WordTypes; import jdk.vm.ci.meta.JavaKind; import jdk.vm.ci.meta.JavaType; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/word/KlassPointer.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/word/KlassPointer.java similarity index 84% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/word/KlassPointer.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/word/KlassPointer.java index 84fa7930d1b2..2717f13585e5 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/word/KlassPointer.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/word/KlassPointer.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.word; +package jdk.graal.compiler.hotspot.word; -import static jdk.compiler.graal.hotspot.word.HotSpotOperation.HotspotOpcode.POINTER_EQ; -import static jdk.compiler.graal.hotspot.word.HotSpotOperation.HotspotOpcode.POINTER_NE; -import static jdk.compiler.graal.hotspot.word.HotSpotOperation.HotspotOpcode.READ_KLASS_POINTER; -import static jdk.compiler.graal.hotspot.word.HotSpotOperation.HotspotOpcode.TO_KLASS_POINTER; +import static jdk.graal.compiler.hotspot.word.HotSpotOperation.HotspotOpcode.POINTER_EQ; +import static jdk.graal.compiler.hotspot.word.HotSpotOperation.HotspotOpcode.POINTER_NE; +import static jdk.graal.compiler.hotspot.word.HotSpotOperation.HotspotOpcode.READ_KLASS_POINTER; +import static jdk.graal.compiler.hotspot.word.HotSpotOperation.HotspotOpcode.TO_KLASS_POINTER; -import jdk.compiler.graal.word.Word.Opcode; -import jdk.compiler.graal.word.Word.Operation; +import jdk.graal.compiler.word.Word.Opcode; +import jdk.graal.compiler.word.Word.Operation; import org.graalvm.word.LocationIdentity; import org.graalvm.word.Pointer; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/word/MetaspacePointer.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/word/MetaspacePointer.java similarity index 99% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/word/MetaspacePointer.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/word/MetaspacePointer.java index 690d3f2bb9ce..974da797ceab 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/word/MetaspacePointer.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/word/MetaspacePointer.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.word; +package jdk.graal.compiler.hotspot.word; -import static jdk.compiler.graal.hotspot.word.HotSpotOperation.HotspotOpcode.FROM_POINTER; -import static jdk.compiler.graal.hotspot.word.HotSpotOperation.HotspotOpcode.IS_NULL; +import static jdk.graal.compiler.hotspot.word.HotSpotOperation.HotspotOpcode.FROM_POINTER; +import static jdk.graal.compiler.hotspot.word.HotSpotOperation.HotspotOpcode.IS_NULL; -import jdk.compiler.graal.core.common.memory.BarrierType; -import jdk.compiler.graal.word.Word; -import jdk.compiler.graal.word.Word.Opcode; -import jdk.compiler.graal.word.Word.Operation; +import jdk.graal.compiler.core.common.memory.BarrierType; +import jdk.graal.compiler.word.Word; +import jdk.graal.compiler.word.Word.Opcode; +import jdk.graal.compiler.word.Word.Operation; import org.graalvm.word.LocationIdentity; import org.graalvm.word.SignedWord; import org.graalvm.word.UnsignedWord; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/word/MethodCountersPointer.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/word/MethodCountersPointer.java similarity index 90% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/word/MethodCountersPointer.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/word/MethodCountersPointer.java index 5e598c056282..af80cc4a417a 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/word/MethodCountersPointer.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/word/MethodCountersPointer.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.word; +package jdk.graal.compiler.hotspot.word; -import static jdk.compiler.graal.hotspot.word.HotSpotOperation.HotspotOpcode.POINTER_EQ; -import static jdk.compiler.graal.hotspot.word.HotSpotOperation.HotspotOpcode.POINTER_NE; +import static jdk.graal.compiler.hotspot.word.HotSpotOperation.HotspotOpcode.POINTER_EQ; +import static jdk.graal.compiler.hotspot.word.HotSpotOperation.HotspotOpcode.POINTER_NE; /** * Marker type for a metaspace pointer to a method counters. diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/word/MethodPointer.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/word/MethodPointer.java similarity index 88% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/word/MethodPointer.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/word/MethodPointer.java index 175990fafc3d..c8251f96c4cd 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/word/MethodPointer.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/word/MethodPointer.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.word; +package jdk.graal.compiler.hotspot.word; -import static jdk.compiler.graal.hotspot.word.HotSpotOperation.HotspotOpcode.POINTER_EQ; -import static jdk.compiler.graal.hotspot.word.HotSpotOperation.HotspotOpcode.POINTER_NE; -import static jdk.compiler.graal.hotspot.word.HotSpotOperation.HotspotOpcode.TO_METHOD_POINTER; +import static jdk.graal.compiler.hotspot.word.HotSpotOperation.HotspotOpcode.POINTER_EQ; +import static jdk.graal.compiler.hotspot.word.HotSpotOperation.HotspotOpcode.POINTER_NE; +import static jdk.graal.compiler.hotspot.word.HotSpotOperation.HotspotOpcode.TO_METHOD_POINTER; import org.graalvm.word.Pointer; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/word/PointerCastNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/word/PointerCastNode.java similarity index 80% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/word/PointerCastNode.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/word/PointerCastNode.java index 7d1c055d12da..16c3d4b24e43 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/word/PointerCastNode.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/word/PointerCastNode.java @@ -22,23 +22,23 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.hotspot.word; +package jdk.graal.compiler.hotspot.word; -import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0; -import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_0; +import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_0; +import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_0; -import jdk.compiler.graal.core.common.type.Stamp; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.graph.NodeClass; -import jdk.compiler.graal.nodes.spi.Canonicalizable; -import jdk.compiler.graal.nodes.spi.CanonicalizerTool; -import jdk.compiler.graal.hotspot.word.HotSpotOperation.HotspotOpcode; -import jdk.compiler.graal.nodeinfo.NodeInfo; -import jdk.compiler.graal.nodes.NodeView; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.calc.FloatingNode; -import jdk.compiler.graal.nodes.spi.LIRLowerable; -import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool; +import jdk.graal.compiler.core.common.type.Stamp; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.graph.NodeClass; +import jdk.graal.compiler.nodes.spi.Canonicalizable; +import jdk.graal.compiler.nodes.spi.CanonicalizerTool; +import jdk.graal.compiler.hotspot.word.HotSpotOperation.HotspotOpcode; +import jdk.graal.compiler.nodeinfo.NodeInfo; +import jdk.graal.compiler.nodes.NodeView; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.calc.FloatingNode; +import jdk.graal.compiler.nodes.spi.LIRLowerable; +import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool; import jdk.vm.ci.meta.Value; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/java/BciBlockMapping.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/java/BciBlockMapping.java similarity index 82% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/java/BciBlockMapping.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/java/BciBlockMapping.java index f9d9591560d3..65a3c43953d2 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/java/BciBlockMapping.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/java/BciBlockMapping.java @@ -22,213 +22,213 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.java; - -import static jdk.compiler.graal.bytecode.Bytecodes.AALOAD; -import static jdk.compiler.graal.bytecode.Bytecodes.AASTORE; -import static jdk.compiler.graal.bytecode.Bytecodes.ACONST_NULL; -import static jdk.compiler.graal.bytecode.Bytecodes.ALOAD; -import static jdk.compiler.graal.bytecode.Bytecodes.ALOAD_0; -import static jdk.compiler.graal.bytecode.Bytecodes.ALOAD_1; -import static jdk.compiler.graal.bytecode.Bytecodes.ALOAD_2; -import static jdk.compiler.graal.bytecode.Bytecodes.ALOAD_3; -import static jdk.compiler.graal.bytecode.Bytecodes.ANEWARRAY; -import static jdk.compiler.graal.bytecode.Bytecodes.ARETURN; -import static jdk.compiler.graal.bytecode.Bytecodes.ARRAYLENGTH; -import static jdk.compiler.graal.bytecode.Bytecodes.ASTORE; -import static jdk.compiler.graal.bytecode.Bytecodes.ASTORE_0; -import static jdk.compiler.graal.bytecode.Bytecodes.ASTORE_1; -import static jdk.compiler.graal.bytecode.Bytecodes.ASTORE_2; -import static jdk.compiler.graal.bytecode.Bytecodes.ASTORE_3; -import static jdk.compiler.graal.bytecode.Bytecodes.ATHROW; -import static jdk.compiler.graal.bytecode.Bytecodes.BALOAD; -import static jdk.compiler.graal.bytecode.Bytecodes.BASTORE; -import static jdk.compiler.graal.bytecode.Bytecodes.BIPUSH; -import static jdk.compiler.graal.bytecode.Bytecodes.BREAKPOINT; -import static jdk.compiler.graal.bytecode.Bytecodes.CALOAD; -import static jdk.compiler.graal.bytecode.Bytecodes.CASTORE; -import static jdk.compiler.graal.bytecode.Bytecodes.CHECKCAST; -import static jdk.compiler.graal.bytecode.Bytecodes.D2F; -import static jdk.compiler.graal.bytecode.Bytecodes.D2I; -import static jdk.compiler.graal.bytecode.Bytecodes.D2L; -import static jdk.compiler.graal.bytecode.Bytecodes.DADD; -import static jdk.compiler.graal.bytecode.Bytecodes.DALOAD; -import static jdk.compiler.graal.bytecode.Bytecodes.DASTORE; -import static jdk.compiler.graal.bytecode.Bytecodes.DCMPG; -import static jdk.compiler.graal.bytecode.Bytecodes.DCMPL; -import static jdk.compiler.graal.bytecode.Bytecodes.DCONST_0; -import static jdk.compiler.graal.bytecode.Bytecodes.DCONST_1; -import static jdk.compiler.graal.bytecode.Bytecodes.DDIV; -import static jdk.compiler.graal.bytecode.Bytecodes.DLOAD; -import static jdk.compiler.graal.bytecode.Bytecodes.DLOAD_0; -import static jdk.compiler.graal.bytecode.Bytecodes.DLOAD_1; -import static jdk.compiler.graal.bytecode.Bytecodes.DLOAD_2; -import static jdk.compiler.graal.bytecode.Bytecodes.DLOAD_3; -import static jdk.compiler.graal.bytecode.Bytecodes.DMUL; -import static jdk.compiler.graal.bytecode.Bytecodes.DNEG; -import static jdk.compiler.graal.bytecode.Bytecodes.DREM; -import static jdk.compiler.graal.bytecode.Bytecodes.DRETURN; -import static jdk.compiler.graal.bytecode.Bytecodes.DSTORE; -import static jdk.compiler.graal.bytecode.Bytecodes.DSTORE_0; -import static jdk.compiler.graal.bytecode.Bytecodes.DSTORE_1; -import static jdk.compiler.graal.bytecode.Bytecodes.DSTORE_2; -import static jdk.compiler.graal.bytecode.Bytecodes.DSTORE_3; -import static jdk.compiler.graal.bytecode.Bytecodes.DSUB; -import static jdk.compiler.graal.bytecode.Bytecodes.DUP; -import static jdk.compiler.graal.bytecode.Bytecodes.DUP2; -import static jdk.compiler.graal.bytecode.Bytecodes.DUP2_X1; -import static jdk.compiler.graal.bytecode.Bytecodes.DUP2_X2; -import static jdk.compiler.graal.bytecode.Bytecodes.DUP_X1; -import static jdk.compiler.graal.bytecode.Bytecodes.DUP_X2; -import static jdk.compiler.graal.bytecode.Bytecodes.F2D; -import static jdk.compiler.graal.bytecode.Bytecodes.F2I; -import static jdk.compiler.graal.bytecode.Bytecodes.F2L; -import static jdk.compiler.graal.bytecode.Bytecodes.FADD; -import static jdk.compiler.graal.bytecode.Bytecodes.FALOAD; -import static jdk.compiler.graal.bytecode.Bytecodes.FASTORE; -import static jdk.compiler.graal.bytecode.Bytecodes.FCMPG; -import static jdk.compiler.graal.bytecode.Bytecodes.FCMPL; -import static jdk.compiler.graal.bytecode.Bytecodes.FCONST_0; -import static jdk.compiler.graal.bytecode.Bytecodes.FCONST_1; -import static jdk.compiler.graal.bytecode.Bytecodes.FCONST_2; -import static jdk.compiler.graal.bytecode.Bytecodes.FDIV; -import static jdk.compiler.graal.bytecode.Bytecodes.FLOAD; -import static jdk.compiler.graal.bytecode.Bytecodes.FLOAD_0; -import static jdk.compiler.graal.bytecode.Bytecodes.FLOAD_1; -import static jdk.compiler.graal.bytecode.Bytecodes.FLOAD_2; -import static jdk.compiler.graal.bytecode.Bytecodes.FLOAD_3; -import static jdk.compiler.graal.bytecode.Bytecodes.FMUL; -import static jdk.compiler.graal.bytecode.Bytecodes.FNEG; -import static jdk.compiler.graal.bytecode.Bytecodes.FREM; -import static jdk.compiler.graal.bytecode.Bytecodes.FRETURN; -import static jdk.compiler.graal.bytecode.Bytecodes.FSTORE; -import static jdk.compiler.graal.bytecode.Bytecodes.FSTORE_0; -import static jdk.compiler.graal.bytecode.Bytecodes.FSTORE_1; -import static jdk.compiler.graal.bytecode.Bytecodes.FSTORE_2; -import static jdk.compiler.graal.bytecode.Bytecodes.FSTORE_3; -import static jdk.compiler.graal.bytecode.Bytecodes.FSUB; -import static jdk.compiler.graal.bytecode.Bytecodes.GETFIELD; -import static jdk.compiler.graal.bytecode.Bytecodes.GETSTATIC; -import static jdk.compiler.graal.bytecode.Bytecodes.GOTO; -import static jdk.compiler.graal.bytecode.Bytecodes.GOTO_W; -import static jdk.compiler.graal.bytecode.Bytecodes.I2B; -import static jdk.compiler.graal.bytecode.Bytecodes.I2C; -import static jdk.compiler.graal.bytecode.Bytecodes.I2D; -import static jdk.compiler.graal.bytecode.Bytecodes.I2F; -import static jdk.compiler.graal.bytecode.Bytecodes.I2L; -import static jdk.compiler.graal.bytecode.Bytecodes.I2S; -import static jdk.compiler.graal.bytecode.Bytecodes.IADD; -import static jdk.compiler.graal.bytecode.Bytecodes.IALOAD; -import static jdk.compiler.graal.bytecode.Bytecodes.IAND; -import static jdk.compiler.graal.bytecode.Bytecodes.IASTORE; -import static jdk.compiler.graal.bytecode.Bytecodes.ICONST_0; -import static jdk.compiler.graal.bytecode.Bytecodes.ICONST_1; -import static jdk.compiler.graal.bytecode.Bytecodes.ICONST_2; -import static jdk.compiler.graal.bytecode.Bytecodes.ICONST_3; -import static jdk.compiler.graal.bytecode.Bytecodes.ICONST_4; -import static jdk.compiler.graal.bytecode.Bytecodes.ICONST_5; -import static jdk.compiler.graal.bytecode.Bytecodes.ICONST_M1; -import static jdk.compiler.graal.bytecode.Bytecodes.IDIV; -import static jdk.compiler.graal.bytecode.Bytecodes.IFEQ; -import static jdk.compiler.graal.bytecode.Bytecodes.IFGE; -import static jdk.compiler.graal.bytecode.Bytecodes.IFGT; -import static jdk.compiler.graal.bytecode.Bytecodes.IFLE; -import static jdk.compiler.graal.bytecode.Bytecodes.IFLT; -import static jdk.compiler.graal.bytecode.Bytecodes.IFNE; -import static jdk.compiler.graal.bytecode.Bytecodes.IFNONNULL; -import static jdk.compiler.graal.bytecode.Bytecodes.IFNULL; -import static jdk.compiler.graal.bytecode.Bytecodes.IF_ACMPEQ; -import static jdk.compiler.graal.bytecode.Bytecodes.IF_ACMPNE; -import static jdk.compiler.graal.bytecode.Bytecodes.IF_ICMPEQ; -import static jdk.compiler.graal.bytecode.Bytecodes.IF_ICMPGE; -import static jdk.compiler.graal.bytecode.Bytecodes.IF_ICMPGT; -import static jdk.compiler.graal.bytecode.Bytecodes.IF_ICMPLE; -import static jdk.compiler.graal.bytecode.Bytecodes.IF_ICMPLT; -import static jdk.compiler.graal.bytecode.Bytecodes.IF_ICMPNE; -import static jdk.compiler.graal.bytecode.Bytecodes.IINC; -import static jdk.compiler.graal.bytecode.Bytecodes.ILOAD; -import static jdk.compiler.graal.bytecode.Bytecodes.ILOAD_0; -import static jdk.compiler.graal.bytecode.Bytecodes.ILOAD_1; -import static jdk.compiler.graal.bytecode.Bytecodes.ILOAD_2; -import static jdk.compiler.graal.bytecode.Bytecodes.ILOAD_3; -import static jdk.compiler.graal.bytecode.Bytecodes.IMUL; -import static jdk.compiler.graal.bytecode.Bytecodes.INEG; -import static jdk.compiler.graal.bytecode.Bytecodes.INSTANCEOF; -import static jdk.compiler.graal.bytecode.Bytecodes.INVOKEDYNAMIC; -import static jdk.compiler.graal.bytecode.Bytecodes.INVOKEINTERFACE; -import static jdk.compiler.graal.bytecode.Bytecodes.INVOKESPECIAL; -import static jdk.compiler.graal.bytecode.Bytecodes.INVOKESTATIC; -import static jdk.compiler.graal.bytecode.Bytecodes.INVOKEVIRTUAL; -import static jdk.compiler.graal.bytecode.Bytecodes.IOR; -import static jdk.compiler.graal.bytecode.Bytecodes.IREM; -import static jdk.compiler.graal.bytecode.Bytecodes.IRETURN; -import static jdk.compiler.graal.bytecode.Bytecodes.ISHL; -import static jdk.compiler.graal.bytecode.Bytecodes.ISHR; -import static jdk.compiler.graal.bytecode.Bytecodes.ISTORE; -import static jdk.compiler.graal.bytecode.Bytecodes.ISTORE_0; -import static jdk.compiler.graal.bytecode.Bytecodes.ISTORE_1; -import static jdk.compiler.graal.bytecode.Bytecodes.ISTORE_2; -import static jdk.compiler.graal.bytecode.Bytecodes.ISTORE_3; -import static jdk.compiler.graal.bytecode.Bytecodes.ISUB; -import static jdk.compiler.graal.bytecode.Bytecodes.IUSHR; -import static jdk.compiler.graal.bytecode.Bytecodes.IXOR; -import static jdk.compiler.graal.bytecode.Bytecodes.JSR; -import static jdk.compiler.graal.bytecode.Bytecodes.JSR_W; -import static jdk.compiler.graal.bytecode.Bytecodes.L2D; -import static jdk.compiler.graal.bytecode.Bytecodes.L2F; -import static jdk.compiler.graal.bytecode.Bytecodes.L2I; -import static jdk.compiler.graal.bytecode.Bytecodes.LADD; -import static jdk.compiler.graal.bytecode.Bytecodes.LALOAD; -import static jdk.compiler.graal.bytecode.Bytecodes.LAND; -import static jdk.compiler.graal.bytecode.Bytecodes.LASTORE; -import static jdk.compiler.graal.bytecode.Bytecodes.LCMP; -import static jdk.compiler.graal.bytecode.Bytecodes.LCONST_0; -import static jdk.compiler.graal.bytecode.Bytecodes.LCONST_1; -import static jdk.compiler.graal.bytecode.Bytecodes.LDC; -import static jdk.compiler.graal.bytecode.Bytecodes.LDC2_W; -import static jdk.compiler.graal.bytecode.Bytecodes.LDC_W; -import static jdk.compiler.graal.bytecode.Bytecodes.LDIV; -import static jdk.compiler.graal.bytecode.Bytecodes.LLOAD; -import static jdk.compiler.graal.bytecode.Bytecodes.LLOAD_0; -import static jdk.compiler.graal.bytecode.Bytecodes.LLOAD_1; -import static jdk.compiler.graal.bytecode.Bytecodes.LLOAD_2; -import static jdk.compiler.graal.bytecode.Bytecodes.LLOAD_3; -import static jdk.compiler.graal.bytecode.Bytecodes.LMUL; -import static jdk.compiler.graal.bytecode.Bytecodes.LNEG; -import static jdk.compiler.graal.bytecode.Bytecodes.LOOKUPSWITCH; -import static jdk.compiler.graal.bytecode.Bytecodes.LOR; -import static jdk.compiler.graal.bytecode.Bytecodes.LREM; -import static jdk.compiler.graal.bytecode.Bytecodes.LRETURN; -import static jdk.compiler.graal.bytecode.Bytecodes.LSHL; -import static jdk.compiler.graal.bytecode.Bytecodes.LSHR; -import static jdk.compiler.graal.bytecode.Bytecodes.LSTORE; -import static jdk.compiler.graal.bytecode.Bytecodes.LSTORE_0; -import static jdk.compiler.graal.bytecode.Bytecodes.LSTORE_1; -import static jdk.compiler.graal.bytecode.Bytecodes.LSTORE_2; -import static jdk.compiler.graal.bytecode.Bytecodes.LSTORE_3; -import static jdk.compiler.graal.bytecode.Bytecodes.LSUB; -import static jdk.compiler.graal.bytecode.Bytecodes.LUSHR; -import static jdk.compiler.graal.bytecode.Bytecodes.LXOR; -import static jdk.compiler.graal.bytecode.Bytecodes.MONITORENTER; -import static jdk.compiler.graal.bytecode.Bytecodes.MONITOREXIT; -import static jdk.compiler.graal.bytecode.Bytecodes.MULTIANEWARRAY; -import static jdk.compiler.graal.bytecode.Bytecodes.NEW; -import static jdk.compiler.graal.bytecode.Bytecodes.NEWARRAY; -import static jdk.compiler.graal.bytecode.Bytecodes.NOP; -import static jdk.compiler.graal.bytecode.Bytecodes.POP; -import static jdk.compiler.graal.bytecode.Bytecodes.POP2; -import static jdk.compiler.graal.bytecode.Bytecodes.PUTFIELD; -import static jdk.compiler.graal.bytecode.Bytecodes.PUTSTATIC; -import static jdk.compiler.graal.bytecode.Bytecodes.RET; -import static jdk.compiler.graal.bytecode.Bytecodes.RETURN; -import static jdk.compiler.graal.bytecode.Bytecodes.SALOAD; -import static jdk.compiler.graal.bytecode.Bytecodes.SASTORE; -import static jdk.compiler.graal.bytecode.Bytecodes.SIPUSH; -import static jdk.compiler.graal.bytecode.Bytecodes.SWAP; -import static jdk.compiler.graal.bytecode.Bytecodes.TABLESWITCH; -import static jdk.compiler.graal.bytecode.Bytecodes.WIDE; -import static jdk.compiler.graal.core.common.GraalOptions.SupportJsrBytecodes; -import static jdk.compiler.graal.java.BciBlockMapping.Options.MaxDuplicationFactor; +package jdk.graal.compiler.java; + +import static jdk.graal.compiler.bytecode.Bytecodes.AALOAD; +import static jdk.graal.compiler.bytecode.Bytecodes.AASTORE; +import static jdk.graal.compiler.bytecode.Bytecodes.ACONST_NULL; +import static jdk.graal.compiler.bytecode.Bytecodes.ALOAD; +import static jdk.graal.compiler.bytecode.Bytecodes.ALOAD_0; +import static jdk.graal.compiler.bytecode.Bytecodes.ALOAD_1; +import static jdk.graal.compiler.bytecode.Bytecodes.ALOAD_2; +import static jdk.graal.compiler.bytecode.Bytecodes.ALOAD_3; +import static jdk.graal.compiler.bytecode.Bytecodes.ANEWARRAY; +import static jdk.graal.compiler.bytecode.Bytecodes.ARETURN; +import static jdk.graal.compiler.bytecode.Bytecodes.ARRAYLENGTH; +import static jdk.graal.compiler.bytecode.Bytecodes.ASTORE; +import static jdk.graal.compiler.bytecode.Bytecodes.ASTORE_0; +import static jdk.graal.compiler.bytecode.Bytecodes.ASTORE_1; +import static jdk.graal.compiler.bytecode.Bytecodes.ASTORE_2; +import static jdk.graal.compiler.bytecode.Bytecodes.ASTORE_3; +import static jdk.graal.compiler.bytecode.Bytecodes.ATHROW; +import static jdk.graal.compiler.bytecode.Bytecodes.BALOAD; +import static jdk.graal.compiler.bytecode.Bytecodes.BASTORE; +import static jdk.graal.compiler.bytecode.Bytecodes.BIPUSH; +import static jdk.graal.compiler.bytecode.Bytecodes.BREAKPOINT; +import static jdk.graal.compiler.bytecode.Bytecodes.CALOAD; +import static jdk.graal.compiler.bytecode.Bytecodes.CASTORE; +import static jdk.graal.compiler.bytecode.Bytecodes.CHECKCAST; +import static jdk.graal.compiler.bytecode.Bytecodes.D2F; +import static jdk.graal.compiler.bytecode.Bytecodes.D2I; +import static jdk.graal.compiler.bytecode.Bytecodes.D2L; +import static jdk.graal.compiler.bytecode.Bytecodes.DADD; +import static jdk.graal.compiler.bytecode.Bytecodes.DALOAD; +import static jdk.graal.compiler.bytecode.Bytecodes.DASTORE; +import static jdk.graal.compiler.bytecode.Bytecodes.DCMPG; +import static jdk.graal.compiler.bytecode.Bytecodes.DCMPL; +import static jdk.graal.compiler.bytecode.Bytecodes.DCONST_0; +import static jdk.graal.compiler.bytecode.Bytecodes.DCONST_1; +import static jdk.graal.compiler.bytecode.Bytecodes.DDIV; +import static jdk.graal.compiler.bytecode.Bytecodes.DLOAD; +import static jdk.graal.compiler.bytecode.Bytecodes.DLOAD_0; +import static jdk.graal.compiler.bytecode.Bytecodes.DLOAD_1; +import static jdk.graal.compiler.bytecode.Bytecodes.DLOAD_2; +import static jdk.graal.compiler.bytecode.Bytecodes.DLOAD_3; +import static jdk.graal.compiler.bytecode.Bytecodes.DMUL; +import static jdk.graal.compiler.bytecode.Bytecodes.DNEG; +import static jdk.graal.compiler.bytecode.Bytecodes.DREM; +import static jdk.graal.compiler.bytecode.Bytecodes.DRETURN; +import static jdk.graal.compiler.bytecode.Bytecodes.DSTORE; +import static jdk.graal.compiler.bytecode.Bytecodes.DSTORE_0; +import static jdk.graal.compiler.bytecode.Bytecodes.DSTORE_1; +import static jdk.graal.compiler.bytecode.Bytecodes.DSTORE_2; +import static jdk.graal.compiler.bytecode.Bytecodes.DSTORE_3; +import static jdk.graal.compiler.bytecode.Bytecodes.DSUB; +import static jdk.graal.compiler.bytecode.Bytecodes.DUP; +import static jdk.graal.compiler.bytecode.Bytecodes.DUP2; +import static jdk.graal.compiler.bytecode.Bytecodes.DUP2_X1; +import static jdk.graal.compiler.bytecode.Bytecodes.DUP2_X2; +import static jdk.graal.compiler.bytecode.Bytecodes.DUP_X1; +import static jdk.graal.compiler.bytecode.Bytecodes.DUP_X2; +import static jdk.graal.compiler.bytecode.Bytecodes.F2D; +import static jdk.graal.compiler.bytecode.Bytecodes.F2I; +import static jdk.graal.compiler.bytecode.Bytecodes.F2L; +import static jdk.graal.compiler.bytecode.Bytecodes.FADD; +import static jdk.graal.compiler.bytecode.Bytecodes.FALOAD; +import static jdk.graal.compiler.bytecode.Bytecodes.FASTORE; +import static jdk.graal.compiler.bytecode.Bytecodes.FCMPG; +import static jdk.graal.compiler.bytecode.Bytecodes.FCMPL; +import static jdk.graal.compiler.bytecode.Bytecodes.FCONST_0; +import static jdk.graal.compiler.bytecode.Bytecodes.FCONST_1; +import static jdk.graal.compiler.bytecode.Bytecodes.FCONST_2; +import static jdk.graal.compiler.bytecode.Bytecodes.FDIV; +import static jdk.graal.compiler.bytecode.Bytecodes.FLOAD; +import static jdk.graal.compiler.bytecode.Bytecodes.FLOAD_0; +import static jdk.graal.compiler.bytecode.Bytecodes.FLOAD_1; +import static jdk.graal.compiler.bytecode.Bytecodes.FLOAD_2; +import static jdk.graal.compiler.bytecode.Bytecodes.FLOAD_3; +import static jdk.graal.compiler.bytecode.Bytecodes.FMUL; +import static jdk.graal.compiler.bytecode.Bytecodes.FNEG; +import static jdk.graal.compiler.bytecode.Bytecodes.FREM; +import static jdk.graal.compiler.bytecode.Bytecodes.FRETURN; +import static jdk.graal.compiler.bytecode.Bytecodes.FSTORE; +import static jdk.graal.compiler.bytecode.Bytecodes.FSTORE_0; +import static jdk.graal.compiler.bytecode.Bytecodes.FSTORE_1; +import static jdk.graal.compiler.bytecode.Bytecodes.FSTORE_2; +import static jdk.graal.compiler.bytecode.Bytecodes.FSTORE_3; +import static jdk.graal.compiler.bytecode.Bytecodes.FSUB; +import static jdk.graal.compiler.bytecode.Bytecodes.GETFIELD; +import static jdk.graal.compiler.bytecode.Bytecodes.GETSTATIC; +import static jdk.graal.compiler.bytecode.Bytecodes.GOTO; +import static jdk.graal.compiler.bytecode.Bytecodes.GOTO_W; +import static jdk.graal.compiler.bytecode.Bytecodes.I2B; +import static jdk.graal.compiler.bytecode.Bytecodes.I2C; +import static jdk.graal.compiler.bytecode.Bytecodes.I2D; +import static jdk.graal.compiler.bytecode.Bytecodes.I2F; +import static jdk.graal.compiler.bytecode.Bytecodes.I2L; +import static jdk.graal.compiler.bytecode.Bytecodes.I2S; +import static jdk.graal.compiler.bytecode.Bytecodes.IADD; +import static jdk.graal.compiler.bytecode.Bytecodes.IALOAD; +import static jdk.graal.compiler.bytecode.Bytecodes.IAND; +import static jdk.graal.compiler.bytecode.Bytecodes.IASTORE; +import static jdk.graal.compiler.bytecode.Bytecodes.ICONST_0; +import static jdk.graal.compiler.bytecode.Bytecodes.ICONST_1; +import static jdk.graal.compiler.bytecode.Bytecodes.ICONST_2; +import static jdk.graal.compiler.bytecode.Bytecodes.ICONST_3; +import static jdk.graal.compiler.bytecode.Bytecodes.ICONST_4; +import static jdk.graal.compiler.bytecode.Bytecodes.ICONST_5; +import static jdk.graal.compiler.bytecode.Bytecodes.ICONST_M1; +import static jdk.graal.compiler.bytecode.Bytecodes.IDIV; +import static jdk.graal.compiler.bytecode.Bytecodes.IFEQ; +import static jdk.graal.compiler.bytecode.Bytecodes.IFGE; +import static jdk.graal.compiler.bytecode.Bytecodes.IFGT; +import static jdk.graal.compiler.bytecode.Bytecodes.IFLE; +import static jdk.graal.compiler.bytecode.Bytecodes.IFLT; +import static jdk.graal.compiler.bytecode.Bytecodes.IFNE; +import static jdk.graal.compiler.bytecode.Bytecodes.IFNONNULL; +import static jdk.graal.compiler.bytecode.Bytecodes.IFNULL; +import static jdk.graal.compiler.bytecode.Bytecodes.IF_ACMPEQ; +import static jdk.graal.compiler.bytecode.Bytecodes.IF_ACMPNE; +import static jdk.graal.compiler.bytecode.Bytecodes.IF_ICMPEQ; +import static jdk.graal.compiler.bytecode.Bytecodes.IF_ICMPGE; +import static jdk.graal.compiler.bytecode.Bytecodes.IF_ICMPGT; +import static jdk.graal.compiler.bytecode.Bytecodes.IF_ICMPLE; +import static jdk.graal.compiler.bytecode.Bytecodes.IF_ICMPLT; +import static jdk.graal.compiler.bytecode.Bytecodes.IF_ICMPNE; +import static jdk.graal.compiler.bytecode.Bytecodes.IINC; +import static jdk.graal.compiler.bytecode.Bytecodes.ILOAD; +import static jdk.graal.compiler.bytecode.Bytecodes.ILOAD_0; +import static jdk.graal.compiler.bytecode.Bytecodes.ILOAD_1; +import static jdk.graal.compiler.bytecode.Bytecodes.ILOAD_2; +import static jdk.graal.compiler.bytecode.Bytecodes.ILOAD_3; +import static jdk.graal.compiler.bytecode.Bytecodes.IMUL; +import static jdk.graal.compiler.bytecode.Bytecodes.INEG; +import static jdk.graal.compiler.bytecode.Bytecodes.INSTANCEOF; +import static jdk.graal.compiler.bytecode.Bytecodes.INVOKEDYNAMIC; +import static jdk.graal.compiler.bytecode.Bytecodes.INVOKEINTERFACE; +import static jdk.graal.compiler.bytecode.Bytecodes.INVOKESPECIAL; +import static jdk.graal.compiler.bytecode.Bytecodes.INVOKESTATIC; +import static jdk.graal.compiler.bytecode.Bytecodes.INVOKEVIRTUAL; +import static jdk.graal.compiler.bytecode.Bytecodes.IOR; +import static jdk.graal.compiler.bytecode.Bytecodes.IREM; +import static jdk.graal.compiler.bytecode.Bytecodes.IRETURN; +import static jdk.graal.compiler.bytecode.Bytecodes.ISHL; +import static jdk.graal.compiler.bytecode.Bytecodes.ISHR; +import static jdk.graal.compiler.bytecode.Bytecodes.ISTORE; +import static jdk.graal.compiler.bytecode.Bytecodes.ISTORE_0; +import static jdk.graal.compiler.bytecode.Bytecodes.ISTORE_1; +import static jdk.graal.compiler.bytecode.Bytecodes.ISTORE_2; +import static jdk.graal.compiler.bytecode.Bytecodes.ISTORE_3; +import static jdk.graal.compiler.bytecode.Bytecodes.ISUB; +import static jdk.graal.compiler.bytecode.Bytecodes.IUSHR; +import static jdk.graal.compiler.bytecode.Bytecodes.IXOR; +import static jdk.graal.compiler.bytecode.Bytecodes.JSR; +import static jdk.graal.compiler.bytecode.Bytecodes.JSR_W; +import static jdk.graal.compiler.bytecode.Bytecodes.L2D; +import static jdk.graal.compiler.bytecode.Bytecodes.L2F; +import static jdk.graal.compiler.bytecode.Bytecodes.L2I; +import static jdk.graal.compiler.bytecode.Bytecodes.LADD; +import static jdk.graal.compiler.bytecode.Bytecodes.LALOAD; +import static jdk.graal.compiler.bytecode.Bytecodes.LAND; +import static jdk.graal.compiler.bytecode.Bytecodes.LASTORE; +import static jdk.graal.compiler.bytecode.Bytecodes.LCMP; +import static jdk.graal.compiler.bytecode.Bytecodes.LCONST_0; +import static jdk.graal.compiler.bytecode.Bytecodes.LCONST_1; +import static jdk.graal.compiler.bytecode.Bytecodes.LDC; +import static jdk.graal.compiler.bytecode.Bytecodes.LDC2_W; +import static jdk.graal.compiler.bytecode.Bytecodes.LDC_W; +import static jdk.graal.compiler.bytecode.Bytecodes.LDIV; +import static jdk.graal.compiler.bytecode.Bytecodes.LLOAD; +import static jdk.graal.compiler.bytecode.Bytecodes.LLOAD_0; +import static jdk.graal.compiler.bytecode.Bytecodes.LLOAD_1; +import static jdk.graal.compiler.bytecode.Bytecodes.LLOAD_2; +import static jdk.graal.compiler.bytecode.Bytecodes.LLOAD_3; +import static jdk.graal.compiler.bytecode.Bytecodes.LMUL; +import static jdk.graal.compiler.bytecode.Bytecodes.LNEG; +import static jdk.graal.compiler.bytecode.Bytecodes.LOOKUPSWITCH; +import static jdk.graal.compiler.bytecode.Bytecodes.LOR; +import static jdk.graal.compiler.bytecode.Bytecodes.LREM; +import static jdk.graal.compiler.bytecode.Bytecodes.LRETURN; +import static jdk.graal.compiler.bytecode.Bytecodes.LSHL; +import static jdk.graal.compiler.bytecode.Bytecodes.LSHR; +import static jdk.graal.compiler.bytecode.Bytecodes.LSTORE; +import static jdk.graal.compiler.bytecode.Bytecodes.LSTORE_0; +import static jdk.graal.compiler.bytecode.Bytecodes.LSTORE_1; +import static jdk.graal.compiler.bytecode.Bytecodes.LSTORE_2; +import static jdk.graal.compiler.bytecode.Bytecodes.LSTORE_3; +import static jdk.graal.compiler.bytecode.Bytecodes.LSUB; +import static jdk.graal.compiler.bytecode.Bytecodes.LUSHR; +import static jdk.graal.compiler.bytecode.Bytecodes.LXOR; +import static jdk.graal.compiler.bytecode.Bytecodes.MONITORENTER; +import static jdk.graal.compiler.bytecode.Bytecodes.MONITOREXIT; +import static jdk.graal.compiler.bytecode.Bytecodes.MULTIANEWARRAY; +import static jdk.graal.compiler.bytecode.Bytecodes.NEW; +import static jdk.graal.compiler.bytecode.Bytecodes.NEWARRAY; +import static jdk.graal.compiler.bytecode.Bytecodes.NOP; +import static jdk.graal.compiler.bytecode.Bytecodes.POP; +import static jdk.graal.compiler.bytecode.Bytecodes.POP2; +import static jdk.graal.compiler.bytecode.Bytecodes.PUTFIELD; +import static jdk.graal.compiler.bytecode.Bytecodes.PUTSTATIC; +import static jdk.graal.compiler.bytecode.Bytecodes.RET; +import static jdk.graal.compiler.bytecode.Bytecodes.RETURN; +import static jdk.graal.compiler.bytecode.Bytecodes.SALOAD; +import static jdk.graal.compiler.bytecode.Bytecodes.SASTORE; +import static jdk.graal.compiler.bytecode.Bytecodes.SIPUSH; +import static jdk.graal.compiler.bytecode.Bytecodes.SWAP; +import static jdk.graal.compiler.bytecode.Bytecodes.TABLESWITCH; +import static jdk.graal.compiler.bytecode.Bytecodes.WIDE; +import static jdk.graal.compiler.core.common.GraalOptions.SupportJsrBytecodes; +import static jdk.graal.compiler.java.BciBlockMapping.Options.MaxDuplicationFactor; import java.util.ArrayDeque; import java.util.ArrayList; @@ -246,21 +246,21 @@ import org.graalvm.collections.EconomicMap; import org.graalvm.collections.EconomicSet; import org.graalvm.collections.Equivalence; -import jdk.compiler.graal.bytecode.Bytecode; -import jdk.compiler.graal.bytecode.BytecodeLookupSwitch; -import jdk.compiler.graal.bytecode.BytecodeStream; -import jdk.compiler.graal.bytecode.BytecodeSwitch; -import jdk.compiler.graal.bytecode.BytecodeTableSwitch; -import jdk.compiler.graal.bytecode.Bytecodes; -import jdk.compiler.graal.core.common.PermanentBailoutException; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.debug.DebugContext.Scope; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.debug.JavaMethodContext; -import jdk.compiler.graal.options.Option; -import jdk.compiler.graal.options.OptionKey; -import jdk.compiler.graal.options.OptionType; -import jdk.compiler.graal.options.OptionValues; +import jdk.graal.compiler.bytecode.Bytecode; +import jdk.graal.compiler.bytecode.BytecodeLookupSwitch; +import jdk.graal.compiler.bytecode.BytecodeStream; +import jdk.graal.compiler.bytecode.BytecodeSwitch; +import jdk.graal.compiler.bytecode.BytecodeTableSwitch; +import jdk.graal.compiler.bytecode.Bytecodes; +import jdk.graal.compiler.core.common.PermanentBailoutException; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.debug.DebugContext.Scope; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.debug.JavaMethodContext; +import jdk.graal.compiler.options.Option; +import jdk.graal.compiler.options.OptionKey; +import jdk.graal.compiler.options.OptionType; +import jdk.graal.compiler.options.OptionValues; import jdk.vm.ci.code.BytecodeFrame; import jdk.vm.ci.meta.ExceptionHandler; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/java/BytecodeParser.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/java/BytecodeParser.java similarity index 91% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/java/BytecodeParser.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/java/BytecodeParser.java index f8108e62cedd..59ee7122a807 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/java/BytecodeParser.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/java/BytecodeParser.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.java; +package jdk.graal.compiler.java; import static java.lang.String.format; import static java.lang.reflect.Modifier.STATIC; @@ -39,226 +39,226 @@ import static jdk.vm.ci.runtime.JVMCICompiler.INVOCATION_ENTRY_BCI; import static jdk.vm.ci.services.Services.IS_BUILDING_NATIVE_IMAGE; import static jdk.vm.ci.services.Services.IS_IN_NATIVE_IMAGE; -import static jdk.compiler.graal.bytecode.Bytecodes.AALOAD; -import static jdk.compiler.graal.bytecode.Bytecodes.AASTORE; -import static jdk.compiler.graal.bytecode.Bytecodes.ACONST_NULL; -import static jdk.compiler.graal.bytecode.Bytecodes.ALOAD; -import static jdk.compiler.graal.bytecode.Bytecodes.ALOAD_0; -import static jdk.compiler.graal.bytecode.Bytecodes.ALOAD_1; -import static jdk.compiler.graal.bytecode.Bytecodes.ALOAD_2; -import static jdk.compiler.graal.bytecode.Bytecodes.ALOAD_3; -import static jdk.compiler.graal.bytecode.Bytecodes.ANEWARRAY; -import static jdk.compiler.graal.bytecode.Bytecodes.ARETURN; -import static jdk.compiler.graal.bytecode.Bytecodes.ARRAYLENGTH; -import static jdk.compiler.graal.bytecode.Bytecodes.ASTORE; -import static jdk.compiler.graal.bytecode.Bytecodes.ASTORE_0; -import static jdk.compiler.graal.bytecode.Bytecodes.ASTORE_1; -import static jdk.compiler.graal.bytecode.Bytecodes.ASTORE_2; -import static jdk.compiler.graal.bytecode.Bytecodes.ASTORE_3; -import static jdk.compiler.graal.bytecode.Bytecodes.ATHROW; -import static jdk.compiler.graal.bytecode.Bytecodes.BALOAD; -import static jdk.compiler.graal.bytecode.Bytecodes.BASTORE; -import static jdk.compiler.graal.bytecode.Bytecodes.BIPUSH; -import static jdk.compiler.graal.bytecode.Bytecodes.BREAKPOINT; -import static jdk.compiler.graal.bytecode.Bytecodes.CALOAD; -import static jdk.compiler.graal.bytecode.Bytecodes.CASTORE; -import static jdk.compiler.graal.bytecode.Bytecodes.CHECKCAST; -import static jdk.compiler.graal.bytecode.Bytecodes.D2F; -import static jdk.compiler.graal.bytecode.Bytecodes.D2I; -import static jdk.compiler.graal.bytecode.Bytecodes.D2L; -import static jdk.compiler.graal.bytecode.Bytecodes.DADD; -import static jdk.compiler.graal.bytecode.Bytecodes.DALOAD; -import static jdk.compiler.graal.bytecode.Bytecodes.DASTORE; -import static jdk.compiler.graal.bytecode.Bytecodes.DCMPG; -import static jdk.compiler.graal.bytecode.Bytecodes.DCMPL; -import static jdk.compiler.graal.bytecode.Bytecodes.DCONST_0; -import static jdk.compiler.graal.bytecode.Bytecodes.DCONST_1; -import static jdk.compiler.graal.bytecode.Bytecodes.DDIV; -import static jdk.compiler.graal.bytecode.Bytecodes.DLOAD; -import static jdk.compiler.graal.bytecode.Bytecodes.DLOAD_0; -import static jdk.compiler.graal.bytecode.Bytecodes.DLOAD_1; -import static jdk.compiler.graal.bytecode.Bytecodes.DLOAD_2; -import static jdk.compiler.graal.bytecode.Bytecodes.DLOAD_3; -import static jdk.compiler.graal.bytecode.Bytecodes.DMUL; -import static jdk.compiler.graal.bytecode.Bytecodes.DNEG; -import static jdk.compiler.graal.bytecode.Bytecodes.DREM; -import static jdk.compiler.graal.bytecode.Bytecodes.DRETURN; -import static jdk.compiler.graal.bytecode.Bytecodes.DSTORE; -import static jdk.compiler.graal.bytecode.Bytecodes.DSTORE_0; -import static jdk.compiler.graal.bytecode.Bytecodes.DSTORE_1; -import static jdk.compiler.graal.bytecode.Bytecodes.DSTORE_2; -import static jdk.compiler.graal.bytecode.Bytecodes.DSTORE_3; -import static jdk.compiler.graal.bytecode.Bytecodes.DSUB; -import static jdk.compiler.graal.bytecode.Bytecodes.DUP; -import static jdk.compiler.graal.bytecode.Bytecodes.DUP2; -import static jdk.compiler.graal.bytecode.Bytecodes.DUP2_X1; -import static jdk.compiler.graal.bytecode.Bytecodes.DUP2_X2; -import static jdk.compiler.graal.bytecode.Bytecodes.DUP_X1; -import static jdk.compiler.graal.bytecode.Bytecodes.DUP_X2; -import static jdk.compiler.graal.bytecode.Bytecodes.F2D; -import static jdk.compiler.graal.bytecode.Bytecodes.F2I; -import static jdk.compiler.graal.bytecode.Bytecodes.F2L; -import static jdk.compiler.graal.bytecode.Bytecodes.FADD; -import static jdk.compiler.graal.bytecode.Bytecodes.FALOAD; -import static jdk.compiler.graal.bytecode.Bytecodes.FASTORE; -import static jdk.compiler.graal.bytecode.Bytecodes.FCMPG; -import static jdk.compiler.graal.bytecode.Bytecodes.FCMPL; -import static jdk.compiler.graal.bytecode.Bytecodes.FCONST_0; -import static jdk.compiler.graal.bytecode.Bytecodes.FCONST_1; -import static jdk.compiler.graal.bytecode.Bytecodes.FCONST_2; -import static jdk.compiler.graal.bytecode.Bytecodes.FDIV; -import static jdk.compiler.graal.bytecode.Bytecodes.FLOAD; -import static jdk.compiler.graal.bytecode.Bytecodes.FLOAD_0; -import static jdk.compiler.graal.bytecode.Bytecodes.FLOAD_1; -import static jdk.compiler.graal.bytecode.Bytecodes.FLOAD_2; -import static jdk.compiler.graal.bytecode.Bytecodes.FLOAD_3; -import static jdk.compiler.graal.bytecode.Bytecodes.FMUL; -import static jdk.compiler.graal.bytecode.Bytecodes.FNEG; -import static jdk.compiler.graal.bytecode.Bytecodes.FREM; -import static jdk.compiler.graal.bytecode.Bytecodes.FRETURN; -import static jdk.compiler.graal.bytecode.Bytecodes.FSTORE; -import static jdk.compiler.graal.bytecode.Bytecodes.FSTORE_0; -import static jdk.compiler.graal.bytecode.Bytecodes.FSTORE_1; -import static jdk.compiler.graal.bytecode.Bytecodes.FSTORE_2; -import static jdk.compiler.graal.bytecode.Bytecodes.FSTORE_3; -import static jdk.compiler.graal.bytecode.Bytecodes.FSUB; -import static jdk.compiler.graal.bytecode.Bytecodes.GETFIELD; -import static jdk.compiler.graal.bytecode.Bytecodes.GETSTATIC; -import static jdk.compiler.graal.bytecode.Bytecodes.GOTO; -import static jdk.compiler.graal.bytecode.Bytecodes.GOTO_W; -import static jdk.compiler.graal.bytecode.Bytecodes.I2B; -import static jdk.compiler.graal.bytecode.Bytecodes.I2C; -import static jdk.compiler.graal.bytecode.Bytecodes.I2D; -import static jdk.compiler.graal.bytecode.Bytecodes.I2F; -import static jdk.compiler.graal.bytecode.Bytecodes.I2L; -import static jdk.compiler.graal.bytecode.Bytecodes.I2S; -import static jdk.compiler.graal.bytecode.Bytecodes.IADD; -import static jdk.compiler.graal.bytecode.Bytecodes.IALOAD; -import static jdk.compiler.graal.bytecode.Bytecodes.IAND; -import static jdk.compiler.graal.bytecode.Bytecodes.IASTORE; -import static jdk.compiler.graal.bytecode.Bytecodes.ICONST_0; -import static jdk.compiler.graal.bytecode.Bytecodes.ICONST_1; -import static jdk.compiler.graal.bytecode.Bytecodes.ICONST_2; -import static jdk.compiler.graal.bytecode.Bytecodes.ICONST_3; -import static jdk.compiler.graal.bytecode.Bytecodes.ICONST_4; -import static jdk.compiler.graal.bytecode.Bytecodes.ICONST_5; -import static jdk.compiler.graal.bytecode.Bytecodes.ICONST_M1; -import static jdk.compiler.graal.bytecode.Bytecodes.IDIV; -import static jdk.compiler.graal.bytecode.Bytecodes.IFEQ; -import static jdk.compiler.graal.bytecode.Bytecodes.IFGE; -import static jdk.compiler.graal.bytecode.Bytecodes.IFGT; -import static jdk.compiler.graal.bytecode.Bytecodes.IFLE; -import static jdk.compiler.graal.bytecode.Bytecodes.IFLT; -import static jdk.compiler.graal.bytecode.Bytecodes.IFNE; -import static jdk.compiler.graal.bytecode.Bytecodes.IFNONNULL; -import static jdk.compiler.graal.bytecode.Bytecodes.IFNULL; -import static jdk.compiler.graal.bytecode.Bytecodes.IF_ACMPEQ; -import static jdk.compiler.graal.bytecode.Bytecodes.IF_ACMPNE; -import static jdk.compiler.graal.bytecode.Bytecodes.IF_ICMPEQ; -import static jdk.compiler.graal.bytecode.Bytecodes.IF_ICMPGE; -import static jdk.compiler.graal.bytecode.Bytecodes.IF_ICMPGT; -import static jdk.compiler.graal.bytecode.Bytecodes.IF_ICMPLE; -import static jdk.compiler.graal.bytecode.Bytecodes.IF_ICMPLT; -import static jdk.compiler.graal.bytecode.Bytecodes.IF_ICMPNE; -import static jdk.compiler.graal.bytecode.Bytecodes.IINC; -import static jdk.compiler.graal.bytecode.Bytecodes.ILOAD; -import static jdk.compiler.graal.bytecode.Bytecodes.ILOAD_0; -import static jdk.compiler.graal.bytecode.Bytecodes.ILOAD_1; -import static jdk.compiler.graal.bytecode.Bytecodes.ILOAD_2; -import static jdk.compiler.graal.bytecode.Bytecodes.ILOAD_3; -import static jdk.compiler.graal.bytecode.Bytecodes.IMUL; -import static jdk.compiler.graal.bytecode.Bytecodes.INEG; -import static jdk.compiler.graal.bytecode.Bytecodes.INSTANCEOF; -import static jdk.compiler.graal.bytecode.Bytecodes.INVOKEDYNAMIC; -import static jdk.compiler.graal.bytecode.Bytecodes.INVOKEINTERFACE; -import static jdk.compiler.graal.bytecode.Bytecodes.INVOKESPECIAL; -import static jdk.compiler.graal.bytecode.Bytecodes.INVOKESTATIC; -import static jdk.compiler.graal.bytecode.Bytecodes.INVOKEVIRTUAL; -import static jdk.compiler.graal.bytecode.Bytecodes.IOR; -import static jdk.compiler.graal.bytecode.Bytecodes.IREM; -import static jdk.compiler.graal.bytecode.Bytecodes.IRETURN; -import static jdk.compiler.graal.bytecode.Bytecodes.ISHL; -import static jdk.compiler.graal.bytecode.Bytecodes.ISHR; -import static jdk.compiler.graal.bytecode.Bytecodes.ISTORE; -import static jdk.compiler.graal.bytecode.Bytecodes.ISTORE_0; -import static jdk.compiler.graal.bytecode.Bytecodes.ISTORE_1; -import static jdk.compiler.graal.bytecode.Bytecodes.ISTORE_2; -import static jdk.compiler.graal.bytecode.Bytecodes.ISTORE_3; -import static jdk.compiler.graal.bytecode.Bytecodes.ISUB; -import static jdk.compiler.graal.bytecode.Bytecodes.IUSHR; -import static jdk.compiler.graal.bytecode.Bytecodes.IXOR; -import static jdk.compiler.graal.bytecode.Bytecodes.JSR; -import static jdk.compiler.graal.bytecode.Bytecodes.JSR_W; -import static jdk.compiler.graal.bytecode.Bytecodes.L2D; -import static jdk.compiler.graal.bytecode.Bytecodes.L2F; -import static jdk.compiler.graal.bytecode.Bytecodes.L2I; -import static jdk.compiler.graal.bytecode.Bytecodes.LADD; -import static jdk.compiler.graal.bytecode.Bytecodes.LALOAD; -import static jdk.compiler.graal.bytecode.Bytecodes.LAND; -import static jdk.compiler.graal.bytecode.Bytecodes.LASTORE; -import static jdk.compiler.graal.bytecode.Bytecodes.LCMP; -import static jdk.compiler.graal.bytecode.Bytecodes.LCONST_0; -import static jdk.compiler.graal.bytecode.Bytecodes.LCONST_1; -import static jdk.compiler.graal.bytecode.Bytecodes.LDC; -import static jdk.compiler.graal.bytecode.Bytecodes.LDC2_W; -import static jdk.compiler.graal.bytecode.Bytecodes.LDC_W; -import static jdk.compiler.graal.bytecode.Bytecodes.LDIV; -import static jdk.compiler.graal.bytecode.Bytecodes.LLOAD; -import static jdk.compiler.graal.bytecode.Bytecodes.LLOAD_0; -import static jdk.compiler.graal.bytecode.Bytecodes.LLOAD_1; -import static jdk.compiler.graal.bytecode.Bytecodes.LLOAD_2; -import static jdk.compiler.graal.bytecode.Bytecodes.LLOAD_3; -import static jdk.compiler.graal.bytecode.Bytecodes.LMUL; -import static jdk.compiler.graal.bytecode.Bytecodes.LNEG; -import static jdk.compiler.graal.bytecode.Bytecodes.LOOKUPSWITCH; -import static jdk.compiler.graal.bytecode.Bytecodes.LOR; -import static jdk.compiler.graal.bytecode.Bytecodes.LREM; -import static jdk.compiler.graal.bytecode.Bytecodes.LRETURN; -import static jdk.compiler.graal.bytecode.Bytecodes.LSHL; -import static jdk.compiler.graal.bytecode.Bytecodes.LSHR; -import static jdk.compiler.graal.bytecode.Bytecodes.LSTORE; -import static jdk.compiler.graal.bytecode.Bytecodes.LSTORE_0; -import static jdk.compiler.graal.bytecode.Bytecodes.LSTORE_1; -import static jdk.compiler.graal.bytecode.Bytecodes.LSTORE_2; -import static jdk.compiler.graal.bytecode.Bytecodes.LSTORE_3; -import static jdk.compiler.graal.bytecode.Bytecodes.LSUB; -import static jdk.compiler.graal.bytecode.Bytecodes.LUSHR; -import static jdk.compiler.graal.bytecode.Bytecodes.LXOR; -import static jdk.compiler.graal.bytecode.Bytecodes.MONITORENTER; -import static jdk.compiler.graal.bytecode.Bytecodes.MONITOREXIT; -import static jdk.compiler.graal.bytecode.Bytecodes.MULTIANEWARRAY; -import static jdk.compiler.graal.bytecode.Bytecodes.NEW; -import static jdk.compiler.graal.bytecode.Bytecodes.NEWARRAY; -import static jdk.compiler.graal.bytecode.Bytecodes.NOP; -import static jdk.compiler.graal.bytecode.Bytecodes.POP; -import static jdk.compiler.graal.bytecode.Bytecodes.POP2; -import static jdk.compiler.graal.bytecode.Bytecodes.PUTFIELD; -import static jdk.compiler.graal.bytecode.Bytecodes.PUTSTATIC; -import static jdk.compiler.graal.bytecode.Bytecodes.RET; -import static jdk.compiler.graal.bytecode.Bytecodes.RETURN; -import static jdk.compiler.graal.bytecode.Bytecodes.SALOAD; -import static jdk.compiler.graal.bytecode.Bytecodes.SASTORE; -import static jdk.compiler.graal.bytecode.Bytecodes.SIPUSH; -import static jdk.compiler.graal.bytecode.Bytecodes.SWAP; -import static jdk.compiler.graal.bytecode.Bytecodes.TABLESWITCH; -import static jdk.compiler.graal.bytecode.Bytecodes.nameOf; -import static jdk.compiler.graal.core.common.GraalOptions.DeoptALot; -import static jdk.compiler.graal.core.common.GraalOptions.HotSpotPrintInlining; -import static jdk.compiler.graal.core.common.GraalOptions.PrintProfilingInformation; -import static jdk.compiler.graal.core.common.GraalOptions.StressExplicitExceptionCode; -import static jdk.compiler.graal.core.common.GraalOptions.StressInvokeWithExceptionNode; -import static jdk.compiler.graal.core.common.GraalOptions.StrictDeoptInsertionChecks; -import static jdk.compiler.graal.core.common.GraalOptions.TraceInlining; -import static jdk.compiler.graal.core.common.type.StampFactory.objectNonNull; -import static jdk.compiler.graal.debug.GraalError.guarantee; -import static jdk.compiler.graal.debug.GraalError.shouldNotReachHereUnexpectedValue; -import static jdk.compiler.graal.java.BytecodeParserOptions.InlinePartialIntrinsicExitDuringParsing; -import static jdk.compiler.graal.java.BytecodeParserOptions.TraceBytecodeParserLevel; -import static jdk.compiler.graal.java.BytecodeParserOptions.TraceInlineDuringParsing; -import static jdk.compiler.graal.java.BytecodeParserOptions.TraceParserPlugins; -import static jdk.compiler.graal.nodes.extended.BranchProbabilityNode.EXTREMELY_FAST_PATH_PROBABILITY; -import static jdk.compiler.graal.nodes.extended.BranchProbabilityNode.EXTREMELY_SLOW_PATH_PROBABILITY; -import static jdk.compiler.graal.nodes.graphbuilderconf.IntrinsicContext.CompilationContext.INLINE_DURING_PARSING; +import static jdk.graal.compiler.bytecode.Bytecodes.AALOAD; +import static jdk.graal.compiler.bytecode.Bytecodes.AASTORE; +import static jdk.graal.compiler.bytecode.Bytecodes.ACONST_NULL; +import static jdk.graal.compiler.bytecode.Bytecodes.ALOAD; +import static jdk.graal.compiler.bytecode.Bytecodes.ALOAD_0; +import static jdk.graal.compiler.bytecode.Bytecodes.ALOAD_1; +import static jdk.graal.compiler.bytecode.Bytecodes.ALOAD_2; +import static jdk.graal.compiler.bytecode.Bytecodes.ALOAD_3; +import static jdk.graal.compiler.bytecode.Bytecodes.ANEWARRAY; +import static jdk.graal.compiler.bytecode.Bytecodes.ARETURN; +import static jdk.graal.compiler.bytecode.Bytecodes.ARRAYLENGTH; +import static jdk.graal.compiler.bytecode.Bytecodes.ASTORE; +import static jdk.graal.compiler.bytecode.Bytecodes.ASTORE_0; +import static jdk.graal.compiler.bytecode.Bytecodes.ASTORE_1; +import static jdk.graal.compiler.bytecode.Bytecodes.ASTORE_2; +import static jdk.graal.compiler.bytecode.Bytecodes.ASTORE_3; +import static jdk.graal.compiler.bytecode.Bytecodes.ATHROW; +import static jdk.graal.compiler.bytecode.Bytecodes.BALOAD; +import static jdk.graal.compiler.bytecode.Bytecodes.BASTORE; +import static jdk.graal.compiler.bytecode.Bytecodes.BIPUSH; +import static jdk.graal.compiler.bytecode.Bytecodes.BREAKPOINT; +import static jdk.graal.compiler.bytecode.Bytecodes.CALOAD; +import static jdk.graal.compiler.bytecode.Bytecodes.CASTORE; +import static jdk.graal.compiler.bytecode.Bytecodes.CHECKCAST; +import static jdk.graal.compiler.bytecode.Bytecodes.D2F; +import static jdk.graal.compiler.bytecode.Bytecodes.D2I; +import static jdk.graal.compiler.bytecode.Bytecodes.D2L; +import static jdk.graal.compiler.bytecode.Bytecodes.DADD; +import static jdk.graal.compiler.bytecode.Bytecodes.DALOAD; +import static jdk.graal.compiler.bytecode.Bytecodes.DASTORE; +import static jdk.graal.compiler.bytecode.Bytecodes.DCMPG; +import static jdk.graal.compiler.bytecode.Bytecodes.DCMPL; +import static jdk.graal.compiler.bytecode.Bytecodes.DCONST_0; +import static jdk.graal.compiler.bytecode.Bytecodes.DCONST_1; +import static jdk.graal.compiler.bytecode.Bytecodes.DDIV; +import static jdk.graal.compiler.bytecode.Bytecodes.DLOAD; +import static jdk.graal.compiler.bytecode.Bytecodes.DLOAD_0; +import static jdk.graal.compiler.bytecode.Bytecodes.DLOAD_1; +import static jdk.graal.compiler.bytecode.Bytecodes.DLOAD_2; +import static jdk.graal.compiler.bytecode.Bytecodes.DLOAD_3; +import static jdk.graal.compiler.bytecode.Bytecodes.DMUL; +import static jdk.graal.compiler.bytecode.Bytecodes.DNEG; +import static jdk.graal.compiler.bytecode.Bytecodes.DREM; +import static jdk.graal.compiler.bytecode.Bytecodes.DRETURN; +import static jdk.graal.compiler.bytecode.Bytecodes.DSTORE; +import static jdk.graal.compiler.bytecode.Bytecodes.DSTORE_0; +import static jdk.graal.compiler.bytecode.Bytecodes.DSTORE_1; +import static jdk.graal.compiler.bytecode.Bytecodes.DSTORE_2; +import static jdk.graal.compiler.bytecode.Bytecodes.DSTORE_3; +import static jdk.graal.compiler.bytecode.Bytecodes.DSUB; +import static jdk.graal.compiler.bytecode.Bytecodes.DUP; +import static jdk.graal.compiler.bytecode.Bytecodes.DUP2; +import static jdk.graal.compiler.bytecode.Bytecodes.DUP2_X1; +import static jdk.graal.compiler.bytecode.Bytecodes.DUP2_X2; +import static jdk.graal.compiler.bytecode.Bytecodes.DUP_X1; +import static jdk.graal.compiler.bytecode.Bytecodes.DUP_X2; +import static jdk.graal.compiler.bytecode.Bytecodes.F2D; +import static jdk.graal.compiler.bytecode.Bytecodes.F2I; +import static jdk.graal.compiler.bytecode.Bytecodes.F2L; +import static jdk.graal.compiler.bytecode.Bytecodes.FADD; +import static jdk.graal.compiler.bytecode.Bytecodes.FALOAD; +import static jdk.graal.compiler.bytecode.Bytecodes.FASTORE; +import static jdk.graal.compiler.bytecode.Bytecodes.FCMPG; +import static jdk.graal.compiler.bytecode.Bytecodes.FCMPL; +import static jdk.graal.compiler.bytecode.Bytecodes.FCONST_0; +import static jdk.graal.compiler.bytecode.Bytecodes.FCONST_1; +import static jdk.graal.compiler.bytecode.Bytecodes.FCONST_2; +import static jdk.graal.compiler.bytecode.Bytecodes.FDIV; +import static jdk.graal.compiler.bytecode.Bytecodes.FLOAD; +import static jdk.graal.compiler.bytecode.Bytecodes.FLOAD_0; +import static jdk.graal.compiler.bytecode.Bytecodes.FLOAD_1; +import static jdk.graal.compiler.bytecode.Bytecodes.FLOAD_2; +import static jdk.graal.compiler.bytecode.Bytecodes.FLOAD_3; +import static jdk.graal.compiler.bytecode.Bytecodes.FMUL; +import static jdk.graal.compiler.bytecode.Bytecodes.FNEG; +import static jdk.graal.compiler.bytecode.Bytecodes.FREM; +import static jdk.graal.compiler.bytecode.Bytecodes.FRETURN; +import static jdk.graal.compiler.bytecode.Bytecodes.FSTORE; +import static jdk.graal.compiler.bytecode.Bytecodes.FSTORE_0; +import static jdk.graal.compiler.bytecode.Bytecodes.FSTORE_1; +import static jdk.graal.compiler.bytecode.Bytecodes.FSTORE_2; +import static jdk.graal.compiler.bytecode.Bytecodes.FSTORE_3; +import static jdk.graal.compiler.bytecode.Bytecodes.FSUB; +import static jdk.graal.compiler.bytecode.Bytecodes.GETFIELD; +import static jdk.graal.compiler.bytecode.Bytecodes.GETSTATIC; +import static jdk.graal.compiler.bytecode.Bytecodes.GOTO; +import static jdk.graal.compiler.bytecode.Bytecodes.GOTO_W; +import static jdk.graal.compiler.bytecode.Bytecodes.I2B; +import static jdk.graal.compiler.bytecode.Bytecodes.I2C; +import static jdk.graal.compiler.bytecode.Bytecodes.I2D; +import static jdk.graal.compiler.bytecode.Bytecodes.I2F; +import static jdk.graal.compiler.bytecode.Bytecodes.I2L; +import static jdk.graal.compiler.bytecode.Bytecodes.I2S; +import static jdk.graal.compiler.bytecode.Bytecodes.IADD; +import static jdk.graal.compiler.bytecode.Bytecodes.IALOAD; +import static jdk.graal.compiler.bytecode.Bytecodes.IAND; +import static jdk.graal.compiler.bytecode.Bytecodes.IASTORE; +import static jdk.graal.compiler.bytecode.Bytecodes.ICONST_0; +import static jdk.graal.compiler.bytecode.Bytecodes.ICONST_1; +import static jdk.graal.compiler.bytecode.Bytecodes.ICONST_2; +import static jdk.graal.compiler.bytecode.Bytecodes.ICONST_3; +import static jdk.graal.compiler.bytecode.Bytecodes.ICONST_4; +import static jdk.graal.compiler.bytecode.Bytecodes.ICONST_5; +import static jdk.graal.compiler.bytecode.Bytecodes.ICONST_M1; +import static jdk.graal.compiler.bytecode.Bytecodes.IDIV; +import static jdk.graal.compiler.bytecode.Bytecodes.IFEQ; +import static jdk.graal.compiler.bytecode.Bytecodes.IFGE; +import static jdk.graal.compiler.bytecode.Bytecodes.IFGT; +import static jdk.graal.compiler.bytecode.Bytecodes.IFLE; +import static jdk.graal.compiler.bytecode.Bytecodes.IFLT; +import static jdk.graal.compiler.bytecode.Bytecodes.IFNE; +import static jdk.graal.compiler.bytecode.Bytecodes.IFNONNULL; +import static jdk.graal.compiler.bytecode.Bytecodes.IFNULL; +import static jdk.graal.compiler.bytecode.Bytecodes.IF_ACMPEQ; +import static jdk.graal.compiler.bytecode.Bytecodes.IF_ACMPNE; +import static jdk.graal.compiler.bytecode.Bytecodes.IF_ICMPEQ; +import static jdk.graal.compiler.bytecode.Bytecodes.IF_ICMPGE; +import static jdk.graal.compiler.bytecode.Bytecodes.IF_ICMPGT; +import static jdk.graal.compiler.bytecode.Bytecodes.IF_ICMPLE; +import static jdk.graal.compiler.bytecode.Bytecodes.IF_ICMPLT; +import static jdk.graal.compiler.bytecode.Bytecodes.IF_ICMPNE; +import static jdk.graal.compiler.bytecode.Bytecodes.IINC; +import static jdk.graal.compiler.bytecode.Bytecodes.ILOAD; +import static jdk.graal.compiler.bytecode.Bytecodes.ILOAD_0; +import static jdk.graal.compiler.bytecode.Bytecodes.ILOAD_1; +import static jdk.graal.compiler.bytecode.Bytecodes.ILOAD_2; +import static jdk.graal.compiler.bytecode.Bytecodes.ILOAD_3; +import static jdk.graal.compiler.bytecode.Bytecodes.IMUL; +import static jdk.graal.compiler.bytecode.Bytecodes.INEG; +import static jdk.graal.compiler.bytecode.Bytecodes.INSTANCEOF; +import static jdk.graal.compiler.bytecode.Bytecodes.INVOKEDYNAMIC; +import static jdk.graal.compiler.bytecode.Bytecodes.INVOKEINTERFACE; +import static jdk.graal.compiler.bytecode.Bytecodes.INVOKESPECIAL; +import static jdk.graal.compiler.bytecode.Bytecodes.INVOKESTATIC; +import static jdk.graal.compiler.bytecode.Bytecodes.INVOKEVIRTUAL; +import static jdk.graal.compiler.bytecode.Bytecodes.IOR; +import static jdk.graal.compiler.bytecode.Bytecodes.IREM; +import static jdk.graal.compiler.bytecode.Bytecodes.IRETURN; +import static jdk.graal.compiler.bytecode.Bytecodes.ISHL; +import static jdk.graal.compiler.bytecode.Bytecodes.ISHR; +import static jdk.graal.compiler.bytecode.Bytecodes.ISTORE; +import static jdk.graal.compiler.bytecode.Bytecodes.ISTORE_0; +import static jdk.graal.compiler.bytecode.Bytecodes.ISTORE_1; +import static jdk.graal.compiler.bytecode.Bytecodes.ISTORE_2; +import static jdk.graal.compiler.bytecode.Bytecodes.ISTORE_3; +import static jdk.graal.compiler.bytecode.Bytecodes.ISUB; +import static jdk.graal.compiler.bytecode.Bytecodes.IUSHR; +import static jdk.graal.compiler.bytecode.Bytecodes.IXOR; +import static jdk.graal.compiler.bytecode.Bytecodes.JSR; +import static jdk.graal.compiler.bytecode.Bytecodes.JSR_W; +import static jdk.graal.compiler.bytecode.Bytecodes.L2D; +import static jdk.graal.compiler.bytecode.Bytecodes.L2F; +import static jdk.graal.compiler.bytecode.Bytecodes.L2I; +import static jdk.graal.compiler.bytecode.Bytecodes.LADD; +import static jdk.graal.compiler.bytecode.Bytecodes.LALOAD; +import static jdk.graal.compiler.bytecode.Bytecodes.LAND; +import static jdk.graal.compiler.bytecode.Bytecodes.LASTORE; +import static jdk.graal.compiler.bytecode.Bytecodes.LCMP; +import static jdk.graal.compiler.bytecode.Bytecodes.LCONST_0; +import static jdk.graal.compiler.bytecode.Bytecodes.LCONST_1; +import static jdk.graal.compiler.bytecode.Bytecodes.LDC; +import static jdk.graal.compiler.bytecode.Bytecodes.LDC2_W; +import static jdk.graal.compiler.bytecode.Bytecodes.LDC_W; +import static jdk.graal.compiler.bytecode.Bytecodes.LDIV; +import static jdk.graal.compiler.bytecode.Bytecodes.LLOAD; +import static jdk.graal.compiler.bytecode.Bytecodes.LLOAD_0; +import static jdk.graal.compiler.bytecode.Bytecodes.LLOAD_1; +import static jdk.graal.compiler.bytecode.Bytecodes.LLOAD_2; +import static jdk.graal.compiler.bytecode.Bytecodes.LLOAD_3; +import static jdk.graal.compiler.bytecode.Bytecodes.LMUL; +import static jdk.graal.compiler.bytecode.Bytecodes.LNEG; +import static jdk.graal.compiler.bytecode.Bytecodes.LOOKUPSWITCH; +import static jdk.graal.compiler.bytecode.Bytecodes.LOR; +import static jdk.graal.compiler.bytecode.Bytecodes.LREM; +import static jdk.graal.compiler.bytecode.Bytecodes.LRETURN; +import static jdk.graal.compiler.bytecode.Bytecodes.LSHL; +import static jdk.graal.compiler.bytecode.Bytecodes.LSHR; +import static jdk.graal.compiler.bytecode.Bytecodes.LSTORE; +import static jdk.graal.compiler.bytecode.Bytecodes.LSTORE_0; +import static jdk.graal.compiler.bytecode.Bytecodes.LSTORE_1; +import static jdk.graal.compiler.bytecode.Bytecodes.LSTORE_2; +import static jdk.graal.compiler.bytecode.Bytecodes.LSTORE_3; +import static jdk.graal.compiler.bytecode.Bytecodes.LSUB; +import static jdk.graal.compiler.bytecode.Bytecodes.LUSHR; +import static jdk.graal.compiler.bytecode.Bytecodes.LXOR; +import static jdk.graal.compiler.bytecode.Bytecodes.MONITORENTER; +import static jdk.graal.compiler.bytecode.Bytecodes.MONITOREXIT; +import static jdk.graal.compiler.bytecode.Bytecodes.MULTIANEWARRAY; +import static jdk.graal.compiler.bytecode.Bytecodes.NEW; +import static jdk.graal.compiler.bytecode.Bytecodes.NEWARRAY; +import static jdk.graal.compiler.bytecode.Bytecodes.NOP; +import static jdk.graal.compiler.bytecode.Bytecodes.POP; +import static jdk.graal.compiler.bytecode.Bytecodes.POP2; +import static jdk.graal.compiler.bytecode.Bytecodes.PUTFIELD; +import static jdk.graal.compiler.bytecode.Bytecodes.PUTSTATIC; +import static jdk.graal.compiler.bytecode.Bytecodes.RET; +import static jdk.graal.compiler.bytecode.Bytecodes.RETURN; +import static jdk.graal.compiler.bytecode.Bytecodes.SALOAD; +import static jdk.graal.compiler.bytecode.Bytecodes.SASTORE; +import static jdk.graal.compiler.bytecode.Bytecodes.SIPUSH; +import static jdk.graal.compiler.bytecode.Bytecodes.SWAP; +import static jdk.graal.compiler.bytecode.Bytecodes.TABLESWITCH; +import static jdk.graal.compiler.bytecode.Bytecodes.nameOf; +import static jdk.graal.compiler.core.common.GraalOptions.DeoptALot; +import static jdk.graal.compiler.core.common.GraalOptions.HotSpotPrintInlining; +import static jdk.graal.compiler.core.common.GraalOptions.PrintProfilingInformation; +import static jdk.graal.compiler.core.common.GraalOptions.StressExplicitExceptionCode; +import static jdk.graal.compiler.core.common.GraalOptions.StressInvokeWithExceptionNode; +import static jdk.graal.compiler.core.common.GraalOptions.StrictDeoptInsertionChecks; +import static jdk.graal.compiler.core.common.GraalOptions.TraceInlining; +import static jdk.graal.compiler.core.common.type.StampFactory.objectNonNull; +import static jdk.graal.compiler.debug.GraalError.guarantee; +import static jdk.graal.compiler.debug.GraalError.shouldNotReachHereUnexpectedValue; +import static jdk.graal.compiler.java.BytecodeParserOptions.InlinePartialIntrinsicExitDuringParsing; +import static jdk.graal.compiler.java.BytecodeParserOptions.TraceBytecodeParserLevel; +import static jdk.graal.compiler.java.BytecodeParserOptions.TraceInlineDuringParsing; +import static jdk.graal.compiler.java.BytecodeParserOptions.TraceParserPlugins; +import static jdk.graal.compiler.nodes.extended.BranchProbabilityNode.EXTREMELY_FAST_PATH_PROBABILITY; +import static jdk.graal.compiler.nodes.extended.BranchProbabilityNode.EXTREMELY_SLOW_PATH_PROBABILITY; +import static jdk.graal.compiler.nodes.graphbuilderconf.IntrinsicContext.CompilationContext.INLINE_DURING_PARSING; import java.util.ArrayList; import java.util.BitSet; @@ -270,171 +270,171 @@ import org.graalvm.collections.EconomicMap; import org.graalvm.collections.Equivalence; -import jdk.compiler.graal.api.replacements.Fold; -import jdk.compiler.graal.api.replacements.Snippet; -import jdk.compiler.graal.bytecode.Bytecode; -import jdk.compiler.graal.bytecode.BytecodeDisassembler; -import jdk.compiler.graal.bytecode.BytecodeLookupSwitch; -import jdk.compiler.graal.bytecode.BytecodeProvider; -import jdk.compiler.graal.bytecode.BytecodeStream; -import jdk.compiler.graal.bytecode.BytecodeSwitch; -import jdk.compiler.graal.bytecode.BytecodeTableSwitch; -import jdk.compiler.graal.bytecode.Bytecodes; -import jdk.compiler.graal.bytecode.Bytes; -import jdk.compiler.graal.bytecode.ResolvedJavaMethodBytecodeProvider; -import jdk.compiler.graal.core.common.GraalOptions; -import jdk.compiler.graal.core.common.PermanentBailoutException; -import jdk.compiler.graal.core.common.RetryableBailoutException; -import jdk.compiler.graal.core.common.calc.CanonicalCondition; -import jdk.compiler.graal.core.common.calc.Condition; -import jdk.compiler.graal.core.common.calc.Condition.CanonicalizedCondition; -import jdk.compiler.graal.core.common.calc.FloatConvert; -import jdk.compiler.graal.core.common.type.IntegerStamp; -import jdk.compiler.graal.core.common.type.ObjectStamp; -import jdk.compiler.graal.core.common.type.Stamp; -import jdk.compiler.graal.core.common.type.StampFactory; -import jdk.compiler.graal.core.common.type.StampPair; -import jdk.compiler.graal.core.common.type.TypeReference; -import jdk.compiler.graal.core.common.util.Util; -import jdk.compiler.graal.debug.Assertions; -import jdk.compiler.graal.debug.CounterKey; -import jdk.compiler.graal.debug.DebugCloseable; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.debug.DebugOptions; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.debug.Indent; -import jdk.compiler.graal.debug.MethodFilter; -import jdk.compiler.graal.debug.TTY; -import jdk.compiler.graal.graph.Graph.Mark; -import jdk.compiler.graal.graph.Node; -import jdk.compiler.graal.graph.NodeSourcePosition; -import jdk.compiler.graal.graph.iterators.NodeIterable; -import jdk.compiler.graal.java.BciBlockMapping.BciBlock; -import jdk.compiler.graal.java.BciBlockMapping.ExceptionDispatchBlock; -import jdk.compiler.graal.nodes.AbstractBeginNode; -import jdk.compiler.graal.nodes.AbstractMergeNode; -import jdk.compiler.graal.nodes.BeginNode; -import jdk.compiler.graal.nodes.BeginStateSplitNode; -import jdk.compiler.graal.nodes.CallTargetNode; -import jdk.compiler.graal.nodes.CallTargetNode.InvokeKind; -import jdk.compiler.graal.nodes.ConstantNode; -import jdk.compiler.graal.nodes.ControlSplitNode; -import jdk.compiler.graal.nodes.DeoptimizeNode; -import jdk.compiler.graal.nodes.EndNode; -import jdk.compiler.graal.nodes.EntryMarkerNode; -import jdk.compiler.graal.nodes.EntryProxyNode; -import jdk.compiler.graal.nodes.FieldLocationIdentity; -import jdk.compiler.graal.nodes.FixedGuardNode; -import jdk.compiler.graal.nodes.FixedNode; -import jdk.compiler.graal.nodes.FixedWithNextNode; -import jdk.compiler.graal.nodes.FrameState; -import jdk.compiler.graal.nodes.FullInfopointNode; -import jdk.compiler.graal.nodes.IfNode; -import jdk.compiler.graal.nodes.InliningLog; -import jdk.compiler.graal.nodes.InliningLog.PlaceholderInvokable; -import jdk.compiler.graal.nodes.Invokable; -import jdk.compiler.graal.nodes.Invoke; -import jdk.compiler.graal.nodes.InvokeNode; -import jdk.compiler.graal.nodes.InvokeWithExceptionNode; -import jdk.compiler.graal.nodes.LogicConstantNode; -import jdk.compiler.graal.nodes.LogicNegationNode; -import jdk.compiler.graal.nodes.LogicNode; -import jdk.compiler.graal.nodes.LoopBeginNode; -import jdk.compiler.graal.nodes.LoopEndNode; -import jdk.compiler.graal.nodes.LoopExitNode; -import jdk.compiler.graal.nodes.MergeNode; -import jdk.compiler.graal.nodes.NodeView; -import jdk.compiler.graal.nodes.ParameterNode; -import jdk.compiler.graal.nodes.PiNode; -import jdk.compiler.graal.nodes.PluginReplacementNode; -import jdk.compiler.graal.nodes.PluginReplacementWithExceptionNode; -import jdk.compiler.graal.nodes.ProfileData.BranchProbabilityData; -import jdk.compiler.graal.nodes.ProfileData.ProfileSource; -import jdk.compiler.graal.nodes.ProfileData.SwitchProbabilityData; -import jdk.compiler.graal.nodes.ReturnNode; -import jdk.compiler.graal.nodes.StartNode; -import jdk.compiler.graal.nodes.StateSplit; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.UnwindNode; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.ValuePhiNode; -import jdk.compiler.graal.nodes.WithExceptionNode; -import jdk.compiler.graal.nodes.calc.AddNode; -import jdk.compiler.graal.nodes.calc.AndNode; -import jdk.compiler.graal.nodes.calc.CompareNode; -import jdk.compiler.graal.nodes.calc.ConditionalNode; -import jdk.compiler.graal.nodes.calc.FloatConvertNode; -import jdk.compiler.graal.nodes.calc.FloatDivNode; -import jdk.compiler.graal.nodes.calc.FloatNormalizeCompareNode; -import jdk.compiler.graal.nodes.calc.IntegerBelowNode; -import jdk.compiler.graal.nodes.calc.IntegerEqualsNode; -import jdk.compiler.graal.nodes.calc.IntegerLessThanNode; -import jdk.compiler.graal.nodes.calc.IntegerNormalizeCompareNode; -import jdk.compiler.graal.nodes.calc.IsNullNode; -import jdk.compiler.graal.nodes.calc.LeftShiftNode; -import jdk.compiler.graal.nodes.calc.MulNode; -import jdk.compiler.graal.nodes.calc.NarrowNode; -import jdk.compiler.graal.nodes.calc.NegateNode; -import jdk.compiler.graal.nodes.calc.ObjectEqualsNode; -import jdk.compiler.graal.nodes.calc.OrNode; -import jdk.compiler.graal.nodes.calc.RemNode; -import jdk.compiler.graal.nodes.calc.RightShiftNode; -import jdk.compiler.graal.nodes.calc.SignExtendNode; -import jdk.compiler.graal.nodes.calc.SignedDivNode; -import jdk.compiler.graal.nodes.calc.SignedRemNode; -import jdk.compiler.graal.nodes.calc.SubNode; -import jdk.compiler.graal.nodes.calc.UnsignedRightShiftNode; -import jdk.compiler.graal.nodes.calc.XorNode; -import jdk.compiler.graal.nodes.calc.ZeroExtendNode; -import jdk.compiler.graal.nodes.extended.AnchoringNode; -import jdk.compiler.graal.nodes.extended.BranchProbabilityNode; -import jdk.compiler.graal.nodes.extended.BytecodeExceptionNode; -import jdk.compiler.graal.nodes.extended.BytecodeExceptionNode.BytecodeExceptionKind; -import jdk.compiler.graal.nodes.extended.GuardingNode; -import jdk.compiler.graal.nodes.extended.IntegerSwitchNode; -import jdk.compiler.graal.nodes.extended.LoadArrayComponentHubNode; -import jdk.compiler.graal.nodes.extended.LoadHubNode; -import jdk.compiler.graal.nodes.extended.MembarNode; -import jdk.compiler.graal.nodes.extended.StateSplitProxyNode; -import jdk.compiler.graal.nodes.graphbuilderconf.ClassInitializationPlugin; -import jdk.compiler.graal.nodes.graphbuilderconf.GeneratedInvocationPlugin; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration.BytecodeExceptionMode; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext; -import jdk.compiler.graal.nodes.graphbuilderconf.InlineInvokePlugin; -import jdk.compiler.graal.nodes.graphbuilderconf.InlineInvokePlugin.InlineInfo; -import jdk.compiler.graal.nodes.graphbuilderconf.IntrinsicContext; -import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin; -import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPluginContext; -import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins; -import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins.InvocationPluginReceiver; -import jdk.compiler.graal.nodes.graphbuilderconf.NodePlugin; -import jdk.compiler.graal.nodes.java.ArrayLengthNode; -import jdk.compiler.graal.nodes.java.ExceptionObjectNode; -import jdk.compiler.graal.nodes.java.FinalFieldBarrierNode; -import jdk.compiler.graal.nodes.java.InstanceOfDynamicNode; -import jdk.compiler.graal.nodes.java.InstanceOfNode; -import jdk.compiler.graal.nodes.java.LoadFieldNode; -import jdk.compiler.graal.nodes.java.LoadIndexedNode; -import jdk.compiler.graal.nodes.java.MethodCallTargetNode; -import jdk.compiler.graal.nodes.java.MonitorEnterNode; -import jdk.compiler.graal.nodes.java.MonitorExitNode; -import jdk.compiler.graal.nodes.java.MonitorIdNode; -import jdk.compiler.graal.nodes.java.NewArrayNode; -import jdk.compiler.graal.nodes.java.NewInstanceNode; -import jdk.compiler.graal.nodes.java.NewMultiArrayNode; -import jdk.compiler.graal.nodes.java.RegisterFinalizerNode; -import jdk.compiler.graal.nodes.java.StoreFieldNode; -import jdk.compiler.graal.nodes.java.StoreIndexedNode; -import jdk.compiler.graal.nodes.spi.CoreProvidersDelegate; -import jdk.compiler.graal.nodes.type.StampTool; -import jdk.compiler.graal.nodes.util.GraphUtil; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.phases.OptimisticOptimizations; -import jdk.compiler.graal.phases.util.ValueMergeUtil; -import jdk.compiler.graal.replacements.nodes.MacroInvokable; -import jdk.compiler.graal.serviceprovider.GraalServices; -import jdk.compiler.graal.serviceprovider.SpeculationReasonGroup; +import jdk.graal.compiler.api.replacements.Fold; +import jdk.graal.compiler.api.replacements.Snippet; +import jdk.graal.compiler.bytecode.Bytecode; +import jdk.graal.compiler.bytecode.BytecodeDisassembler; +import jdk.graal.compiler.bytecode.BytecodeLookupSwitch; +import jdk.graal.compiler.bytecode.BytecodeProvider; +import jdk.graal.compiler.bytecode.BytecodeStream; +import jdk.graal.compiler.bytecode.BytecodeSwitch; +import jdk.graal.compiler.bytecode.BytecodeTableSwitch; +import jdk.graal.compiler.bytecode.Bytecodes; +import jdk.graal.compiler.bytecode.Bytes; +import jdk.graal.compiler.bytecode.ResolvedJavaMethodBytecodeProvider; +import jdk.graal.compiler.core.common.GraalOptions; +import jdk.graal.compiler.core.common.PermanentBailoutException; +import jdk.graal.compiler.core.common.RetryableBailoutException; +import jdk.graal.compiler.core.common.calc.CanonicalCondition; +import jdk.graal.compiler.core.common.calc.Condition; +import jdk.graal.compiler.core.common.calc.Condition.CanonicalizedCondition; +import jdk.graal.compiler.core.common.calc.FloatConvert; +import jdk.graal.compiler.core.common.type.IntegerStamp; +import jdk.graal.compiler.core.common.type.ObjectStamp; +import jdk.graal.compiler.core.common.type.Stamp; +import jdk.graal.compiler.core.common.type.StampFactory; +import jdk.graal.compiler.core.common.type.StampPair; +import jdk.graal.compiler.core.common.type.TypeReference; +import jdk.graal.compiler.core.common.util.Util; +import jdk.graal.compiler.debug.Assertions; +import jdk.graal.compiler.debug.CounterKey; +import jdk.graal.compiler.debug.DebugCloseable; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.debug.DebugOptions; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.debug.Indent; +import jdk.graal.compiler.debug.MethodFilter; +import jdk.graal.compiler.debug.TTY; +import jdk.graal.compiler.graph.Graph.Mark; +import jdk.graal.compiler.graph.Node; +import jdk.graal.compiler.graph.NodeSourcePosition; +import jdk.graal.compiler.graph.iterators.NodeIterable; +import jdk.graal.compiler.java.BciBlockMapping.BciBlock; +import jdk.graal.compiler.java.BciBlockMapping.ExceptionDispatchBlock; +import jdk.graal.compiler.nodes.AbstractBeginNode; +import jdk.graal.compiler.nodes.AbstractMergeNode; +import jdk.graal.compiler.nodes.BeginNode; +import jdk.graal.compiler.nodes.BeginStateSplitNode; +import jdk.graal.compiler.nodes.CallTargetNode; +import jdk.graal.compiler.nodes.CallTargetNode.InvokeKind; +import jdk.graal.compiler.nodes.ConstantNode; +import jdk.graal.compiler.nodes.ControlSplitNode; +import jdk.graal.compiler.nodes.DeoptimizeNode; +import jdk.graal.compiler.nodes.EndNode; +import jdk.graal.compiler.nodes.EntryMarkerNode; +import jdk.graal.compiler.nodes.EntryProxyNode; +import jdk.graal.compiler.nodes.FieldLocationIdentity; +import jdk.graal.compiler.nodes.FixedGuardNode; +import jdk.graal.compiler.nodes.FixedNode; +import jdk.graal.compiler.nodes.FixedWithNextNode; +import jdk.graal.compiler.nodes.FrameState; +import jdk.graal.compiler.nodes.FullInfopointNode; +import jdk.graal.compiler.nodes.IfNode; +import jdk.graal.compiler.nodes.InliningLog; +import jdk.graal.compiler.nodes.InliningLog.PlaceholderInvokable; +import jdk.graal.compiler.nodes.Invokable; +import jdk.graal.compiler.nodes.Invoke; +import jdk.graal.compiler.nodes.InvokeNode; +import jdk.graal.compiler.nodes.InvokeWithExceptionNode; +import jdk.graal.compiler.nodes.LogicConstantNode; +import jdk.graal.compiler.nodes.LogicNegationNode; +import jdk.graal.compiler.nodes.LogicNode; +import jdk.graal.compiler.nodes.LoopBeginNode; +import jdk.graal.compiler.nodes.LoopEndNode; +import jdk.graal.compiler.nodes.LoopExitNode; +import jdk.graal.compiler.nodes.MergeNode; +import jdk.graal.compiler.nodes.NodeView; +import jdk.graal.compiler.nodes.ParameterNode; +import jdk.graal.compiler.nodes.PiNode; +import jdk.graal.compiler.nodes.PluginReplacementNode; +import jdk.graal.compiler.nodes.PluginReplacementWithExceptionNode; +import jdk.graal.compiler.nodes.ProfileData.BranchProbabilityData; +import jdk.graal.compiler.nodes.ProfileData.ProfileSource; +import jdk.graal.compiler.nodes.ProfileData.SwitchProbabilityData; +import jdk.graal.compiler.nodes.ReturnNode; +import jdk.graal.compiler.nodes.StartNode; +import jdk.graal.compiler.nodes.StateSplit; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.UnwindNode; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.ValuePhiNode; +import jdk.graal.compiler.nodes.WithExceptionNode; +import jdk.graal.compiler.nodes.calc.AddNode; +import jdk.graal.compiler.nodes.calc.AndNode; +import jdk.graal.compiler.nodes.calc.CompareNode; +import jdk.graal.compiler.nodes.calc.ConditionalNode; +import jdk.graal.compiler.nodes.calc.FloatConvertNode; +import jdk.graal.compiler.nodes.calc.FloatDivNode; +import jdk.graal.compiler.nodes.calc.FloatNormalizeCompareNode; +import jdk.graal.compiler.nodes.calc.IntegerBelowNode; +import jdk.graal.compiler.nodes.calc.IntegerEqualsNode; +import jdk.graal.compiler.nodes.calc.IntegerLessThanNode; +import jdk.graal.compiler.nodes.calc.IntegerNormalizeCompareNode; +import jdk.graal.compiler.nodes.calc.IsNullNode; +import jdk.graal.compiler.nodes.calc.LeftShiftNode; +import jdk.graal.compiler.nodes.calc.MulNode; +import jdk.graal.compiler.nodes.calc.NarrowNode; +import jdk.graal.compiler.nodes.calc.NegateNode; +import jdk.graal.compiler.nodes.calc.ObjectEqualsNode; +import jdk.graal.compiler.nodes.calc.OrNode; +import jdk.graal.compiler.nodes.calc.RemNode; +import jdk.graal.compiler.nodes.calc.RightShiftNode; +import jdk.graal.compiler.nodes.calc.SignExtendNode; +import jdk.graal.compiler.nodes.calc.SignedDivNode; +import jdk.graal.compiler.nodes.calc.SignedRemNode; +import jdk.graal.compiler.nodes.calc.SubNode; +import jdk.graal.compiler.nodes.calc.UnsignedRightShiftNode; +import jdk.graal.compiler.nodes.calc.XorNode; +import jdk.graal.compiler.nodes.calc.ZeroExtendNode; +import jdk.graal.compiler.nodes.extended.AnchoringNode; +import jdk.graal.compiler.nodes.extended.BranchProbabilityNode; +import jdk.graal.compiler.nodes.extended.BytecodeExceptionNode; +import jdk.graal.compiler.nodes.extended.BytecodeExceptionNode.BytecodeExceptionKind; +import jdk.graal.compiler.nodes.extended.GuardingNode; +import jdk.graal.compiler.nodes.extended.IntegerSwitchNode; +import jdk.graal.compiler.nodes.extended.LoadArrayComponentHubNode; +import jdk.graal.compiler.nodes.extended.LoadHubNode; +import jdk.graal.compiler.nodes.extended.MembarNode; +import jdk.graal.compiler.nodes.extended.StateSplitProxyNode; +import jdk.graal.compiler.nodes.graphbuilderconf.ClassInitializationPlugin; +import jdk.graal.compiler.nodes.graphbuilderconf.GeneratedInvocationPlugin; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.BytecodeExceptionMode; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext; +import jdk.graal.compiler.nodes.graphbuilderconf.InlineInvokePlugin; +import jdk.graal.compiler.nodes.graphbuilderconf.InlineInvokePlugin.InlineInfo; +import jdk.graal.compiler.nodes.graphbuilderconf.IntrinsicContext; +import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin; +import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPluginContext; +import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins; +import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins.InvocationPluginReceiver; +import jdk.graal.compiler.nodes.graphbuilderconf.NodePlugin; +import jdk.graal.compiler.nodes.java.ArrayLengthNode; +import jdk.graal.compiler.nodes.java.ExceptionObjectNode; +import jdk.graal.compiler.nodes.java.FinalFieldBarrierNode; +import jdk.graal.compiler.nodes.java.InstanceOfDynamicNode; +import jdk.graal.compiler.nodes.java.InstanceOfNode; +import jdk.graal.compiler.nodes.java.LoadFieldNode; +import jdk.graal.compiler.nodes.java.LoadIndexedNode; +import jdk.graal.compiler.nodes.java.MethodCallTargetNode; +import jdk.graal.compiler.nodes.java.MonitorEnterNode; +import jdk.graal.compiler.nodes.java.MonitorExitNode; +import jdk.graal.compiler.nodes.java.MonitorIdNode; +import jdk.graal.compiler.nodes.java.NewArrayNode; +import jdk.graal.compiler.nodes.java.NewInstanceNode; +import jdk.graal.compiler.nodes.java.NewMultiArrayNode; +import jdk.graal.compiler.nodes.java.RegisterFinalizerNode; +import jdk.graal.compiler.nodes.java.StoreFieldNode; +import jdk.graal.compiler.nodes.java.StoreIndexedNode; +import jdk.graal.compiler.nodes.spi.CoreProvidersDelegate; +import jdk.graal.compiler.nodes.type.StampTool; +import jdk.graal.compiler.nodes.util.GraphUtil; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.phases.OptimisticOptimizations; +import jdk.graal.compiler.phases.util.ValueMergeUtil; +import jdk.graal.compiler.replacements.nodes.MacroInvokable; +import jdk.graal.compiler.serviceprovider.GraalServices; +import jdk.graal.compiler.serviceprovider.SpeculationReasonGroup; import org.graalvm.word.LocationIdentity; import jdk.vm.ci.code.BailoutException; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/java/BytecodeParserOptions.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/java/BytecodeParserOptions.java similarity index 95% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/java/BytecodeParserOptions.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/java/BytecodeParserOptions.java index b96186ee92c4..110cfe87b4f0 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/java/BytecodeParserOptions.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/java/BytecodeParserOptions.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.java; +package jdk.graal.compiler.java; -import jdk.compiler.graal.options.Option; -import jdk.compiler.graal.options.OptionKey; -import jdk.compiler.graal.options.OptionType; +import jdk.graal.compiler.options.Option; +import jdk.graal.compiler.options.OptionKey; +import jdk.graal.compiler.options.OptionType; /** * Options related to {@link BytecodeParser}. diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/java/DefaultSuitesCreator.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/java/DefaultSuitesCreator.java similarity index 84% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/java/DefaultSuitesCreator.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/java/DefaultSuitesCreator.java index f881c7d1b948..ebc9e5b08528 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/java/DefaultSuitesCreator.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/java/DefaultSuitesCreator.java @@ -22,16 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.java; +package jdk.graal.compiler.java; -import jdk.compiler.graal.lir.phases.LIRSuites; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.phases.PhaseSuite; -import jdk.compiler.graal.phases.tiers.CompilerConfiguration; -import jdk.compiler.graal.phases.tiers.HighTierContext; -import jdk.compiler.graal.phases.tiers.Suites; +import jdk.graal.compiler.lir.phases.LIRSuites; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.phases.PhaseSuite; +import jdk.graal.compiler.phases.tiers.CompilerConfiguration; +import jdk.graal.compiler.phases.tiers.HighTierContext; +import jdk.graal.compiler.phases.tiers.Suites; import jdk.vm.ci.code.Architecture; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/java/FrameStateBuilder.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/java/FrameStateBuilder.java similarity index 95% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/java/FrameStateBuilder.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/java/FrameStateBuilder.java index 28042a7dec41..14b8a5d9daf7 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/java/FrameStateBuilder.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/java/FrameStateBuilder.java @@ -22,20 +22,20 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.java; - -import static jdk.compiler.graal.bytecode.Bytecodes.DUP; -import static jdk.compiler.graal.bytecode.Bytecodes.DUP2; -import static jdk.compiler.graal.bytecode.Bytecodes.DUP2_X1; -import static jdk.compiler.graal.bytecode.Bytecodes.DUP2_X2; -import static jdk.compiler.graal.bytecode.Bytecodes.DUP_X1; -import static jdk.compiler.graal.bytecode.Bytecodes.DUP_X2; -import static jdk.compiler.graal.bytecode.Bytecodes.POP; -import static jdk.compiler.graal.bytecode.Bytecodes.POP2; -import static jdk.compiler.graal.bytecode.Bytecodes.SWAP; -import static jdk.compiler.graal.debug.GraalError.shouldNotReachHereUnexpectedValue; -import static jdk.compiler.graal.nodes.FrameState.TWO_SLOT_MARKER; -import static jdk.compiler.graal.nodes.util.GraphUtil.originalValue; +package jdk.graal.compiler.java; + +import static jdk.graal.compiler.bytecode.Bytecodes.DUP; +import static jdk.graal.compiler.bytecode.Bytecodes.DUP2; +import static jdk.graal.compiler.bytecode.Bytecodes.DUP2_X1; +import static jdk.graal.compiler.bytecode.Bytecodes.DUP2_X2; +import static jdk.graal.compiler.bytecode.Bytecodes.DUP_X1; +import static jdk.graal.compiler.bytecode.Bytecodes.DUP_X2; +import static jdk.graal.compiler.bytecode.Bytecodes.POP; +import static jdk.graal.compiler.bytecode.Bytecodes.POP2; +import static jdk.graal.compiler.bytecode.Bytecodes.SWAP; +import static jdk.graal.compiler.debug.GraalError.shouldNotReachHereUnexpectedValue; +import static jdk.graal.compiler.nodes.FrameState.TWO_SLOT_MARKER; +import static jdk.graal.compiler.nodes.util.GraphUtil.originalValue; import java.util.ArrayList; import java.util.Arrays; @@ -43,36 +43,36 @@ import java.util.List; import java.util.function.Function; -import jdk.compiler.graal.bytecode.Bytecode; -import jdk.compiler.graal.bytecode.Bytecodes; -import jdk.compiler.graal.bytecode.ResolvedJavaMethodBytecode; -import jdk.compiler.graal.core.common.PermanentBailoutException; -import jdk.compiler.graal.core.common.type.StampFactory; -import jdk.compiler.graal.core.common.type.StampPair; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.graph.NodeSourcePosition; -import jdk.compiler.graal.java.BciBlockMapping.BciBlock; -import jdk.compiler.graal.nodeinfo.Verbosity; -import jdk.compiler.graal.nodes.AbstractMergeNode; -import jdk.compiler.graal.nodes.ConstantNode; -import jdk.compiler.graal.nodes.FrameState; -import jdk.compiler.graal.nodes.LoopBeginNode; -import jdk.compiler.graal.nodes.LoopExitNode; -import jdk.compiler.graal.nodes.NodeView; -import jdk.compiler.graal.nodes.ParameterNode; -import jdk.compiler.graal.nodes.PhiNode; -import jdk.compiler.graal.nodes.ProxyNode; -import jdk.compiler.graal.nodes.StateSplit; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.ValueNode; -import jdk.compiler.graal.nodes.ValuePhiNode; -import jdk.compiler.graal.nodes.calc.FloatingNode; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderTool; -import jdk.compiler.graal.nodes.graphbuilderconf.IntrinsicContext.SideEffectsState; -import jdk.compiler.graal.nodes.graphbuilderconf.ParameterPlugin; -import jdk.compiler.graal.nodes.java.MonitorIdNode; +import jdk.graal.compiler.bytecode.Bytecode; +import jdk.graal.compiler.bytecode.Bytecodes; +import jdk.graal.compiler.bytecode.ResolvedJavaMethodBytecode; +import jdk.graal.compiler.core.common.PermanentBailoutException; +import jdk.graal.compiler.core.common.type.StampFactory; +import jdk.graal.compiler.core.common.type.StampPair; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.graph.NodeSourcePosition; +import jdk.graal.compiler.java.BciBlockMapping.BciBlock; +import jdk.graal.compiler.nodeinfo.Verbosity; +import jdk.graal.compiler.nodes.AbstractMergeNode; +import jdk.graal.compiler.nodes.ConstantNode; +import jdk.graal.compiler.nodes.FrameState; +import jdk.graal.compiler.nodes.LoopBeginNode; +import jdk.graal.compiler.nodes.LoopExitNode; +import jdk.graal.compiler.nodes.NodeView; +import jdk.graal.compiler.nodes.ParameterNode; +import jdk.graal.compiler.nodes.PhiNode; +import jdk.graal.compiler.nodes.ProxyNode; +import jdk.graal.compiler.nodes.StateSplit; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.ValueNode; +import jdk.graal.compiler.nodes.ValuePhiNode; +import jdk.graal.compiler.nodes.calc.FloatingNode; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderTool; +import jdk.graal.compiler.nodes.graphbuilderconf.IntrinsicContext.SideEffectsState; +import jdk.graal.compiler.nodes.graphbuilderconf.ParameterPlugin; +import jdk.graal.compiler.nodes.java.MonitorIdNode; import jdk.vm.ci.code.BytecodeFrame; import jdk.vm.ci.meta.Assumptions; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/java/GraphBuilderPhase.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/java/GraphBuilderPhase.java similarity index 88% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/java/GraphBuilderPhase.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/java/GraphBuilderPhase.java index 8bd4ed529fa2..770968b6610e 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/java/GraphBuilderPhase.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/java/GraphBuilderPhase.java @@ -22,19 +22,19 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.java; +package jdk.graal.compiler.java; import java.util.Optional; -import jdk.compiler.graal.nodes.GraphState; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration; -import jdk.compiler.graal.nodes.graphbuilderconf.IntrinsicContext; -import jdk.compiler.graal.nodes.spi.CoreProviders; -import jdk.compiler.graal.phases.Phase; -import jdk.compiler.graal.phases.BasePhase; -import jdk.compiler.graal.phases.OptimisticOptimizations; -import jdk.compiler.graal.phases.tiers.HighTierContext; +import jdk.graal.compiler.nodes.GraphState; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration; +import jdk.graal.compiler.nodes.graphbuilderconf.IntrinsicContext; +import jdk.graal.compiler.nodes.spi.CoreProviders; +import jdk.graal.compiler.phases.Phase; +import jdk.graal.compiler.phases.BasePhase; +import jdk.graal.compiler.phases.OptimisticOptimizations; +import jdk.graal.compiler.phases.tiers.HighTierContext; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/java/JsrNotSupportedBailout.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/java/JsrNotSupportedBailout.java similarity index 93% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/java/JsrNotSupportedBailout.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/java/JsrNotSupportedBailout.java index 99a6fb2a3448..464566a0abbe 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/java/JsrNotSupportedBailout.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/java/JsrNotSupportedBailout.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.java; +package jdk.graal.compiler.java; -import jdk.compiler.graal.core.common.PermanentBailoutException; +import jdk.graal.compiler.core.common.PermanentBailoutException; public class JsrNotSupportedBailout extends PermanentBailoutException { diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/java/JsrScope.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/java/JsrScope.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/java/JsrScope.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/java/JsrScope.java index 29298c7e8698..8e3f7e9f64e9 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/java/JsrScope.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/java/JsrScope.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.java; +package jdk.graal.compiler.java; -import jdk.compiler.graal.bytecode.Bytecodes; -import jdk.compiler.graal.java.BciBlockMapping.BciBlock; +import jdk.graal.compiler.bytecode.Bytecodes; +import jdk.graal.compiler.java.BciBlockMapping.BciBlock; /** * Represents a subroutine entered via {@link Bytecodes#JSR} and exited via {@link Bytecodes#RET}. diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/java/LambdaUtils.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/java/LambdaUtils.java similarity index 92% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/java/LambdaUtils.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/java/LambdaUtils.java index a5cf6ec6b9c1..b508c9bf884c 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/java/LambdaUtils.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/java/LambdaUtils.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.java; +package jdk.graal.compiler.java; import java.nio.charset.StandardCharsets; import java.security.MessageDigest; @@ -34,19 +34,19 @@ import java.util.stream.Collectors; import java.util.stream.StreamSupport; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext; -import jdk.compiler.graal.nodes.Invoke; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.graphbuilderconf.ClassInitializationPlugin; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration; -import jdk.compiler.graal.nodes.graphbuilderconf.IntrinsicContext; -import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins; -import jdk.compiler.graal.nodes.spi.CoreProviders; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.phases.OptimisticOptimizations; -import jdk.compiler.graal.phases.tiers.HighTierContext; -import jdk.compiler.graal.phases.util.Providers; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext; +import jdk.graal.compiler.nodes.Invoke; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.graphbuilderconf.ClassInitializationPlugin; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration; +import jdk.graal.compiler.nodes.graphbuilderconf.IntrinsicContext; +import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins; +import jdk.graal.compiler.nodes.spi.CoreProviders; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.phases.OptimisticOptimizations; +import jdk.graal.compiler.phases.tiers.HighTierContext; +import jdk.graal.compiler.phases.util.Providers; import jdk.vm.ci.common.JVMCIError; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/java/LargeLocalLiveness.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/java/LargeLocalLiveness.java similarity index 99% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/java/LargeLocalLiveness.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/java/LargeLocalLiveness.java index 072ca4845292..24fb13fe261c 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/java/LargeLocalLiveness.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/java/LargeLocalLiveness.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.java; +package jdk.graal.compiler.java; import java.util.BitSet; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/java/LocalLiveness.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/java/LocalLiveness.java similarity index 81% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/java/LocalLiveness.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/java/LocalLiveness.java index 3e1a10ace84e..3eb6040c9ad2 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/java/LocalLiveness.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/java/LocalLiveness.java @@ -22,69 +22,69 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.java; - -import static jdk.compiler.graal.bytecode.Bytecodes.ALOAD; -import static jdk.compiler.graal.bytecode.Bytecodes.ALOAD_0; -import static jdk.compiler.graal.bytecode.Bytecodes.ALOAD_1; -import static jdk.compiler.graal.bytecode.Bytecodes.ALOAD_2; -import static jdk.compiler.graal.bytecode.Bytecodes.ALOAD_3; -import static jdk.compiler.graal.bytecode.Bytecodes.ASTORE; -import static jdk.compiler.graal.bytecode.Bytecodes.ASTORE_0; -import static jdk.compiler.graal.bytecode.Bytecodes.ASTORE_1; -import static jdk.compiler.graal.bytecode.Bytecodes.ASTORE_2; -import static jdk.compiler.graal.bytecode.Bytecodes.ASTORE_3; -import static jdk.compiler.graal.bytecode.Bytecodes.DLOAD; -import static jdk.compiler.graal.bytecode.Bytecodes.DLOAD_0; -import static jdk.compiler.graal.bytecode.Bytecodes.DLOAD_1; -import static jdk.compiler.graal.bytecode.Bytecodes.DLOAD_2; -import static jdk.compiler.graal.bytecode.Bytecodes.DLOAD_3; -import static jdk.compiler.graal.bytecode.Bytecodes.DSTORE; -import static jdk.compiler.graal.bytecode.Bytecodes.DSTORE_0; -import static jdk.compiler.graal.bytecode.Bytecodes.DSTORE_1; -import static jdk.compiler.graal.bytecode.Bytecodes.DSTORE_2; -import static jdk.compiler.graal.bytecode.Bytecodes.DSTORE_3; -import static jdk.compiler.graal.bytecode.Bytecodes.FLOAD; -import static jdk.compiler.graal.bytecode.Bytecodes.FLOAD_0; -import static jdk.compiler.graal.bytecode.Bytecodes.FLOAD_1; -import static jdk.compiler.graal.bytecode.Bytecodes.FLOAD_2; -import static jdk.compiler.graal.bytecode.Bytecodes.FLOAD_3; -import static jdk.compiler.graal.bytecode.Bytecodes.FSTORE; -import static jdk.compiler.graal.bytecode.Bytecodes.FSTORE_0; -import static jdk.compiler.graal.bytecode.Bytecodes.FSTORE_1; -import static jdk.compiler.graal.bytecode.Bytecodes.FSTORE_2; -import static jdk.compiler.graal.bytecode.Bytecodes.FSTORE_3; -import static jdk.compiler.graal.bytecode.Bytecodes.IINC; -import static jdk.compiler.graal.bytecode.Bytecodes.ILOAD; -import static jdk.compiler.graal.bytecode.Bytecodes.ILOAD_0; -import static jdk.compiler.graal.bytecode.Bytecodes.ILOAD_1; -import static jdk.compiler.graal.bytecode.Bytecodes.ILOAD_2; -import static jdk.compiler.graal.bytecode.Bytecodes.ILOAD_3; -import static jdk.compiler.graal.bytecode.Bytecodes.ISTORE; -import static jdk.compiler.graal.bytecode.Bytecodes.ISTORE_0; -import static jdk.compiler.graal.bytecode.Bytecodes.ISTORE_1; -import static jdk.compiler.graal.bytecode.Bytecodes.ISTORE_2; -import static jdk.compiler.graal.bytecode.Bytecodes.ISTORE_3; -import static jdk.compiler.graal.bytecode.Bytecodes.LLOAD; -import static jdk.compiler.graal.bytecode.Bytecodes.LLOAD_0; -import static jdk.compiler.graal.bytecode.Bytecodes.LLOAD_1; -import static jdk.compiler.graal.bytecode.Bytecodes.LLOAD_2; -import static jdk.compiler.graal.bytecode.Bytecodes.LLOAD_3; -import static jdk.compiler.graal.bytecode.Bytecodes.LSTORE; -import static jdk.compiler.graal.bytecode.Bytecodes.LSTORE_0; -import static jdk.compiler.graal.bytecode.Bytecodes.LSTORE_1; -import static jdk.compiler.graal.bytecode.Bytecodes.LSTORE_2; -import static jdk.compiler.graal.bytecode.Bytecodes.LSTORE_3; -import static jdk.compiler.graal.bytecode.Bytecodes.RET; +package jdk.graal.compiler.java; + +import static jdk.graal.compiler.bytecode.Bytecodes.ALOAD; +import static jdk.graal.compiler.bytecode.Bytecodes.ALOAD_0; +import static jdk.graal.compiler.bytecode.Bytecodes.ALOAD_1; +import static jdk.graal.compiler.bytecode.Bytecodes.ALOAD_2; +import static jdk.graal.compiler.bytecode.Bytecodes.ALOAD_3; +import static jdk.graal.compiler.bytecode.Bytecodes.ASTORE; +import static jdk.graal.compiler.bytecode.Bytecodes.ASTORE_0; +import static jdk.graal.compiler.bytecode.Bytecodes.ASTORE_1; +import static jdk.graal.compiler.bytecode.Bytecodes.ASTORE_2; +import static jdk.graal.compiler.bytecode.Bytecodes.ASTORE_3; +import static jdk.graal.compiler.bytecode.Bytecodes.DLOAD; +import static jdk.graal.compiler.bytecode.Bytecodes.DLOAD_0; +import static jdk.graal.compiler.bytecode.Bytecodes.DLOAD_1; +import static jdk.graal.compiler.bytecode.Bytecodes.DLOAD_2; +import static jdk.graal.compiler.bytecode.Bytecodes.DLOAD_3; +import static jdk.graal.compiler.bytecode.Bytecodes.DSTORE; +import static jdk.graal.compiler.bytecode.Bytecodes.DSTORE_0; +import static jdk.graal.compiler.bytecode.Bytecodes.DSTORE_1; +import static jdk.graal.compiler.bytecode.Bytecodes.DSTORE_2; +import static jdk.graal.compiler.bytecode.Bytecodes.DSTORE_3; +import static jdk.graal.compiler.bytecode.Bytecodes.FLOAD; +import static jdk.graal.compiler.bytecode.Bytecodes.FLOAD_0; +import static jdk.graal.compiler.bytecode.Bytecodes.FLOAD_1; +import static jdk.graal.compiler.bytecode.Bytecodes.FLOAD_2; +import static jdk.graal.compiler.bytecode.Bytecodes.FLOAD_3; +import static jdk.graal.compiler.bytecode.Bytecodes.FSTORE; +import static jdk.graal.compiler.bytecode.Bytecodes.FSTORE_0; +import static jdk.graal.compiler.bytecode.Bytecodes.FSTORE_1; +import static jdk.graal.compiler.bytecode.Bytecodes.FSTORE_2; +import static jdk.graal.compiler.bytecode.Bytecodes.FSTORE_3; +import static jdk.graal.compiler.bytecode.Bytecodes.IINC; +import static jdk.graal.compiler.bytecode.Bytecodes.ILOAD; +import static jdk.graal.compiler.bytecode.Bytecodes.ILOAD_0; +import static jdk.graal.compiler.bytecode.Bytecodes.ILOAD_1; +import static jdk.graal.compiler.bytecode.Bytecodes.ILOAD_2; +import static jdk.graal.compiler.bytecode.Bytecodes.ILOAD_3; +import static jdk.graal.compiler.bytecode.Bytecodes.ISTORE; +import static jdk.graal.compiler.bytecode.Bytecodes.ISTORE_0; +import static jdk.graal.compiler.bytecode.Bytecodes.ISTORE_1; +import static jdk.graal.compiler.bytecode.Bytecodes.ISTORE_2; +import static jdk.graal.compiler.bytecode.Bytecodes.ISTORE_3; +import static jdk.graal.compiler.bytecode.Bytecodes.LLOAD; +import static jdk.graal.compiler.bytecode.Bytecodes.LLOAD_0; +import static jdk.graal.compiler.bytecode.Bytecodes.LLOAD_1; +import static jdk.graal.compiler.bytecode.Bytecodes.LLOAD_2; +import static jdk.graal.compiler.bytecode.Bytecodes.LLOAD_3; +import static jdk.graal.compiler.bytecode.Bytecodes.LSTORE; +import static jdk.graal.compiler.bytecode.Bytecodes.LSTORE_0; +import static jdk.graal.compiler.bytecode.Bytecodes.LSTORE_1; +import static jdk.graal.compiler.bytecode.Bytecodes.LSTORE_2; +import static jdk.graal.compiler.bytecode.Bytecodes.LSTORE_3; +import static jdk.graal.compiler.bytecode.Bytecodes.RET; import java.util.ArrayList; import java.util.Arrays; import java.util.BitSet; import org.graalvm.collections.Pair; -import jdk.compiler.graal.bytecode.BytecodeStream; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.java.BciBlockMapping.BciBlock; +import jdk.graal.compiler.bytecode.BytecodeStream; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.java.BciBlockMapping.BciBlock; /** * Encapsulates the liveness calculation, so that subclasses for locals ≤ 64 and locals > 64 diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/java/SmallLocalLiveness.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/java/SmallLocalLiveness.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/java/SmallLocalLiveness.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/java/SmallLocalLiveness.java index 26ca12b0875e..757ae5d42bf3 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/java/SmallLocalLiveness.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/java/SmallLocalLiveness.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.java; +package jdk.graal.compiler.java; -import jdk.compiler.graal.java.BciBlockMapping.BciBlock; +import jdk.graal.compiler.java.BciBlockMapping.BciBlock; import java.util.BitSet; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/java/StableMethodNameFormatter.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/java/StableMethodNameFormatter.java similarity index 94% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/java/StableMethodNameFormatter.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/java/StableMethodNameFormatter.java index c83ddc30962f..4e41bf410602 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/java/StableMethodNameFormatter.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/java/StableMethodNameFormatter.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.java; +package jdk.graal.compiler.java; -import static jdk.compiler.graal.java.LambdaUtils.digest; +import static jdk.graal.compiler.java.LambdaUtils.digest; import java.util.List; import java.util.function.Function; @@ -35,14 +35,14 @@ import org.graalvm.collections.EconomicMap; import org.graalvm.collections.Equivalence; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.nodes.Invoke; -import jdk.compiler.graal.nodes.StructuredGraph; -import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration; -import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins; -import jdk.compiler.graal.phases.OptimisticOptimizations; -import jdk.compiler.graal.phases.tiers.HighTierContext; -import jdk.compiler.graal.phases.util.Providers; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.nodes.Invoke; +import jdk.graal.compiler.nodes.StructuredGraph; +import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration; +import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins; +import jdk.graal.compiler.phases.OptimisticOptimizations; +import jdk.graal.compiler.phases.tiers.HighTierContext; +import jdk.graal.compiler.phases.util.Providers; import jdk.vm.ci.meta.ResolvedJavaMethod; import jdk.vm.ci.meta.ResolvedJavaType; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/java/SuitesProviderBase.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/java/SuitesProviderBase.java similarity index 85% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/java/SuitesProviderBase.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/java/SuitesProviderBase.java index 7f98edf9b862..c8facd568561 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/java/SuitesProviderBase.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/java/SuitesProviderBase.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.java; - -import jdk.compiler.graal.lir.phases.LIRSuites; -import jdk.compiler.graal.options.OptionValues; -import jdk.compiler.graal.phases.PhaseSuite; -import jdk.compiler.graal.phases.tiers.HighTierContext; -import jdk.compiler.graal.phases.tiers.Suites; -import jdk.compiler.graal.phases.tiers.SuitesCreator; +package jdk.graal.compiler.java; + +import jdk.graal.compiler.lir.phases.LIRSuites; +import jdk.graal.compiler.options.OptionValues; +import jdk.graal.compiler.phases.PhaseSuite; +import jdk.graal.compiler.phases.tiers.HighTierContext; +import jdk.graal.compiler.phases.tiers.Suites; +import jdk.graal.compiler.phases.tiers.SuitesCreator; import jdk.vm.ci.code.Architecture; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/BailoutAndRestartBackendException.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/BailoutAndRestartBackendException.java similarity index 94% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/BailoutAndRestartBackendException.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/BailoutAndRestartBackendException.java index 0aa2df20feb7..2c84d326670f 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/BailoutAndRestartBackendException.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/BailoutAndRestartBackendException.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir; +package jdk.graal.compiler.lir; -import jdk.compiler.graal.core.common.PermanentBailoutException; +import jdk.graal.compiler.core.common.PermanentBailoutException; /** * Restarts the {@link LIR low-level} compilation with a modified configuration. diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/CastValue.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/CastValue.java similarity index 99% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/CastValue.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/CastValue.java index 3e87dfaf743f..0c84ca00d3f3 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/CastValue.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/CastValue.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir; +package jdk.graal.compiler.lir; import jdk.vm.ci.code.Register; import jdk.vm.ci.code.StackSlot; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/CompositeValue.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/CompositeValue.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/CompositeValue.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/CompositeValue.java index 6bd00202ece5..19141aa62af4 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/CompositeValue.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/CompositeValue.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir; +package jdk.graal.compiler.lir; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/CompositeValueClass.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/CompositeValueClass.java similarity index 94% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/CompositeValueClass.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/CompositeValueClass.java index abbc0a9c1bab..c4c4a677585d 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/CompositeValueClass.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/CompositeValueClass.java @@ -22,17 +22,17 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir; +package jdk.graal.compiler.lir; import java.lang.reflect.Field; import java.util.Arrays; import java.util.EnumSet; -import jdk.compiler.graal.core.common.FieldIntrospection; -import jdk.compiler.graal.core.common.Fields; -import jdk.compiler.graal.core.common.FieldsScanner; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.lir.CompositeValue.Component; +import jdk.graal.compiler.core.common.FieldIntrospection; +import jdk.graal.compiler.core.common.Fields; +import jdk.graal.compiler.core.common.FieldsScanner; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.lir.CompositeValue.Component; /** * Lazily associated metadata for every {@link CompositeValue} type. The metadata includes: diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/ComputeCodeEmissionOrder.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/ComputeCodeEmissionOrder.java similarity index 87% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/ComputeCodeEmissionOrder.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/ComputeCodeEmissionOrder.java index 89d5b9caabee..13a165b5f781 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/ComputeCodeEmissionOrder.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/ComputeCodeEmissionOrder.java @@ -22,18 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir; +package jdk.graal.compiler.lir; -import static jdk.compiler.graal.core.common.GraalOptions.LoopHeaderAlignment; +import static jdk.graal.compiler.core.common.GraalOptions.LoopHeaderAlignment; import java.util.ArrayList; -import jdk.compiler.graal.core.common.cfg.BasicBlock; -import jdk.compiler.graal.core.common.cfg.CodeEmissionOrder.ComputationTime; -import jdk.compiler.graal.lir.gen.LIRGenerationResult; -import jdk.compiler.graal.lir.phases.PostAllocationOptimizationPhase; -import jdk.compiler.graal.options.Option; -import jdk.compiler.graal.options.OptionKey; +import jdk.graal.compiler.core.common.cfg.BasicBlock; +import jdk.graal.compiler.core.common.cfg.CodeEmissionOrder.ComputationTime; +import jdk.graal.compiler.lir.gen.LIRGenerationResult; +import jdk.graal.compiler.lir.phases.PostAllocationOptimizationPhase; +import jdk.graal.compiler.options.Option; +import jdk.graal.compiler.options.OptionKey; import jdk.vm.ci.code.TargetDescription; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/ConstantValue.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/ConstantValue.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/ConstantValue.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/ConstantValue.java index 740059737c98..d18b13b26a45 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/ConstantValue.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/ConstantValue.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir; +package jdk.graal.compiler.lir; import jdk.vm.ci.meta.Constant; import jdk.vm.ci.meta.JavaConstant; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/ControlFlowOptimizer.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/ControlFlowOptimizer.java similarity index 93% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/ControlFlowOptimizer.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/ControlFlowOptimizer.java index 0f6e7b2546af..18ba74d17a4d 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/ControlFlowOptimizer.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/ControlFlowOptimizer.java @@ -22,17 +22,17 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir; +package jdk.graal.compiler.lir; -import static jdk.compiler.graal.core.common.cfg.AbstractControlFlowGraph.INVALID_BLOCK_ID; +import static jdk.graal.compiler.core.common.cfg.AbstractControlFlowGraph.INVALID_BLOCK_ID; import java.util.ArrayList; -import jdk.compiler.graal.core.common.cfg.BasicBlock; -import jdk.compiler.graal.debug.CounterKey; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.lir.gen.LIRGenerationResult; -import jdk.compiler.graal.lir.phases.PostAllocationOptimizationPhase; +import jdk.graal.compiler.core.common.cfg.BasicBlock; +import jdk.graal.compiler.debug.CounterKey; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.lir.gen.LIRGenerationResult; +import jdk.graal.compiler.lir.phases.PostAllocationOptimizationPhase; import jdk.vm.ci.code.TargetDescription; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/EdgeMoveOptimizer.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/EdgeMoveOptimizer.java similarity index 96% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/EdgeMoveOptimizer.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/EdgeMoveOptimizer.java index 28cbed02cdeb..c77b29e94bb6 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/EdgeMoveOptimizer.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/EdgeMoveOptimizer.java @@ -22,18 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir; +package jdk.graal.compiler.lir; import java.util.ArrayList; import java.util.List; -import jdk.compiler.graal.core.common.cfg.BasicBlock; -import jdk.compiler.graal.core.common.util.CompilationAlarm; -import jdk.compiler.graal.lir.StandardOp.LoadConstantOp; -import jdk.compiler.graal.lir.StandardOp.MoveOp; -import jdk.compiler.graal.lir.StandardOp.ValueMoveOp; -import jdk.compiler.graal.lir.gen.LIRGenerationResult; -import jdk.compiler.graal.lir.phases.PostAllocationOptimizationPhase; +import jdk.graal.compiler.core.common.cfg.BasicBlock; +import jdk.graal.compiler.core.common.util.CompilationAlarm; +import jdk.graal.compiler.lir.StandardOp.LoadConstantOp; +import jdk.graal.compiler.lir.StandardOp.MoveOp; +import jdk.graal.compiler.lir.StandardOp.ValueMoveOp; +import jdk.graal.compiler.lir.gen.LIRGenerationResult; +import jdk.graal.compiler.lir.phases.PostAllocationOptimizationPhase; import jdk.vm.ci.code.TargetDescription; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/FullInfopointOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/FullInfopointOp.java similarity index 95% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/FullInfopointOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/FullInfopointOp.java index 7cc13801d097..396e46ca8b73 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/FullInfopointOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/FullInfopointOp.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir; +package jdk.graal.compiler.lir; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; import jdk.vm.ci.code.site.InfopointReason; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/GenerateStub.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/GenerateStub.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/GenerateStub.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/GenerateStub.java index f91106e54ed5..a6567364859f 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/GenerateStub.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/GenerateStub.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir; +package jdk.graal.compiler.lir; -import jdk.compiler.graal.graph.Node; +import jdk.graal.compiler.graph.Node; import java.lang.annotation.ElementType; import java.lang.annotation.Repeatable; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/GenerateStubs.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/GenerateStubs.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/GenerateStubs.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/GenerateStubs.java index 79af724d888e..bc88cf746b0e 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/GenerateStubs.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/GenerateStubs.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir; +package jdk.graal.compiler.lir; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/GeneratedStubsHolder.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/GeneratedStubsHolder.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/GeneratedStubsHolder.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/GeneratedStubsHolder.java index 1003778b6025..fc127982318e 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/GeneratedStubsHolder.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/GeneratedStubsHolder.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir; +package jdk.graal.compiler.lir; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/ImplicitLIRFrameState.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/ImplicitLIRFrameState.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/ImplicitLIRFrameState.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/ImplicitLIRFrameState.java index 6f8881ff34b8..563b9b08e923 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/ImplicitLIRFrameState.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/ImplicitLIRFrameState.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir; +package jdk.graal.compiler.lir; import jdk.vm.ci.code.BytecodeFrame; import jdk.vm.ci.code.VirtualObject; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/InstructionStateProcedure.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/InstructionStateProcedure.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/InstructionStateProcedure.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/InstructionStateProcedure.java index 95db4ef20e56..87e4368e6232 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/InstructionStateProcedure.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/InstructionStateProcedure.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir; +package jdk.graal.compiler.lir; @FunctionalInterface public interface InstructionStateProcedure { diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/InstructionValueConsumer.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/InstructionValueConsumer.java similarity index 92% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/InstructionValueConsumer.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/InstructionValueConsumer.java index f1790c798c88..48e1ef7e97b0 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/InstructionValueConsumer.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/InstructionValueConsumer.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir; +package jdk.graal.compiler.lir; import java.util.EnumSet; -import jdk.compiler.graal.lir.LIRInstruction.OperandFlag; -import jdk.compiler.graal.lir.LIRInstruction.OperandMode; +import jdk.graal.compiler.lir.LIRInstruction.OperandFlag; +import jdk.graal.compiler.lir.LIRInstruction.OperandMode; import jdk.vm.ci.meta.Value; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/InstructionValueProcedure.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/InstructionValueProcedure.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/InstructionValueProcedure.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/InstructionValueProcedure.java index 8ecf68f04d4f..9031685c6907 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/InstructionValueProcedure.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/InstructionValueProcedure.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir; +package jdk.graal.compiler.lir; import java.util.EnumSet; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/LIR.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/LIR.java similarity index 95% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/LIR.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/LIR.java index 41c4f97aaa56..76b142296888 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/LIR.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/LIR.java @@ -22,22 +22,22 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir; +package jdk.graal.compiler.lir; import java.util.ArrayList; import java.util.List; -import jdk.compiler.graal.asm.Label; -import jdk.compiler.graal.core.common.cfg.AbstractControlFlowGraph; -import jdk.compiler.graal.core.common.cfg.BasicBlock; -import jdk.compiler.graal.core.common.cfg.BlockMap; -import jdk.compiler.graal.core.common.util.EventCounter; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.lir.StandardOp.BlockEndOp; -import jdk.compiler.graal.lir.StandardOp.LabelHoldingOp; -import jdk.compiler.graal.lir.StandardOp.LabelOp; -import jdk.compiler.graal.lir.gen.LIRGenerator; -import jdk.compiler.graal.options.OptionValues; +import jdk.graal.compiler.asm.Label; +import jdk.graal.compiler.core.common.cfg.AbstractControlFlowGraph; +import jdk.graal.compiler.core.common.cfg.BasicBlock; +import jdk.graal.compiler.core.common.cfg.BlockMap; +import jdk.graal.compiler.core.common.util.EventCounter; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.lir.StandardOp.BlockEndOp; +import jdk.graal.compiler.lir.StandardOp.LabelHoldingOp; +import jdk.graal.compiler.lir.StandardOp.LabelOp; +import jdk.graal.compiler.lir.gen.LIRGenerator; +import jdk.graal.compiler.options.OptionValues; /** * This class implements the overall container for the LIR graph and directs its construction, diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/LIRFrameState.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/LIRFrameState.java similarity index 96% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/LIRFrameState.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/LIRFrameState.java index 6eeb8deaf76a..1df9dffd4000 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/LIRFrameState.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/LIRFrameState.java @@ -22,20 +22,20 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir; +package jdk.graal.compiler.lir; import static jdk.vm.ci.code.ValueUtil.asAllocatableValue; import static jdk.vm.ci.code.ValueUtil.isConstantJavaValue; import static jdk.vm.ci.code.ValueUtil.isIllegalJavaValue; import static jdk.vm.ci.code.ValueUtil.isVirtualObject; -import static jdk.compiler.graal.lir.LIRValueUtil.isVirtualStackSlot; +import static jdk.graal.compiler.lir.LIRValueUtil.isVirtualStackSlot; import java.util.Arrays; import java.util.EnumSet; -import jdk.compiler.graal.lir.LIRInstruction.OperandFlag; -import jdk.compiler.graal.lir.LIRInstruction.OperandMode; -import jdk.compiler.graal.lir.util.IndexedValueMap; +import jdk.graal.compiler.lir.LIRInstruction.OperandFlag; +import jdk.graal.compiler.lir.LIRInstruction.OperandMode; +import jdk.graal.compiler.lir.util.IndexedValueMap; import jdk.vm.ci.code.BytecodeFrame; import jdk.vm.ci.code.DebugInfo; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/LIRInsertionBuffer.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/LIRInsertionBuffer.java similarity index 99% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/LIRInsertionBuffer.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/LIRInsertionBuffer.java index 9d29bc1a73d8..f81763598779 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/LIRInsertionBuffer.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/LIRInsertionBuffer.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir; +package jdk.graal.compiler.lir; import java.util.ArrayList; import java.util.Arrays; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/LIRInstruction.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/LIRInstruction.java similarity index 92% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/LIRInstruction.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/LIRInstruction.java index 2ea9ee93bf89..ce27928ba54f 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/LIRInstruction.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/LIRInstruction.java @@ -22,21 +22,21 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir; +package jdk.graal.compiler.lir; import static jdk.vm.ci.code.ValueUtil.isStackSlot; -import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.COMPOSITE; -import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.CONST; -import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.HINT; -import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.ILLEGAL; -import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.OUTGOING; -import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.REG; -import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.STACK; -import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.UNINITIALIZED; -import static jdk.compiler.graal.lir.LIRInstruction.OperandMode.ALIVE; -import static jdk.compiler.graal.lir.LIRInstruction.OperandMode.DEF; -import static jdk.compiler.graal.lir.LIRInstruction.OperandMode.TEMP; -import static jdk.compiler.graal.lir.LIRValueUtil.isVirtualStackSlot; +import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.COMPOSITE; +import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.CONST; +import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.HINT; +import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.ILLEGAL; +import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.OUTGOING; +import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.REG; +import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.STACK; +import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.UNINITIALIZED; +import static jdk.graal.compiler.lir.LIRInstruction.OperandMode.ALIVE; +import static jdk.graal.compiler.lir.LIRInstruction.OperandMode.DEF; +import static jdk.graal.compiler.lir.LIRInstruction.OperandMode.TEMP; +import static jdk.graal.compiler.lir.LIRValueUtil.isVirtualStackSlot; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; @@ -46,12 +46,12 @@ import java.util.EnumMap; import java.util.EnumSet; -import jdk.compiler.graal.graph.NodeSourcePosition; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; -import jdk.compiler.graal.lir.StandardOp.LoadConstantOp; -import jdk.compiler.graal.lir.StandardOp.MoveOp; -import jdk.compiler.graal.lir.StandardOp.ValueMoveOp; -import jdk.compiler.graal.lir.gen.LIRGenerationResult; +import jdk.graal.compiler.graph.NodeSourcePosition; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.lir.StandardOp.LoadConstantOp; +import jdk.graal.compiler.lir.StandardOp.MoveOp; +import jdk.graal.compiler.lir.StandardOp.ValueMoveOp; +import jdk.graal.compiler.lir.gen.LIRGenerationResult; import jdk.vm.ci.code.RegisterValue; import jdk.vm.ci.code.StackSlot; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/LIRInstructionClass.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/LIRInstructionClass.java similarity index 96% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/LIRInstructionClass.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/LIRInstructionClass.java index 295c8c47ff97..71972651f735 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/LIRInstructionClass.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/LIRInstructionClass.java @@ -22,20 +22,20 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir; +package jdk.graal.compiler.lir; import java.lang.reflect.Field; import java.util.Arrays; import java.util.EnumSet; -import jdk.compiler.graal.core.common.Fields; -import jdk.compiler.graal.core.common.FieldsScanner; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.lir.LIRInstruction.OperandFlag; -import jdk.compiler.graal.lir.LIRInstruction.OperandMode; -import jdk.compiler.graal.lir.StandardOp.LoadConstantOp; -import jdk.compiler.graal.lir.StandardOp.MoveOp; -import jdk.compiler.graal.lir.StandardOp.ValueMoveOp; +import jdk.graal.compiler.core.common.Fields; +import jdk.graal.compiler.core.common.FieldsScanner; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.lir.LIRInstruction.OperandFlag; +import jdk.graal.compiler.lir.LIRInstruction.OperandMode; +import jdk.graal.compiler.lir.StandardOp.LoadConstantOp; +import jdk.graal.compiler.lir.StandardOp.MoveOp; +import jdk.graal.compiler.lir.StandardOp.ValueMoveOp; import jdk.vm.ci.code.BytecodeFrame; import jdk.vm.ci.meta.Value; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/LIRInstructionVerifier.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/LIRInstructionVerifier.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/LIRInstructionVerifier.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/LIRInstructionVerifier.java index e56ffa70b8b4..5f1ab3494933 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/LIRInstructionVerifier.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/LIRInstructionVerifier.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir; +package jdk.graal.compiler.lir; public interface LIRInstructionVerifier { diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/LIRIntrospection.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/LIRIntrospection.java similarity index 96% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/LIRIntrospection.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/LIRIntrospection.java index 74658cd45a56..b3fb3aedd0fc 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/LIRIntrospection.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/LIRIntrospection.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir; +package jdk.graal.compiler.lir; -import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.CONST; -import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.REG; -import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.STACK; +import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.CONST; +import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.REG; +import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.STACK; import java.lang.annotation.Annotation; import java.lang.reflect.Field; @@ -40,12 +40,12 @@ import org.graalvm.collections.EconomicMap; import org.graalvm.collections.Equivalence; import org.graalvm.collections.MapCursor; -import jdk.compiler.graal.core.common.FieldIntrospection; -import jdk.compiler.graal.core.common.Fields; -import jdk.compiler.graal.core.common.FieldsScanner; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.lir.LIRInstruction.OperandFlag; -import jdk.compiler.graal.lir.LIRInstruction.OperandMode; +import jdk.graal.compiler.core.common.FieldIntrospection; +import jdk.graal.compiler.core.common.Fields; +import jdk.graal.compiler.core.common.FieldsScanner; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.lir.LIRInstruction.OperandFlag; +import jdk.graal.compiler.lir.LIRInstruction.OperandMode; import jdk.vm.ci.code.RegisterValue; import jdk.vm.ci.code.StackSlot; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/LIRValueUtil.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/LIRValueUtil.java similarity index 96% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/LIRValueUtil.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/LIRValueUtil.java index 810a01929af7..51ba71539465 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/LIRValueUtil.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/LIRValueUtil.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir; +package jdk.graal.compiler.lir; import static jdk.vm.ci.code.ValueUtil.asRegister; import static jdk.vm.ci.code.ValueUtil.isRegister; @@ -30,10 +30,10 @@ import java.util.ArrayList; import java.util.List; -import jdk.compiler.graal.core.common.LIRKindWithCast; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.lir.framemap.SimpleVirtualStackSlot; -import jdk.compiler.graal.lir.framemap.SimpleVirtualStackSlotAlias; +import jdk.graal.compiler.core.common.LIRKindWithCast; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.lir.framemap.SimpleVirtualStackSlot; +import jdk.graal.compiler.lir.framemap.SimpleVirtualStackSlotAlias; import jdk.vm.ci.code.Register; import jdk.vm.ci.code.RegisterValue; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/LabelRef.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/LabelRef.java similarity index 93% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/LabelRef.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/LabelRef.java index 6e973d4b3ddf..5179e3df2c0a 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/LabelRef.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/LabelRef.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir; +package jdk.graal.compiler.lir; -import jdk.compiler.graal.asm.Label; -import jdk.compiler.graal.core.common.cfg.BasicBlock; -import jdk.compiler.graal.lir.StandardOp.BranchOp; -import jdk.compiler.graal.lir.StandardOp.JumpOp; +import jdk.graal.compiler.asm.Label; +import jdk.graal.compiler.core.common.cfg.BasicBlock; +import jdk.graal.compiler.lir.StandardOp.BranchOp; +import jdk.graal.compiler.lir.StandardOp.JumpOp; /** * LIR instructions such as {@link JumpOp} and {@link BranchOp} need to reference their target diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/NullCheckOptimizer.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/NullCheckOptimizer.java similarity index 90% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/NullCheckOptimizer.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/NullCheckOptimizer.java index d5b531e24844..06c7c6ca8f51 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/NullCheckOptimizer.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/NullCheckOptimizer.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir; +package jdk.graal.compiler.lir; import java.util.ArrayList; -import jdk.compiler.graal.core.common.cfg.BasicBlock; -import jdk.compiler.graal.lir.StandardOp.ImplicitNullCheck; -import jdk.compiler.graal.lir.StandardOp.NullCheck; -import jdk.compiler.graal.lir.gen.LIRGenerationResult; -import jdk.compiler.graal.lir.phases.PostAllocationOptimizationPhase; +import jdk.graal.compiler.core.common.cfg.BasicBlock; +import jdk.graal.compiler.lir.StandardOp.ImplicitNullCheck; +import jdk.graal.compiler.lir.StandardOp.NullCheck; +import jdk.graal.compiler.lir.gen.LIRGenerationResult; +import jdk.graal.compiler.lir.phases.PostAllocationOptimizationPhase; import jdk.vm.ci.code.TargetDescription; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/Opcode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/Opcode.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/Opcode.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/Opcode.java index bfb4dfa1420c..35865d794819 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/Opcode.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/Opcode.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir; +package jdk.graal.compiler.lir; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/RedundantMoveElimination.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/RedundantMoveElimination.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/RedundantMoveElimination.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/RedundantMoveElimination.java index ffc4965f735d..07e958e21deb 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/RedundantMoveElimination.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/RedundantMoveElimination.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir; +package jdk.graal.compiler.lir; import static jdk.vm.ci.code.ValueUtil.isRegister; import static jdk.vm.ci.code.ValueUtil.isStackSlot; @@ -34,18 +34,18 @@ import org.graalvm.collections.EconomicMap; import org.graalvm.collections.Equivalence; -import jdk.compiler.graal.core.common.LIRKind; -import jdk.compiler.graal.core.common.cfg.BasicBlock; -import jdk.compiler.graal.debug.CounterKey; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.debug.Indent; -import jdk.compiler.graal.lir.LIRInstruction.OperandFlag; -import jdk.compiler.graal.lir.LIRInstruction.OperandMode; -import jdk.compiler.graal.lir.StandardOp.MoveOp; -import jdk.compiler.graal.lir.StandardOp.ValueMoveOp; -import jdk.compiler.graal.lir.framemap.FrameMap; -import jdk.compiler.graal.lir.gen.LIRGenerationResult; -import jdk.compiler.graal.lir.phases.PostAllocationOptimizationPhase; +import jdk.graal.compiler.core.common.LIRKind; +import jdk.graal.compiler.core.common.cfg.BasicBlock; +import jdk.graal.compiler.debug.CounterKey; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.debug.Indent; +import jdk.graal.compiler.lir.LIRInstruction.OperandFlag; +import jdk.graal.compiler.lir.LIRInstruction.OperandMode; +import jdk.graal.compiler.lir.StandardOp.MoveOp; +import jdk.graal.compiler.lir.StandardOp.ValueMoveOp; +import jdk.graal.compiler.lir.framemap.FrameMap; +import jdk.graal.compiler.lir.gen.LIRGenerationResult; +import jdk.graal.compiler.lir.phases.PostAllocationOptimizationPhase; import jdk.vm.ci.code.Register; import jdk.vm.ci.code.RegisterArray; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/StandardOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/StandardOp.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/StandardOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/StandardOp.java index a747728c937f..27829a65f543 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/StandardOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/StandardOp.java @@ -22,18 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir; +package jdk.graal.compiler.lir; import java.util.ArrayList; import java.util.Arrays; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; import org.graalvm.collections.EconomicSet; import org.graalvm.collections.Equivalence; -import jdk.compiler.graal.asm.Label; -import jdk.compiler.graal.core.common.cfg.BasicBlock; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.lir.framemap.FrameMap; +import jdk.graal.compiler.asm.Label; +import jdk.graal.compiler.core.common.cfg.BasicBlock; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.lir.framemap.FrameMap; import jdk.vm.ci.code.Register; import jdk.vm.ci.code.RegisterSaveLayout; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/StateProcedure.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/StateProcedure.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/StateProcedure.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/StateProcedure.java index 0919046e98f9..795d7b525fc5 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/StateProcedure.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/StateProcedure.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir; +package jdk.graal.compiler.lir; @FunctionalInterface public interface StateProcedure extends InstructionStateProcedure { diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/SwitchStrategy.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/SwitchStrategy.java similarity index 99% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/SwitchStrategy.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/SwitchStrategy.java index 0739a647cc3a..1f2923ac48d4 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/SwitchStrategy.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/SwitchStrategy.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir; +package jdk.graal.compiler.lir; import java.util.Arrays; import java.util.Comparator; -import jdk.compiler.graal.asm.Assembler; -import jdk.compiler.graal.asm.Label; -import jdk.compiler.graal.core.common.calc.Condition; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.asm.Assembler; +import jdk.graal.compiler.asm.Label; +import jdk.graal.compiler.core.common.calc.Condition; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; import jdk.vm.ci.meta.Constant; import jdk.vm.ci.meta.JavaConstant; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/SyncPort.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/SyncPort.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/SyncPort.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/SyncPort.java index 2ac108ba5672..d44c2289c44a 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/SyncPort.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/SyncPort.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir; +package jdk.graal.compiler.lir; import java.lang.annotation.ElementType; import java.lang.annotation.Repeatable; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/SyncPorts.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/SyncPorts.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/SyncPorts.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/SyncPorts.java index 1813dc91fa9e..410437e0000a 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/SyncPorts.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/SyncPorts.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir; +package jdk.graal.compiler.lir; import java.lang.annotation.ElementType; import java.lang.annotation.Target; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/ValueConsumer.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/ValueConsumer.java similarity index 92% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/ValueConsumer.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/ValueConsumer.java index d0ef02d1bbce..5ff0756d7319 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/ValueConsumer.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/ValueConsumer.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir; +package jdk.graal.compiler.lir; import java.util.EnumSet; -import jdk.compiler.graal.lir.LIRInstruction.OperandFlag; -import jdk.compiler.graal.lir.LIRInstruction.OperandMode; +import jdk.graal.compiler.lir.LIRInstruction.OperandFlag; +import jdk.graal.compiler.lir.LIRInstruction.OperandMode; import jdk.vm.ci.meta.Value; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/ValueProcedure.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/ValueProcedure.java similarity index 93% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/ValueProcedure.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/ValueProcedure.java index a5297dd9e94f..933b4ca393a0 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/ValueProcedure.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/ValueProcedure.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir; +package jdk.graal.compiler.lir; import java.util.EnumSet; -import jdk.compiler.graal.lir.LIRInstruction.OperandFlag; -import jdk.compiler.graal.lir.LIRInstruction.OperandMode; +import jdk.graal.compiler.lir.LIRInstruction.OperandFlag; +import jdk.graal.compiler.lir.LIRInstruction.OperandMode; import jdk.vm.ci.meta.Value; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/Variable.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/Variable.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/Variable.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/Variable.java index 6857fd4da3ae..9e1e5e6ab9d5 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/Variable.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/Variable.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir; +package jdk.graal.compiler.lir; import jdk.vm.ci.code.RegisterValue; import jdk.vm.ci.code.StackSlot; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/VirtualStackSlot.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/VirtualStackSlot.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/VirtualStackSlot.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/VirtualStackSlot.java index 564d47542b9e..96446001c379 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/VirtualStackSlot.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/VirtualStackSlot.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir; +package jdk.graal.compiler.lir; import jdk.vm.ci.code.StackSlot; import jdk.vm.ci.meta.AllocatableValue; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64AESDecryptOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64AESDecryptOp.java similarity index 90% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64AESDecryptOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64AESDecryptOp.java index 9b8554a36038..a6797dc6e6dd 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64AESDecryptOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64AESDecryptOp.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.aarch64; +package jdk.graal.compiler.lir.aarch64; import static jdk.vm.ci.aarch64.AArch64.v0; import static jdk.vm.ci.aarch64.AArch64.v1; @@ -31,23 +31,23 @@ import static jdk.vm.ci.aarch64.AArch64.v4; import static jdk.vm.ci.aarch64.AArch64.v5; import static jdk.vm.ci.code.ValueUtil.asRegister; -import static jdk.compiler.graal.asm.aarch64.AArch64Address.AddressingMode.IMMEDIATE_POST_INDEXED; -import static jdk.compiler.graal.asm.aarch64.AArch64Address.AddressingMode.IMMEDIATE_SIGNED_UNSCALED; - -import jdk.compiler.graal.asm.Label; -import jdk.compiler.graal.asm.aarch64.AArch64ASIMDAssembler.ASIMDInstruction; -import jdk.compiler.graal.asm.aarch64.AArch64ASIMDAssembler.ASIMDSize; -import jdk.compiler.graal.asm.aarch64.AArch64ASIMDAssembler.ElementSize; -import jdk.compiler.graal.asm.aarch64.AArch64Address; -import jdk.compiler.graal.asm.aarch64.AArch64Assembler; -import jdk.compiler.graal.asm.aarch64.AArch64Assembler.ConditionFlag; -import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler; -import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler.ScratchRegister; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.lir.LIRInstruction; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.SyncPort; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; +import static jdk.graal.compiler.asm.aarch64.AArch64Address.AddressingMode.IMMEDIATE_POST_INDEXED; +import static jdk.graal.compiler.asm.aarch64.AArch64Address.AddressingMode.IMMEDIATE_SIGNED_UNSCALED; + +import jdk.graal.compiler.asm.Label; +import jdk.graal.compiler.asm.aarch64.AArch64ASIMDAssembler.ASIMDInstruction; +import jdk.graal.compiler.asm.aarch64.AArch64ASIMDAssembler.ASIMDSize; +import jdk.graal.compiler.asm.aarch64.AArch64ASIMDAssembler.ElementSize; +import jdk.graal.compiler.asm.aarch64.AArch64Address; +import jdk.graal.compiler.asm.aarch64.AArch64Assembler; +import jdk.graal.compiler.asm.aarch64.AArch64Assembler.ConditionFlag; +import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler; +import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler.ScratchRegister; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.lir.LIRInstruction; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.SyncPort; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; import jdk.vm.ci.aarch64.AArch64Kind; import jdk.vm.ci.code.CodeUtil; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64AESEncryptOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64AESEncryptOp.java similarity index 94% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64AESEncryptOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64AESEncryptOp.java index ee9052642038..bd1ecc57b7ff 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64AESEncryptOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64AESEncryptOp.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.aarch64; +package jdk.graal.compiler.lir.aarch64; import static jdk.vm.ci.aarch64.AArch64.v0; import static jdk.vm.ci.aarch64.AArch64.v17; @@ -41,22 +41,22 @@ import static jdk.vm.ci.aarch64.AArch64.v30; import static jdk.vm.ci.aarch64.AArch64.v31; import static jdk.vm.ci.code.ValueUtil.asRegister; -import static jdk.compiler.graal.asm.aarch64.AArch64Address.AddressingMode.IMMEDIATE_SIGNED_UNSCALED; -import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.REG; - -import jdk.compiler.graal.asm.Label; -import jdk.compiler.graal.asm.aarch64.AArch64ASIMDAssembler; -import jdk.compiler.graal.asm.aarch64.AArch64ASIMDAssembler.ASIMDSize; -import jdk.compiler.graal.asm.aarch64.AArch64ASIMDAssembler.ElementSize; -import jdk.compiler.graal.asm.aarch64.AArch64Address; -import jdk.compiler.graal.asm.aarch64.AArch64Assembler; -import jdk.compiler.graal.asm.aarch64.AArch64Assembler.ConditionFlag; -import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler; -import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler.ScratchRegister; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.SyncPort; +import static jdk.graal.compiler.asm.aarch64.AArch64Address.AddressingMode.IMMEDIATE_SIGNED_UNSCALED; +import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.REG; + +import jdk.graal.compiler.asm.Label; +import jdk.graal.compiler.asm.aarch64.AArch64ASIMDAssembler; +import jdk.graal.compiler.asm.aarch64.AArch64ASIMDAssembler.ASIMDSize; +import jdk.graal.compiler.asm.aarch64.AArch64ASIMDAssembler.ElementSize; +import jdk.graal.compiler.asm.aarch64.AArch64Address; +import jdk.graal.compiler.asm.aarch64.AArch64Assembler; +import jdk.graal.compiler.asm.aarch64.AArch64Assembler.ConditionFlag; +import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler; +import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler.ScratchRegister; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.SyncPort; import jdk.vm.ci.aarch64.AArch64; import jdk.vm.ci.aarch64.AArch64Kind; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64AcrossVectorOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64AcrossVectorOp.java similarity index 87% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64AcrossVectorOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64AcrossVectorOp.java index 9ca27692dc37..48fa36c4cbb9 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64AcrossVectorOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64AcrossVectorOp.java @@ -22,18 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.aarch64; +package jdk.graal.compiler.lir.aarch64; import static jdk.vm.ci.code.ValueUtil.asRegister; -import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.REG; +import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.REG; -import jdk.compiler.graal.asm.aarch64.AArch64ASIMDAssembler.ASIMDSize; -import jdk.compiler.graal.asm.aarch64.AArch64ASIMDAssembler.ElementSize; -import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.Opcode; +import jdk.graal.compiler.asm.aarch64.AArch64ASIMDAssembler.ASIMDSize; +import jdk.graal.compiler.asm.aarch64.AArch64ASIMDAssembler.ElementSize; +import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.Opcode; import jdk.vm.ci.code.Register; import jdk.vm.ci.meta.AllocatableValue; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64AddressValue.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64AddressValue.java similarity index 91% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64AddressValue.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64AddressValue.java index 1a052eafee08..6ba1a2352248 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64AddressValue.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64AddressValue.java @@ -22,22 +22,22 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.aarch64; +package jdk.graal.compiler.lir.aarch64; -import static jdk.compiler.graal.asm.aarch64.AArch64Address.isImmediateScaled; -import static jdk.compiler.graal.asm.aarch64.AArch64Address.AddressingMode.IMMEDIATE_SIGNED_UNSCALED; -import static jdk.compiler.graal.asm.aarch64.AArch64Address.AddressingMode.IMMEDIATE_UNSIGNED_SCALED; -import static jdk.compiler.graal.asm.aarch64.AArch64Address.AddressingMode.REGISTER_OFFSET; +import static jdk.graal.compiler.asm.aarch64.AArch64Address.isImmediateScaled; +import static jdk.graal.compiler.asm.aarch64.AArch64Address.AddressingMode.IMMEDIATE_SIGNED_UNSCALED; +import static jdk.graal.compiler.asm.aarch64.AArch64Address.AddressingMode.IMMEDIATE_UNSIGNED_SCALED; +import static jdk.graal.compiler.asm.aarch64.AArch64Address.AddressingMode.REGISTER_OFFSET; import java.util.EnumSet; -import jdk.compiler.graal.asm.aarch64.AArch64Address; -import jdk.compiler.graal.asm.aarch64.AArch64Address.AddressingMode; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.lir.InstructionValueConsumer; -import jdk.compiler.graal.lir.InstructionValueProcedure; -import jdk.compiler.graal.lir.LIRInstruction; -import jdk.compiler.graal.lir.CompositeValue; +import jdk.graal.compiler.asm.aarch64.AArch64Address; +import jdk.graal.compiler.asm.aarch64.AArch64Address.AddressingMode; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.lir.InstructionValueConsumer; +import jdk.graal.compiler.lir.InstructionValueProcedure; +import jdk.graal.compiler.lir.LIRInstruction; +import jdk.graal.compiler.lir.CompositeValue; import jdk.vm.ci.aarch64.AArch64; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64ArithmeticOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64ArithmeticOp.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64ArithmeticOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64ArithmeticOp.java index 4b3310300d63..c73fdd42c2f0 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64ArithmeticOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64ArithmeticOp.java @@ -22,26 +22,26 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.aarch64; +package jdk.graal.compiler.lir.aarch64; import static jdk.vm.ci.aarch64.AArch64.zr; import static jdk.vm.ci.code.ValueUtil.asRegister; -import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.REG; -import static jdk.compiler.graal.lir.aarch64.AArch64ArithmeticOp.ARMv8ConstantCategory.ADDSUBTRACT; -import static jdk.compiler.graal.lir.aarch64.AArch64ArithmeticOp.ARMv8ConstantCategory.LOGICAL; -import static jdk.compiler.graal.lir.aarch64.AArch64ArithmeticOp.ARMv8ConstantCategory.NONE; -import static jdk.compiler.graal.lir.aarch64.AArch64ArithmeticOp.ARMv8ConstantCategory.SHIFT; - -import jdk.compiler.graal.asm.aarch64.AArch64ASIMDAssembler.ASIMDSize; -import jdk.compiler.graal.asm.aarch64.AArch64ASIMDAssembler.ElementSize; -import jdk.compiler.graal.asm.aarch64.AArch64Assembler; -import jdk.compiler.graal.asm.aarch64.AArch64Assembler.ConditionFlag; -import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler; -import jdk.compiler.graal.core.common.NumUtil; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.Opcode; +import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.REG; +import static jdk.graal.compiler.lir.aarch64.AArch64ArithmeticOp.ARMv8ConstantCategory.ADDSUBTRACT; +import static jdk.graal.compiler.lir.aarch64.AArch64ArithmeticOp.ARMv8ConstantCategory.LOGICAL; +import static jdk.graal.compiler.lir.aarch64.AArch64ArithmeticOp.ARMv8ConstantCategory.NONE; +import static jdk.graal.compiler.lir.aarch64.AArch64ArithmeticOp.ARMv8ConstantCategory.SHIFT; + +import jdk.graal.compiler.asm.aarch64.AArch64ASIMDAssembler.ASIMDSize; +import jdk.graal.compiler.asm.aarch64.AArch64ASIMDAssembler.ElementSize; +import jdk.graal.compiler.asm.aarch64.AArch64Assembler; +import jdk.graal.compiler.asm.aarch64.AArch64Assembler.ConditionFlag; +import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler; +import jdk.graal.compiler.core.common.NumUtil; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.Opcode; import jdk.vm.ci.code.Register; import jdk.vm.ci.meta.AllocatableValue; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64ArrayCompareToOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64ArrayCompareToOp.java similarity index 96% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64ArrayCompareToOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64ArrayCompareToOp.java index 2dd44fec9569..5f309a9a3917 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64ArrayCompareToOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64ArrayCompareToOp.java @@ -22,23 +22,23 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.aarch64; +package jdk.graal.compiler.lir.aarch64; import static jdk.vm.ci.code.ValueUtil.asRegister; -import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.REG; - -import jdk.compiler.graal.asm.Label; -import jdk.compiler.graal.asm.aarch64.AArch64ASIMDAssembler; -import jdk.compiler.graal.asm.aarch64.AArch64Address; -import jdk.compiler.graal.asm.aarch64.AArch64Assembler; -import jdk.compiler.graal.asm.aarch64.AArch64Assembler.ConditionFlag; -import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler; -import jdk.compiler.graal.core.common.Stride; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.Opcode; -import jdk.compiler.graal.lir.gen.LIRGeneratorTool; +import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.REG; + +import jdk.graal.compiler.asm.Label; +import jdk.graal.compiler.asm.aarch64.AArch64ASIMDAssembler; +import jdk.graal.compiler.asm.aarch64.AArch64Address; +import jdk.graal.compiler.asm.aarch64.AArch64Assembler; +import jdk.graal.compiler.asm.aarch64.AArch64Assembler.ConditionFlag; +import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler; +import jdk.graal.compiler.core.common.Stride; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.Opcode; +import jdk.graal.compiler.lir.gen.LIRGeneratorTool; import jdk.vm.ci.aarch64.AArch64Kind; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64ArrayCopyWithConversionsOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64ArrayCopyWithConversionsOp.java similarity index 93% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64ArrayCopyWithConversionsOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64ArrayCopyWithConversionsOp.java index b2c4cee7b6a0..df47bf3ce135 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64ArrayCopyWithConversionsOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64ArrayCopyWithConversionsOp.java @@ -22,37 +22,37 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.aarch64; +package jdk.graal.compiler.lir.aarch64; import static jdk.vm.ci.code.ValueUtil.asRegister; import static jdk.vm.ci.code.ValueUtil.isIllegal; -import static jdk.compiler.graal.asm.aarch64.AArch64ASIMDAssembler.ASIMDSize.FullReg; -import static jdk.compiler.graal.asm.aarch64.AArch64Address.createBaseRegisterOnlyAddress; -import static jdk.compiler.graal.asm.aarch64.AArch64Address.createImmediateAddress; -import static jdk.compiler.graal.asm.aarch64.AArch64Address.createPairBaseRegisterOnlyAddress; -import static jdk.compiler.graal.asm.aarch64.AArch64Address.createRegisterOffsetAddress; -import static jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler.PREFERRED_BRANCH_TARGET_ALIGNMENT; -import static jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler.PREFERRED_LOOP_ALIGNMENT; -import static jdk.compiler.graal.asm.aarch64.AArch64ASIMDAssembler.ElementSize.fromStride; -import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.ILLEGAL; -import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.REG; +import static jdk.graal.compiler.asm.aarch64.AArch64ASIMDAssembler.ASIMDSize.FullReg; +import static jdk.graal.compiler.asm.aarch64.AArch64Address.createBaseRegisterOnlyAddress; +import static jdk.graal.compiler.asm.aarch64.AArch64Address.createImmediateAddress; +import static jdk.graal.compiler.asm.aarch64.AArch64Address.createPairBaseRegisterOnlyAddress; +import static jdk.graal.compiler.asm.aarch64.AArch64Address.createRegisterOffsetAddress; +import static jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler.PREFERRED_BRANCH_TARGET_ALIGNMENT; +import static jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler.PREFERRED_LOOP_ALIGNMENT; +import static jdk.graal.compiler.asm.aarch64.AArch64ASIMDAssembler.ElementSize.fromStride; +import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.ILLEGAL; +import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.REG; import java.util.Arrays; -import jdk.compiler.graal.asm.Label; -import jdk.compiler.graal.asm.aarch64.AArch64ASIMDAssembler.ElementSize; -import jdk.compiler.graal.asm.aarch64.AArch64Address.AddressingMode; -import jdk.compiler.graal.asm.aarch64.AArch64Assembler.ConditionFlag; -import jdk.compiler.graal.asm.aarch64.AArch64Assembler.ShiftType; -import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler; -import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler.ScratchRegister; -import jdk.compiler.graal.core.common.Stride; -import jdk.compiler.graal.core.common.StrideUtil; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.Opcode; -import jdk.compiler.graal.lir.gen.LIRGeneratorTool; +import jdk.graal.compiler.asm.Label; +import jdk.graal.compiler.asm.aarch64.AArch64ASIMDAssembler.ElementSize; +import jdk.graal.compiler.asm.aarch64.AArch64Address.AddressingMode; +import jdk.graal.compiler.asm.aarch64.AArch64Assembler.ConditionFlag; +import jdk.graal.compiler.asm.aarch64.AArch64Assembler.ShiftType; +import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler; +import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler.ScratchRegister; +import jdk.graal.compiler.core.common.Stride; +import jdk.graal.compiler.core.common.StrideUtil; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.Opcode; +import jdk.graal.compiler.lir.gen.LIRGeneratorTool; import jdk.vm.ci.aarch64.AArch64Kind; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64ArrayEqualsOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64ArrayEqualsOp.java similarity index 96% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64ArrayEqualsOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64ArrayEqualsOp.java index d0126dd850c1..6d2c3c58bff0 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64ArrayEqualsOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64ArrayEqualsOp.java @@ -22,40 +22,40 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.aarch64; +package jdk.graal.compiler.lir.aarch64; import static jdk.vm.ci.code.ValueUtil.asRegister; import static jdk.vm.ci.code.ValueUtil.isIllegal; -import static jdk.compiler.graal.asm.aarch64.AArch64ASIMDAssembler.ASIMDInstruction.LD2_MULTIPLE_2R; -import static jdk.compiler.graal.asm.aarch64.AArch64ASIMDAssembler.ASIMDInstruction.LD4_MULTIPLE_4R; -import static jdk.compiler.graal.asm.aarch64.AArch64ASIMDAssembler.ASIMDSize.FullReg; -import static jdk.compiler.graal.asm.aarch64.AArch64ASIMDAssembler.ElementSize.fromStride; -import static jdk.compiler.graal.asm.aarch64.AArch64Address.createBaseRegisterOnlyAddress; -import static jdk.compiler.graal.asm.aarch64.AArch64Address.createImmediateAddress; -import static jdk.compiler.graal.asm.aarch64.AArch64Address.createPairBaseRegisterOnlyAddress; -import static jdk.compiler.graal.asm.aarch64.AArch64Address.createStructureImmediatePostIndexAddress; -import static jdk.compiler.graal.asm.aarch64.AArch64Address.createStructureNoOffsetAddress; -import static jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler.PREFERRED_BRANCH_TARGET_ALIGNMENT; -import static jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler.PREFERRED_LOOP_ALIGNMENT; -import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.ILLEGAL; -import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.REG; +import static jdk.graal.compiler.asm.aarch64.AArch64ASIMDAssembler.ASIMDInstruction.LD2_MULTIPLE_2R; +import static jdk.graal.compiler.asm.aarch64.AArch64ASIMDAssembler.ASIMDInstruction.LD4_MULTIPLE_4R; +import static jdk.graal.compiler.asm.aarch64.AArch64ASIMDAssembler.ASIMDSize.FullReg; +import static jdk.graal.compiler.asm.aarch64.AArch64ASIMDAssembler.ElementSize.fromStride; +import static jdk.graal.compiler.asm.aarch64.AArch64Address.createBaseRegisterOnlyAddress; +import static jdk.graal.compiler.asm.aarch64.AArch64Address.createImmediateAddress; +import static jdk.graal.compiler.asm.aarch64.AArch64Address.createPairBaseRegisterOnlyAddress; +import static jdk.graal.compiler.asm.aarch64.AArch64Address.createStructureImmediatePostIndexAddress; +import static jdk.graal.compiler.asm.aarch64.AArch64Address.createStructureNoOffsetAddress; +import static jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler.PREFERRED_BRANCH_TARGET_ALIGNMENT; +import static jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler.PREFERRED_LOOP_ALIGNMENT; +import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.ILLEGAL; +import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.REG; import java.util.Arrays; -import jdk.compiler.graal.asm.Label; -import jdk.compiler.graal.asm.aarch64.AArch64ASIMDAssembler.ElementSize; -import jdk.compiler.graal.asm.aarch64.AArch64Address.AddressingMode; -import jdk.compiler.graal.asm.aarch64.AArch64Assembler.ConditionFlag; -import jdk.compiler.graal.asm.aarch64.AArch64Assembler.ShiftType; -import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler; -import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler.ScratchRegister; -import jdk.compiler.graal.core.common.Stride; -import jdk.compiler.graal.core.common.StrideUtil; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.Opcode; -import jdk.compiler.graal.lir.gen.LIRGeneratorTool; +import jdk.graal.compiler.asm.Label; +import jdk.graal.compiler.asm.aarch64.AArch64ASIMDAssembler.ElementSize; +import jdk.graal.compiler.asm.aarch64.AArch64Address.AddressingMode; +import jdk.graal.compiler.asm.aarch64.AArch64Assembler.ConditionFlag; +import jdk.graal.compiler.asm.aarch64.AArch64Assembler.ShiftType; +import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler; +import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler.ScratchRegister; +import jdk.graal.compiler.core.common.Stride; +import jdk.graal.compiler.core.common.StrideUtil; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.Opcode; +import jdk.graal.compiler.lir.gen.LIRGeneratorTool; import jdk.vm.ci.aarch64.AArch64Kind; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64ArrayIndexOfOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64ArrayIndexOfOp.java similarity index 96% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64ArrayIndexOfOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64ArrayIndexOfOp.java index 0cf99632fbf5..43d7ce4cfa8a 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64ArrayIndexOfOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64ArrayIndexOfOp.java @@ -23,34 +23,34 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.aarch64; +package jdk.graal.compiler.lir.aarch64; import static jdk.vm.ci.aarch64.AArch64.zr; import static jdk.vm.ci.code.ValueUtil.asRegister; -import static jdk.compiler.graal.asm.aarch64.AArch64ASIMDAssembler.ASIMDInstruction.LD2_MULTIPLE_2R; -import static jdk.compiler.graal.asm.aarch64.AArch64ASIMDAssembler.ASIMDInstruction.LD4_MULTIPLE_4R; -import static jdk.compiler.graal.asm.aarch64.AArch64ASIMDAssembler.ASIMDSize.FullReg; -import static jdk.compiler.graal.asm.aarch64.AArch64Address.createStructureImmediatePostIndexAddress; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.ConditionFlag; -import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.REG; +import static jdk.graal.compiler.asm.aarch64.AArch64ASIMDAssembler.ASIMDInstruction.LD2_MULTIPLE_2R; +import static jdk.graal.compiler.asm.aarch64.AArch64ASIMDAssembler.ASIMDInstruction.LD4_MULTIPLE_4R; +import static jdk.graal.compiler.asm.aarch64.AArch64ASIMDAssembler.ASIMDSize.FullReg; +import static jdk.graal.compiler.asm.aarch64.AArch64Address.createStructureImmediatePostIndexAddress; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.ConditionFlag; +import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.REG; import java.util.Arrays; -import jdk.compiler.graal.asm.Label; -import jdk.compiler.graal.asm.aarch64.AArch64ASIMDAssembler.ElementSize; -import jdk.compiler.graal.asm.aarch64.AArch64Address; -import jdk.compiler.graal.asm.aarch64.AArch64Address.AddressingMode; -import jdk.compiler.graal.asm.aarch64.AArch64Assembler.ExtendType; -import jdk.compiler.graal.asm.aarch64.AArch64Assembler.ShiftType; -import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler; -import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler.ScratchRegister; -import jdk.compiler.graal.core.common.Stride; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.Opcode; -import jdk.compiler.graal.lir.gen.LIRGeneratorTool; -import jdk.compiler.graal.lir.gen.LIRGeneratorTool.ArrayIndexOfVariant; +import jdk.graal.compiler.asm.Label; +import jdk.graal.compiler.asm.aarch64.AArch64ASIMDAssembler.ElementSize; +import jdk.graal.compiler.asm.aarch64.AArch64Address; +import jdk.graal.compiler.asm.aarch64.AArch64Address.AddressingMode; +import jdk.graal.compiler.asm.aarch64.AArch64Assembler.ExtendType; +import jdk.graal.compiler.asm.aarch64.AArch64Assembler.ShiftType; +import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler; +import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler.ScratchRegister; +import jdk.graal.compiler.core.common.Stride; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.Opcode; +import jdk.graal.compiler.lir.gen.LIRGeneratorTool; +import jdk.graal.compiler.lir.gen.LIRGeneratorTool.ArrayIndexOfVariant; import jdk.vm.ci.aarch64.AArch64Kind; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64ArrayRegionCompareToOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64ArrayRegionCompareToOp.java similarity index 94% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64ArrayRegionCompareToOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64ArrayRegionCompareToOp.java index 57fbf3b9d95d..2e1442df7f9e 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64ArrayRegionCompareToOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64ArrayRegionCompareToOp.java @@ -22,37 +22,37 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.aarch64; +package jdk.graal.compiler.lir.aarch64; import static jdk.vm.ci.aarch64.AArch64.CPU; import static jdk.vm.ci.aarch64.AArch64.SIMD; import static jdk.vm.ci.aarch64.AArch64.zr; import static jdk.vm.ci.code.ValueUtil.asRegister; import static jdk.vm.ci.code.ValueUtil.isIllegal; -import static jdk.compiler.graal.asm.aarch64.AArch64ASIMDAssembler.ASIMDSize.FullReg; -import static jdk.compiler.graal.asm.aarch64.AArch64ASIMDAssembler.ElementSize.fromStride; -import static jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler.PREFERRED_BRANCH_TARGET_ALIGNMENT; -import static jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler.PREFERRED_LOOP_ALIGNMENT; -import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.ILLEGAL; -import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.REG; +import static jdk.graal.compiler.asm.aarch64.AArch64ASIMDAssembler.ASIMDSize.FullReg; +import static jdk.graal.compiler.asm.aarch64.AArch64ASIMDAssembler.ElementSize.fromStride; +import static jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler.PREFERRED_BRANCH_TARGET_ALIGNMENT; +import static jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler.PREFERRED_LOOP_ALIGNMENT; +import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.ILLEGAL; +import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.REG; import java.util.Arrays; -import jdk.compiler.graal.asm.Label; -import jdk.compiler.graal.asm.aarch64.AArch64ASIMDAssembler.ElementSize; -import jdk.compiler.graal.asm.aarch64.AArch64Address; -import jdk.compiler.graal.asm.aarch64.AArch64Address.AddressingMode; -import jdk.compiler.graal.asm.aarch64.AArch64Assembler.ConditionFlag; -import jdk.compiler.graal.asm.aarch64.AArch64Assembler.ShiftType; -import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler; -import jdk.compiler.graal.code.DataSection; -import jdk.compiler.graal.core.common.Stride; -import jdk.compiler.graal.core.common.StrideUtil; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.Opcode; -import jdk.compiler.graal.lir.gen.LIRGeneratorTool; +import jdk.graal.compiler.asm.Label; +import jdk.graal.compiler.asm.aarch64.AArch64ASIMDAssembler.ElementSize; +import jdk.graal.compiler.asm.aarch64.AArch64Address; +import jdk.graal.compiler.asm.aarch64.AArch64Address.AddressingMode; +import jdk.graal.compiler.asm.aarch64.AArch64Assembler.ConditionFlag; +import jdk.graal.compiler.asm.aarch64.AArch64Assembler.ShiftType; +import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler; +import jdk.graal.compiler.code.DataSection; +import jdk.graal.compiler.core.common.Stride; +import jdk.graal.compiler.core.common.StrideUtil; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.Opcode; +import jdk.graal.compiler.lir.gen.LIRGeneratorTool; import jdk.vm.ci.aarch64.AArch64Kind; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64AtomicMove.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64AtomicMove.java similarity index 95% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64AtomicMove.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64AtomicMove.java index 17f2f07eabac..e33208aa06ba 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64AtomicMove.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64AtomicMove.java @@ -22,27 +22,27 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.aarch64; +package jdk.graal.compiler.lir.aarch64; import static jdk.vm.ci.aarch64.AArch64.sp; import static jdk.vm.ci.code.ValueUtil.asRegister; -import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.CONST; -import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.REG; +import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.CONST; +import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.REG; import java.util.function.Consumer; -import jdk.compiler.graal.asm.Label; -import jdk.compiler.graal.asm.aarch64.AArch64Assembler; -import jdk.compiler.graal.asm.aarch64.AArch64Assembler.ExtendType; -import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler; -import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler.ScratchRegister; -import jdk.compiler.graal.core.common.memory.MemoryOrderMode; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.LIRValueUtil; -import jdk.compiler.graal.lir.Opcode; -import jdk.compiler.graal.lir.gen.LIRGenerator; +import jdk.graal.compiler.asm.Label; +import jdk.graal.compiler.asm.aarch64.AArch64Assembler; +import jdk.graal.compiler.asm.aarch64.AArch64Assembler.ExtendType; +import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler; +import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler.ScratchRegister; +import jdk.graal.compiler.core.common.memory.MemoryOrderMode; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.LIRValueUtil; +import jdk.graal.compiler.lir.Opcode; +import jdk.graal.compiler.lir.gen.LIRGenerator; import jdk.vm.ci.aarch64.AArch64; import jdk.vm.ci.aarch64.AArch64Kind; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64BigIntegerMulAddOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64BigIntegerMulAddOp.java similarity index 88% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64BigIntegerMulAddOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64BigIntegerMulAddOp.java index 68909a1cbfbd..1436b28e8741 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64BigIntegerMulAddOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64BigIntegerMulAddOp.java @@ -22,25 +22,25 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.aarch64; +package jdk.graal.compiler.lir.aarch64; import static jdk.vm.ci.aarch64.AArch64.zr; import static jdk.vm.ci.code.ValueUtil.asRegister; -import static jdk.compiler.graal.asm.aarch64.AArch64Address.AddressingMode.IMMEDIATE_PRE_INDEXED; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.ConditionFlag.EQ; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.ConditionFlag.NE; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.ShiftType.LSL; -import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.REG; - -import jdk.compiler.graal.asm.Label; -import jdk.compiler.graal.asm.aarch64.AArch64Address; -import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler; -import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler.ScratchRegister; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.SyncPort; -import jdk.compiler.graal.lir.gen.LIRGeneratorTool; +import static jdk.graal.compiler.asm.aarch64.AArch64Address.AddressingMode.IMMEDIATE_PRE_INDEXED; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.ConditionFlag.EQ; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.ConditionFlag.NE; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.ShiftType.LSL; +import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.REG; + +import jdk.graal.compiler.asm.Label; +import jdk.graal.compiler.asm.aarch64.AArch64Address; +import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler; +import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler.ScratchRegister; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.SyncPort; +import jdk.graal.compiler.lir.gen.LIRGeneratorTool; import jdk.vm.ci.aarch64.AArch64Kind; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64BigIntegerMultiplyToLenOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64BigIntegerMultiplyToLenOp.java similarity index 96% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64BigIntegerMultiplyToLenOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64BigIntegerMultiplyToLenOp.java index 68a2ea5335bc..4bbb88284f5f 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64BigIntegerMultiplyToLenOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64BigIntegerMultiplyToLenOp.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.aarch64; +package jdk.graal.compiler.lir.aarch64; import static jdk.vm.ci.aarch64.AArch64.r10; import static jdk.vm.ci.aarch64.AArch64.r11; @@ -39,18 +39,18 @@ import static jdk.vm.ci.aarch64.AArch64.r23; import static jdk.vm.ci.aarch64.AArch64.zr; import static jdk.vm.ci.code.ValueUtil.asRegister; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.ConditionFlag.MI; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.ExtendType.UXTW; -import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.REG; - -import jdk.compiler.graal.asm.Label; -import jdk.compiler.graal.asm.aarch64.AArch64Address; -import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler; -import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler.ScratchRegister; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.SyncPort; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.ConditionFlag.MI; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.ExtendType.UXTW; +import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.REG; + +import jdk.graal.compiler.asm.Label; +import jdk.graal.compiler.asm.aarch64.AArch64Address; +import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler; +import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler.ScratchRegister; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.SyncPort; import jdk.vm.ci.aarch64.AArch64Kind; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64BigIntegerSquareToLenOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64BigIntegerSquareToLenOp.java similarity index 93% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64BigIntegerSquareToLenOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64BigIntegerSquareToLenOp.java index 5166d939e2a5..69c171e44eb8 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64BigIntegerSquareToLenOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64BigIntegerSquareToLenOp.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.aarch64; +package jdk.graal.compiler.lir.aarch64; import static jdk.vm.ci.aarch64.AArch64.r10; import static jdk.vm.ci.aarch64.AArch64.r11; @@ -41,12 +41,12 @@ import static jdk.vm.ci.aarch64.AArch64.r6; import static jdk.vm.ci.code.ValueUtil.asRegister; -import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.lir.LIRInstruction; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.SyncPort; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.lir.LIRInstruction; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.SyncPort; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; import jdk.vm.ci.aarch64.AArch64Kind; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64BitFieldOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64BitFieldOp.java similarity index 89% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64BitFieldOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64BitFieldOp.java index 1cbf46b45c2e..d6daf396b09d 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64BitFieldOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64BitFieldOp.java @@ -24,18 +24,18 @@ * questions. */ -package jdk.compiler.graal.lir.aarch64; +package jdk.graal.compiler.lir.aarch64; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; import jdk.vm.ci.code.Register; import jdk.vm.ci.meta.AllocatableValue; -import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.Opcode; +import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.Opcode; import static jdk.vm.ci.code.ValueUtil.asRegister; -import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.REG; +import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.REG; /** * Bit field ops for AArch64. diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64BitManipulationOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64BitManipulationOp.java similarity index 87% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64BitManipulationOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64BitManipulationOp.java index 4e78f1a9a17f..471a9ec27ec8 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64BitManipulationOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64BitManipulationOp.java @@ -22,19 +22,19 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.aarch64; +package jdk.graal.compiler.lir.aarch64; import static jdk.vm.ci.code.ValueUtil.asRegister; -import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.ILLEGAL; -import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.REG; +import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.ILLEGAL; +import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.REG; -import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler; -import jdk.compiler.graal.core.common.LIRKind; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.Opcode; -import jdk.compiler.graal.lir.gen.LIRGeneratorTool; +import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler; +import jdk.graal.compiler.core.common.LIRKind; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.Opcode; +import jdk.graal.compiler.lir.gen.LIRGeneratorTool; import jdk.vm.ci.aarch64.AArch64Kind; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64BitSwapOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64BitSwapOp.java similarity index 89% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64BitSwapOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64BitSwapOp.java index 342f5c108451..ae8fa5eb2fb1 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64BitSwapOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64BitSwapOp.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.aarch64; +package jdk.graal.compiler.lir.aarch64; import static jdk.vm.ci.code.ValueUtil.asRegister; -import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler; -import jdk.compiler.graal.lir.LIRInstruction; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.SyncPort; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler; +import jdk.graal.compiler.lir.LIRInstruction; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.SyncPort; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; import jdk.vm.ci.aarch64.AArch64Kind; import jdk.vm.ci.meta.AllocatableValue; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64BlockEndOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64BlockEndOp.java similarity index 85% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64BlockEndOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64BlockEndOp.java index cb11d4c2b5e8..ab0cf09e87b2 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64BlockEndOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64BlockEndOp.java @@ -23,13 +23,13 @@ * questions. */ -package jdk.compiler.graal.lir.aarch64; +package jdk.graal.compiler.lir.aarch64; -import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; -import jdk.compiler.graal.lir.LIRInstruction; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.StandardOp.BlockEndOp; +import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.lir.LIRInstruction; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.StandardOp.BlockEndOp; public abstract class AArch64BlockEndOp extends LIRInstruction implements BlockEndOp { diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64BreakpointOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64BreakpointOp.java similarity index 84% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64BreakpointOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64BreakpointOp.java index 191700bcd66f..d9987b8ba915 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64BreakpointOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64BreakpointOp.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.aarch64; +package jdk.graal.compiler.lir.aarch64; -import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler; -import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler.AArch64ExceptionCode; -import jdk.compiler.graal.lir.LIRInstruction; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; -import jdk.compiler.graal.lir.Opcode; +import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler; +import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler.AArch64ExceptionCode; +import jdk.graal.compiler.lir.LIRInstruction; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.lir.Opcode; import jdk.vm.ci.meta.Value; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64ByteSwap.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64ByteSwap.java similarity index 88% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64ByteSwap.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64ByteSwap.java index d70f1f8c0796..d615d3afae9c 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64ByteSwap.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64ByteSwap.java @@ -22,17 +22,17 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.aarch64; +package jdk.graal.compiler.lir.aarch64; import static jdk.vm.ci.code.ValueUtil.asRegister; -import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.REG; +import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.REG; -import jdk.compiler.graal.asm.aarch64.AArch64ASIMDAssembler.ASIMDSize; -import jdk.compiler.graal.asm.aarch64.AArch64ASIMDAssembler.ElementSize; -import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.Opcode; +import jdk.graal.compiler.asm.aarch64.AArch64ASIMDAssembler.ASIMDSize; +import jdk.graal.compiler.asm.aarch64.AArch64ASIMDAssembler.ElementSize; +import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.Opcode; import jdk.vm.ci.aarch64.AArch64Kind; import jdk.vm.ci.meta.AllocatableValue; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64CacheWritebackOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64CacheWritebackOp.java similarity index 87% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64CacheWritebackOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64CacheWritebackOp.java index d7c2fb082dcd..23617787c426 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64CacheWritebackOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64CacheWritebackOp.java @@ -23,13 +23,13 @@ * questions. */ -package jdk.compiler.graal.lir.aarch64; +package jdk.graal.compiler.lir.aarch64; -import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.COMPOSITE; +import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.COMPOSITE; -import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; -import jdk.compiler.graal.lir.LIRInstructionClass; +import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.lir.LIRInstructionClass; /** * Implements {@code jdk.internal.misc.Unsafe.writeback0(long)}. diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64CacheWritebackPostSyncOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64CacheWritebackPostSyncOp.java similarity index 89% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64CacheWritebackPostSyncOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64CacheWritebackPostSyncOp.java index 36e141d45aac..e0dba5a3fb6d 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64CacheWritebackPostSyncOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64CacheWritebackPostSyncOp.java @@ -23,11 +23,11 @@ * questions. */ -package jdk.compiler.graal.lir.aarch64; +package jdk.graal.compiler.lir.aarch64; -import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; -import jdk.compiler.graal.lir.LIRInstructionClass; +import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.lir.LIRInstructionClass; /** * Implements {@code jdk.internal.misc.Unsafe.writebackPostSync0(long)}. diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64CalcStringAttributesOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64CalcStringAttributesOp.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64CalcStringAttributesOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64CalcStringAttributesOp.java index 02505fcaa1ba..2e81bbda0bb9 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64CalcStringAttributesOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64CalcStringAttributesOp.java @@ -22,51 +22,51 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.aarch64; +package jdk.graal.compiler.lir.aarch64; import static jdk.vm.ci.aarch64.AArch64.zr; import static jdk.vm.ci.code.ValueUtil.asRegister; -import static jdk.compiler.graal.asm.aarch64.AArch64ASIMDAssembler.ASIMDInstruction.LD1_MULTIPLE_4R; -import static jdk.compiler.graal.asm.aarch64.AArch64ASIMDAssembler.ASIMDSize.FullReg; -import static jdk.compiler.graal.asm.aarch64.AArch64ASIMDAssembler.ElementSize.DoubleWord; -import static jdk.compiler.graal.asm.aarch64.AArch64ASIMDAssembler.ElementSize.HalfWord; -import static jdk.compiler.graal.asm.aarch64.AArch64ASIMDAssembler.ElementSize.Word; -import static jdk.compiler.graal.asm.aarch64.AArch64Address.createImmediateAddress; -import static jdk.compiler.graal.asm.aarch64.AArch64Address.createPairBaseRegisterOnlyAddress; -import static jdk.compiler.graal.asm.aarch64.AArch64Address.createRegisterOffsetAddress; -import static jdk.compiler.graal.asm.aarch64.AArch64Address.createStructureImmediatePostIndexAddress; -import static jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler.PREFERRED_BRANCH_TARGET_ALIGNMENT; -import static jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler.PREFERRED_LOOP_ALIGNMENT; -import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.REG; -import static jdk.compiler.graal.lir.gen.LIRGeneratorTool.CalcStringAttributesEncoding.CR_16BIT; -import static jdk.compiler.graal.lir.gen.LIRGeneratorTool.CalcStringAttributesEncoding.CR_7BIT; -import static jdk.compiler.graal.lir.gen.LIRGeneratorTool.CalcStringAttributesEncoding.CR_8BIT; -import static jdk.compiler.graal.lir.gen.LIRGeneratorTool.CalcStringAttributesEncoding.CR_BROKEN; -import static jdk.compiler.graal.lir.gen.LIRGeneratorTool.CalcStringAttributesEncoding.CR_BROKEN_MULTIBYTE; -import static jdk.compiler.graal.lir.gen.LIRGeneratorTool.CalcStringAttributesEncoding.CR_VALID; -import static jdk.compiler.graal.lir.gen.LIRGeneratorTool.CalcStringAttributesEncoding.CR_VALID_MULTIBYTE; -import static jdk.compiler.graal.lir.gen.LIRGeneratorTool.CalcStringAttributesEncoding.UTF_16; -import static jdk.compiler.graal.lir.gen.LIRGeneratorTool.CalcStringAttributesEncoding.UTF_32; -import static jdk.compiler.graal.lir.gen.LIRGeneratorTool.CalcStringAttributesEncoding.UTF_8; +import static jdk.graal.compiler.asm.aarch64.AArch64ASIMDAssembler.ASIMDInstruction.LD1_MULTIPLE_4R; +import static jdk.graal.compiler.asm.aarch64.AArch64ASIMDAssembler.ASIMDSize.FullReg; +import static jdk.graal.compiler.asm.aarch64.AArch64ASIMDAssembler.ElementSize.DoubleWord; +import static jdk.graal.compiler.asm.aarch64.AArch64ASIMDAssembler.ElementSize.HalfWord; +import static jdk.graal.compiler.asm.aarch64.AArch64ASIMDAssembler.ElementSize.Word; +import static jdk.graal.compiler.asm.aarch64.AArch64Address.createImmediateAddress; +import static jdk.graal.compiler.asm.aarch64.AArch64Address.createPairBaseRegisterOnlyAddress; +import static jdk.graal.compiler.asm.aarch64.AArch64Address.createRegisterOffsetAddress; +import static jdk.graal.compiler.asm.aarch64.AArch64Address.createStructureImmediatePostIndexAddress; +import static jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler.PREFERRED_BRANCH_TARGET_ALIGNMENT; +import static jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler.PREFERRED_LOOP_ALIGNMENT; +import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.REG; +import static jdk.graal.compiler.lir.gen.LIRGeneratorTool.CalcStringAttributesEncoding.CR_16BIT; +import static jdk.graal.compiler.lir.gen.LIRGeneratorTool.CalcStringAttributesEncoding.CR_7BIT; +import static jdk.graal.compiler.lir.gen.LIRGeneratorTool.CalcStringAttributesEncoding.CR_8BIT; +import static jdk.graal.compiler.lir.gen.LIRGeneratorTool.CalcStringAttributesEncoding.CR_BROKEN; +import static jdk.graal.compiler.lir.gen.LIRGeneratorTool.CalcStringAttributesEncoding.CR_BROKEN_MULTIBYTE; +import static jdk.graal.compiler.lir.gen.LIRGeneratorTool.CalcStringAttributesEncoding.CR_VALID; +import static jdk.graal.compiler.lir.gen.LIRGeneratorTool.CalcStringAttributesEncoding.CR_VALID_MULTIBYTE; +import static jdk.graal.compiler.lir.gen.LIRGeneratorTool.CalcStringAttributesEncoding.UTF_16; +import static jdk.graal.compiler.lir.gen.LIRGeneratorTool.CalcStringAttributesEncoding.UTF_32; +import static jdk.graal.compiler.lir.gen.LIRGeneratorTool.CalcStringAttributesEncoding.UTF_8; import java.util.Arrays; -import jdk.compiler.graal.asm.Label; -import jdk.compiler.graal.asm.aarch64.AArch64ASIMDAssembler.ElementSize; -import jdk.compiler.graal.asm.aarch64.AArch64Address; -import jdk.compiler.graal.asm.aarch64.AArch64Address.AddressingMode; -import jdk.compiler.graal.asm.aarch64.AArch64Assembler; -import jdk.compiler.graal.asm.aarch64.AArch64Assembler.ConditionFlag; -import jdk.compiler.graal.asm.aarch64.AArch64Assembler.ShiftType; -import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler; -import jdk.compiler.graal.code.DataSection; -import jdk.compiler.graal.core.common.Stride; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.Opcode; -import jdk.compiler.graal.lir.gen.LIRGeneratorTool; -import jdk.compiler.graal.lir.gen.LIRGeneratorTool.CalcStringAttributesEncoding; +import jdk.graal.compiler.asm.Label; +import jdk.graal.compiler.asm.aarch64.AArch64ASIMDAssembler.ElementSize; +import jdk.graal.compiler.asm.aarch64.AArch64Address; +import jdk.graal.compiler.asm.aarch64.AArch64Address.AddressingMode; +import jdk.graal.compiler.asm.aarch64.AArch64Assembler; +import jdk.graal.compiler.asm.aarch64.AArch64Assembler.ConditionFlag; +import jdk.graal.compiler.asm.aarch64.AArch64Assembler.ShiftType; +import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler; +import jdk.graal.compiler.code.DataSection; +import jdk.graal.compiler.core.common.Stride; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.Opcode; +import jdk.graal.compiler.lir.gen.LIRGeneratorTool; +import jdk.graal.compiler.lir.gen.LIRGeneratorTool.CalcStringAttributesEncoding; import jdk.vm.ci.aarch64.AArch64Kind; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64Call.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64Call.java similarity index 93% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64Call.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64Call.java index 7cf8a75cc141..7485060ad477 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64Call.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64Call.java @@ -23,23 +23,23 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.aarch64; +package jdk.graal.compiler.lir.aarch64; import static jdk.vm.ci.code.ValueUtil.asRegister; import static jdk.vm.ci.code.ValueUtil.isRegister; -import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.ILLEGAL; -import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.REG; -import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.STACK; - -import jdk.compiler.graal.asm.Label; -import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler; -import jdk.compiler.graal.core.common.spi.ForeignCallLinkage; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; -import jdk.compiler.graal.lir.LIRFrameState; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.Opcode; -import jdk.compiler.graal.lir.StandardOp.LabelHoldingOp; -import jdk.compiler.graal.lir.gen.DiagnosticLIRGeneratorTool.ZapRegistersAfterInstruction; +import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.ILLEGAL; +import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.REG; +import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.STACK; + +import jdk.graal.compiler.asm.Label; +import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler; +import jdk.graal.compiler.core.common.spi.ForeignCallLinkage; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.lir.LIRFrameState; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.Opcode; +import jdk.graal.compiler.lir.StandardOp.LabelHoldingOp; +import jdk.graal.compiler.lir.gen.DiagnosticLIRGeneratorTool.ZapRegistersAfterInstruction; import jdk.vm.ci.code.Register; import jdk.vm.ci.code.site.Call; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64CipherBlockChainingAESDecryptOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64CipherBlockChainingAESDecryptOp.java similarity index 92% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64CipherBlockChainingAESDecryptOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64CipherBlockChainingAESDecryptOp.java index db0c294a375a..be4a6ba45934 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64CipherBlockChainingAESDecryptOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64CipherBlockChainingAESDecryptOp.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.aarch64; +package jdk.graal.compiler.lir.aarch64; import static jdk.vm.ci.aarch64.AArch64.v0; import static jdk.vm.ci.aarch64.AArch64.v1; @@ -43,23 +43,23 @@ import static jdk.vm.ci.aarch64.AArch64.v30; import static jdk.vm.ci.aarch64.AArch64.v31; import static jdk.vm.ci.code.ValueUtil.asRegister; -import static jdk.compiler.graal.asm.aarch64.AArch64ASIMDAssembler.ASIMDInstruction.LD1_MULTIPLE_2R; -import static jdk.compiler.graal.asm.aarch64.AArch64ASIMDAssembler.ASIMDInstruction.LD1_MULTIPLE_4R; -import static jdk.compiler.graal.asm.aarch64.AArch64ASIMDAssembler.ASIMDSize.FullReg; -import static jdk.compiler.graal.asm.aarch64.AArch64Address.AddressingMode.IMMEDIATE_POST_INDEXED; -import static jdk.compiler.graal.asm.aarch64.AArch64Address.AddressingMode.IMMEDIATE_SIGNED_UNSCALED; -import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.REG; - -import jdk.compiler.graal.asm.Label; -import jdk.compiler.graal.asm.aarch64.AArch64ASIMDAssembler.ElementSize; -import jdk.compiler.graal.asm.aarch64.AArch64Address; -import jdk.compiler.graal.asm.aarch64.AArch64Assembler.ConditionFlag; -import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.SyncPort; -import jdk.compiler.graal.lir.gen.LIRGeneratorTool; +import static jdk.graal.compiler.asm.aarch64.AArch64ASIMDAssembler.ASIMDInstruction.LD1_MULTIPLE_2R; +import static jdk.graal.compiler.asm.aarch64.AArch64ASIMDAssembler.ASIMDInstruction.LD1_MULTIPLE_4R; +import static jdk.graal.compiler.asm.aarch64.AArch64ASIMDAssembler.ASIMDSize.FullReg; +import static jdk.graal.compiler.asm.aarch64.AArch64Address.AddressingMode.IMMEDIATE_POST_INDEXED; +import static jdk.graal.compiler.asm.aarch64.AArch64Address.AddressingMode.IMMEDIATE_SIGNED_UNSCALED; +import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.REG; + +import jdk.graal.compiler.asm.Label; +import jdk.graal.compiler.asm.aarch64.AArch64ASIMDAssembler.ElementSize; +import jdk.graal.compiler.asm.aarch64.AArch64Address; +import jdk.graal.compiler.asm.aarch64.AArch64Assembler.ConditionFlag; +import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.SyncPort; +import jdk.graal.compiler.lir.gen.LIRGeneratorTool; import jdk.vm.ci.aarch64.AArch64Kind; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64CipherBlockChainingAESEncryptOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64CipherBlockChainingAESEncryptOp.java similarity index 92% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64CipherBlockChainingAESEncryptOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64CipherBlockChainingAESEncryptOp.java index eb6339071e94..39c0c5e5034d 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64CipherBlockChainingAESEncryptOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64CipherBlockChainingAESEncryptOp.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.aarch64; +package jdk.graal.compiler.lir.aarch64; import static jdk.vm.ci.aarch64.AArch64.v0; import static jdk.vm.ci.aarch64.AArch64.v1; @@ -42,23 +42,23 @@ import static jdk.vm.ci.aarch64.AArch64.v30; import static jdk.vm.ci.aarch64.AArch64.v31; import static jdk.vm.ci.code.ValueUtil.asRegister; -import static jdk.compiler.graal.asm.aarch64.AArch64ASIMDAssembler.ASIMDInstruction.LD1_MULTIPLE_2R; -import static jdk.compiler.graal.asm.aarch64.AArch64ASIMDAssembler.ASIMDInstruction.LD1_MULTIPLE_4R; -import static jdk.compiler.graal.asm.aarch64.AArch64ASIMDAssembler.ASIMDSize.FullReg; -import static jdk.compiler.graal.asm.aarch64.AArch64Address.AddressingMode.IMMEDIATE_POST_INDEXED; -import static jdk.compiler.graal.asm.aarch64.AArch64Address.AddressingMode.IMMEDIATE_SIGNED_UNSCALED; -import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.REG; - -import jdk.compiler.graal.asm.Label; -import jdk.compiler.graal.asm.aarch64.AArch64ASIMDAssembler.ElementSize; -import jdk.compiler.graal.asm.aarch64.AArch64Address; -import jdk.compiler.graal.asm.aarch64.AArch64Assembler.ConditionFlag; -import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.SyncPort; -import jdk.compiler.graal.lir.gen.LIRGeneratorTool; +import static jdk.graal.compiler.asm.aarch64.AArch64ASIMDAssembler.ASIMDInstruction.LD1_MULTIPLE_2R; +import static jdk.graal.compiler.asm.aarch64.AArch64ASIMDAssembler.ASIMDInstruction.LD1_MULTIPLE_4R; +import static jdk.graal.compiler.asm.aarch64.AArch64ASIMDAssembler.ASIMDSize.FullReg; +import static jdk.graal.compiler.asm.aarch64.AArch64Address.AddressingMode.IMMEDIATE_POST_INDEXED; +import static jdk.graal.compiler.asm.aarch64.AArch64Address.AddressingMode.IMMEDIATE_SIGNED_UNSCALED; +import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.REG; + +import jdk.graal.compiler.asm.Label; +import jdk.graal.compiler.asm.aarch64.AArch64ASIMDAssembler.ElementSize; +import jdk.graal.compiler.asm.aarch64.AArch64Address; +import jdk.graal.compiler.asm.aarch64.AArch64Assembler.ConditionFlag; +import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.SyncPort; +import jdk.graal.compiler.lir.gen.LIRGeneratorTool; import jdk.vm.ci.aarch64.AArch64Kind; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64Compare.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64Compare.java similarity index 95% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64Compare.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64Compare.java index 78e4e338a440..99576ce0e10e 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64Compare.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64Compare.java @@ -22,26 +22,26 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.aarch64; +package jdk.graal.compiler.lir.aarch64; import static jdk.vm.ci.code.ValueUtil.asRegister; import static jdk.vm.ci.code.ValueUtil.isRegister; -import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.CONST; -import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.REG; -import static jdk.compiler.graal.lir.LIRValueUtil.asJavaConstant; -import static jdk.compiler.graal.lir.LIRValueUtil.isJavaConstant; - -import jdk.compiler.graal.asm.aarch64.AArch64ASIMDAssembler.ASIMDSize; -import jdk.compiler.graal.asm.aarch64.AArch64ASIMDAssembler.ElementSize; -import jdk.compiler.graal.asm.aarch64.AArch64Assembler; -import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler; -import jdk.compiler.graal.core.common.NumUtil; -import jdk.compiler.graal.core.common.calc.Condition; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.Opcode; -import jdk.compiler.graal.lir.gen.LIRGenerator; +import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.CONST; +import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.REG; +import static jdk.graal.compiler.lir.LIRValueUtil.asJavaConstant; +import static jdk.graal.compiler.lir.LIRValueUtil.isJavaConstant; + +import jdk.graal.compiler.asm.aarch64.AArch64ASIMDAssembler.ASIMDSize; +import jdk.graal.compiler.asm.aarch64.AArch64ASIMDAssembler.ElementSize; +import jdk.graal.compiler.asm.aarch64.AArch64Assembler; +import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler; +import jdk.graal.compiler.core.common.NumUtil; +import jdk.graal.compiler.core.common.calc.Condition; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.Opcode; +import jdk.graal.compiler.lir.gen.LIRGenerator; import jdk.vm.ci.code.Register; import jdk.vm.ci.meta.AllocatableValue; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64ComplexVectorOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64ComplexVectorOp.java similarity index 95% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64ComplexVectorOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64ComplexVectorOp.java index abbe3ff91004..6665c7ccf76a 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64ComplexVectorOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64ComplexVectorOp.java @@ -22,22 +22,22 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.aarch64; +package jdk.graal.compiler.lir.aarch64; import static jdk.vm.ci.aarch64.AArch64.SIMD; -import static jdk.compiler.graal.asm.aarch64.AArch64ASIMDAssembler.ASIMDSize.FullReg; -import static jdk.compiler.graal.asm.aarch64.AArch64ASIMDAssembler.ElementSize.Word; +import static jdk.graal.compiler.asm.aarch64.AArch64ASIMDAssembler.ASIMDSize.FullReg; +import static jdk.graal.compiler.asm.aarch64.AArch64ASIMDAssembler.ElementSize.Word; import java.util.Arrays; -import jdk.compiler.graal.asm.aarch64.AArch64ASIMDAssembler; -import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler; -import jdk.compiler.graal.code.DataSection; -import jdk.compiler.graal.core.common.LIRKind; -import jdk.compiler.graal.lir.asm.ArrayDataPointerConstant; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.gen.LIRGeneratorTool; +import jdk.graal.compiler.asm.aarch64.AArch64ASIMDAssembler; +import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler; +import jdk.graal.compiler.code.DataSection; +import jdk.graal.compiler.core.common.LIRKind; +import jdk.graal.compiler.lir.asm.ArrayDataPointerConstant; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.gen.LIRGeneratorTool; import jdk.vm.ci.aarch64.AArch64; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64ControlFlow.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64ControlFlow.java similarity index 95% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64ControlFlow.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64ControlFlow.java index bb5f6bdf1359..7a532abd741a 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64ControlFlow.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64ControlFlow.java @@ -22,40 +22,40 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.aarch64; +package jdk.graal.compiler.lir.aarch64; import static jdk.vm.ci.aarch64.AArch64.lr; import static jdk.vm.ci.code.ValueUtil.asRegister; -import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.ILLEGAL; -import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.REG; +import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.ILLEGAL; +import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.REG; import java.util.Arrays; import java.util.function.Consumer; import java.util.function.Function; import java.util.stream.Stream; -import jdk.compiler.graal.asm.Label; -import jdk.compiler.graal.asm.aarch64.AArch64ASIMDAssembler; -import jdk.compiler.graal.asm.aarch64.AArch64Address; -import jdk.compiler.graal.asm.aarch64.AArch64Assembler; -import jdk.compiler.graal.asm.aarch64.AArch64Assembler.ConditionFlag; -import jdk.compiler.graal.asm.aarch64.AArch64Assembler.ExtendType; -import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler; -import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler.ScratchRegister; -import jdk.compiler.graal.code.CompilationResult.JumpTable; -import jdk.compiler.graal.code.CompilationResult.JumpTable.EntryFormat; -import jdk.compiler.graal.core.common.NumUtil; -import jdk.compiler.graal.core.common.calc.Condition; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; -import jdk.compiler.graal.lir.LIRInstruction; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.LabelRef; -import jdk.compiler.graal.lir.Opcode; -import jdk.compiler.graal.lir.StandardOp; -import jdk.compiler.graal.lir.SwitchStrategy; -import jdk.compiler.graal.lir.SwitchStrategy.BaseSwitchClosure; -import jdk.compiler.graal.lir.Variable; +import jdk.graal.compiler.asm.Label; +import jdk.graal.compiler.asm.aarch64.AArch64ASIMDAssembler; +import jdk.graal.compiler.asm.aarch64.AArch64Address; +import jdk.graal.compiler.asm.aarch64.AArch64Assembler; +import jdk.graal.compiler.asm.aarch64.AArch64Assembler.ConditionFlag; +import jdk.graal.compiler.asm.aarch64.AArch64Assembler.ExtendType; +import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler; +import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler.ScratchRegister; +import jdk.graal.compiler.code.CompilationResult.JumpTable; +import jdk.graal.compiler.code.CompilationResult.JumpTable.EntryFormat; +import jdk.graal.compiler.core.common.NumUtil; +import jdk.graal.compiler.core.common.calc.Condition; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.lir.LIRInstruction; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.LabelRef; +import jdk.graal.compiler.lir.Opcode; +import jdk.graal.compiler.lir.StandardOp; +import jdk.graal.compiler.lir.SwitchStrategy; +import jdk.graal.compiler.lir.SwitchStrategy.BaseSwitchClosure; +import jdk.graal.compiler.lir.Variable; import jdk.vm.ci.aarch64.AArch64Kind; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64Convert.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64Convert.java similarity index 96% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64Convert.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64Convert.java index 503d62708560..f5e2f0a01494 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64Convert.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64Convert.java @@ -22,17 +22,17 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.aarch64; +package jdk.graal.compiler.lir.aarch64; import static jdk.vm.ci.code.ValueUtil.asRegister; -import jdk.compiler.graal.asm.aarch64.AArch64ASIMDAssembler.ASIMDSize; -import jdk.compiler.graal.asm.aarch64.AArch64ASIMDAssembler.ElementSize; -import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler; -import jdk.compiler.graal.core.common.calc.FloatConvert; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; -import jdk.compiler.graal.lir.LIRInstructionClass; +import jdk.graal.compiler.asm.aarch64.AArch64ASIMDAssembler.ASIMDSize; +import jdk.graal.compiler.asm.aarch64.AArch64ASIMDAssembler.ElementSize; +import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler; +import jdk.graal.compiler.core.common.calc.FloatConvert; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.lir.LIRInstructionClass; import jdk.vm.ci.code.Register; import jdk.vm.ci.meta.AllocatableValue; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64CountPositivesOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64CountPositivesOp.java similarity index 93% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64CountPositivesOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64CountPositivesOp.java index 26b68a4d4960..e710546f3484 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64CountPositivesOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64CountPositivesOp.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.aarch64; +package jdk.graal.compiler.lir.aarch64; import static jdk.vm.ci.aarch64.AArch64.r10; import static jdk.vm.ci.aarch64.AArch64.r3; @@ -36,29 +36,29 @@ import static jdk.vm.ci.aarch64.AArch64.v3; import static jdk.vm.ci.aarch64.AArch64.zr; import static jdk.vm.ci.code.ValueUtil.asRegister; -import static jdk.compiler.graal.asm.aarch64.AArch64ASIMDAssembler.ASIMDInstruction.LD1_MULTIPLE_4R; -import static jdk.compiler.graal.asm.aarch64.AArch64ASIMDAssembler.ASIMDSize.FullReg; -import static jdk.compiler.graal.asm.aarch64.AArch64Address.createStructureImmediatePostIndexAddress; -import static jdk.compiler.graal.asm.aarch64.AArch64Address.AddressingMode.IMMEDIATE_PAIR_POST_INDEXED; -import static jdk.compiler.graal.asm.aarch64.AArch64Address.AddressingMode.IMMEDIATE_PAIR_SIGNED_SCALED; -import static jdk.compiler.graal.asm.aarch64.AArch64Address.AddressingMode.IMMEDIATE_POST_INDEXED; -import static jdk.compiler.graal.asm.aarch64.AArch64Address.AddressingMode.IMMEDIATE_SIGNED_UNSCALED; -import static jdk.compiler.graal.asm.aarch64.AArch64Address.AddressingMode.IMMEDIATE_UNSIGNED_SCALED; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.PrefetchMode.PLDL1KEEP; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.ShiftType.LSL; - -import jdk.compiler.graal.asm.Label; -import jdk.compiler.graal.asm.aarch64.AArch64ASIMDAssembler.ElementSize; -import jdk.compiler.graal.asm.aarch64.AArch64Address; -import jdk.compiler.graal.asm.aarch64.AArch64Assembler.ConditionFlag; -import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler; -import jdk.compiler.graal.core.aarch64.AArch64LIRGenerator; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.lir.LIRInstruction; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.Opcode; -import jdk.compiler.graal.lir.SyncPort; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; +import static jdk.graal.compiler.asm.aarch64.AArch64ASIMDAssembler.ASIMDInstruction.LD1_MULTIPLE_4R; +import static jdk.graal.compiler.asm.aarch64.AArch64ASIMDAssembler.ASIMDSize.FullReg; +import static jdk.graal.compiler.asm.aarch64.AArch64Address.createStructureImmediatePostIndexAddress; +import static jdk.graal.compiler.asm.aarch64.AArch64Address.AddressingMode.IMMEDIATE_PAIR_POST_INDEXED; +import static jdk.graal.compiler.asm.aarch64.AArch64Address.AddressingMode.IMMEDIATE_PAIR_SIGNED_SCALED; +import static jdk.graal.compiler.asm.aarch64.AArch64Address.AddressingMode.IMMEDIATE_POST_INDEXED; +import static jdk.graal.compiler.asm.aarch64.AArch64Address.AddressingMode.IMMEDIATE_SIGNED_UNSCALED; +import static jdk.graal.compiler.asm.aarch64.AArch64Address.AddressingMode.IMMEDIATE_UNSIGNED_SCALED; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.PrefetchMode.PLDL1KEEP; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.ShiftType.LSL; + +import jdk.graal.compiler.asm.Label; +import jdk.graal.compiler.asm.aarch64.AArch64ASIMDAssembler.ElementSize; +import jdk.graal.compiler.asm.aarch64.AArch64Address; +import jdk.graal.compiler.asm.aarch64.AArch64Assembler.ConditionFlag; +import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler; +import jdk.graal.compiler.core.aarch64.AArch64LIRGenerator; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.lir.LIRInstruction; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.Opcode; +import jdk.graal.compiler.lir.SyncPort; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; import jdk.vm.ci.code.CodeUtil; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64CounterModeAESCryptOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64CounterModeAESCryptOp.java similarity index 95% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64CounterModeAESCryptOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64CounterModeAESCryptOp.java index a856ef704a26..2c8f8e08d683 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64CounterModeAESCryptOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64CounterModeAESCryptOp.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.aarch64; +package jdk.graal.compiler.lir.aarch64; import static jdk.vm.ci.aarch64.AArch64.r10; import static jdk.vm.ci.aarch64.AArch64.r11; @@ -48,24 +48,24 @@ import static jdk.vm.ci.aarch64.AArch64.v9; import static jdk.vm.ci.aarch64.AArch64.zr; import static jdk.vm.ci.code.ValueUtil.asRegister; -import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.REG; -import static jdk.compiler.graal.lir.aarch64.AArch64AESEncryptOp.aesecbEncrypt; -import static jdk.compiler.graal.lir.aarch64.AArch64AESEncryptOp.aesencLoadkeys; -import static jdk.compiler.graal.lir.aarch64.AArch64AESEncryptOp.asFloatRegister; +import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.REG; +import static jdk.graal.compiler.lir.aarch64.AArch64AESEncryptOp.aesecbEncrypt; +import static jdk.graal.compiler.lir.aarch64.AArch64AESEncryptOp.aesencLoadkeys; +import static jdk.graal.compiler.lir.aarch64.AArch64AESEncryptOp.asFloatRegister; import java.util.Arrays; -import jdk.compiler.graal.asm.Label; -import jdk.compiler.graal.asm.aarch64.AArch64ASIMDAssembler.ASIMDInstruction; -import jdk.compiler.graal.asm.aarch64.AArch64ASIMDAssembler.ASIMDSize; -import jdk.compiler.graal.asm.aarch64.AArch64ASIMDAssembler.ElementSize; -import jdk.compiler.graal.asm.aarch64.AArch64Address; -import jdk.compiler.graal.asm.aarch64.AArch64Assembler.ConditionFlag; -import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.SyncPort; +import jdk.graal.compiler.asm.Label; +import jdk.graal.compiler.asm.aarch64.AArch64ASIMDAssembler.ASIMDInstruction; +import jdk.graal.compiler.asm.aarch64.AArch64ASIMDAssembler.ASIMDSize; +import jdk.graal.compiler.asm.aarch64.AArch64ASIMDAssembler.ElementSize; +import jdk.graal.compiler.asm.aarch64.AArch64Address; +import jdk.graal.compiler.asm.aarch64.AArch64Assembler.ConditionFlag; +import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.SyncPort; import jdk.vm.ci.aarch64.AArch64; import jdk.vm.ci.aarch64.AArch64Kind; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64EncodeArrayOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64EncodeArrayOp.java similarity index 88% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64EncodeArrayOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64EncodeArrayOp.java index d07f12fb60de..5aac496ff087 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64EncodeArrayOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64EncodeArrayOp.java @@ -22,28 +22,28 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.aarch64; +package jdk.graal.compiler.lir.aarch64; import static jdk.vm.ci.code.ValueUtil.asRegister; -import static jdk.compiler.graal.asm.aarch64.AArch64ASIMDAssembler.ASIMDSize.FullReg; -import static jdk.compiler.graal.asm.aarch64.AArch64Address.createBaseRegisterOnlyAddress; -import static jdk.compiler.graal.asm.aarch64.AArch64Address.createImmediateAddress; -import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.REG; - -import jdk.compiler.graal.asm.Label; -import jdk.compiler.graal.asm.aarch64.AArch64ASIMDAssembler.ASIMDInstruction; -import jdk.compiler.graal.asm.aarch64.AArch64ASIMDAssembler.ElementSize; -import jdk.compiler.graal.asm.aarch64.AArch64Address; -import jdk.compiler.graal.asm.aarch64.AArch64Address.AddressingMode; -import jdk.compiler.graal.asm.aarch64.AArch64Assembler.ConditionFlag; -import jdk.compiler.graal.asm.aarch64.AArch64Assembler.PrefetchMode; -import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.Opcode; -import jdk.compiler.graal.lir.SyncPort; -import jdk.compiler.graal.lir.gen.LIRGeneratorTool; -import jdk.compiler.graal.lir.gen.LIRGeneratorTool.CharsetName; +import static jdk.graal.compiler.asm.aarch64.AArch64ASIMDAssembler.ASIMDSize.FullReg; +import static jdk.graal.compiler.asm.aarch64.AArch64Address.createBaseRegisterOnlyAddress; +import static jdk.graal.compiler.asm.aarch64.AArch64Address.createImmediateAddress; +import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.REG; + +import jdk.graal.compiler.asm.Label; +import jdk.graal.compiler.asm.aarch64.AArch64ASIMDAssembler.ASIMDInstruction; +import jdk.graal.compiler.asm.aarch64.AArch64ASIMDAssembler.ElementSize; +import jdk.graal.compiler.asm.aarch64.AArch64Address; +import jdk.graal.compiler.asm.aarch64.AArch64Address.AddressingMode; +import jdk.graal.compiler.asm.aarch64.AArch64Assembler.ConditionFlag; +import jdk.graal.compiler.asm.aarch64.AArch64Assembler.PrefetchMode; +import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.Opcode; +import jdk.graal.compiler.lir.SyncPort; +import jdk.graal.compiler.lir.gen.LIRGeneratorTool; +import jdk.graal.compiler.lir.gen.LIRGeneratorTool.CharsetName; import jdk.vm.ci.aarch64.AArch64Kind; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64FloatToHalfFloatOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64FloatToHalfFloatOp.java similarity index 84% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64FloatToHalfFloatOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64FloatToHalfFloatOp.java index 4cd4e0a8c5eb..62c465c6b4d2 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64FloatToHalfFloatOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64FloatToHalfFloatOp.java @@ -22,18 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.aarch64; +package jdk.graal.compiler.lir.aarch64; import static jdk.vm.ci.code.ValueUtil.asRegister; -import static jdk.compiler.graal.asm.aarch64.AArch64ASIMDAssembler.ElementSize.DoubleWord; -import static jdk.compiler.graal.asm.aarch64.AArch64ASIMDAssembler.ElementSize.HalfWord; +import static jdk.graal.compiler.asm.aarch64.AArch64ASIMDAssembler.ElementSize.DoubleWord; +import static jdk.graal.compiler.asm.aarch64.AArch64ASIMDAssembler.ElementSize.HalfWord; -import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler; -import jdk.compiler.graal.lir.LIRInstruction; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.SyncPort; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; -import jdk.compiler.graal.lir.gen.LIRGeneratorTool; +import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler; +import jdk.graal.compiler.lir.LIRInstruction; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.SyncPort; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.lir.gen.LIRGeneratorTool; import jdk.vm.ci.code.Register; import jdk.vm.ci.meta.Value; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64FrameMap.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64FrameMap.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64FrameMap.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64FrameMap.java index 01d4cd96d610..022b5ea7434c 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64FrameMap.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64FrameMap.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.aarch64; +package jdk.graal.compiler.lir.aarch64; -import jdk.compiler.graal.core.common.LIRKind; -import jdk.compiler.graal.lir.framemap.FrameMap; +import jdk.graal.compiler.core.common.LIRKind; +import jdk.graal.compiler.lir.framemap.FrameMap; import jdk.vm.ci.aarch64.AArch64Kind; import jdk.vm.ci.code.CodeCacheProvider; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64FrameMapBuilder.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64FrameMapBuilder.java similarity index 92% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64FrameMapBuilder.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64FrameMapBuilder.java index 963810aae771..ddbdcdc94637 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64FrameMapBuilder.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64FrameMapBuilder.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.aarch64; +package jdk.graal.compiler.lir.aarch64; -import jdk.compiler.graal.lir.framemap.FrameMap; -import jdk.compiler.graal.lir.framemap.FrameMapBuilderImpl; +import jdk.graal.compiler.lir.framemap.FrameMap; +import jdk.graal.compiler.lir.framemap.FrameMapBuilderImpl; import jdk.vm.ci.code.CodeCacheProvider; import jdk.vm.ci.code.RegisterConfig; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64GHASHProcessBlocksOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64GHASHProcessBlocksOp.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64GHASHProcessBlocksOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64GHASHProcessBlocksOp.java index 37398f66ca70..1588f978f7b2 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64GHASHProcessBlocksOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64GHASHProcessBlocksOp.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.aarch64; +package jdk.graal.compiler.lir.aarch64; import static jdk.vm.ci.aarch64.AArch64.v0; import static jdk.vm.ci.aarch64.AArch64.v1; @@ -38,25 +38,25 @@ import static jdk.vm.ci.aarch64.AArch64.v6; import static jdk.vm.ci.aarch64.AArch64.v7; import static jdk.vm.ci.code.ValueUtil.asRegister; -import static jdk.compiler.graal.asm.aarch64.AArch64Address.AddressingMode.IMMEDIATE_PAIR_SIGNED_SCALED; -import static jdk.compiler.graal.asm.aarch64.AArch64Address.AddressingMode.IMMEDIATE_POST_INDEXED; -import static jdk.compiler.graal.asm.aarch64.AArch64Address.AddressingMode.IMMEDIATE_SIGNED_UNSCALED; -import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.REG; -import static jdk.compiler.graal.lir.aarch64.AArch64AESEncryptOp.asFloatRegister; +import static jdk.graal.compiler.asm.aarch64.AArch64Address.AddressingMode.IMMEDIATE_PAIR_SIGNED_SCALED; +import static jdk.graal.compiler.asm.aarch64.AArch64Address.AddressingMode.IMMEDIATE_POST_INDEXED; +import static jdk.graal.compiler.asm.aarch64.AArch64Address.AddressingMode.IMMEDIATE_SIGNED_UNSCALED; +import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.REG; +import static jdk.graal.compiler.lir.aarch64.AArch64AESEncryptOp.asFloatRegister; import java.util.Arrays; -import jdk.compiler.graal.asm.Label; -import jdk.compiler.graal.asm.aarch64.AArch64ASIMDAssembler.ASIMDSize; -import jdk.compiler.graal.asm.aarch64.AArch64ASIMDAssembler.ElementSize; -import jdk.compiler.graal.asm.aarch64.AArch64Address; -import jdk.compiler.graal.asm.aarch64.AArch64Assembler.ConditionFlag; -import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.SyncPort; -import jdk.compiler.graal.lir.gen.LIRGeneratorTool; +import jdk.graal.compiler.asm.Label; +import jdk.graal.compiler.asm.aarch64.AArch64ASIMDAssembler.ASIMDSize; +import jdk.graal.compiler.asm.aarch64.AArch64ASIMDAssembler.ElementSize; +import jdk.graal.compiler.asm.aarch64.AArch64Address; +import jdk.graal.compiler.asm.aarch64.AArch64Assembler.ConditionFlag; +import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.SyncPort; +import jdk.graal.compiler.lir.gen.LIRGeneratorTool; import jdk.vm.ci.aarch64.AArch64; import jdk.vm.ci.aarch64.AArch64Kind; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64HalfFloatToFloatOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64HalfFloatToFloatOp.java similarity index 85% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64HalfFloatToFloatOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64HalfFloatToFloatOp.java index 1f8a2ffe248c..c3c46becca5f 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64HalfFloatToFloatOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64HalfFloatToFloatOp.java @@ -22,17 +22,17 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.aarch64; +package jdk.graal.compiler.lir.aarch64; import static jdk.vm.ci.code.ValueUtil.asRegister; -import static jdk.compiler.graal.asm.aarch64.AArch64ASIMDAssembler.ElementSize.HalfWord; -import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.REG; +import static jdk.graal.compiler.asm.aarch64.AArch64ASIMDAssembler.ElementSize.HalfWord; +import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.REG; -import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.SyncPort; -import jdk.compiler.graal.lir.gen.LIRGeneratorTool; +import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.SyncPort; +import jdk.graal.compiler.lir.gen.LIRGeneratorTool; import jdk.vm.ci.code.Register; import jdk.vm.ci.meta.Value; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64HaltOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64HaltOp.java similarity index 86% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64HaltOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64HaltOp.java index ea17781c5f71..a5ee08bd48e4 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64HaltOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64HaltOp.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.aarch64; +package jdk.graal.compiler.lir.aarch64; -import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.Opcode; +import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.Opcode; /** * Emits a pause. diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64LIRFlags.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64LIRFlags.java similarity index 94% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64LIRFlags.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64LIRFlags.java index 226101684363..43350e5e0061 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64LIRFlags.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64LIRFlags.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.aarch64; +package jdk.graal.compiler.lir.aarch64; import java.util.EnumSet; -import jdk.compiler.graal.asm.aarch64.AArch64Assembler; +import jdk.graal.compiler.asm.aarch64.AArch64Assembler; import jdk.vm.ci.aarch64.AArch64; import jdk.vm.ci.aarch64.AArch64.CPUFeature; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64LIRInstruction.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64LIRInstruction.java similarity index 86% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64LIRInstruction.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64LIRInstruction.java index 2b488666134e..24ebcbd75f59 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64LIRInstruction.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64LIRInstruction.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.aarch64; +package jdk.graal.compiler.lir.aarch64; -import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; -import jdk.compiler.graal.lir.LIRInstruction; -import jdk.compiler.graal.lir.LIRInstructionClass; +import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.lir.LIRInstruction; +import jdk.graal.compiler.lir.LIRInstructionClass; public abstract class AArch64LIRInstruction extends LIRInstruction { protected AArch64LIRInstruction(LIRInstructionClass c) { diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64MD5Op.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64MD5Op.java similarity index 95% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64MD5Op.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64MD5Op.java index a6d9772297b3..312213bf51c3 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64MD5Op.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64MD5Op.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.aarch64; +package jdk.graal.compiler.lir.aarch64; import static jdk.vm.ci.aarch64.AArch64.r10; import static jdk.vm.ci.aarch64.AArch64.r11; @@ -41,21 +41,21 @@ import static jdk.vm.ci.aarch64.AArch64.r6; import static jdk.vm.ci.aarch64.AArch64.r7; import static jdk.vm.ci.code.ValueUtil.asRegister; -import static jdk.compiler.graal.asm.aarch64.AArch64Address.AddressingMode.IMMEDIATE_PAIR_SIGNED_SCALED; -import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.ILLEGAL; -import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.REG; - -import jdk.compiler.graal.asm.Label; -import jdk.compiler.graal.asm.aarch64.AArch64Address; -import jdk.compiler.graal.asm.aarch64.AArch64Assembler.ConditionFlag; -import jdk.compiler.graal.asm.aarch64.AArch64Assembler.ShiftType; -import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler; -import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler.ScratchRegister; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.SyncPort; -import jdk.compiler.graal.lir.gen.LIRGeneratorTool; +import static jdk.graal.compiler.asm.aarch64.AArch64Address.AddressingMode.IMMEDIATE_PAIR_SIGNED_SCALED; +import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.ILLEGAL; +import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.REG; + +import jdk.graal.compiler.asm.Label; +import jdk.graal.compiler.asm.aarch64.AArch64Address; +import jdk.graal.compiler.asm.aarch64.AArch64Assembler.ConditionFlag; +import jdk.graal.compiler.asm.aarch64.AArch64Assembler.ShiftType; +import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler; +import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler.ScratchRegister; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.SyncPort; +import jdk.graal.compiler.lir.gen.LIRGeneratorTool; import jdk.vm.ci.aarch64.AArch64Kind; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64MathCopySignOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64MathCopySignOp.java similarity index 87% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64MathCopySignOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64MathCopySignOp.java index 5548d230f36d..235b72514ed1 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64MathCopySignOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64MathCopySignOp.java @@ -22,16 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.aarch64; +package jdk.graal.compiler.lir.aarch64; import static jdk.vm.ci.code.ValueUtil.asRegister; -import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.REG; +import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.REG; -import jdk.compiler.graal.asm.aarch64.AArch64ASIMDAssembler.ASIMDSize; -import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.Opcode; +import jdk.graal.compiler.asm.aarch64.AArch64ASIMDAssembler.ASIMDSize; +import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.Opcode; import jdk.vm.ci.code.Register; import jdk.vm.ci.meta.AllocatableValue; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64MathIntrinsicBinaryOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64MathIntrinsicBinaryOp.java similarity index 92% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64MathIntrinsicBinaryOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64MathIntrinsicBinaryOp.java index c414362e616c..e0f37d1b6843 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64MathIntrinsicBinaryOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64MathIntrinsicBinaryOp.java @@ -22,16 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.aarch64; +package jdk.graal.compiler.lir.aarch64; import static jdk.vm.ci.aarch64.AArch64.v0; import static jdk.vm.ci.aarch64.AArch64.v1; -import jdk.compiler.graal.core.common.LIRKind; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.Variable; -import jdk.compiler.graal.lir.gen.LIRGenerator; +import jdk.graal.compiler.core.common.LIRKind; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.Variable; +import jdk.graal.compiler.lir.gen.LIRGenerator; import jdk.vm.ci.aarch64.AArch64; import jdk.vm.ci.aarch64.AArch64Kind; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64MathSignumOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64MathSignumOp.java similarity index 84% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64MathSignumOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64MathSignumOp.java index e21a41c3e481..5b67ebc36328 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64MathSignumOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64MathSignumOp.java @@ -22,19 +22,19 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.aarch64; +package jdk.graal.compiler.lir.aarch64; import static jdk.vm.ci.code.ValueUtil.asRegister; -import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.REG; +import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.REG; -import jdk.compiler.graal.asm.aarch64.AArch64ASIMDAssembler.ASIMDSize; -import jdk.compiler.graal.asm.aarch64.AArch64ASIMDAssembler.ElementSize; -import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler; -import jdk.compiler.graal.core.common.LIRKind; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.Opcode; -import jdk.compiler.graal.lir.gen.LIRGeneratorTool; +import jdk.graal.compiler.asm.aarch64.AArch64ASIMDAssembler.ASIMDSize; +import jdk.graal.compiler.asm.aarch64.AArch64ASIMDAssembler.ElementSize; +import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler; +import jdk.graal.compiler.core.common.LIRKind; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.Opcode; +import jdk.graal.compiler.lir.gen.LIRGeneratorTool; import jdk.vm.ci.code.Register; import jdk.vm.ci.meta.AllocatableValue; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64Move.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64Move.java similarity index 96% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64Move.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64Move.java index 91f32a0f56a5..3c4277215495 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64Move.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64Move.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.aarch64; +package jdk.graal.compiler.lir.aarch64; import static jdk.vm.ci.aarch64.AArch64.CPU; import static jdk.vm.ci.aarch64.AArch64.SIMD; @@ -32,38 +32,38 @@ import static jdk.vm.ci.code.ValueUtil.asStackSlot; import static jdk.vm.ci.code.ValueUtil.isRegister; import static jdk.vm.ci.code.ValueUtil.isStackSlot; -import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.COMPOSITE; -import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.CONST; -import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.HINT; -import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.ILLEGAL; -import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.REG; -import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.STACK; -import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.UNINITIALIZED; -import static jdk.compiler.graal.lir.LIRValueUtil.asJavaConstant; -import static jdk.compiler.graal.lir.LIRValueUtil.isJavaConstant; +import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.COMPOSITE; +import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.CONST; +import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.HINT; +import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.ILLEGAL; +import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.REG; +import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.STACK; +import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.UNINITIALIZED; +import static jdk.graal.compiler.lir.LIRValueUtil.asJavaConstant; +import static jdk.graal.compiler.lir.LIRValueUtil.isJavaConstant; import java.util.function.Function; -import jdk.compiler.graal.asm.Label; -import jdk.compiler.graal.asm.aarch64.AArch64ASIMDAssembler; -import jdk.compiler.graal.asm.aarch64.AArch64Address; -import jdk.compiler.graal.asm.aarch64.AArch64Assembler; -import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler; -import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler.ScratchRegister; -import jdk.compiler.graal.core.common.CompressEncoding; -import jdk.compiler.graal.core.common.memory.MemoryExtendKind; -import jdk.compiler.graal.core.common.spi.LIRKindTool; -import jdk.compiler.graal.core.common.type.DataPointerConstant; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; -import jdk.compiler.graal.lir.LIRFrameState; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.Opcode; -import jdk.compiler.graal.lir.StandardOp; -import jdk.compiler.graal.lir.StandardOp.LoadConstantOp; -import jdk.compiler.graal.lir.StandardOp.NullCheck; -import jdk.compiler.graal.lir.StandardOp.ValueMoveOp; -import jdk.compiler.graal.lir.VirtualStackSlot; +import jdk.graal.compiler.asm.Label; +import jdk.graal.compiler.asm.aarch64.AArch64ASIMDAssembler; +import jdk.graal.compiler.asm.aarch64.AArch64Address; +import jdk.graal.compiler.asm.aarch64.AArch64Assembler; +import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler; +import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler.ScratchRegister; +import jdk.graal.compiler.core.common.CompressEncoding; +import jdk.graal.compiler.core.common.memory.MemoryExtendKind; +import jdk.graal.compiler.core.common.spi.LIRKindTool; +import jdk.graal.compiler.core.common.type.DataPointerConstant; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.lir.LIRFrameState; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.Opcode; +import jdk.graal.compiler.lir.StandardOp; +import jdk.graal.compiler.lir.StandardOp.LoadConstantOp; +import jdk.graal.compiler.lir.StandardOp.NullCheck; +import jdk.graal.compiler.lir.StandardOp.ValueMoveOp; +import jdk.graal.compiler.lir.VirtualStackSlot; import jdk.vm.ci.aarch64.AArch64Kind; import jdk.vm.ci.code.MemoryBarriers; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64NormalizedUnsignedCompareOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64NormalizedUnsignedCompareOp.java similarity index 87% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64NormalizedUnsignedCompareOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64NormalizedUnsignedCompareOp.java index 06cb8bf3b292..c075bd76e86a 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64NormalizedUnsignedCompareOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64NormalizedUnsignedCompareOp.java @@ -22,17 +22,17 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.aarch64; +package jdk.graal.compiler.lir.aarch64; import static jdk.vm.ci.code.ValueUtil.asRegister; -import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.REG; +import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.REG; -import jdk.compiler.graal.asm.aarch64.AArch64Assembler.ConditionFlag; -import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.SyncPort; +import jdk.graal.compiler.asm.aarch64.AArch64Assembler.ConditionFlag; +import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.SyncPort; import jdk.vm.ci.aarch64.AArch64Kind; import jdk.vm.ci.meta.AllocatableValue; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64PauseOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64PauseOp.java similarity index 86% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64PauseOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64PauseOp.java index cd886d6ab213..c7dff922ed4a 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64PauseOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64PauseOp.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.aarch64; +package jdk.graal.compiler.lir.aarch64; -import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.Opcode; +import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.Opcode; /** * Emits a pause. diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64PermuteOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64PermuteOp.java similarity index 88% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64PermuteOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64PermuteOp.java index 25a05c70b1df..4075611d38be 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64PermuteOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64PermuteOp.java @@ -22,18 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.aarch64; +package jdk.graal.compiler.lir.aarch64; import static jdk.vm.ci.code.ValueUtil.asRegister; -import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.REG; +import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.REG; -import jdk.compiler.graal.asm.aarch64.AArch64ASIMDAssembler.ASIMDSize; -import jdk.compiler.graal.asm.aarch64.AArch64ASIMDAssembler.ElementSize; -import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.Opcode; +import jdk.graal.compiler.asm.aarch64.AArch64ASIMDAssembler.ASIMDSize; +import jdk.graal.compiler.asm.aarch64.AArch64ASIMDAssembler.ElementSize; +import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.Opcode; import jdk.vm.ci.code.Register; import jdk.vm.ci.meta.AllocatableValue; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64PrefetchOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64PrefetchOp.java similarity index 84% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64PrefetchOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64PrefetchOp.java index e90f22a72870..ddba4e055248 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64PrefetchOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64PrefetchOp.java @@ -23,14 +23,14 @@ * questions. */ -package jdk.compiler.graal.lir.aarch64; +package jdk.graal.compiler.lir.aarch64; -import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.COMPOSITE; +import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.COMPOSITE; -import jdk.compiler.graal.asm.aarch64.AArch64Assembler.PrefetchMode; -import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; -import jdk.compiler.graal.lir.LIRInstructionClass; +import jdk.graal.compiler.asm.aarch64.AArch64Assembler.PrefetchMode; +import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.lir.LIRInstructionClass; public final class AArch64PrefetchOp extends AArch64LIRInstruction { public static final LIRInstructionClass TYPE = LIRInstructionClass.create(AArch64PrefetchOp.class); diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64ReadTimestampCounter.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64ReadTimestampCounter.java similarity index 86% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64ReadTimestampCounter.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64ReadTimestampCounter.java index 9a821ce9f416..0a3786a0a194 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64ReadTimestampCounter.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64ReadTimestampCounter.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.aarch64; +package jdk.graal.compiler.lir.aarch64; import static jdk.vm.ci.code.ValueUtil.asRegister; -import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.REG; +import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.REG; -import jdk.compiler.graal.asm.aarch64.AArch64Assembler; -import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; -import jdk.compiler.graal.lir.LIRInstructionClass; +import jdk.graal.compiler.asm.aarch64.AArch64Assembler; +import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.lir.LIRInstructionClass; import jdk.vm.ci.meta.AllocatableValue; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64ReinterpretOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64ReinterpretOp.java similarity index 92% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64ReinterpretOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64ReinterpretOp.java index 5f3b3515b5a0..2e7a27e0586d 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64ReinterpretOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64ReinterpretOp.java @@ -23,13 +23,13 @@ * questions. */ -package jdk.compiler.graal.lir.aarch64; +package jdk.graal.compiler.lir.aarch64; import static jdk.vm.ci.code.ValueUtil.asRegister; -import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; -import jdk.compiler.graal.lir.LIRInstructionClass; +import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.lir.LIRInstructionClass; import jdk.vm.ci.aarch64.AArch64Kind; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64RestoreRegistersOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64RestoreRegistersOp.java similarity index 89% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64RestoreRegistersOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64RestoreRegistersOp.java index a88465c21143..f5af908496e7 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64RestoreRegistersOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64RestoreRegistersOp.java @@ -23,21 +23,21 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.aarch64; +package jdk.graal.compiler.lir.aarch64; import static jdk.vm.ci.code.ValueUtil.asStackSlot; import static jdk.vm.ci.code.ValueUtil.isStackSlot; -import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.STACK; +import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.STACK; import java.util.Arrays; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; import jdk.vm.ci.aarch64.AArch64Kind; -import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.LIRValueUtil; -import jdk.compiler.graal.lir.Opcode; -import jdk.compiler.graal.lir.StandardOp; +import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.LIRValueUtil; +import jdk.graal.compiler.lir.Opcode; +import jdk.graal.compiler.lir.StandardOp; import jdk.vm.ci.code.Register; import jdk.vm.ci.code.StackSlot; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64RoundFloatToIntegerOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64RoundFloatToIntegerOp.java similarity index 91% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64RoundFloatToIntegerOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64RoundFloatToIntegerOp.java index 0f338b3fb595..33b012d023af 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64RoundFloatToIntegerOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64RoundFloatToIntegerOp.java @@ -22,19 +22,19 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.aarch64; +package jdk.graal.compiler.lir.aarch64; import static jdk.vm.ci.code.ValueUtil.asRegister; -import jdk.compiler.graal.asm.Label; -import jdk.compiler.graal.asm.aarch64.AArch64Assembler; -import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler; -import jdk.compiler.graal.lir.LIRInstruction; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.Opcode; -import jdk.compiler.graal.lir.SyncPort; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; -import jdk.compiler.graal.lir.gen.LIRGeneratorTool; +import jdk.graal.compiler.asm.Label; +import jdk.graal.compiler.asm.aarch64.AArch64Assembler; +import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler; +import jdk.graal.compiler.lir.LIRInstruction; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.Opcode; +import jdk.graal.compiler.lir.SyncPort; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.lir.gen.LIRGeneratorTool; import jdk.vm.ci.aarch64.AArch64Kind; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64SHA1Op.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64SHA1Op.java similarity index 89% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64SHA1Op.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64SHA1Op.java index a2d36a98cfb1..281c2eebde1d 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64SHA1Op.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64SHA1Op.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.aarch64; +package jdk.graal.compiler.lir.aarch64; import static jdk.vm.ci.aarch64.AArch64.v0; import static jdk.vm.ci.aarch64.AArch64.v1; @@ -40,25 +40,25 @@ import static jdk.vm.ci.aarch64.AArch64.v6; import static jdk.vm.ci.aarch64.AArch64.v7; import static jdk.vm.ci.code.ValueUtil.asRegister; -import static jdk.compiler.graal.asm.aarch64.AArch64ASIMDAssembler.ASIMDInstruction.LD1_MULTIPLE_4R; -import static jdk.compiler.graal.asm.aarch64.AArch64ASIMDAssembler.ASIMDSize.FullReg; -import static jdk.compiler.graal.asm.aarch64.AArch64ASIMDAssembler.ASIMDSize.HalfReg; -import static jdk.compiler.graal.asm.aarch64.AArch64Address.AddressingMode.IMMEDIATE_SIGNED_UNSCALED; -import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.ILLEGAL; -import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.REG; - -import jdk.compiler.graal.asm.Label; -import jdk.compiler.graal.asm.aarch64.AArch64ASIMDAssembler.ElementSize; -import jdk.compiler.graal.asm.aarch64.AArch64Address; -import jdk.compiler.graal.asm.aarch64.AArch64Assembler.ConditionFlag; -import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler; -import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler.ScratchRegister; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.lir.asm.ArrayDataPointerConstant; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.SyncPort; -import jdk.compiler.graal.lir.gen.LIRGeneratorTool; +import static jdk.graal.compiler.asm.aarch64.AArch64ASIMDAssembler.ASIMDInstruction.LD1_MULTIPLE_4R; +import static jdk.graal.compiler.asm.aarch64.AArch64ASIMDAssembler.ASIMDSize.FullReg; +import static jdk.graal.compiler.asm.aarch64.AArch64ASIMDAssembler.ASIMDSize.HalfReg; +import static jdk.graal.compiler.asm.aarch64.AArch64Address.AddressingMode.IMMEDIATE_SIGNED_UNSCALED; +import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.ILLEGAL; +import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.REG; + +import jdk.graal.compiler.asm.Label; +import jdk.graal.compiler.asm.aarch64.AArch64ASIMDAssembler.ElementSize; +import jdk.graal.compiler.asm.aarch64.AArch64Address; +import jdk.graal.compiler.asm.aarch64.AArch64Assembler.ConditionFlag; +import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler; +import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler.ScratchRegister; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.lir.asm.ArrayDataPointerConstant; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.SyncPort; +import jdk.graal.compiler.lir.gen.LIRGeneratorTool; import jdk.vm.ci.aarch64.AArch64Kind; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64SHA256Op.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64SHA256Op.java similarity index 92% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64SHA256Op.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64SHA256Op.java index 3805382f471e..39e6aaac6006 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64SHA256Op.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64SHA256Op.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.aarch64; +package jdk.graal.compiler.lir.aarch64; import static jdk.vm.ci.aarch64.AArch64.v0; import static jdk.vm.ci.aarch64.AArch64.v1; @@ -52,23 +52,23 @@ import static jdk.vm.ci.aarch64.AArch64.v8; import static jdk.vm.ci.aarch64.AArch64.v9; import static jdk.vm.ci.code.ValueUtil.asRegister; -import static jdk.compiler.graal.asm.aarch64.AArch64ASIMDAssembler.ASIMDInstruction.LD1_MULTIPLE_4R; -import static jdk.compiler.graal.asm.aarch64.AArch64ASIMDAssembler.ASIMDSize.FullReg; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.ConditionFlag.LE; -import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.ILLEGAL; -import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.REG; - -import jdk.compiler.graal.asm.Label; -import jdk.compiler.graal.asm.aarch64.AArch64ASIMDAssembler.ElementSize; -import jdk.compiler.graal.asm.aarch64.AArch64Address; -import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler; -import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler.ScratchRegister; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.lir.asm.ArrayDataPointerConstant; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.SyncPort; -import jdk.compiler.graal.lir.gen.LIRGeneratorTool; +import static jdk.graal.compiler.asm.aarch64.AArch64ASIMDAssembler.ASIMDInstruction.LD1_MULTIPLE_4R; +import static jdk.graal.compiler.asm.aarch64.AArch64ASIMDAssembler.ASIMDSize.FullReg; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.ConditionFlag.LE; +import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.ILLEGAL; +import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.REG; + +import jdk.graal.compiler.asm.Label; +import jdk.graal.compiler.asm.aarch64.AArch64ASIMDAssembler.ElementSize; +import jdk.graal.compiler.asm.aarch64.AArch64Address; +import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler; +import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler.ScratchRegister; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.lir.asm.ArrayDataPointerConstant; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.SyncPort; +import jdk.graal.compiler.lir.gen.LIRGeneratorTool; import jdk.vm.ci.aarch64.AArch64Kind; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64SHA3Op.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64SHA3Op.java similarity index 94% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64SHA3Op.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64SHA3Op.java index a69b774b4a85..f1ccc89d5237 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64SHA3Op.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64SHA3Op.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.aarch64; +package jdk.graal.compiler.lir.aarch64; import static jdk.vm.ci.aarch64.AArch64.v0; import static jdk.vm.ci.aarch64.AArch64.v1; @@ -57,29 +57,29 @@ import static jdk.vm.ci.aarch64.AArch64.v8; import static jdk.vm.ci.aarch64.AArch64.v9; import static jdk.vm.ci.code.ValueUtil.asRegister; -import static jdk.compiler.graal.asm.aarch64.AArch64ASIMDAssembler.ASIMDInstruction.LD1R; -import static jdk.compiler.graal.asm.aarch64.AArch64ASIMDAssembler.ASIMDInstruction.LD1_MULTIPLE_2R; -import static jdk.compiler.graal.asm.aarch64.AArch64ASIMDAssembler.ASIMDInstruction.LD1_MULTIPLE_3R; -import static jdk.compiler.graal.asm.aarch64.AArch64ASIMDAssembler.ASIMDInstruction.LD1_MULTIPLE_4R; -import static jdk.compiler.graal.asm.aarch64.AArch64ASIMDAssembler.ASIMDInstruction.ST1_MULTIPLE_4R; -import static jdk.compiler.graal.asm.aarch64.AArch64ASIMDAssembler.ASIMDSize.FullReg; -import static jdk.compiler.graal.asm.aarch64.AArch64ASIMDAssembler.ASIMDSize.HalfReg; -import static jdk.compiler.graal.asm.aarch64.AArch64Address.AddressingMode.IMMEDIATE_POST_INDEXED; -import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.ILLEGAL; -import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.REG; - -import jdk.compiler.graal.asm.Label; -import jdk.compiler.graal.asm.aarch64.AArch64ASIMDAssembler.ElementSize; -import jdk.compiler.graal.asm.aarch64.AArch64Address; -import jdk.compiler.graal.asm.aarch64.AArch64Assembler; -import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler; -import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler.ScratchRegister; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.lir.asm.ArrayDataPointerConstant; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.SyncPort; -import jdk.compiler.graal.lir.gen.LIRGeneratorTool; +import static jdk.graal.compiler.asm.aarch64.AArch64ASIMDAssembler.ASIMDInstruction.LD1R; +import static jdk.graal.compiler.asm.aarch64.AArch64ASIMDAssembler.ASIMDInstruction.LD1_MULTIPLE_2R; +import static jdk.graal.compiler.asm.aarch64.AArch64ASIMDAssembler.ASIMDInstruction.LD1_MULTIPLE_3R; +import static jdk.graal.compiler.asm.aarch64.AArch64ASIMDAssembler.ASIMDInstruction.LD1_MULTIPLE_4R; +import static jdk.graal.compiler.asm.aarch64.AArch64ASIMDAssembler.ASIMDInstruction.ST1_MULTIPLE_4R; +import static jdk.graal.compiler.asm.aarch64.AArch64ASIMDAssembler.ASIMDSize.FullReg; +import static jdk.graal.compiler.asm.aarch64.AArch64ASIMDAssembler.ASIMDSize.HalfReg; +import static jdk.graal.compiler.asm.aarch64.AArch64Address.AddressingMode.IMMEDIATE_POST_INDEXED; +import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.ILLEGAL; +import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.REG; + +import jdk.graal.compiler.asm.Label; +import jdk.graal.compiler.asm.aarch64.AArch64ASIMDAssembler.ElementSize; +import jdk.graal.compiler.asm.aarch64.AArch64Address; +import jdk.graal.compiler.asm.aarch64.AArch64Assembler; +import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler; +import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler.ScratchRegister; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.lir.asm.ArrayDataPointerConstant; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.SyncPort; +import jdk.graal.compiler.lir.gen.LIRGeneratorTool; import jdk.vm.ci.aarch64.AArch64Kind; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64SHA512Op.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64SHA512Op.java similarity index 95% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64SHA512Op.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64SHA512Op.java index 00ae3c7f2758..e97ca72d5272 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64SHA512Op.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64SHA512Op.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.aarch64; +package jdk.graal.compiler.lir.aarch64; import static jdk.vm.ci.aarch64.AArch64.v0; import static jdk.vm.ci.aarch64.AArch64.v1; @@ -57,23 +57,23 @@ import static jdk.vm.ci.aarch64.AArch64.v8; import static jdk.vm.ci.aarch64.AArch64.v9; import static jdk.vm.ci.code.ValueUtil.asRegister; -import static jdk.compiler.graal.asm.aarch64.AArch64ASIMDAssembler.ASIMDInstruction.LD1_MULTIPLE_1R; -import static jdk.compiler.graal.asm.aarch64.AArch64ASIMDAssembler.ASIMDInstruction.LD1_MULTIPLE_4R; -import static jdk.compiler.graal.asm.aarch64.AArch64ASIMDAssembler.ASIMDSize.FullReg; -import static jdk.compiler.graal.asm.aarch64.AArch64Assembler.ConditionFlag.LE; -import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.ILLEGAL; -import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.REG; - -import jdk.compiler.graal.asm.Label; -import jdk.compiler.graal.asm.aarch64.AArch64ASIMDAssembler.ElementSize; -import jdk.compiler.graal.asm.aarch64.AArch64Address; -import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.SyncPort; -import jdk.compiler.graal.lir.asm.ArrayDataPointerConstant; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; -import jdk.compiler.graal.lir.gen.LIRGeneratorTool; +import static jdk.graal.compiler.asm.aarch64.AArch64ASIMDAssembler.ASIMDInstruction.LD1_MULTIPLE_1R; +import static jdk.graal.compiler.asm.aarch64.AArch64ASIMDAssembler.ASIMDInstruction.LD1_MULTIPLE_4R; +import static jdk.graal.compiler.asm.aarch64.AArch64ASIMDAssembler.ASIMDSize.FullReg; +import static jdk.graal.compiler.asm.aarch64.AArch64Assembler.ConditionFlag.LE; +import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.ILLEGAL; +import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.REG; + +import jdk.graal.compiler.asm.Label; +import jdk.graal.compiler.asm.aarch64.AArch64ASIMDAssembler.ElementSize; +import jdk.graal.compiler.asm.aarch64.AArch64Address; +import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.SyncPort; +import jdk.graal.compiler.lir.asm.ArrayDataPointerConstant; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.lir.gen.LIRGeneratorTool; import jdk.vm.ci.aarch64.AArch64Kind; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64SaveRegistersOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64SaveRegistersOp.java similarity index 90% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64SaveRegistersOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64SaveRegistersOp.java index d1f5158099b4..03ed39ead7e5 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64SaveRegistersOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64SaveRegistersOp.java @@ -22,18 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.aarch64; +package jdk.graal.compiler.lir.aarch64; import static jdk.vm.ci.code.ValueUtil.asStackSlot; import static jdk.vm.ci.code.ValueUtil.isStackSlot; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; import jdk.vm.ci.aarch64.AArch64Kind; import org.graalvm.collections.EconomicSet; -import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.Opcode; -import jdk.compiler.graal.lir.StandardOp.SaveRegistersOp; +import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.Opcode; +import jdk.graal.compiler.lir.StandardOp.SaveRegistersOp; import jdk.vm.ci.code.Register; import jdk.vm.ci.code.StackSlot; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64SpeculativeBarrier.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64SpeculativeBarrier.java similarity index 88% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64SpeculativeBarrier.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64SpeculativeBarrier.java index fb534bedfa5d..1f6a8bc71a7a 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64SpeculativeBarrier.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64SpeculativeBarrier.java @@ -23,11 +23,11 @@ * questions. */ -package jdk.compiler.graal.lir.aarch64; +package jdk.graal.compiler.lir.aarch64; -import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; -import jdk.compiler.graal.lir.LIRInstructionClass; +import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.lir.LIRInstructionClass; public class AArch64SpeculativeBarrier extends AArch64LIRInstruction { private static final LIRInstructionClass TYPE = LIRInstructionClass.create(AArch64SpeculativeBarrier.class); diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64SpinWaitOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64SpinWaitOp.java similarity index 87% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64SpinWaitOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64SpinWaitOp.java index 10e71c3ec428..31dc6bf431e7 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64SpinWaitOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64SpinWaitOp.java @@ -22,16 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.aarch64; +package jdk.graal.compiler.lir.aarch64; import java.util.function.Consumer; -import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.Opcode; -import jdk.compiler.graal.lir.SyncPort; +import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.Opcode; +import jdk.graal.compiler.lir.SyncPort; /** * Emits spin wait instruction(s). diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64StringLatin1InflateOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64StringLatin1InflateOp.java similarity index 92% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64StringLatin1InflateOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64StringLatin1InflateOp.java index 2af885fd9300..36e5ea0e8a6d 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64StringLatin1InflateOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64StringLatin1InflateOp.java @@ -23,22 +23,22 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.aarch64; +package jdk.graal.compiler.lir.aarch64; import static jdk.vm.ci.aarch64.AArch64.SIMD; import static jdk.vm.ci.code.ValueUtil.asRegister; -import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.REG; - -import jdk.compiler.graal.asm.Label; -import jdk.compiler.graal.asm.aarch64.AArch64ASIMDAssembler; -import jdk.compiler.graal.asm.aarch64.AArch64Address; -import jdk.compiler.graal.asm.aarch64.AArch64Assembler; -import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler; -import jdk.compiler.graal.core.common.LIRKind; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.Opcode; -import jdk.compiler.graal.lir.gen.LIRGeneratorTool; +import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.REG; + +import jdk.graal.compiler.asm.Label; +import jdk.graal.compiler.asm.aarch64.AArch64ASIMDAssembler; +import jdk.graal.compiler.asm.aarch64.AArch64Address; +import jdk.graal.compiler.asm.aarch64.AArch64Assembler; +import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler; +import jdk.graal.compiler.core.common.LIRKind; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.Opcode; +import jdk.graal.compiler.lir.gen.LIRGeneratorTool; import jdk.vm.ci.aarch64.AArch64Kind; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64StringUTF16CompressOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64StringUTF16CompressOp.java similarity index 92% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64StringUTF16CompressOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64StringUTF16CompressOp.java index 8dadd05a3417..3442d7c10f61 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64StringUTF16CompressOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64StringUTF16CompressOp.java @@ -23,27 +23,27 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.aarch64; +package jdk.graal.compiler.lir.aarch64; import static jdk.vm.ci.aarch64.AArch64.SIMD; import static jdk.vm.ci.aarch64.AArch64.zr; import static jdk.vm.ci.code.ValueUtil.asRegister; -import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.REG; - -import jdk.compiler.graal.asm.Label; -import jdk.compiler.graal.asm.aarch64.AArch64ASIMDAssembler; -import jdk.compiler.graal.asm.aarch64.AArch64ASIMDAssembler.ElementSize; -import jdk.compiler.graal.asm.aarch64.AArch64Address; -import jdk.compiler.graal.asm.aarch64.AArch64Address.AddressingMode; -import jdk.compiler.graal.asm.aarch64.AArch64Assembler; -import jdk.compiler.graal.asm.aarch64.AArch64Assembler.ConditionFlag; -import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler; -import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler.ScratchRegister; -import jdk.compiler.graal.core.common.LIRKind; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.Opcode; -import jdk.compiler.graal.lir.gen.LIRGeneratorTool; +import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.REG; + +import jdk.graal.compiler.asm.Label; +import jdk.graal.compiler.asm.aarch64.AArch64ASIMDAssembler; +import jdk.graal.compiler.asm.aarch64.AArch64ASIMDAssembler.ElementSize; +import jdk.graal.compiler.asm.aarch64.AArch64Address; +import jdk.graal.compiler.asm.aarch64.AArch64Address.AddressingMode; +import jdk.graal.compiler.asm.aarch64.AArch64Assembler; +import jdk.graal.compiler.asm.aarch64.AArch64Assembler.ConditionFlag; +import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler; +import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler.ScratchRegister; +import jdk.graal.compiler.core.common.LIRKind; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.Opcode; +import jdk.graal.compiler.lir.gen.LIRGeneratorTool; import jdk.vm.ci.aarch64.AArch64Kind; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64VectorizedMismatchOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64VectorizedMismatchOp.java similarity index 92% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64VectorizedMismatchOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64VectorizedMismatchOp.java index a398e6cb002e..715e9e830d8a 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64VectorizedMismatchOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64VectorizedMismatchOp.java @@ -22,28 +22,28 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.aarch64; +package jdk.graal.compiler.lir.aarch64; import static jdk.vm.ci.aarch64.AArch64.zr; import static jdk.vm.ci.code.ValueUtil.asRegister; -import static jdk.compiler.graal.asm.aarch64.AArch64ASIMDAssembler.ASIMDSize.FullReg; -import static jdk.compiler.graal.asm.aarch64.AArch64Address.createBaseRegisterOnlyAddress; -import static jdk.compiler.graal.asm.aarch64.AArch64Address.createImmediateAddress; -import static jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler.PREFERRED_BRANCH_TARGET_ALIGNMENT; -import static jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler.PREFERRED_LOOP_ALIGNMENT; -import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.REG; +import static jdk.graal.compiler.asm.aarch64.AArch64ASIMDAssembler.ASIMDSize.FullReg; +import static jdk.graal.compiler.asm.aarch64.AArch64Address.createBaseRegisterOnlyAddress; +import static jdk.graal.compiler.asm.aarch64.AArch64Address.createImmediateAddress; +import static jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler.PREFERRED_BRANCH_TARGET_ALIGNMENT; +import static jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler.PREFERRED_LOOP_ALIGNMENT; +import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.REG; -import jdk.compiler.graal.asm.Label; -import jdk.compiler.graal.asm.aarch64.AArch64ASIMDAssembler.ElementSize; -import jdk.compiler.graal.asm.aarch64.AArch64Address; -import jdk.compiler.graal.asm.aarch64.AArch64Assembler.ConditionFlag; -import jdk.compiler.graal.asm.aarch64.AArch64Assembler.ShiftType; -import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.Opcode; -import jdk.compiler.graal.lir.gen.LIRGeneratorTool; +import jdk.graal.compiler.asm.Label; +import jdk.graal.compiler.asm.aarch64.AArch64ASIMDAssembler.ElementSize; +import jdk.graal.compiler.asm.aarch64.AArch64Address; +import jdk.graal.compiler.asm.aarch64.AArch64Assembler.ConditionFlag; +import jdk.graal.compiler.asm.aarch64.AArch64Assembler.ShiftType; +import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.Opcode; +import jdk.graal.compiler.lir.gen.LIRGeneratorTool; import jdk.vm.ci.aarch64.AArch64Kind; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64ZapRegistersOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64ZapRegistersOp.java similarity index 90% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64ZapRegistersOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64ZapRegistersOp.java index 72d1609defa0..17726cea26b1 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64ZapRegistersOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64ZapRegistersOp.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.aarch64; +package jdk.graal.compiler.lir.aarch64; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.Opcode; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.Opcode; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; import jdk.vm.ci.aarch64.AArch64Kind; -import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler; +import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler; import jdk.vm.ci.code.Register; import jdk.vm.ci.meta.JavaConstant; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64ZapStackOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64ZapStackOp.java similarity index 90% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64ZapStackOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64ZapStackOp.java index 833109ab6e48..0146f840e399 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64ZapStackOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64ZapStackOp.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.aarch64; +package jdk.graal.compiler.lir.aarch64; -import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.Opcode; +import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.Opcode; import jdk.vm.ci.aarch64.AArch64Kind; import jdk.vm.ci.code.StackSlot; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64ZeroMemoryOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64ZeroMemoryOp.java similarity index 94% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64ZeroMemoryOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64ZeroMemoryOp.java index 2473aed483a9..aabdafe38e63 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64ZeroMemoryOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/aarch64/AArch64ZeroMemoryOp.java @@ -23,21 +23,21 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.aarch64; +package jdk.graal.compiler.lir.aarch64; import static jdk.vm.ci.aarch64.AArch64.zr; import static jdk.vm.ci.code.ValueUtil.asRegister; -import static jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler.PREFERRED_LOOP_ALIGNMENT; -import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.REG; - -import jdk.compiler.graal.asm.Label; -import jdk.compiler.graal.asm.aarch64.AArch64Address; -import jdk.compiler.graal.asm.aarch64.AArch64Assembler; -import jdk.compiler.graal.asm.aarch64.AArch64Assembler.ConditionFlag; -import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.Opcode; +import static jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler.PREFERRED_LOOP_ALIGNMENT; +import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.REG; + +import jdk.graal.compiler.asm.Label; +import jdk.graal.compiler.asm.aarch64.AArch64Address; +import jdk.graal.compiler.asm.aarch64.AArch64Assembler; +import jdk.graal.compiler.asm.aarch64.AArch64Assembler.ConditionFlag; +import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.Opcode; import jdk.vm.ci.code.CodeUtil; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/AllocationStageVerifier.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/alloc/AllocationStageVerifier.java similarity index 83% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/AllocationStageVerifier.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/alloc/AllocationStageVerifier.java index 70ef8a5d132c..40a4d7fd2efb 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/AllocationStageVerifier.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/alloc/AllocationStageVerifier.java @@ -22,19 +22,19 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.alloc; +package jdk.graal.compiler.lir.alloc; -import static jdk.compiler.graal.lir.LIRValueUtil.isVariable; -import static jdk.compiler.graal.lir.LIRValueUtil.isVirtualStackSlot; +import static jdk.graal.compiler.lir.LIRValueUtil.isVariable; +import static jdk.graal.compiler.lir.LIRValueUtil.isVirtualStackSlot; import java.util.EnumSet; -import jdk.compiler.graal.core.common.cfg.BasicBlock; -import jdk.compiler.graal.lir.LIR; -import jdk.compiler.graal.lir.LIRInstruction; -import jdk.compiler.graal.lir.LIRInstruction.OperandFlag; -import jdk.compiler.graal.lir.LIRInstruction.OperandMode; -import jdk.compiler.graal.lir.gen.LIRGenerationResult; -import jdk.compiler.graal.lir.phases.AllocationPhase; +import jdk.graal.compiler.core.common.cfg.BasicBlock; +import jdk.graal.compiler.lir.LIR; +import jdk.graal.compiler.lir.LIRInstruction; +import jdk.graal.compiler.lir.LIRInstruction.OperandFlag; +import jdk.graal.compiler.lir.LIRInstruction.OperandMode; +import jdk.graal.compiler.lir.gen.LIRGenerationResult; +import jdk.graal.compiler.lir.phases.AllocationPhase; import jdk.vm.ci.code.TargetDescription; import jdk.vm.ci.meta.Value; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/OutOfRegistersException.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/alloc/OutOfRegistersException.java similarity index 94% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/OutOfRegistersException.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/alloc/OutOfRegistersException.java index ad9297f15762..0cebd6534aa4 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/OutOfRegistersException.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/alloc/OutOfRegistersException.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.alloc; +package jdk.graal.compiler.lir.alloc; -import jdk.compiler.graal.lir.BailoutAndRestartBackendException; +import jdk.graal.compiler.lir.BailoutAndRestartBackendException; /** * Thrown if the register allocator runs out of registers. This should never happen in normal mode. diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/RegisterAllocationPhase.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/alloc/RegisterAllocationPhase.java similarity index 94% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/RegisterAllocationPhase.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/alloc/RegisterAllocationPhase.java index 8ababe2be59d..da7f64ffe0fd 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/RegisterAllocationPhase.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/alloc/RegisterAllocationPhase.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.alloc; +package jdk.graal.compiler.lir.alloc; -import jdk.compiler.graal.lir.phases.AllocationPhase; +import jdk.graal.compiler.lir.phases.AllocationPhase; /** * Marker class for register allocation phases. diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/SaveCalleeSaveRegisters.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/alloc/SaveCalleeSaveRegisters.java similarity index 88% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/SaveCalleeSaveRegisters.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/alloc/SaveCalleeSaveRegisters.java index 69c8d0d0d4d5..75ac557c64e8 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/SaveCalleeSaveRegisters.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/alloc/SaveCalleeSaveRegisters.java @@ -22,22 +22,22 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.alloc; +package jdk.graal.compiler.lir.alloc; import java.util.ArrayList; -import jdk.compiler.graal.core.common.LIRKind; -import jdk.compiler.graal.core.common.cfg.BasicBlock; -import jdk.compiler.graal.lir.LIR; -import jdk.compiler.graal.lir.LIRInsertionBuffer; -import jdk.compiler.graal.lir.LIRInstruction; -import jdk.compiler.graal.lir.StandardOp; -import jdk.compiler.graal.lir.Variable; -import jdk.compiler.graal.lir.gen.LIRGenerationResult; -import jdk.compiler.graal.lir.gen.LIRGeneratorTool; -import jdk.compiler.graal.lir.gen.MoveFactory; -import jdk.compiler.graal.lir.phases.PreAllocationOptimizationPhase; -import jdk.compiler.graal.lir.util.RegisterMap; +import jdk.graal.compiler.core.common.LIRKind; +import jdk.graal.compiler.core.common.cfg.BasicBlock; +import jdk.graal.compiler.lir.LIR; +import jdk.graal.compiler.lir.LIRInsertionBuffer; +import jdk.graal.compiler.lir.LIRInstruction; +import jdk.graal.compiler.lir.StandardOp; +import jdk.graal.compiler.lir.Variable; +import jdk.graal.compiler.lir.gen.LIRGenerationResult; +import jdk.graal.compiler.lir.gen.LIRGeneratorTool; +import jdk.graal.compiler.lir.gen.MoveFactory; +import jdk.graal.compiler.lir.phases.PreAllocationOptimizationPhase; +import jdk.graal.compiler.lir.util.RegisterMap; import jdk.vm.ci.code.Architecture; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/lsra/Interval.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/alloc/lsra/Interval.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/lsra/Interval.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/alloc/lsra/Interval.java index c751ac9df75f..44e4f97019e1 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/lsra/Interval.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/alloc/lsra/Interval.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.alloc.lsra; +package jdk.graal.compiler.lir.alloc.lsra; import static jdk.vm.ci.code.ValueUtil.asRegister; import static jdk.vm.ci.code.ValueUtil.isIllegal; @@ -34,15 +34,15 @@ import java.util.EnumSet; import java.util.List; -import jdk.compiler.graal.core.common.LIRKind; -import jdk.compiler.graal.core.common.util.IntList; -import jdk.compiler.graal.core.common.util.Util; -import jdk.compiler.graal.debug.Assertions; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.lir.LIR; -import jdk.compiler.graal.lir.LIRInstruction; -import jdk.compiler.graal.lir.LIRValueUtil; -import jdk.compiler.graal.lir.Variable; +import jdk.graal.compiler.core.common.LIRKind; +import jdk.graal.compiler.core.common.util.IntList; +import jdk.graal.compiler.core.common.util.Util; +import jdk.graal.compiler.debug.Assertions; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.lir.LIR; +import jdk.graal.compiler.lir.LIRInstruction; +import jdk.graal.compiler.lir.LIRValueUtil; +import jdk.graal.compiler.lir.Variable; import jdk.vm.ci.code.RegisterValue; import jdk.vm.ci.code.StackSlot; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/lsra/IntervalWalker.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/alloc/lsra/IntervalWalker.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/lsra/IntervalWalker.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/alloc/lsra/IntervalWalker.java index 003f1ed6beba..12e508e87fe4 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/lsra/IntervalWalker.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/alloc/lsra/IntervalWalker.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.alloc.lsra; +package jdk.graal.compiler.lir.alloc.lsra; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.debug.Indent; -import jdk.compiler.graal.lir.alloc.lsra.Interval.RegisterBinding; -import jdk.compiler.graal.lir.alloc.lsra.Interval.RegisterBindingLists; -import jdk.compiler.graal.lir.alloc.lsra.Interval.State; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.debug.Indent; +import jdk.graal.compiler.lir.alloc.lsra.Interval.RegisterBinding; +import jdk.graal.compiler.lir.alloc.lsra.Interval.RegisterBindingLists; +import jdk.graal.compiler.lir.alloc.lsra.Interval.State; /** */ diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/lsra/LinearScan.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/alloc/lsra/LinearScan.java similarity index 96% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/lsra/LinearScan.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/alloc/lsra/LinearScan.java index 972f55664985..5b1e3314c7c7 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/lsra/LinearScan.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/alloc/lsra/LinearScan.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.alloc.lsra; +package jdk.graal.compiler.lir.alloc.lsra; import static jdk.vm.ci.code.CodeUtil.isEven; import static jdk.vm.ci.code.ValueUtil.asRegister; @@ -34,30 +34,30 @@ import java.util.Arrays; import java.util.BitSet; -import jdk.compiler.graal.lir.LIR; -import jdk.compiler.graal.lir.LIRInstruction; -import jdk.compiler.graal.lir.LIRValueUtil; -import jdk.compiler.graal.lir.Variable; -import jdk.compiler.graal.lir.VirtualStackSlot; -import jdk.compiler.graal.lir.framemap.FrameMapBuilder; -import jdk.compiler.graal.lir.gen.LIRGenerationResult; -import jdk.compiler.graal.lir.gen.MoveFactory; -import jdk.compiler.graal.lir.phases.AllocationPhase; -import jdk.compiler.graal.lir.phases.LIRPhase; +import jdk.graal.compiler.lir.LIR; +import jdk.graal.compiler.lir.LIRInstruction; +import jdk.graal.compiler.lir.LIRValueUtil; +import jdk.graal.compiler.lir.Variable; +import jdk.graal.compiler.lir.VirtualStackSlot; +import jdk.graal.compiler.lir.framemap.FrameMapBuilder; +import jdk.graal.compiler.lir.gen.LIRGenerationResult; +import jdk.graal.compiler.lir.gen.MoveFactory; +import jdk.graal.compiler.lir.phases.AllocationPhase; +import jdk.graal.compiler.lir.phases.LIRPhase; import org.graalvm.collections.Pair; -import jdk.compiler.graal.core.common.LIRKind; -import jdk.compiler.graal.core.common.alloc.RegisterAllocationConfig; -import jdk.compiler.graal.core.common.cfg.BasicBlock; -import jdk.compiler.graal.core.common.cfg.BlockMap; -import jdk.compiler.graal.debug.Assertions; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.debug.Indent; -import jdk.compiler.graal.options.NestedBooleanOptionKey; -import jdk.compiler.graal.options.Option; -import jdk.compiler.graal.options.OptionKey; -import jdk.compiler.graal.options.OptionType; -import jdk.compiler.graal.options.OptionValues; +import jdk.graal.compiler.core.common.LIRKind; +import jdk.graal.compiler.core.common.alloc.RegisterAllocationConfig; +import jdk.graal.compiler.core.common.cfg.BasicBlock; +import jdk.graal.compiler.core.common.cfg.BlockMap; +import jdk.graal.compiler.debug.Assertions; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.debug.Indent; +import jdk.graal.compiler.options.NestedBooleanOptionKey; +import jdk.graal.compiler.options.Option; +import jdk.graal.compiler.options.OptionKey; +import jdk.graal.compiler.options.OptionType; +import jdk.graal.compiler.options.OptionValues; import jdk.vm.ci.code.Register; import jdk.vm.ci.code.RegisterArray; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/lsra/LinearScanAllocationPhase.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/alloc/lsra/LinearScanAllocationPhase.java similarity index 89% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/lsra/LinearScanAllocationPhase.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/alloc/lsra/LinearScanAllocationPhase.java index e412fd343ccb..e45e40850538 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/lsra/LinearScanAllocationPhase.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/alloc/lsra/LinearScanAllocationPhase.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.alloc.lsra; +package jdk.graal.compiler.lir.alloc.lsra; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.debug.DebugContext.CompilerPhaseScope; -import jdk.compiler.graal.lir.gen.LIRGenerationResult; -import jdk.compiler.graal.lir.phases.AllocationPhase; -import jdk.compiler.graal.lir.phases.LIRPhase; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.debug.DebugContext.CompilerPhaseScope; +import jdk.graal.compiler.lir.gen.LIRGenerationResult; +import jdk.graal.compiler.lir.phases.AllocationPhase; +import jdk.graal.compiler.lir.phases.LIRPhase; import jdk.vm.ci.code.TargetDescription; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/lsra/LinearScanAssignLocationsPhase.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/alloc/lsra/LinearScanAssignLocationsPhase.java similarity index 94% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/lsra/LinearScanAssignLocationsPhase.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/alloc/lsra/LinearScanAssignLocationsPhase.java index e04991aedf82..20bcf317b8f9 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/lsra/LinearScanAssignLocationsPhase.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/alloc/lsra/LinearScanAssignLocationsPhase.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.alloc.lsra; +package jdk.graal.compiler.lir.alloc.lsra; import static jdk.vm.ci.code.ValueUtil.isIllegal; @@ -30,19 +30,19 @@ import java.util.Collections; import java.util.EnumSet; -import jdk.compiler.graal.core.common.cfg.BasicBlock; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.debug.Indent; -import jdk.compiler.graal.lir.CastValue; -import jdk.compiler.graal.lir.ConstantValue; -import jdk.compiler.graal.lir.InstructionValueProcedure; -import jdk.compiler.graal.lir.LIRInstruction; -import jdk.compiler.graal.lir.LIRValueUtil; -import jdk.compiler.graal.lir.StandardOp; -import jdk.compiler.graal.lir.Variable; -import jdk.compiler.graal.lir.gen.LIRGenerationResult; -import jdk.compiler.graal.lir.phases.AllocationPhase; +import jdk.graal.compiler.core.common.cfg.BasicBlock; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.debug.Indent; +import jdk.graal.compiler.lir.CastValue; +import jdk.graal.compiler.lir.ConstantValue; +import jdk.graal.compiler.lir.InstructionValueProcedure; +import jdk.graal.compiler.lir.LIRInstruction; +import jdk.graal.compiler.lir.LIRValueUtil; +import jdk.graal.compiler.lir.StandardOp; +import jdk.graal.compiler.lir.Variable; +import jdk.graal.compiler.lir.gen.LIRGenerationResult; +import jdk.graal.compiler.lir.phases.AllocationPhase; import jdk.vm.ci.code.TargetDescription; import jdk.vm.ci.code.ValueUtil; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/lsra/LinearScanEliminateSpillMovePhase.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/alloc/lsra/LinearScanEliminateSpillMovePhase.java similarity index 92% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/lsra/LinearScanEliminateSpillMovePhase.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/alloc/lsra/LinearScanEliminateSpillMovePhase.java index 76586467cddc..412e516915b3 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/lsra/LinearScanEliminateSpillMovePhase.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/alloc/lsra/LinearScanEliminateSpillMovePhase.java @@ -22,29 +22,29 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.alloc.lsra; +package jdk.graal.compiler.lir.alloc.lsra; import static jdk.vm.ci.code.ValueUtil.isRegister; import java.util.ArrayList; -import jdk.compiler.graal.core.common.cfg.BasicBlock; -import jdk.compiler.graal.debug.Assertions; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.debug.Indent; -import jdk.compiler.graal.lir.LIRInsertionBuffer; -import jdk.compiler.graal.lir.LIRInstruction; -import jdk.compiler.graal.lir.LIRValueUtil; -import jdk.compiler.graal.lir.StandardOp; -import jdk.compiler.graal.lir.gen.LIRGenerationResult; -import jdk.compiler.graal.lir.phases.AllocationPhase; -import jdk.compiler.graal.lir.phases.LIRPhase; -import jdk.compiler.graal.lir.alloc.lsra.Interval.SpillState; -import jdk.compiler.graal.lir.alloc.lsra.LinearScan.IntervalPredicate; -import jdk.compiler.graal.options.NestedBooleanOptionKey; -import jdk.compiler.graal.options.Option; -import jdk.compiler.graal.options.OptionKey; -import jdk.compiler.graal.options.OptionType; +import jdk.graal.compiler.core.common.cfg.BasicBlock; +import jdk.graal.compiler.debug.Assertions; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.debug.Indent; +import jdk.graal.compiler.lir.LIRInsertionBuffer; +import jdk.graal.compiler.lir.LIRInstruction; +import jdk.graal.compiler.lir.LIRValueUtil; +import jdk.graal.compiler.lir.StandardOp; +import jdk.graal.compiler.lir.gen.LIRGenerationResult; +import jdk.graal.compiler.lir.phases.AllocationPhase; +import jdk.graal.compiler.lir.phases.LIRPhase; +import jdk.graal.compiler.lir.alloc.lsra.Interval.SpillState; +import jdk.graal.compiler.lir.alloc.lsra.LinearScan.IntervalPredicate; +import jdk.graal.compiler.options.NestedBooleanOptionKey; +import jdk.graal.compiler.options.Option; +import jdk.graal.compiler.options.OptionKey; +import jdk.graal.compiler.options.OptionType; import jdk.vm.ci.code.TargetDescription; import jdk.vm.ci.meta.AllocatableValue; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/lsra/LinearScanIntervalDumper.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/alloc/lsra/LinearScanIntervalDumper.java similarity index 94% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/lsra/LinearScanIntervalDumper.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/alloc/lsra/LinearScanIntervalDumper.java index 72dca193e945..8ffb6ba0fabf 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/lsra/LinearScanIntervalDumper.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/alloc/lsra/LinearScanIntervalDumper.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.alloc.lsra; +package jdk.graal.compiler.lir.alloc.lsra; import static jdk.vm.ci.code.ValueUtil.isRegister; -import jdk.compiler.graal.lir.debug.IntervalDumper; -import jdk.compiler.graal.lir.alloc.lsra.Interval.UsePosList; +import jdk.graal.compiler.lir.debug.IntervalDumper; +import jdk.graal.compiler.lir.alloc.lsra.Interval.UsePosList; import jdk.vm.ci.meta.AllocatableValue; import jdk.vm.ci.meta.Value; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/lsra/LinearScanLifetimeAnalysisPhase.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/alloc/lsra/LinearScanLifetimeAnalysisPhase.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/lsra/LinearScanLifetimeAnalysisPhase.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/alloc/lsra/LinearScanLifetimeAnalysisPhase.java index 8b951922e2aa..dfc7fe2b10de 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/lsra/LinearScanLifetimeAnalysisPhase.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/alloc/lsra/LinearScanLifetimeAnalysisPhase.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.alloc.lsra; +package jdk.graal.compiler.lir.alloc.lsra; import static jdk.vm.ci.code.ValueUtil.asRegister; import static jdk.vm.ci.code.ValueUtil.asStackSlot; @@ -34,29 +34,29 @@ import java.util.BitSet; import java.util.EnumSet; -import jdk.compiler.graal.lir.InstructionStateProcedure; -import jdk.compiler.graal.lir.InstructionValueConsumer; -import jdk.compiler.graal.lir.LIRInstruction; -import jdk.compiler.graal.lir.LIRValueUtil; -import jdk.compiler.graal.lir.StandardOp; -import jdk.compiler.graal.lir.ValueConsumer; -import jdk.compiler.graal.lir.debug.LIRGenerationDebugContext; -import jdk.compiler.graal.lir.gen.LIRGenerationResult; -import jdk.compiler.graal.lir.phases.AllocationPhase; -import jdk.compiler.graal.lir.util.IndexedValueMap; +import jdk.graal.compiler.lir.InstructionStateProcedure; +import jdk.graal.compiler.lir.InstructionValueConsumer; +import jdk.graal.compiler.lir.LIRInstruction; +import jdk.graal.compiler.lir.LIRValueUtil; +import jdk.graal.compiler.lir.StandardOp; +import jdk.graal.compiler.lir.ValueConsumer; +import jdk.graal.compiler.lir.debug.LIRGenerationDebugContext; +import jdk.graal.compiler.lir.gen.LIRGenerationResult; +import jdk.graal.compiler.lir.phases.AllocationPhase; +import jdk.graal.compiler.lir.util.IndexedValueMap; import org.graalvm.collections.EconomicSet; import org.graalvm.collections.Equivalence; -import jdk.compiler.graal.core.common.LIRKind; -import jdk.compiler.graal.core.common.PermanentBailoutException; -import jdk.compiler.graal.core.common.cfg.BasicBlock; -import jdk.compiler.graal.core.common.util.BitMap2D; -import jdk.compiler.graal.debug.Assertions; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.debug.Indent; -import jdk.compiler.graal.lir.alloc.lsra.Interval.RegisterPriority; -import jdk.compiler.graal.lir.alloc.lsra.Interval.SpillState; -import jdk.compiler.graal.lir.alloc.lsra.LinearScan.BlockData; +import jdk.graal.compiler.core.common.LIRKind; +import jdk.graal.compiler.core.common.PermanentBailoutException; +import jdk.graal.compiler.core.common.cfg.BasicBlock; +import jdk.graal.compiler.core.common.util.BitMap2D; +import jdk.graal.compiler.debug.Assertions; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.debug.Indent; +import jdk.graal.compiler.lir.alloc.lsra.Interval.RegisterPriority; +import jdk.graal.compiler.lir.alloc.lsra.Interval.SpillState; +import jdk.graal.compiler.lir.alloc.lsra.LinearScan.BlockData; import jdk.vm.ci.code.Register; import jdk.vm.ci.code.RegisterArray; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/lsra/LinearScanOptimizeSpillPositionPhase.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/alloc/lsra/LinearScanOptimizeSpillPositionPhase.java similarity index 94% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/lsra/LinearScanOptimizeSpillPositionPhase.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/alloc/lsra/LinearScanOptimizeSpillPositionPhase.java index 88bdaf5bfaee..2d94612da4d6 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/lsra/LinearScanOptimizeSpillPositionPhase.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/alloc/lsra/LinearScanOptimizeSpillPositionPhase.java @@ -22,22 +22,22 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.alloc.lsra; +package jdk.graal.compiler.lir.alloc.lsra; -import static jdk.compiler.graal.core.common.cfg.AbstractControlFlowGraph.commonDominator; +import static jdk.graal.compiler.core.common.cfg.AbstractControlFlowGraph.commonDominator; import java.util.Iterator; -import jdk.compiler.graal.core.common.cfg.BasicBlock; -import jdk.compiler.graal.debug.CounterKey; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.debug.Indent; -import jdk.compiler.graal.lir.LIRInsertionBuffer; -import jdk.compiler.graal.lir.LIRInstruction; -import jdk.compiler.graal.lir.LIRValueUtil; -import jdk.compiler.graal.lir.gen.LIRGenerationResult; -import jdk.compiler.graal.lir.phases.AllocationPhase; -import jdk.compiler.graal.lir.alloc.lsra.Interval.SpillState; +import jdk.graal.compiler.core.common.cfg.BasicBlock; +import jdk.graal.compiler.debug.CounterKey; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.debug.Indent; +import jdk.graal.compiler.lir.LIRInsertionBuffer; +import jdk.graal.compiler.lir.LIRInstruction; +import jdk.graal.compiler.lir.LIRValueUtil; +import jdk.graal.compiler.lir.gen.LIRGenerationResult; +import jdk.graal.compiler.lir.phases.AllocationPhase; +import jdk.graal.compiler.lir.alloc.lsra.Interval.SpillState; import jdk.vm.ci.code.TargetDescription; import jdk.vm.ci.meta.AllocatableValue; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/lsra/LinearScanPhase.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/alloc/lsra/LinearScanPhase.java similarity index 83% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/lsra/LinearScanPhase.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/alloc/lsra/LinearScanPhase.java index bdf513a5026f..ef48de9ff186 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/lsra/LinearScanPhase.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/alloc/lsra/LinearScanPhase.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.alloc.lsra; +package jdk.graal.compiler.lir.alloc.lsra; -import jdk.compiler.graal.core.common.alloc.RegisterAllocationConfig; -import jdk.compiler.graal.lir.alloc.RegisterAllocationPhase; -import jdk.compiler.graal.lir.alloc.lsra.ssa.SSALinearScan; -import jdk.compiler.graal.lir.gen.LIRGenerationResult; -import jdk.compiler.graal.lir.gen.MoveFactory; -import jdk.compiler.graal.lir.phases.AllocationPhase; +import jdk.graal.compiler.core.common.alloc.RegisterAllocationConfig; +import jdk.graal.compiler.lir.alloc.RegisterAllocationPhase; +import jdk.graal.compiler.lir.alloc.lsra.ssa.SSALinearScan; +import jdk.graal.compiler.lir.gen.LIRGenerationResult; +import jdk.graal.compiler.lir.gen.MoveFactory; +import jdk.graal.compiler.lir.phases.AllocationPhase; import jdk.vm.ci.code.TargetDescription; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/lsra/LinearScanRegisterAllocationPhase.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/alloc/lsra/LinearScanRegisterAllocationPhase.java similarity index 93% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/lsra/LinearScanRegisterAllocationPhase.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/alloc/lsra/LinearScanRegisterAllocationPhase.java index 6beacf7e60a7..758292a1af11 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/lsra/LinearScanRegisterAllocationPhase.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/alloc/lsra/LinearScanRegisterAllocationPhase.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.alloc.lsra; +package jdk.graal.compiler.lir.alloc.lsra; -import jdk.compiler.graal.lir.gen.LIRGenerationResult; -import jdk.compiler.graal.lir.phases.AllocationPhase; +import jdk.graal.compiler.lir.gen.LIRGenerationResult; +import jdk.graal.compiler.lir.phases.AllocationPhase; import org.graalvm.collections.Pair; -import jdk.compiler.graal.debug.Indent; +import jdk.graal.compiler.debug.Indent; import jdk.vm.ci.code.TargetDescription; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/lsra/LinearScanResolveDataFlowPhase.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/alloc/lsra/LinearScanResolveDataFlowPhase.java similarity index 96% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/lsra/LinearScanResolveDataFlowPhase.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/alloc/lsra/LinearScanResolveDataFlowPhase.java index e05f55980da2..dbf21115c348 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/lsra/LinearScanResolveDataFlowPhase.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/alloc/lsra/LinearScanResolveDataFlowPhase.java @@ -22,18 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.alloc.lsra; +package jdk.graal.compiler.lir.alloc.lsra; import java.util.ArrayList; import java.util.BitSet; -import jdk.compiler.graal.core.common.cfg.BasicBlock; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.debug.Indent; -import jdk.compiler.graal.lir.LIRInstruction; -import jdk.compiler.graal.lir.StandardOp; -import jdk.compiler.graal.lir.gen.LIRGenerationResult; -import jdk.compiler.graal.lir.phases.AllocationPhase; +import jdk.graal.compiler.core.common.cfg.BasicBlock; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.debug.Indent; +import jdk.graal.compiler.lir.LIRInstruction; +import jdk.graal.compiler.lir.StandardOp; +import jdk.graal.compiler.lir.gen.LIRGenerationResult; +import jdk.graal.compiler.lir.phases.AllocationPhase; import jdk.vm.ci.code.TargetDescription; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/lsra/LinearScanWalker.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/alloc/lsra/LinearScanWalker.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/lsra/LinearScanWalker.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/alloc/lsra/LinearScanWalker.java index 56f8790f773a..1f82efbab8de 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/lsra/LinearScanWalker.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/alloc/lsra/LinearScanWalker.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.alloc.lsra; +package jdk.graal.compiler.lir.alloc.lsra; import static jdk.vm.ci.code.CodeUtil.isOdd; import static jdk.vm.ci.code.ValueUtil.asRegister; @@ -33,21 +33,21 @@ import java.util.Collections; import java.util.List; -import jdk.compiler.graal.core.common.alloc.RegisterAllocationConfig.AllocatableRegisters; -import jdk.compiler.graal.core.common.cfg.BasicBlock; -import jdk.compiler.graal.core.common.util.Util; -import jdk.compiler.graal.debug.CounterKey; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.debug.Indent; -import jdk.compiler.graal.lir.LIRInstruction; -import jdk.compiler.graal.lir.LIRValueUtil; -import jdk.compiler.graal.lir.StandardOp; -import jdk.compiler.graal.lir.alloc.OutOfRegistersException; -import jdk.compiler.graal.lir.alloc.lsra.Interval.RegisterBinding; -import jdk.compiler.graal.lir.alloc.lsra.Interval.RegisterPriority; -import jdk.compiler.graal.lir.alloc.lsra.Interval.SpillState; -import jdk.compiler.graal.lir.alloc.lsra.Interval.State; +import jdk.graal.compiler.core.common.alloc.RegisterAllocationConfig.AllocatableRegisters; +import jdk.graal.compiler.core.common.cfg.BasicBlock; +import jdk.graal.compiler.core.common.util.Util; +import jdk.graal.compiler.debug.CounterKey; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.debug.Indent; +import jdk.graal.compiler.lir.LIRInstruction; +import jdk.graal.compiler.lir.LIRValueUtil; +import jdk.graal.compiler.lir.StandardOp; +import jdk.graal.compiler.lir.alloc.OutOfRegistersException; +import jdk.graal.compiler.lir.alloc.lsra.Interval.RegisterBinding; +import jdk.graal.compiler.lir.alloc.lsra.Interval.RegisterPriority; +import jdk.graal.compiler.lir.alloc.lsra.Interval.SpillState; +import jdk.graal.compiler.lir.alloc.lsra.Interval.State; import jdk.vm.ci.code.Register; import jdk.vm.ci.meta.Value; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/lsra/MoveResolver.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/alloc/lsra/MoveResolver.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/lsra/MoveResolver.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/alloc/lsra/MoveResolver.java index 99bbd3d86758..c99d8a2025c4 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/lsra/MoveResolver.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/alloc/lsra/MoveResolver.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.alloc.lsra; +package jdk.graal.compiler.lir.alloc.lsra; import static jdk.vm.ci.code.ValueUtil.asRegister; import static jdk.vm.ci.code.ValueUtil.isIllegal; @@ -30,17 +30,17 @@ import java.util.ArrayList; -import jdk.compiler.graal.lir.LIRInsertionBuffer; -import jdk.compiler.graal.lir.LIRInstruction; -import jdk.compiler.graal.lir.LIRValueUtil; -import jdk.compiler.graal.lir.gen.LIRGenerationResult; +import jdk.graal.compiler.lir.LIRInsertionBuffer; +import jdk.graal.compiler.lir.LIRInstruction; +import jdk.graal.compiler.lir.LIRValueUtil; +import jdk.graal.compiler.lir.gen.LIRGenerationResult; import org.graalvm.collections.EconomicSet; import org.graalvm.collections.Equivalence; -import jdk.compiler.graal.core.common.LIRKind; -import jdk.compiler.graal.debug.CounterKey; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.debug.Indent; +import jdk.graal.compiler.core.common.LIRKind; +import jdk.graal.compiler.debug.CounterKey; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.debug.Indent; import jdk.vm.ci.meta.AllocatableValue; import jdk.vm.ci.meta.Constant; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/lsra/OptimizingLinearScanWalker.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/alloc/lsra/OptimizingLinearScanWalker.java similarity index 95% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/lsra/OptimizingLinearScanWalker.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/alloc/lsra/OptimizingLinearScanWalker.java index d04499e5418d..7e0a9236a031 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/lsra/OptimizingLinearScanWalker.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/alloc/lsra/OptimizingLinearScanWalker.java @@ -22,21 +22,21 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.alloc.lsra; +package jdk.graal.compiler.lir.alloc.lsra; import static jdk.vm.ci.code.ValueUtil.asRegister; import static jdk.vm.ci.code.ValueUtil.isRegister; -import jdk.compiler.graal.core.common.cfg.BasicBlock; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.debug.Indent; -import jdk.compiler.graal.lir.LIRValueUtil; -import jdk.compiler.graal.lir.alloc.lsra.Interval.RegisterBinding; -import jdk.compiler.graal.lir.alloc.lsra.Interval.RegisterPriority; -import jdk.compiler.graal.lir.alloc.lsra.Interval.State; -import jdk.compiler.graal.options.Option; -import jdk.compiler.graal.options.OptionKey; -import jdk.compiler.graal.options.OptionType; +import jdk.graal.compiler.core.common.cfg.BasicBlock; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.debug.Indent; +import jdk.graal.compiler.lir.LIRValueUtil; +import jdk.graal.compiler.lir.alloc.lsra.Interval.RegisterBinding; +import jdk.graal.compiler.lir.alloc.lsra.Interval.RegisterPriority; +import jdk.graal.compiler.lir.alloc.lsra.Interval.State; +import jdk.graal.compiler.options.Option; +import jdk.graal.compiler.options.OptionKey; +import jdk.graal.compiler.options.OptionType; import jdk.vm.ci.code.Register; import jdk.vm.ci.meta.AllocatableValue; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/lsra/Range.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/alloc/lsra/Range.java similarity index 96% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/lsra/Range.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/alloc/lsra/Range.java index e70e9439f610..264607a2448c 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/lsra/Range.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/alloc/lsra/Range.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.alloc.lsra; +package jdk.graal.compiler.lir.alloc.lsra; -import jdk.compiler.graal.core.common.util.CompilationAlarm; -import jdk.compiler.graal.lir.LIR; +import jdk.graal.compiler.core.common.util.CompilationAlarm; +import jdk.graal.compiler.lir.LIR; /** * Represents a range of integers from a start (inclusive) to an end (exclusive. diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/lsra/RegisterVerifier.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/alloc/lsra/RegisterVerifier.java similarity index 96% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/lsra/RegisterVerifier.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/alloc/lsra/RegisterVerifier.java index 2cf4c2ec4415..d2dfb9997785 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/lsra/RegisterVerifier.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/alloc/lsra/RegisterVerifier.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.alloc.lsra; +package jdk.graal.compiler.lir.alloc.lsra; import static jdk.vm.ci.code.ValueUtil.asRegister; import static jdk.vm.ci.code.ValueUtil.isRegister; @@ -30,13 +30,13 @@ import java.util.ArrayList; import java.util.EnumSet; -import jdk.compiler.graal.core.common.cfg.BasicBlock; -import jdk.compiler.graal.core.common.cfg.BlockMap; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.debug.Indent; -import jdk.compiler.graal.lir.InstructionValueConsumer; -import jdk.compiler.graal.lir.LIRInstruction; +import jdk.graal.compiler.core.common.cfg.BasicBlock; +import jdk.graal.compiler.core.common.cfg.BlockMap; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.debug.Indent; +import jdk.graal.compiler.lir.InstructionValueConsumer; +import jdk.graal.compiler.lir.LIRInstruction; import jdk.vm.ci.code.Register; import jdk.vm.ci.meta.Value; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/lsra/ssa/SSALinearScan.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/alloc/lsra/ssa/SSALinearScan.java similarity index 82% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/lsra/ssa/SSALinearScan.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/alloc/lsra/ssa/SSALinearScan.java index 4a1a4d9ff76e..65e183ed5611 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/lsra/ssa/SSALinearScan.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/alloc/lsra/ssa/SSALinearScan.java @@ -22,19 +22,19 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.alloc.lsra.ssa; +package jdk.graal.compiler.lir.alloc.lsra.ssa; -import jdk.compiler.graal.core.common.alloc.RegisterAllocationConfig; -import jdk.compiler.graal.core.common.cfg.BasicBlock; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.lir.alloc.lsra.LinearScan; -import jdk.compiler.graal.lir.alloc.lsra.LinearScanEliminateSpillMovePhase; -import jdk.compiler.graal.lir.alloc.lsra.LinearScanLifetimeAnalysisPhase; -import jdk.compiler.graal.lir.alloc.lsra.LinearScanResolveDataFlowPhase; -import jdk.compiler.graal.lir.alloc.lsra.MoveResolver; -import jdk.compiler.graal.lir.gen.LIRGenerationResult; -import jdk.compiler.graal.lir.gen.MoveFactory; -import jdk.compiler.graal.lir.ssa.SSAUtil; +import jdk.graal.compiler.core.common.alloc.RegisterAllocationConfig; +import jdk.graal.compiler.core.common.cfg.BasicBlock; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.lir.alloc.lsra.LinearScan; +import jdk.graal.compiler.lir.alloc.lsra.LinearScanEliminateSpillMovePhase; +import jdk.graal.compiler.lir.alloc.lsra.LinearScanLifetimeAnalysisPhase; +import jdk.graal.compiler.lir.alloc.lsra.LinearScanResolveDataFlowPhase; +import jdk.graal.compiler.lir.alloc.lsra.MoveResolver; +import jdk.graal.compiler.lir.gen.LIRGenerationResult; +import jdk.graal.compiler.lir.gen.MoveFactory; +import jdk.graal.compiler.lir.ssa.SSAUtil; import jdk.vm.ci.code.TargetDescription; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/lsra/ssa/SSALinearScanEliminateSpillMovePhase.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/alloc/lsra/ssa/SSALinearScanEliminateSpillMovePhase.java similarity index 85% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/lsra/ssa/SSALinearScanEliminateSpillMovePhase.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/alloc/lsra/ssa/SSALinearScanEliminateSpillMovePhase.java index 74a2d14ed31b..75ad14f669f8 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/lsra/ssa/SSALinearScanEliminateSpillMovePhase.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/alloc/lsra/ssa/SSALinearScanEliminateSpillMovePhase.java @@ -22,20 +22,20 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.alloc.lsra.ssa; +package jdk.graal.compiler.lir.alloc.lsra.ssa; import static jdk.vm.ci.code.ValueUtil.isRegister; -import static jdk.compiler.graal.lir.LIRValueUtil.isStackSlotValue; +import static jdk.graal.compiler.lir.LIRValueUtil.isStackSlotValue; -import jdk.compiler.graal.core.common.cfg.BasicBlock; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.debug.Indent; -import jdk.compiler.graal.lir.LIRInstruction; -import jdk.compiler.graal.lir.StandardOp.LabelOp; -import jdk.compiler.graal.lir.StandardOp.MoveOp; -import jdk.compiler.graal.lir.alloc.lsra.Interval; -import jdk.compiler.graal.lir.alloc.lsra.LinearScan; -import jdk.compiler.graal.lir.alloc.lsra.LinearScanEliminateSpillMovePhase; +import jdk.graal.compiler.core.common.cfg.BasicBlock; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.debug.Indent; +import jdk.graal.compiler.lir.LIRInstruction; +import jdk.graal.compiler.lir.StandardOp.LabelOp; +import jdk.graal.compiler.lir.StandardOp.MoveOp; +import jdk.graal.compiler.lir.alloc.lsra.Interval; +import jdk.graal.compiler.lir.alloc.lsra.LinearScan; +import jdk.graal.compiler.lir.alloc.lsra.LinearScanEliminateSpillMovePhase; public class SSALinearScanEliminateSpillMovePhase extends LinearScanEliminateSpillMovePhase { diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/lsra/ssa/SSALinearScanLifetimeAnalysisPhase.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/alloc/lsra/ssa/SSALinearScanLifetimeAnalysisPhase.java similarity index 86% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/lsra/ssa/SSALinearScanLifetimeAnalysisPhase.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/alloc/lsra/ssa/SSALinearScanLifetimeAnalysisPhase.java index 09c95df64c55..bdb5ffd02099 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/lsra/ssa/SSALinearScanLifetimeAnalysisPhase.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/alloc/lsra/ssa/SSALinearScanLifetimeAnalysisPhase.java @@ -22,24 +22,24 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.alloc.lsra.ssa; +package jdk.graal.compiler.lir.alloc.lsra.ssa; import java.util.BitSet; import java.util.EnumSet; -import jdk.compiler.graal.core.common.cfg.BasicBlock; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.lir.LIR; -import jdk.compiler.graal.lir.LIRInstruction; -import jdk.compiler.graal.lir.LIRInstruction.OperandFlag; -import jdk.compiler.graal.lir.LIRInstruction.OperandMode; -import jdk.compiler.graal.lir.StandardOp; -import jdk.compiler.graal.lir.StandardOp.LabelOp; -import jdk.compiler.graal.lir.alloc.lsra.Interval; -import jdk.compiler.graal.lir.alloc.lsra.Interval.RegisterPriority; -import jdk.compiler.graal.lir.alloc.lsra.LinearScan; -import jdk.compiler.graal.lir.alloc.lsra.LinearScanLifetimeAnalysisPhase; -import jdk.compiler.graal.lir.ssa.SSAUtil; +import jdk.graal.compiler.core.common.cfg.BasicBlock; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.lir.LIR; +import jdk.graal.compiler.lir.LIRInstruction; +import jdk.graal.compiler.lir.LIRInstruction.OperandFlag; +import jdk.graal.compiler.lir.LIRInstruction.OperandMode; +import jdk.graal.compiler.lir.StandardOp; +import jdk.graal.compiler.lir.StandardOp.LabelOp; +import jdk.graal.compiler.lir.alloc.lsra.Interval; +import jdk.graal.compiler.lir.alloc.lsra.Interval.RegisterPriority; +import jdk.graal.compiler.lir.alloc.lsra.LinearScan; +import jdk.graal.compiler.lir.alloc.lsra.LinearScanLifetimeAnalysisPhase; +import jdk.graal.compiler.lir.ssa.SSAUtil; import jdk.vm.ci.meta.AllocatableValue; import jdk.vm.ci.meta.Value; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/lsra/ssa/SSALinearScanResolveDataFlowPhase.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/alloc/lsra/ssa/SSALinearScanResolveDataFlowPhase.java similarity index 85% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/lsra/ssa/SSALinearScanResolveDataFlowPhase.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/alloc/lsra/ssa/SSALinearScanResolveDataFlowPhase.java index 8d4b15622584..2e014a6ea856 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/lsra/ssa/SSALinearScanResolveDataFlowPhase.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/alloc/lsra/ssa/SSALinearScanResolveDataFlowPhase.java @@ -22,25 +22,25 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.alloc.lsra.ssa; +package jdk.graal.compiler.lir.alloc.lsra.ssa; import static jdk.vm.ci.code.ValueUtil.isRegister; -import static jdk.compiler.graal.lir.LIRValueUtil.asConstant; -import static jdk.compiler.graal.lir.LIRValueUtil.isConstantValue; -import static jdk.compiler.graal.lir.LIRValueUtil.isStackSlotValue; +import static jdk.graal.compiler.lir.LIRValueUtil.asConstant; +import static jdk.graal.compiler.lir.LIRValueUtil.isConstantValue; +import static jdk.graal.compiler.lir.LIRValueUtil.isStackSlotValue; import java.util.ArrayList; -import jdk.compiler.graal.core.common.cfg.BasicBlock; -import jdk.compiler.graal.debug.CounterKey; -import jdk.compiler.graal.debug.DebugContext; -import jdk.compiler.graal.lir.LIRInstruction; -import jdk.compiler.graal.lir.alloc.lsra.Interval; -import jdk.compiler.graal.lir.alloc.lsra.LinearScan; -import jdk.compiler.graal.lir.alloc.lsra.LinearScanResolveDataFlowPhase; -import jdk.compiler.graal.lir.alloc.lsra.MoveResolver; -import jdk.compiler.graal.lir.ssa.SSAUtil; -import jdk.compiler.graal.lir.ssa.SSAUtil.PhiValueVisitor; +import jdk.graal.compiler.core.common.cfg.BasicBlock; +import jdk.graal.compiler.debug.CounterKey; +import jdk.graal.compiler.debug.DebugContext; +import jdk.graal.compiler.lir.LIRInstruction; +import jdk.graal.compiler.lir.alloc.lsra.Interval; +import jdk.graal.compiler.lir.alloc.lsra.LinearScan; +import jdk.graal.compiler.lir.alloc.lsra.LinearScanResolveDataFlowPhase; +import jdk.graal.compiler.lir.alloc.lsra.MoveResolver; +import jdk.graal.compiler.lir.ssa.SSAUtil; +import jdk.graal.compiler.lir.ssa.SSAUtil.PhiValueVisitor; import jdk.vm.ci.meta.Value; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/lsra/ssa/SSAMoveResolver.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/alloc/lsra/ssa/SSAMoveResolver.java similarity index 90% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/lsra/ssa/SSAMoveResolver.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/alloc/lsra/ssa/SSAMoveResolver.java index 42b174f531e7..03b4af8dde55 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/lsra/ssa/SSAMoveResolver.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/alloc/lsra/ssa/SSAMoveResolver.java @@ -22,24 +22,24 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.alloc.lsra.ssa; +package jdk.graal.compiler.lir.alloc.lsra.ssa; -import static jdk.compiler.graal.lir.LIRValueUtil.asVirtualStackSlot; -import static jdk.compiler.graal.lir.LIRValueUtil.isStackSlotValue; -import static jdk.compiler.graal.lir.LIRValueUtil.isVirtualStackSlot; +import static jdk.graal.compiler.lir.LIRValueUtil.asVirtualStackSlot; +import static jdk.graal.compiler.lir.LIRValueUtil.isStackSlotValue; +import static jdk.graal.compiler.lir.LIRValueUtil.isVirtualStackSlot; import static jdk.vm.ci.code.ValueUtil.asStackSlot; import static jdk.vm.ci.code.ValueUtil.isStackSlot; import java.util.Arrays; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.lir.LIRInstruction; -import jdk.compiler.graal.lir.VirtualStackSlot; -import jdk.compiler.graal.lir.alloc.lsra.Interval; -import jdk.compiler.graal.lir.alloc.lsra.LinearScan; -import jdk.compiler.graal.lir.alloc.lsra.MoveResolver; -import jdk.compiler.graal.lir.framemap.FrameMap; -import jdk.compiler.graal.lir.framemap.FrameMapBuilderTool; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.lir.LIRInstruction; +import jdk.graal.compiler.lir.VirtualStackSlot; +import jdk.graal.compiler.lir.alloc.lsra.Interval; +import jdk.graal.compiler.lir.alloc.lsra.LinearScan; +import jdk.graal.compiler.lir.alloc.lsra.MoveResolver; +import jdk.graal.compiler.lir.framemap.FrameMap; +import jdk.graal.compiler.lir.framemap.FrameMapBuilderTool; import jdk.vm.ci.code.StackSlot; import jdk.vm.ci.meta.AllocatableValue; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64AESDecryptOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64AESDecryptOp.java similarity index 92% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64AESDecryptOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64AESDecryptOp.java index 7aa96b61bf9c..5e42667e74c9 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64AESDecryptOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64AESDecryptOp.java @@ -22,21 +22,21 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.amd64; +package jdk.graal.compiler.lir.amd64; import static jdk.vm.ci.code.ValueUtil.asRegister; -import static jdk.compiler.graal.lir.amd64.AMD64LIRHelper.recordExternalAddress; - -import jdk.compiler.graal.asm.Label; -import jdk.compiler.graal.asm.amd64.AMD64Address; -import jdk.compiler.graal.asm.amd64.AMD64Assembler.ConditionFlag; -import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler; -import jdk.compiler.graal.core.common.LIRKind; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.SyncPort; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; -import jdk.compiler.graal.lir.gen.LIRGeneratorTool; +import static jdk.graal.compiler.lir.amd64.AMD64LIRHelper.recordExternalAddress; + +import jdk.graal.compiler.asm.Label; +import jdk.graal.compiler.asm.amd64.AMD64Address; +import jdk.graal.compiler.asm.amd64.AMD64Assembler.ConditionFlag; +import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler; +import jdk.graal.compiler.core.common.LIRKind; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.SyncPort; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.lir.gen.LIRGeneratorTool; import jdk.vm.ci.amd64.AMD64Kind; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64AESEncryptOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64AESEncryptOp.java similarity index 90% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64AESEncryptOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64AESEncryptOp.java index e6fc7edda324..601bcb024d40 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64AESEncryptOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64AESEncryptOp.java @@ -22,24 +22,24 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.amd64; +package jdk.graal.compiler.lir.amd64; import static jdk.vm.ci.code.ValueUtil.asRegister; -import static jdk.compiler.graal.lir.amd64.AMD64LIRHelper.pointerConstant; -import static jdk.compiler.graal.lir.amd64.AMD64LIRHelper.recordExternalAddress; - -import jdk.compiler.graal.asm.Label; -import jdk.compiler.graal.asm.amd64.AMD64Address; -import jdk.compiler.graal.asm.amd64.AMD64Assembler.ConditionFlag; -import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler; -import jdk.compiler.graal.asm.amd64.AVXKind.AVXSize; -import jdk.compiler.graal.core.common.LIRKind; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.SyncPort; -import jdk.compiler.graal.lir.asm.ArrayDataPointerConstant; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; -import jdk.compiler.graal.lir.gen.LIRGeneratorTool; +import static jdk.graal.compiler.lir.amd64.AMD64LIRHelper.pointerConstant; +import static jdk.graal.compiler.lir.amd64.AMD64LIRHelper.recordExternalAddress; + +import jdk.graal.compiler.asm.Label; +import jdk.graal.compiler.asm.amd64.AMD64Address; +import jdk.graal.compiler.asm.amd64.AMD64Assembler.ConditionFlag; +import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler; +import jdk.graal.compiler.asm.amd64.AVXKind.AVXSize; +import jdk.graal.compiler.core.common.LIRKind; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.SyncPort; +import jdk.graal.compiler.lir.asm.ArrayDataPointerConstant; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.lir.gen.LIRGeneratorTool; import jdk.vm.ci.amd64.AMD64; import jdk.vm.ci.amd64.AMD64Kind; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64AddressValue.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64AddressValue.java similarity index 94% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64AddressValue.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64AddressValue.java index ab7266da32a8..ffc21a389646 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64AddressValue.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64AddressValue.java @@ -22,18 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.amd64; +package jdk.graal.compiler.lir.amd64; import static jdk.vm.ci.code.ValueUtil.isLegal; import java.util.EnumSet; -import jdk.compiler.graal.asm.amd64.AMD64Address; -import jdk.compiler.graal.core.common.Stride; -import jdk.compiler.graal.lir.CompositeValue; -import jdk.compiler.graal.lir.InstructionValueConsumer; -import jdk.compiler.graal.lir.InstructionValueProcedure; -import jdk.compiler.graal.lir.LIRInstruction; +import jdk.graal.compiler.asm.amd64.AMD64Address; +import jdk.graal.compiler.core.common.Stride; +import jdk.graal.compiler.lir.CompositeValue; +import jdk.graal.compiler.lir.InstructionValueConsumer; +import jdk.graal.compiler.lir.InstructionValueProcedure; +import jdk.graal.compiler.lir.LIRInstruction; import jdk.vm.ci.code.Register; import jdk.vm.ci.code.RegisterValue; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64Arithmetic.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64Arithmetic.java similarity index 89% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64Arithmetic.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64Arithmetic.java index a92124f529ff..c4ff719361c2 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64Arithmetic.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64Arithmetic.java @@ -22,18 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.amd64; +package jdk.graal.compiler.lir.amd64; import static jdk.vm.ci.code.ValueUtil.asRegister; -import jdk.compiler.graal.asm.Label; -import jdk.compiler.graal.asm.amd64.AMD64Address; -import jdk.compiler.graal.asm.amd64.AMD64Assembler.ConditionFlag; -import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler; -import jdk.compiler.graal.core.common.LIRKind; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.Opcode; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.asm.Label; +import jdk.graal.compiler.asm.amd64.AMD64Address; +import jdk.graal.compiler.asm.amd64.AMD64Assembler.ConditionFlag; +import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler; +import jdk.graal.compiler.core.common.LIRKind; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.Opcode; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; import jdk.vm.ci.amd64.AMD64; import jdk.vm.ci.amd64.AMD64Kind; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64ArithmeticLIRGeneratorTool.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64ArithmeticLIRGeneratorTool.java similarity index 94% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64ArithmeticLIRGeneratorTool.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64ArithmeticLIRGeneratorTool.java index cffe7cd204b2..cffe672a1f2e 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64ArithmeticLIRGeneratorTool.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64ArithmeticLIRGeneratorTool.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.amd64; +package jdk.graal.compiler.lir.amd64; -import jdk.compiler.graal.lir.gen.ArithmeticLIRGeneratorTool; +import jdk.graal.compiler.lir.gen.ArithmeticLIRGeneratorTool; import jdk.vm.ci.amd64.AMD64Kind; import jdk.vm.ci.meta.AllocatableValue; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64ArrayCompareToOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64ArrayCompareToOp.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64ArrayCompareToOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64ArrayCompareToOp.java index db7e8e853fab..702dfbf1f36e 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64ArrayCompareToOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64ArrayCompareToOp.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.amd64; +package jdk.graal.compiler.lir.amd64; import static jdk.vm.ci.amd64.AMD64.k7; import static jdk.vm.ci.amd64.AMD64.rax; @@ -32,17 +32,17 @@ import java.util.EnumSet; -import jdk.compiler.graal.asm.Label; -import jdk.compiler.graal.asm.amd64.AMD64Address; -import jdk.compiler.graal.asm.amd64.AMD64Assembler.ConditionFlag; -import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler; -import jdk.compiler.graal.asm.amd64.AVXKind.AVXSize; -import jdk.compiler.graal.core.common.LIRKind; -import jdk.compiler.graal.core.common.Stride; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.Opcode; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; -import jdk.compiler.graal.lir.gen.LIRGeneratorTool; +import jdk.graal.compiler.asm.Label; +import jdk.graal.compiler.asm.amd64.AMD64Address; +import jdk.graal.compiler.asm.amd64.AMD64Assembler.ConditionFlag; +import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler; +import jdk.graal.compiler.asm.amd64.AVXKind.AVXSize; +import jdk.graal.compiler.core.common.LIRKind; +import jdk.graal.compiler.core.common.Stride; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.Opcode; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.lir.gen.LIRGeneratorTool; import jdk.vm.ci.amd64.AMD64.CPUFeature; import jdk.vm.ci.amd64.AMD64Kind; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64ArrayCopyWithConversionsOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64ArrayCopyWithConversionsOp.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64ArrayCopyWithConversionsOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64ArrayCopyWithConversionsOp.java index ed56bb0a666a..3455f7f72406 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64ArrayCopyWithConversionsOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64ArrayCopyWithConversionsOp.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.amd64; +package jdk.graal.compiler.lir.amd64; import static jdk.vm.ci.amd64.AMD64.r8; import static jdk.vm.ci.amd64.AMD64.rax; @@ -32,27 +32,27 @@ import static jdk.vm.ci.amd64.AMD64.rsi; import static jdk.vm.ci.code.ValueUtil.asRegister; import static jdk.vm.ci.code.ValueUtil.isIllegal; -import static jdk.compiler.graal.asm.amd64.AVXKind.AVXSize.XMM; -import static jdk.compiler.graal.asm.amd64.AVXKind.AVXSize.YMM; +import static jdk.graal.compiler.asm.amd64.AVXKind.AVXSize.XMM; +import static jdk.graal.compiler.asm.amd64.AVXKind.AVXSize.YMM; import java.util.Arrays; import java.util.EnumSet; -import jdk.compiler.graal.asm.Label; -import jdk.compiler.graal.asm.amd64.AMD64Address; -import jdk.compiler.graal.asm.amd64.AMD64Assembler.ConditionFlag; -import jdk.compiler.graal.asm.amd64.AMD64Assembler.VexRMIOp; -import jdk.compiler.graal.asm.amd64.AMD64Assembler.VexRVMOp; -import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler; -import jdk.compiler.graal.asm.amd64.AVXKind.AVXSize; -import jdk.compiler.graal.core.common.LIRKind; -import jdk.compiler.graal.core.common.Stride; -import jdk.compiler.graal.core.common.StrideUtil; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.Opcode; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; -import jdk.compiler.graal.lir.gen.LIRGeneratorTool; +import jdk.graal.compiler.asm.Label; +import jdk.graal.compiler.asm.amd64.AMD64Address; +import jdk.graal.compiler.asm.amd64.AMD64Assembler.ConditionFlag; +import jdk.graal.compiler.asm.amd64.AMD64Assembler.VexRMIOp; +import jdk.graal.compiler.asm.amd64.AMD64Assembler.VexRVMOp; +import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler; +import jdk.graal.compiler.asm.amd64.AVXKind.AVXSize; +import jdk.graal.compiler.core.common.LIRKind; +import jdk.graal.compiler.core.common.Stride; +import jdk.graal.compiler.core.common.StrideUtil; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.Opcode; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.lir.gen.LIRGeneratorTool; import jdk.vm.ci.amd64.AMD64.CPUFeature; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64ArrayEqualsOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64ArrayEqualsOp.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64ArrayEqualsOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64ArrayEqualsOp.java index 70bd1c088e84..40df5fd8f8de 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64ArrayEqualsOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64ArrayEqualsOp.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.amd64; +package jdk.graal.compiler.lir.amd64; import static jdk.vm.ci.amd64.AMD64.r8; import static jdk.vm.ci.amd64.AMD64.r9; @@ -33,29 +33,29 @@ import static jdk.vm.ci.amd64.AMD64.rsi; import static jdk.vm.ci.code.ValueUtil.asRegister; import static jdk.vm.ci.code.ValueUtil.isIllegal; -import static jdk.compiler.graal.asm.amd64.AMD64Assembler.AMD64BinaryArithmetic.OR; -import static jdk.compiler.graal.asm.amd64.AMD64Assembler.AMD64BinaryArithmetic.XOR; +import static jdk.graal.compiler.asm.amd64.AMD64Assembler.AMD64BinaryArithmetic.OR; +import static jdk.graal.compiler.asm.amd64.AMD64Assembler.AMD64BinaryArithmetic.XOR; import java.util.Arrays; import java.util.EnumSet; -import jdk.compiler.graal.asm.Label; -import jdk.compiler.graal.asm.amd64.AMD64Address; -import jdk.compiler.graal.asm.amd64.AMD64Assembler; -import jdk.compiler.graal.asm.amd64.AMD64Assembler.ConditionFlag; -import jdk.compiler.graal.asm.amd64.AMD64Assembler.SSEOp; -import jdk.compiler.graal.asm.amd64.AMD64BaseAssembler.OperandSize; -import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler; -import jdk.compiler.graal.asm.amd64.AVXKind.AVXSize; -import jdk.compiler.graal.core.common.LIRKind; -import jdk.compiler.graal.core.common.Stride; -import jdk.compiler.graal.core.common.StrideUtil; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.LIRValueUtil; -import jdk.compiler.graal.lir.Opcode; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; -import jdk.compiler.graal.lir.gen.LIRGeneratorTool; +import jdk.graal.compiler.asm.Label; +import jdk.graal.compiler.asm.amd64.AMD64Address; +import jdk.graal.compiler.asm.amd64.AMD64Assembler; +import jdk.graal.compiler.asm.amd64.AMD64Assembler.ConditionFlag; +import jdk.graal.compiler.asm.amd64.AMD64Assembler.SSEOp; +import jdk.graal.compiler.asm.amd64.AMD64BaseAssembler.OperandSize; +import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler; +import jdk.graal.compiler.asm.amd64.AVXKind.AVXSize; +import jdk.graal.compiler.core.common.LIRKind; +import jdk.graal.compiler.core.common.Stride; +import jdk.graal.compiler.core.common.StrideUtil; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.LIRValueUtil; +import jdk.graal.compiler.lir.Opcode; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.lir.gen.LIRGeneratorTool; import jdk.vm.ci.amd64.AMD64.CPUFeature; import jdk.vm.ci.amd64.AMD64Kind; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64ArrayIndexOfOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64ArrayIndexOfOp.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64ArrayIndexOfOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64ArrayIndexOfOp.java index 9496fe568152..d7ab74d71d70 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64ArrayIndexOfOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64ArrayIndexOfOp.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.amd64; +package jdk.graal.compiler.lir.amd64; import static jdk.vm.ci.amd64.AMD64.r8; import static jdk.vm.ci.amd64.AMD64.rax; @@ -33,28 +33,28 @@ import static jdk.vm.ci.code.ValueUtil.asRegister; import static jdk.vm.ci.code.ValueUtil.isRegister; import static jdk.vm.ci.code.ValueUtil.isStackSlot; -import static jdk.compiler.graal.asm.amd64.AMD64MacroAssembler.ExtendMode.ZERO_EXTEND; +import static jdk.graal.compiler.asm.amd64.AMD64MacroAssembler.ExtendMode.ZERO_EXTEND; import java.util.EnumSet; -import jdk.compiler.graal.asm.Label; -import jdk.compiler.graal.asm.amd64.AMD64Address; -import jdk.compiler.graal.asm.amd64.AMD64Assembler; -import jdk.compiler.graal.asm.amd64.AMD64Assembler.ConditionFlag; -import jdk.compiler.graal.asm.amd64.AMD64Assembler.VexMoveOp; -import jdk.compiler.graal.asm.amd64.AMD64Assembler.VexRMIOp; -import jdk.compiler.graal.asm.amd64.AMD64Assembler.VexRMOp; -import jdk.compiler.graal.asm.amd64.AMD64Assembler.VexRVMOp; -import jdk.compiler.graal.asm.amd64.AMD64BaseAssembler.OperandSize; -import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler; -import jdk.compiler.graal.asm.amd64.AVXKind.AVXSize; -import jdk.compiler.graal.core.common.Stride; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.lir.ConstantValue; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.Opcode; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; -import jdk.compiler.graal.lir.gen.LIRGeneratorTool; +import jdk.graal.compiler.asm.Label; +import jdk.graal.compiler.asm.amd64.AMD64Address; +import jdk.graal.compiler.asm.amd64.AMD64Assembler; +import jdk.graal.compiler.asm.amd64.AMD64Assembler.ConditionFlag; +import jdk.graal.compiler.asm.amd64.AMD64Assembler.VexMoveOp; +import jdk.graal.compiler.asm.amd64.AMD64Assembler.VexRMIOp; +import jdk.graal.compiler.asm.amd64.AMD64Assembler.VexRMOp; +import jdk.graal.compiler.asm.amd64.AMD64Assembler.VexRVMOp; +import jdk.graal.compiler.asm.amd64.AMD64BaseAssembler.OperandSize; +import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler; +import jdk.graal.compiler.asm.amd64.AVXKind.AVXSize; +import jdk.graal.compiler.core.common.Stride; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.lir.ConstantValue; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.Opcode; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.lir.gen.LIRGeneratorTool; import jdk.vm.ci.amd64.AMD64.CPUFeature; import jdk.vm.ci.amd64.AMD64Kind; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64ArrayRegionCompareToOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64ArrayRegionCompareToOp.java similarity index 95% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64ArrayRegionCompareToOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64ArrayRegionCompareToOp.java index b52b25c86110..66ab95e1adbe 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64ArrayRegionCompareToOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64ArrayRegionCompareToOp.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.amd64; +package jdk.graal.compiler.lir.amd64; import static jdk.vm.ci.amd64.AMD64.r8; import static jdk.vm.ci.amd64.AMD64.rax; @@ -32,26 +32,26 @@ import static jdk.vm.ci.amd64.AMD64.rsi; import static jdk.vm.ci.code.ValueUtil.asRegister; import static jdk.vm.ci.code.ValueUtil.isIllegal; -import static jdk.compiler.graal.asm.amd64.AVXKind.AVXSize.QWORD; -import static jdk.compiler.graal.asm.amd64.AVXKind.AVXSize.XMM; -import static jdk.compiler.graal.asm.amd64.AVXKind.AVXSize.YMM; +import static jdk.graal.compiler.asm.amd64.AVXKind.AVXSize.QWORD; +import static jdk.graal.compiler.asm.amd64.AVXKind.AVXSize.XMM; +import static jdk.graal.compiler.asm.amd64.AVXKind.AVXSize.YMM; import java.util.Arrays; import java.util.EnumSet; -import jdk.compiler.graal.asm.Label; -import jdk.compiler.graal.asm.amd64.AMD64Address; -import jdk.compiler.graal.asm.amd64.AMD64Assembler; -import jdk.compiler.graal.asm.amd64.AMD64Assembler.ConditionFlag; -import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler; -import jdk.compiler.graal.asm.amd64.AVXKind.AVXSize; -import jdk.compiler.graal.core.common.Stride; -import jdk.compiler.graal.core.common.StrideUtil; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.Opcode; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; -import jdk.compiler.graal.lir.gen.LIRGeneratorTool; +import jdk.graal.compiler.asm.Label; +import jdk.graal.compiler.asm.amd64.AMD64Address; +import jdk.graal.compiler.asm.amd64.AMD64Assembler; +import jdk.graal.compiler.asm.amd64.AMD64Assembler.ConditionFlag; +import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler; +import jdk.graal.compiler.asm.amd64.AVXKind.AVXSize; +import jdk.graal.compiler.core.common.Stride; +import jdk.graal.compiler.core.common.StrideUtil; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.Opcode; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.lir.gen.LIRGeneratorTool; import jdk.vm.ci.amd64.AMD64.CPUFeature; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64BigIntegerMulAddOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64BigIntegerMulAddOp.java similarity index 96% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64BigIntegerMulAddOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64BigIntegerMulAddOp.java index 33c93c0b1c2e..f239ca20ea88 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64BigIntegerMulAddOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64BigIntegerMulAddOp.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.amd64; +package jdk.graal.compiler.lir.amd64; import static jdk.vm.ci.amd64.AMD64.r10; import static jdk.vm.ci.amd64.AMD64.r11; @@ -41,15 +41,15 @@ import static jdk.vm.ci.amd64.AMD64.CPUFeature.BMI2; import static jdk.vm.ci.code.ValueUtil.asRegister; -import jdk.compiler.graal.asm.Label; -import jdk.compiler.graal.asm.amd64.AMD64Address; -import jdk.compiler.graal.asm.amd64.AMD64Assembler.ConditionFlag; -import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler; -import jdk.compiler.graal.core.common.Stride; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.SyncPort; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.asm.Label; +import jdk.graal.compiler.asm.amd64.AMD64Address; +import jdk.graal.compiler.asm.amd64.AMD64Assembler.ConditionFlag; +import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler; +import jdk.graal.compiler.core.common.Stride; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.SyncPort; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; import jdk.vm.ci.amd64.AMD64; import jdk.vm.ci.amd64.AMD64Kind; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64BigIntegerMultiplyToLenOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64BigIntegerMultiplyToLenOp.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64BigIntegerMultiplyToLenOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64BigIntegerMultiplyToLenOp.java index 2986021e7e22..f0f33e45b12d 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64BigIntegerMultiplyToLenOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64BigIntegerMultiplyToLenOp.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.amd64; +package jdk.graal.compiler.lir.amd64; import static jdk.vm.ci.amd64.AMD64.r10; import static jdk.vm.ci.amd64.AMD64.r11; @@ -42,15 +42,15 @@ import static jdk.vm.ci.amd64.AMD64.CPUFeature.BMI2; import static jdk.vm.ci.code.ValueUtil.asRegister; -import jdk.compiler.graal.asm.Label; -import jdk.compiler.graal.asm.amd64.AMD64Address; -import jdk.compiler.graal.asm.amd64.AMD64Assembler.ConditionFlag; -import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler; -import jdk.compiler.graal.core.common.Stride; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.SyncPort; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.asm.Label; +import jdk.graal.compiler.asm.amd64.AMD64Address; +import jdk.graal.compiler.asm.amd64.AMD64Assembler.ConditionFlag; +import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler; +import jdk.graal.compiler.core.common.Stride; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.SyncPort; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; import jdk.vm.ci.amd64.AMD64Kind; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64BigIntegerSquareToLenOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64BigIntegerSquareToLenOp.java similarity index 95% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64BigIntegerSquareToLenOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64BigIntegerSquareToLenOp.java index b5044ec47e2b..5a05adf51587 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64BigIntegerSquareToLenOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64BigIntegerSquareToLenOp.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.amd64; +package jdk.graal.compiler.lir.amd64; import static jdk.vm.ci.amd64.AMD64.r10; import static jdk.vm.ci.amd64.AMD64.r11; @@ -37,19 +37,19 @@ import static jdk.vm.ci.amd64.AMD64.rdx; import static jdk.vm.ci.amd64.AMD64.rsi; import static jdk.vm.ci.code.ValueUtil.asRegister; -import static jdk.compiler.graal.lir.amd64.AMD64BigIntegerMulAddOp.multiplyAdd64; -import static jdk.compiler.graal.lir.amd64.AMD64BigIntegerMulAddOp.multiplyAdd64Bmi2; -import static jdk.compiler.graal.lir.amd64.AMD64BigIntegerMulAddOp.useBMI2Instructions; - -import jdk.compiler.graal.asm.Label; -import jdk.compiler.graal.asm.amd64.AMD64Address; -import jdk.compiler.graal.asm.amd64.AMD64Assembler.ConditionFlag; -import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler; -import jdk.compiler.graal.core.common.Stride; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.SyncPort; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; +import static jdk.graal.compiler.lir.amd64.AMD64BigIntegerMulAddOp.multiplyAdd64; +import static jdk.graal.compiler.lir.amd64.AMD64BigIntegerMulAddOp.multiplyAdd64Bmi2; +import static jdk.graal.compiler.lir.amd64.AMD64BigIntegerMulAddOp.useBMI2Instructions; + +import jdk.graal.compiler.asm.Label; +import jdk.graal.compiler.asm.amd64.AMD64Address; +import jdk.graal.compiler.asm.amd64.AMD64Assembler.ConditionFlag; +import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler; +import jdk.graal.compiler.core.common.Stride; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.SyncPort; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; import jdk.vm.ci.amd64.AMD64Kind; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64Binary.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64Binary.java similarity index 93% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64Binary.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64Binary.java index c4c1fff998d4..056329464f20 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64Binary.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64Binary.java @@ -22,27 +22,27 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.amd64; +package jdk.graal.compiler.lir.amd64; import static jdk.vm.ci.code.ValueUtil.asRegister; import static jdk.vm.ci.code.ValueUtil.isRegister; import static jdk.vm.ci.code.ValueUtil.isStackSlot; -import jdk.compiler.graal.asm.amd64.AMD64Address; -import jdk.compiler.graal.asm.amd64.AMD64Assembler.AMD64BinaryArithmetic; -import jdk.compiler.graal.asm.amd64.AMD64Assembler.AMD64MIOp; -import jdk.compiler.graal.asm.amd64.AMD64Assembler.AMD64RMIOp; -import jdk.compiler.graal.asm.amd64.AMD64Assembler.AMD64RMOp; -import jdk.compiler.graal.asm.amd64.AMD64BaseAssembler.OperandSize; -import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler; -import jdk.compiler.graal.core.common.NumUtil; -import jdk.compiler.graal.lir.LIRFrameState; -import jdk.compiler.graal.lir.LIRInstruction; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.LIRValueUtil; -import jdk.compiler.graal.lir.Opcode; -import jdk.compiler.graal.lir.StandardOp; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.asm.amd64.AMD64Address; +import jdk.graal.compiler.asm.amd64.AMD64Assembler.AMD64BinaryArithmetic; +import jdk.graal.compiler.asm.amd64.AMD64Assembler.AMD64MIOp; +import jdk.graal.compiler.asm.amd64.AMD64Assembler.AMD64RMIOp; +import jdk.graal.compiler.asm.amd64.AMD64Assembler.AMD64RMOp; +import jdk.graal.compiler.asm.amd64.AMD64BaseAssembler.OperandSize; +import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler; +import jdk.graal.compiler.core.common.NumUtil; +import jdk.graal.compiler.lir.LIRFrameState; +import jdk.graal.compiler.lir.LIRInstruction; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.LIRValueUtil; +import jdk.graal.compiler.lir.Opcode; +import jdk.graal.compiler.lir.StandardOp; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; import jdk.vm.ci.code.site.DataSectionReference; import jdk.vm.ci.meta.AllocatableValue; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64BinaryConsumer.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64BinaryConsumer.java similarity index 93% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64BinaryConsumer.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64BinaryConsumer.java index 65e96249a54e..82468338a2be 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64BinaryConsumer.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64BinaryConsumer.java @@ -22,27 +22,27 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.amd64; +package jdk.graal.compiler.lir.amd64; import static jdk.vm.ci.code.ValueUtil.asRegister; import static jdk.vm.ci.code.ValueUtil.isRegister; import static jdk.vm.ci.code.ValueUtil.isStackSlot; -import static jdk.compiler.graal.asm.amd64.AMD64BaseAssembler.OperandSize.DWORD; - -import jdk.compiler.graal.asm.amd64.AMD64Address; -import jdk.compiler.graal.asm.amd64.AMD64Assembler.AMD64BinaryArithmetic; -import jdk.compiler.graal.asm.amd64.AMD64Assembler.AMD64MIOp; -import jdk.compiler.graal.asm.amd64.AMD64Assembler.AMD64MROp; -import jdk.compiler.graal.asm.amd64.AMD64Assembler.AMD64RMOp; -import jdk.compiler.graal.asm.amd64.AMD64BaseAssembler.OperandSize; -import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler; -import jdk.compiler.graal.core.common.NumUtil; -import jdk.compiler.graal.lir.LIRFrameState; -import jdk.compiler.graal.lir.LIRInstruction; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.Opcode; -import jdk.compiler.graal.lir.StandardOp; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; +import static jdk.graal.compiler.asm.amd64.AMD64BaseAssembler.OperandSize.DWORD; + +import jdk.graal.compiler.asm.amd64.AMD64Address; +import jdk.graal.compiler.asm.amd64.AMD64Assembler.AMD64BinaryArithmetic; +import jdk.graal.compiler.asm.amd64.AMD64Assembler.AMD64MIOp; +import jdk.graal.compiler.asm.amd64.AMD64Assembler.AMD64MROp; +import jdk.graal.compiler.asm.amd64.AMD64Assembler.AMD64RMOp; +import jdk.graal.compiler.asm.amd64.AMD64BaseAssembler.OperandSize; +import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler; +import jdk.graal.compiler.core.common.NumUtil; +import jdk.graal.compiler.lir.LIRFrameState; +import jdk.graal.compiler.lir.LIRInstruction; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.Opcode; +import jdk.graal.compiler.lir.StandardOp; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; import jdk.vm.ci.code.site.DataSectionReference; import jdk.vm.ci.meta.AllocatableValue; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64BitSwapOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64BitSwapOp.java similarity index 94% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64BitSwapOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64BitSwapOp.java index 8435b1271acc..a5f47c9e036b 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64BitSwapOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64BitSwapOp.java @@ -22,19 +22,19 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.amd64; +package jdk.graal.compiler.lir.amd64; import static jdk.vm.ci.amd64.AMD64.CPUFeature.GFNI; import static jdk.vm.ci.code.ValueUtil.asRegister; -import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler; -import jdk.compiler.graal.core.common.LIRKind; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.lir.LIRInstruction; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.SyncPort; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; -import jdk.compiler.graal.lir.gen.LIRGeneratorTool; +import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler; +import jdk.graal.compiler.core.common.LIRKind; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.lir.LIRInstruction; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.SyncPort; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.lir.gen.LIRGeneratorTool; import jdk.vm.ci.amd64.AMD64; import jdk.vm.ci.amd64.AMD64Kind; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64BlockEndOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64BlockEndOp.java similarity index 85% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64BlockEndOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64BlockEndOp.java index 79360f9f0e8d..df34a8043cc2 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64BlockEndOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64BlockEndOp.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.amd64; +package jdk.graal.compiler.lir.amd64; -import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler; -import jdk.compiler.graal.lir.LIRInstruction; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.StandardOp; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler; +import jdk.graal.compiler.lir.LIRInstruction; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.StandardOp; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; public abstract class AMD64BlockEndOp extends LIRInstruction implements StandardOp.BlockEndOp { diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64BreakpointOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64BreakpointOp.java similarity index 88% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64BreakpointOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64BreakpointOp.java index 150e15c045bf..99e581784f2e 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64BreakpointOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64BreakpointOp.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.amd64; +package jdk.graal.compiler.lir.amd64; -import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.Opcode; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.Opcode; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; import jdk.vm.ci.meta.Value; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64ByteSwapOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64ByteSwapOp.java similarity index 89% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64ByteSwapOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64ByteSwapOp.java index c9cdb1a3af04..cf9315483e3d 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64ByteSwapOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64ByteSwapOp.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.amd64; +package jdk.graal.compiler.lir.amd64; -import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.Opcode; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.Opcode; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; import jdk.vm.ci.amd64.AMD64Kind; import jdk.vm.ci.code.ValueUtil; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64CacheWritebackOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64CacheWritebackOp.java similarity index 87% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64CacheWritebackOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64CacheWritebackOp.java index d0fdf89a7f95..e7c8ee97001c 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64CacheWritebackOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64CacheWritebackOp.java @@ -23,12 +23,12 @@ * questions. */ -package jdk.compiler.graal.lir.amd64; +package jdk.graal.compiler.lir.amd64; -import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler; -import jdk.compiler.graal.lir.LIRInstruction; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler; +import jdk.graal.compiler.lir.LIRInstruction; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; /** * Implements {@code jdk.internal.misc.Unsafe.writeback0(long)}. diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64CacheWritebackPostSyncOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64CacheWritebackPostSyncOp.java similarity index 91% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64CacheWritebackPostSyncOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64CacheWritebackPostSyncOp.java index bad00bc7f0b8..9350125d704f 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64CacheWritebackPostSyncOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64CacheWritebackPostSyncOp.java @@ -23,14 +23,14 @@ * questions. */ -package jdk.compiler.graal.lir.amd64; +package jdk.graal.compiler.lir.amd64; import static jdk.vm.ci.amd64.AMD64.CPUFeature.CLWB; import static jdk.vm.ci.amd64.AMD64.CPUFeature.FLUSHOPT; -import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; /** * Implements {@code jdk.internal.misc.Unsafe.writebackPostSync0(long)}. diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64CalcStringAttributesOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64CalcStringAttributesOp.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64CalcStringAttributesOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64CalcStringAttributesOp.java index 2f0c60673e4d..341b91bd1f84 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64CalcStringAttributesOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64CalcStringAttributesOp.java @@ -22,40 +22,40 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.amd64; +package jdk.graal.compiler.lir.amd64; import static jdk.vm.ci.amd64.AMD64.rcx; import static jdk.vm.ci.amd64.AMD64.rdx; import static jdk.vm.ci.amd64.AMD64.rsi; import static jdk.vm.ci.code.ValueUtil.asRegister; -import static jdk.compiler.graal.asm.amd64.AMD64Assembler.ConditionFlag.Equal; -import static jdk.compiler.graal.asm.amd64.AMD64Assembler.ConditionFlag.Less; -import static jdk.compiler.graal.asm.amd64.AMD64Assembler.ConditionFlag.NotEqual; -import static jdk.compiler.graal.asm.amd64.AMD64Assembler.ConditionFlag.NotZero; -import static jdk.compiler.graal.asm.amd64.AMD64Assembler.ConditionFlag.Zero; -import static jdk.compiler.graal.asm.amd64.AVXKind.AVXSize.DWORD; -import static jdk.compiler.graal.asm.amd64.AVXKind.AVXSize.QWORD; -import static jdk.compiler.graal.asm.amd64.AVXKind.AVXSize.XMM; -import static jdk.compiler.graal.asm.amd64.AVXKind.AVXSize.YMM; +import static jdk.graal.compiler.asm.amd64.AMD64Assembler.ConditionFlag.Equal; +import static jdk.graal.compiler.asm.amd64.AMD64Assembler.ConditionFlag.Less; +import static jdk.graal.compiler.asm.amd64.AMD64Assembler.ConditionFlag.NotEqual; +import static jdk.graal.compiler.asm.amd64.AMD64Assembler.ConditionFlag.NotZero; +import static jdk.graal.compiler.asm.amd64.AMD64Assembler.ConditionFlag.Zero; +import static jdk.graal.compiler.asm.amd64.AVXKind.AVXSize.DWORD; +import static jdk.graal.compiler.asm.amd64.AVXKind.AVXSize.QWORD; +import static jdk.graal.compiler.asm.amd64.AVXKind.AVXSize.XMM; +import static jdk.graal.compiler.asm.amd64.AVXKind.AVXSize.YMM; import java.util.Arrays; import java.util.EnumSet; -import jdk.compiler.graal.asm.Label; -import jdk.compiler.graal.asm.amd64.AMD64Address; -import jdk.compiler.graal.asm.amd64.AMD64Assembler; -import jdk.compiler.graal.asm.amd64.AMD64BaseAssembler; -import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler; -import jdk.compiler.graal.asm.amd64.AVXKind; -import jdk.compiler.graal.asm.amd64.AVXKind.AVXSize; -import jdk.compiler.graal.code.DataSection; -import jdk.compiler.graal.core.common.LIRKind; -import jdk.compiler.graal.core.common.Stride; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.Opcode; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; -import jdk.compiler.graal.lir.gen.LIRGeneratorTool; +import jdk.graal.compiler.asm.Label; +import jdk.graal.compiler.asm.amd64.AMD64Address; +import jdk.graal.compiler.asm.amd64.AMD64Assembler; +import jdk.graal.compiler.asm.amd64.AMD64BaseAssembler; +import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler; +import jdk.graal.compiler.asm.amd64.AVXKind; +import jdk.graal.compiler.asm.amd64.AVXKind.AVXSize; +import jdk.graal.compiler.code.DataSection; +import jdk.graal.compiler.core.common.LIRKind; +import jdk.graal.compiler.core.common.Stride; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.Opcode; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.lir.gen.LIRGeneratorTool; import jdk.vm.ci.amd64.AMD64.CPUFeature; import jdk.vm.ci.amd64.AMD64Kind; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64Call.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64Call.java similarity index 95% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64Call.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64Call.java index b9851ee765b3..366fc68b0d5d 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64Call.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64Call.java @@ -22,22 +22,22 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.amd64; +package jdk.graal.compiler.lir.amd64; import static jdk.vm.ci.code.ValueUtil.asRegister; import static jdk.vm.ci.code.ValueUtil.isRegister; -import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler; -import jdk.compiler.graal.code.CompilationResult.MarkId; -import jdk.compiler.graal.core.common.LIRKind; -import jdk.compiler.graal.core.common.spi.ForeignCallLinkage; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.lir.LIRFrameState; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.LIRValueUtil; -import jdk.compiler.graal.lir.Opcode; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; -import jdk.compiler.graal.lir.gen.DiagnosticLIRGeneratorTool; +import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler; +import jdk.graal.compiler.code.CompilationResult.MarkId; +import jdk.graal.compiler.core.common.LIRKind; +import jdk.graal.compiler.core.common.spi.ForeignCallLinkage; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.lir.LIRFrameState; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.LIRValueUtil; +import jdk.graal.compiler.lir.Opcode; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.lir.gen.DiagnosticLIRGeneratorTool; import jdk.vm.ci.amd64.AMD64; import jdk.vm.ci.amd64.AMD64Kind; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64CipherBlockChainingAESDecryptOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64CipherBlockChainingAESDecryptOp.java similarity index 95% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64CipherBlockChainingAESDecryptOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64CipherBlockChainingAESDecryptOp.java index aa762955010c..16606d1f7251 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64CipherBlockChainingAESDecryptOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64CipherBlockChainingAESDecryptOp.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.amd64; +package jdk.graal.compiler.lir.amd64; import static jdk.vm.ci.amd64.AMD64.r11; import static jdk.vm.ci.amd64.AMD64.rbx; @@ -44,24 +44,24 @@ import static jdk.vm.ci.amd64.AMD64.xmm8; import static jdk.vm.ci.amd64.AMD64.xmm9; import static jdk.vm.ci.code.ValueUtil.asRegister; -import static jdk.compiler.graal.lir.amd64.AMD64AESEncryptOp.AES_BLOCK_SIZE; -import static jdk.compiler.graal.lir.amd64.AMD64AESEncryptOp.asXMMRegister; -import static jdk.compiler.graal.lir.amd64.AMD64AESEncryptOp.keyShuffleMask; -import static jdk.compiler.graal.lir.amd64.AMD64AESEncryptOp.loadKey; -import static jdk.compiler.graal.lir.amd64.AMD64CounterModeAESCryptOp.newLabels; -import static jdk.compiler.graal.lir.amd64.AMD64LIRHelper.recordExternalAddress; +import static jdk.graal.compiler.lir.amd64.AMD64AESEncryptOp.AES_BLOCK_SIZE; +import static jdk.graal.compiler.lir.amd64.AMD64AESEncryptOp.asXMMRegister; +import static jdk.graal.compiler.lir.amd64.AMD64AESEncryptOp.keyShuffleMask; +import static jdk.graal.compiler.lir.amd64.AMD64AESEncryptOp.loadKey; +import static jdk.graal.compiler.lir.amd64.AMD64CounterModeAESCryptOp.newLabels; +import static jdk.graal.compiler.lir.amd64.AMD64LIRHelper.recordExternalAddress; import java.util.function.BiConsumer; -import jdk.compiler.graal.asm.Label; -import jdk.compiler.graal.asm.amd64.AMD64Address; -import jdk.compiler.graal.asm.amd64.AMD64Assembler.ConditionFlag; -import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler; -import jdk.compiler.graal.core.common.Stride; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.SyncPort; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.asm.Label; +import jdk.graal.compiler.asm.amd64.AMD64Address; +import jdk.graal.compiler.asm.amd64.AMD64Assembler.ConditionFlag; +import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler; +import jdk.graal.compiler.core.common.Stride; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.SyncPort; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; import jdk.vm.ci.amd64.AMD64Kind; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64CipherBlockChainingAESEncryptOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64CipherBlockChainingAESEncryptOp.java similarity index 93% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64CipherBlockChainingAESEncryptOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64CipherBlockChainingAESEncryptOp.java index 505b4e06aa29..98524cefa356 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64CipherBlockChainingAESEncryptOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64CipherBlockChainingAESEncryptOp.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.amd64; +package jdk.graal.compiler.lir.amd64; import static jdk.vm.ci.amd64.AMD64.r11; import static jdk.vm.ci.amd64.AMD64.xmm0; @@ -42,21 +42,21 @@ import static jdk.vm.ci.amd64.AMD64.xmm8; import static jdk.vm.ci.amd64.AMD64.xmm9; import static jdk.vm.ci.code.ValueUtil.asRegister; -import static jdk.compiler.graal.lir.amd64.AMD64AESEncryptOp.AES_BLOCK_SIZE; -import static jdk.compiler.graal.lir.amd64.AMD64AESEncryptOp.asXMMRegister; -import static jdk.compiler.graal.lir.amd64.AMD64AESEncryptOp.keyShuffleMask; -import static jdk.compiler.graal.lir.amd64.AMD64AESEncryptOp.loadKey; -import static jdk.compiler.graal.lir.amd64.AMD64LIRHelper.recordExternalAddress; - -import jdk.compiler.graal.asm.Label; -import jdk.compiler.graal.asm.amd64.AMD64Address; -import jdk.compiler.graal.asm.amd64.AMD64Assembler.ConditionFlag; -import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler; -import jdk.compiler.graal.core.common.Stride; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.SyncPort; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; +import static jdk.graal.compiler.lir.amd64.AMD64AESEncryptOp.AES_BLOCK_SIZE; +import static jdk.graal.compiler.lir.amd64.AMD64AESEncryptOp.asXMMRegister; +import static jdk.graal.compiler.lir.amd64.AMD64AESEncryptOp.keyShuffleMask; +import static jdk.graal.compiler.lir.amd64.AMD64AESEncryptOp.loadKey; +import static jdk.graal.compiler.lir.amd64.AMD64LIRHelper.recordExternalAddress; + +import jdk.graal.compiler.asm.Label; +import jdk.graal.compiler.asm.amd64.AMD64Address; +import jdk.graal.compiler.asm.amd64.AMD64Assembler.ConditionFlag; +import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler; +import jdk.graal.compiler.core.common.Stride; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.SyncPort; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; import jdk.vm.ci.amd64.AMD64Kind; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64ClearRegisterOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64ClearRegisterOp.java similarity index 82% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64ClearRegisterOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64ClearRegisterOp.java index 07807ad7c012..d1fe52d16d1c 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64ClearRegisterOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64ClearRegisterOp.java @@ -22,17 +22,17 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.amd64; +package jdk.graal.compiler.lir.amd64; import static jdk.vm.ci.code.ValueUtil.asRegister; -import static jdk.compiler.graal.asm.amd64.AMD64Assembler.AMD64BinaryArithmetic.XOR; - -import jdk.compiler.graal.asm.amd64.AMD64Assembler.AMD64RMOp; -import jdk.compiler.graal.asm.amd64.AMD64BaseAssembler.OperandSize; -import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.Opcode; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; +import static jdk.graal.compiler.asm.amd64.AMD64Assembler.AMD64BinaryArithmetic.XOR; + +import jdk.graal.compiler.asm.amd64.AMD64Assembler.AMD64RMOp; +import jdk.graal.compiler.asm.amd64.AMD64BaseAssembler.OperandSize; +import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.Opcode; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; import jdk.vm.ci.meta.AllocatableValue; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64ComplexVectorOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64ComplexVectorOp.java similarity index 96% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64ComplexVectorOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64ComplexVectorOp.java index 00a706fd8820..b4777e81b617 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64ComplexVectorOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64ComplexVectorOp.java @@ -22,32 +22,32 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.amd64; +package jdk.graal.compiler.lir.amd64; import static jdk.vm.ci.amd64.AMD64.rcx; -import static jdk.compiler.graal.asm.amd64.AMD64Assembler.AMD64RMOp.TZCNT; -import static jdk.compiler.graal.asm.amd64.AMD64Assembler.ConditionFlag.Less; -import static jdk.compiler.graal.asm.amd64.AMD64BaseAssembler.OperandSize.QWORD; -import static jdk.compiler.graal.asm.amd64.AVXKind.AVXSize.XMM; -import static jdk.compiler.graal.asm.amd64.AVXKind.AVXSize.YMM; +import static jdk.graal.compiler.asm.amd64.AMD64Assembler.AMD64RMOp.TZCNT; +import static jdk.graal.compiler.asm.amd64.AMD64Assembler.ConditionFlag.Less; +import static jdk.graal.compiler.asm.amd64.AMD64BaseAssembler.OperandSize.QWORD; +import static jdk.graal.compiler.asm.amd64.AVXKind.AVXSize.XMM; +import static jdk.graal.compiler.asm.amd64.AVXKind.AVXSize.YMM; import java.nio.ByteOrder; import java.util.Arrays; import java.util.EnumSet; -import jdk.compiler.graal.asm.Label; -import jdk.compiler.graal.asm.amd64.AMD64Address; -import jdk.compiler.graal.asm.amd64.AMD64Assembler; -import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler; -import jdk.compiler.graal.asm.amd64.AVXKind.AVXSize; -import jdk.compiler.graal.code.DataSection; -import jdk.compiler.graal.core.common.LIRKind; -import jdk.compiler.graal.core.common.Stride; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.asm.ArrayDataPointerConstant; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; -import jdk.compiler.graal.lir.gen.LIRGeneratorTool; +import jdk.graal.compiler.asm.Label; +import jdk.graal.compiler.asm.amd64.AMD64Address; +import jdk.graal.compiler.asm.amd64.AMD64Assembler; +import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler; +import jdk.graal.compiler.asm.amd64.AVXKind.AVXSize; +import jdk.graal.compiler.code.DataSection; +import jdk.graal.compiler.core.common.LIRKind; +import jdk.graal.compiler.core.common.Stride; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.asm.ArrayDataPointerConstant; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.lir.gen.LIRGeneratorTool; import jdk.vm.ci.amd64.AMD64; import jdk.vm.ci.amd64.AMD64.CPUFeature; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64ControlFlow.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64ControlFlow.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64ControlFlow.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64ControlFlow.java index ba273db7efb8..fa29688d18a1 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64ControlFlow.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64ControlFlow.java @@ -22,40 +22,40 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.amd64; +package jdk.graal.compiler.lir.amd64; import static jdk.vm.ci.code.ValueUtil.asRegister; import static jdk.vm.ci.code.ValueUtil.isRegister; import static jdk.vm.ci.code.ValueUtil.isStackSlot; -import static jdk.compiler.graal.asm.amd64.AMD64BaseAssembler.OperandSize.DWORD; -import static jdk.compiler.graal.asm.amd64.AMD64BaseAssembler.OperandSize.QWORD; -import static jdk.compiler.graal.asm.amd64.AMD64BaseAssembler.OperandSize.WORD; +import static jdk.graal.compiler.asm.amd64.AMD64BaseAssembler.OperandSize.DWORD; +import static jdk.graal.compiler.asm.amd64.AMD64BaseAssembler.OperandSize.QWORD; +import static jdk.graal.compiler.asm.amd64.AMD64BaseAssembler.OperandSize.WORD; import java.util.Arrays; import java.util.function.IntConsumer; import java.util.function.Supplier; import java.util.stream.Stream; -import jdk.compiler.graal.asm.Label; -import jdk.compiler.graal.asm.amd64.AMD64Address; -import jdk.compiler.graal.core.common.Stride; -import jdk.compiler.graal.asm.amd64.AMD64Assembler.ConditionFlag; -import jdk.compiler.graal.asm.amd64.AMD64BaseAssembler.OperandSize; -import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler; -import jdk.compiler.graal.code.CompilationResult.JumpTable; -import jdk.compiler.graal.code.CompilationResult.JumpTable.EntryFormat; -import jdk.compiler.graal.core.common.NumUtil; -import jdk.compiler.graal.core.common.calc.Condition; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.lir.LIRFrameState; -import jdk.compiler.graal.lir.LIRInstruction; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.LabelRef; -import jdk.compiler.graal.lir.Opcode; -import jdk.compiler.graal.lir.StandardOp; -import jdk.compiler.graal.lir.SwitchStrategy; -import jdk.compiler.graal.lir.Variable; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.asm.Label; +import jdk.graal.compiler.asm.amd64.AMD64Address; +import jdk.graal.compiler.core.common.Stride; +import jdk.graal.compiler.asm.amd64.AMD64Assembler.ConditionFlag; +import jdk.graal.compiler.asm.amd64.AMD64BaseAssembler.OperandSize; +import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler; +import jdk.graal.compiler.code.CompilationResult.JumpTable; +import jdk.graal.compiler.code.CompilationResult.JumpTable.EntryFormat; +import jdk.graal.compiler.core.common.NumUtil; +import jdk.graal.compiler.core.common.calc.Condition; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.lir.LIRFrameState; +import jdk.graal.compiler.lir.LIRInstruction; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.LabelRef; +import jdk.graal.compiler.lir.Opcode; +import jdk.graal.compiler.lir.StandardOp; +import jdk.graal.compiler.lir.SwitchStrategy; +import jdk.graal.compiler.lir.Variable; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; import jdk.vm.ci.amd64.AMD64; import jdk.vm.ci.amd64.AMD64Kind; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64CountPositivesOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64CountPositivesOp.java similarity index 93% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64CountPositivesOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64CountPositivesOp.java index c51280fb2c8b..55ace30d51b7 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64CountPositivesOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64CountPositivesOp.java @@ -22,30 +22,30 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.amd64; +package jdk.graal.compiler.lir.amd64; import static jdk.vm.ci.code.ValueUtil.asRegister; -import static jdk.compiler.graal.asm.amd64.AMD64Assembler.VexGeneralPurposeRMVOp.SHLX; -import static jdk.compiler.graal.asm.amd64.AMD64Assembler.VexRMOp.VPBROADCASTD; -import static jdk.compiler.graal.asm.amd64.AMD64Assembler.VexRVMOp.VPXOR; -import static jdk.compiler.graal.asm.amd64.AVXKind.AVXSize.QWORD; -import static jdk.compiler.graal.asm.amd64.AVXKind.AVXSize.YMM; -import static jdk.compiler.graal.asm.amd64.AVXKind.AVXSize.ZMM; +import static jdk.graal.compiler.asm.amd64.AMD64Assembler.VexGeneralPurposeRMVOp.SHLX; +import static jdk.graal.compiler.asm.amd64.AMD64Assembler.VexRMOp.VPBROADCASTD; +import static jdk.graal.compiler.asm.amd64.AMD64Assembler.VexRVMOp.VPXOR; +import static jdk.graal.compiler.asm.amd64.AVXKind.AVXSize.QWORD; +import static jdk.graal.compiler.asm.amd64.AVXKind.AVXSize.YMM; +import static jdk.graal.compiler.asm.amd64.AVXKind.AVXSize.ZMM; import java.util.EnumSet; -import jdk.compiler.graal.asm.Label; -import jdk.compiler.graal.asm.amd64.AMD64Address; -import jdk.compiler.graal.asm.amd64.AMD64Assembler.ConditionFlag; -import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler; -import jdk.compiler.graal.asm.amd64.AVXKind; -import jdk.compiler.graal.core.common.LIRKind; -import jdk.compiler.graal.core.common.Stride; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.Opcode; -import jdk.compiler.graal.lir.SyncPort; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; -import jdk.compiler.graal.lir.gen.LIRGeneratorTool; +import jdk.graal.compiler.asm.Label; +import jdk.graal.compiler.asm.amd64.AMD64Address; +import jdk.graal.compiler.asm.amd64.AMD64Assembler.ConditionFlag; +import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler; +import jdk.graal.compiler.asm.amd64.AVXKind; +import jdk.graal.compiler.core.common.LIRKind; +import jdk.graal.compiler.core.common.Stride; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.Opcode; +import jdk.graal.compiler.lir.SyncPort; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.lir.gen.LIRGeneratorTool; import jdk.vm.ci.amd64.AMD64.CPUFeature; import jdk.vm.ci.amd64.AMD64Kind; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64CounterModeAESCryptOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64CounterModeAESCryptOp.java similarity index 95% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64CounterModeAESCryptOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64CounterModeAESCryptOp.java index ac43cba3d708..0469f3851314 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64CounterModeAESCryptOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64CounterModeAESCryptOp.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.amd64; +package jdk.graal.compiler.lir.amd64; import static jdk.vm.ci.amd64.AMD64.r11; import static jdk.vm.ci.amd64.AMD64.rax; @@ -43,25 +43,25 @@ import static jdk.vm.ci.amd64.AMD64.xmm8; import static jdk.vm.ci.amd64.AMD64.xmm9; import static jdk.vm.ci.code.ValueUtil.asRegister; -import static jdk.compiler.graal.lir.amd64.AMD64AESEncryptOp.AES_BLOCK_SIZE; -import static jdk.compiler.graal.lir.amd64.AMD64AESEncryptOp.keyShuffleMask; -import static jdk.compiler.graal.lir.amd64.AMD64AESEncryptOp.loadKey; -import static jdk.compiler.graal.lir.amd64.AMD64LIRHelper.pointerConstant; -import static jdk.compiler.graal.lir.amd64.AMD64LIRHelper.recordExternalAddress; +import static jdk.graal.compiler.lir.amd64.AMD64AESEncryptOp.AES_BLOCK_SIZE; +import static jdk.graal.compiler.lir.amd64.AMD64AESEncryptOp.keyShuffleMask; +import static jdk.graal.compiler.lir.amd64.AMD64AESEncryptOp.loadKey; +import static jdk.graal.compiler.lir.amd64.AMD64LIRHelper.pointerConstant; +import static jdk.graal.compiler.lir.amd64.AMD64LIRHelper.recordExternalAddress; import java.util.function.BiConsumer; -import jdk.compiler.graal.asm.Label; -import jdk.compiler.graal.asm.amd64.AMD64Address; -import jdk.compiler.graal.asm.amd64.AMD64Assembler.ConditionFlag; -import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler; -import jdk.compiler.graal.asm.amd64.AVXKind.AVXSize; -import jdk.compiler.graal.core.common.Stride; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.SyncPort; -import jdk.compiler.graal.lir.asm.ArrayDataPointerConstant; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.asm.Label; +import jdk.graal.compiler.asm.amd64.AMD64Address; +import jdk.graal.compiler.asm.amd64.AMD64Assembler.ConditionFlag; +import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler; +import jdk.graal.compiler.asm.amd64.AVXKind.AVXSize; +import jdk.graal.compiler.core.common.Stride; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.SyncPort; +import jdk.graal.compiler.lir.asm.ArrayDataPointerConstant; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; import jdk.vm.ci.amd64.AMD64Kind; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64EncodeArrayOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64EncodeArrayOp.java similarity index 90% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64EncodeArrayOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64EncodeArrayOp.java index d08d9ee981b8..26880c2f3784 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64EncodeArrayOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64EncodeArrayOp.java @@ -22,30 +22,30 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.amd64; +package jdk.graal.compiler.lir.amd64; import static jdk.vm.ci.code.ValueUtil.asRegister; -import static jdk.compiler.graal.asm.amd64.AMD64Assembler.VexRMIOp.VPERMQ; -import static jdk.compiler.graal.asm.amd64.AMD64Assembler.VexRMOp.VPBROADCASTD; -import static jdk.compiler.graal.asm.amd64.AMD64Assembler.VexRVMOp.VPACKUSWB; -import static jdk.compiler.graal.asm.amd64.AMD64Assembler.VexRVMOp.VPOR; -import static jdk.compiler.graal.asm.amd64.AVXKind.AVXSize.XMM; -import static jdk.compiler.graal.asm.amd64.AVXKind.AVXSize.YMM; +import static jdk.graal.compiler.asm.amd64.AMD64Assembler.VexRMIOp.VPERMQ; +import static jdk.graal.compiler.asm.amd64.AMD64Assembler.VexRMOp.VPBROADCASTD; +import static jdk.graal.compiler.asm.amd64.AMD64Assembler.VexRVMOp.VPACKUSWB; +import static jdk.graal.compiler.asm.amd64.AMD64Assembler.VexRVMOp.VPOR; +import static jdk.graal.compiler.asm.amd64.AVXKind.AVXSize.XMM; +import static jdk.graal.compiler.asm.amd64.AVXKind.AVXSize.YMM; import java.util.EnumSet; -import jdk.compiler.graal.asm.Label; -import jdk.compiler.graal.asm.amd64.AMD64Address; -import jdk.compiler.graal.asm.amd64.AMD64Assembler.ConditionFlag; -import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler; -import jdk.compiler.graal.asm.amd64.AVXKind; -import jdk.compiler.graal.core.common.LIRKind; -import jdk.compiler.graal.core.common.Stride; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.Opcode; -import jdk.compiler.graal.lir.SyncPort; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; -import jdk.compiler.graal.lir.gen.LIRGeneratorTool; +import jdk.graal.compiler.asm.Label; +import jdk.graal.compiler.asm.amd64.AMD64Address; +import jdk.graal.compiler.asm.amd64.AMD64Assembler.ConditionFlag; +import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler; +import jdk.graal.compiler.asm.amd64.AVXKind; +import jdk.graal.compiler.core.common.LIRKind; +import jdk.graal.compiler.core.common.Stride; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.Opcode; +import jdk.graal.compiler.lir.SyncPort; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.lir.gen.LIRGeneratorTool; import jdk.vm.ci.amd64.AMD64.CPUFeature; import jdk.vm.ci.amd64.AMD64Kind; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64FloatToHalfFloatOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64FloatToHalfFloatOp.java similarity index 88% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64FloatToHalfFloatOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64FloatToHalfFloatOp.java index 75d48405ddf7..8043b553241c 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64FloatToHalfFloatOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64FloatToHalfFloatOp.java @@ -22,16 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.amd64; +package jdk.graal.compiler.lir.amd64; import static jdk.vm.ci.code.ValueUtil.asRegister; -import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler; -import jdk.compiler.graal.lir.LIRInstruction; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.SyncPort; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; -import jdk.compiler.graal.lir.gen.LIRGeneratorTool; +import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler; +import jdk.graal.compiler.lir.LIRInstruction; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.SyncPort; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.lir.gen.LIRGeneratorTool; import jdk.vm.ci.code.Register; import jdk.vm.ci.meta.Value; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64FrameMap.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64FrameMap.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64FrameMap.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64FrameMap.java index c38e4132ad9d..2d0e0808e88d 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64FrameMap.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64FrameMap.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.amd64; +package jdk.graal.compiler.lir.amd64; -import jdk.compiler.graal.core.common.NumUtil; -import jdk.compiler.graal.lir.framemap.FrameMap; +import jdk.graal.compiler.core.common.NumUtil; +import jdk.graal.compiler.lir.framemap.FrameMap; import jdk.vm.ci.code.CodeCacheProvider; import jdk.vm.ci.code.RegisterConfig; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64FrameMapBuilder.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64FrameMapBuilder.java similarity index 91% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64FrameMapBuilder.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64FrameMapBuilder.java index bce603bda3fa..355ee4d970fc 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64FrameMapBuilder.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64FrameMapBuilder.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.amd64; +package jdk.graal.compiler.lir.amd64; -import jdk.compiler.graal.lir.framemap.FrameMap; -import jdk.compiler.graal.lir.framemap.FrameMapBuilderImpl; +import jdk.graal.compiler.lir.framemap.FrameMap; +import jdk.graal.compiler.lir.framemap.FrameMapBuilderImpl; import jdk.vm.ci.code.CodeCacheProvider; import jdk.vm.ci.code.RegisterConfig; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64GHASHProcessBlocksOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64GHASHProcessBlocksOp.java similarity index 97% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64GHASHProcessBlocksOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64GHASHProcessBlocksOp.java index 55c1dfab3250..e5ffd40a9ad0 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64GHASHProcessBlocksOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64GHASHProcessBlocksOp.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.amd64; +package jdk.graal.compiler.lir.amd64; import static jdk.vm.ci.amd64.AMD64.rax; import static jdk.vm.ci.amd64.AMD64.xmm0; @@ -41,21 +41,21 @@ import static jdk.vm.ci.amd64.AMD64.xmm8; import static jdk.vm.ci.amd64.AMD64.xmm9; import static jdk.vm.ci.code.ValueUtil.asRegister; -import static jdk.compiler.graal.lir.amd64.AMD64LIRHelper.pointerConstant; -import static jdk.compiler.graal.lir.amd64.AMD64LIRHelper.recordExternalAddress; - -import jdk.compiler.graal.asm.Label; -import jdk.compiler.graal.asm.amd64.AMD64Address; -import jdk.compiler.graal.asm.amd64.AMD64Assembler; -import jdk.compiler.graal.asm.amd64.AMD64Assembler.ConditionFlag; -import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler; -import jdk.compiler.graal.asm.amd64.AVXKind.AVXSize; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.SyncPort; -import jdk.compiler.graal.lir.asm.ArrayDataPointerConstant; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; -import jdk.compiler.graal.lir.gen.LIRGeneratorTool; +import static jdk.graal.compiler.lir.amd64.AMD64LIRHelper.pointerConstant; +import static jdk.graal.compiler.lir.amd64.AMD64LIRHelper.recordExternalAddress; + +import jdk.graal.compiler.asm.Label; +import jdk.graal.compiler.asm.amd64.AMD64Address; +import jdk.graal.compiler.asm.amd64.AMD64Assembler; +import jdk.graal.compiler.asm.amd64.AMD64Assembler.ConditionFlag; +import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler; +import jdk.graal.compiler.asm.amd64.AVXKind.AVXSize; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.SyncPort; +import jdk.graal.compiler.lir.asm.ArrayDataPointerConstant; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.lir.gen.LIRGeneratorTool; import jdk.vm.ci.amd64.AMD64; import jdk.vm.ci.amd64.AMD64Kind; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64HalfFloatToFloatOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64HalfFloatToFloatOp.java similarity index 90% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64HalfFloatToFloatOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64HalfFloatToFloatOp.java index 6ac7d9f3772c..4f286c0156cd 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64HalfFloatToFloatOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64HalfFloatToFloatOp.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.amd64; +package jdk.graal.compiler.lir.amd64; import static jdk.vm.ci.code.ValueUtil.asRegister; -import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.SyncPort; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.SyncPort; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; import jdk.vm.ci.code.Register; import jdk.vm.ci.meta.Value; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64HaltOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64HaltOp.java similarity index 86% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64HaltOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64HaltOp.java index 05a2f72e1ff2..d0a2a27a3320 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64HaltOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64HaltOp.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.amd64; +package jdk.graal.compiler.lir.amd64; -import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.Opcode; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.Opcode; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; /** * Emits a halt. diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64LFenceOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64LFenceOp.java similarity index 86% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64LFenceOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64LFenceOp.java index 1809a90fb684..e3e2f5b6188c 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64LFenceOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64LFenceOp.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.amd64; +package jdk.graal.compiler.lir.amd64; -import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.Opcode; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.Opcode; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; @Opcode("LFENCE") public final class AMD64LFenceOp extends AMD64LIRInstruction { diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64LIRHelper.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64LIRHelper.java similarity index 89% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64LIRHelper.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64LIRHelper.java index 9fe0ddb994ba..a0df1f59029a 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64LIRHelper.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64LIRHelper.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.amd64; +package jdk.graal.compiler.lir.amd64; -import jdk.compiler.graal.asm.amd64.AMD64Address; -import jdk.compiler.graal.core.common.LIRKind; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.lir.asm.ArrayDataPointerConstant; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.asm.amd64.AMD64Address; +import jdk.graal.compiler.core.common.LIRKind; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.lir.asm.ArrayDataPointerConstant; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; import jdk.vm.ci.amd64.AMD64; import jdk.vm.ci.amd64.AMD64Kind; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64LIRInstruction.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64LIRInstruction.java similarity index 89% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64LIRInstruction.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64LIRInstruction.java index 52d6f1bbfdeb..6058c38f16dd 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64LIRInstruction.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64LIRInstruction.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.amd64; +package jdk.graal.compiler.lir.amd64; -import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler; -import jdk.compiler.graal.lir.LIRInstruction; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler; +import jdk.graal.compiler.lir.LIRInstruction; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; /** * Convenience class to provide AMD64MacroAssembler for the {@link #emitCode} method. diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64MD5Op.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64MD5Op.java similarity index 96% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64MD5Op.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64MD5Op.java index 310e150b0c67..98eacf2b148c 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64MD5Op.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64MD5Op.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.amd64; +package jdk.graal.compiler.lir.amd64; import static jdk.vm.ci.amd64.AMD64.rax; import static jdk.vm.ci.amd64.AMD64.rbx; @@ -31,16 +31,16 @@ import static jdk.vm.ci.amd64.AMD64.rdx; import static jdk.vm.ci.amd64.AMD64.rsi; import static jdk.vm.ci.code.ValueUtil.asRegister; -import static jdk.compiler.graal.asm.amd64.AMD64Assembler.ConditionFlag.BelowEqual; +import static jdk.graal.compiler.asm.amd64.AMD64Assembler.ConditionFlag.BelowEqual; -import jdk.compiler.graal.asm.Label; -import jdk.compiler.graal.asm.amd64.AMD64Address; -import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.SyncPort; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; -import jdk.compiler.graal.lir.gen.LIRGeneratorTool; +import jdk.graal.compiler.asm.Label; +import jdk.graal.compiler.asm.amd64.AMD64Address; +import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.SyncPort; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.lir.gen.LIRGeneratorTool; import jdk.vm.ci.amd64.AMD64Kind; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64MathCopySignOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64MathCopySignOp.java similarity index 88% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64MathCopySignOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64MathCopySignOp.java index 50eca53434ec..fe7030e253c8 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64MathCopySignOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64MathCopySignOp.java @@ -22,18 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.amd64; +package jdk.graal.compiler.lir.amd64; import static jdk.vm.ci.code.ValueUtil.asRegister; -import jdk.compiler.graal.asm.amd64.AMD64Assembler.VexRVMIOp; -import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler; -import jdk.compiler.graal.asm.amd64.AVXKind.AVXSize; -import jdk.compiler.graal.core.common.LIRKind; -import jdk.compiler.graal.debug.GraalError; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; -import jdk.compiler.graal.lir.gen.LIRGeneratorTool; +import jdk.graal.compiler.asm.amd64.AMD64Assembler.VexRVMIOp; +import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler; +import jdk.graal.compiler.asm.amd64.AVXKind.AVXSize; +import jdk.graal.compiler.core.common.LIRKind; +import jdk.graal.compiler.debug.GraalError; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; +import jdk.graal.compiler.lir.gen.LIRGeneratorTool; import jdk.vm.ci.amd64.AMD64Kind; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64MathCosOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64MathCosOp.java similarity index 98% rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64MathCosOp.java rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64MathCosOp.java index 0fd2abdd67a3..b6595dafebd0 100644 --- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64MathCosOp.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64MathCosOp.java @@ -24,7 +24,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package jdk.compiler.graal.lir.amd64; +package jdk.graal.compiler.lir.amd64; import static jdk.vm.ci.amd64.AMD64.r10; import static jdk.vm.ci.amd64.AMD64.r11; @@ -45,17 +45,17 @@ import static jdk.vm.ci.amd64.AMD64.xmm5; import static jdk.vm.ci.amd64.AMD64.xmm6; import static jdk.vm.ci.amd64.AMD64.xmm7; -import static jdk.compiler.graal.lir.amd64.AMD64LIRHelper.pointerConstant; -import static jdk.compiler.graal.lir.amd64.AMD64LIRHelper.recordExternalAddress; - -import jdk.compiler.graal.asm.Label; -import jdk.compiler.graal.asm.amd64.AMD64Address; -import jdk.compiler.graal.asm.amd64.AMD64Assembler.ConditionFlag; -import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler; -import jdk.compiler.graal.lir.LIRInstructionClass; -import jdk.compiler.graal.lir.SyncPort; -import jdk.compiler.graal.lir.asm.ArrayDataPointerConstant; -import jdk.compiler.graal.lir.asm.CompilationResultBuilder; +import static jdk.graal.compiler.lir.amd64.AMD64LIRHelper.pointerConstant; +import static jdk.graal.compiler.lir.amd64.AMD64LIRHelper.recordExternalAddress; + +import jdk.graal.compiler.asm.Label; +import jdk.graal.compiler.asm.amd64.AMD64Address; +import jdk.graal.compiler.asm.amd64.AMD64Assembler.ConditionFlag; +import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler; +import jdk.graal.compiler.lir.LIRInstructionClass; +import jdk.graal.compiler.lir.SyncPort; +import jdk.graal.compiler.lir.asm.ArrayDataPointerConstant; +import jdk.graal.compiler.lir.asm.CompilationResultBuilder; /** * 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64MathExpOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64MathExpOp.java
similarity index 96%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64MathExpOp.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64MathExpOp.java
index 3a3747b479b9..5db5d8ce7067 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64MathExpOp.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64MathExpOp.java
@@ -24,7 +24,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.lir.amd64;
+package jdk.graal.compiler.lir.amd64;
 
 import static jdk.vm.ci.amd64.AMD64.r11;
 import static jdk.vm.ci.amd64.AMD64.rax;
@@ -39,18 +39,18 @@
 import static jdk.vm.ci.amd64.AMD64.xmm5;
 import static jdk.vm.ci.amd64.AMD64.xmm6;
 import static jdk.vm.ci.amd64.AMD64.xmm7;
-import static jdk.compiler.graal.lir.amd64.AMD64LIRHelper.pointerConstant;
-import static jdk.compiler.graal.lir.amd64.AMD64LIRHelper.recordExternalAddress;
-
-import jdk.compiler.graal.asm.Label;
-import jdk.compiler.graal.asm.amd64.AMD64Address;
-import jdk.compiler.graal.asm.amd64.AMD64Assembler.ConditionFlag;
-import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler;
-import jdk.compiler.graal.core.common.Stride;
-import jdk.compiler.graal.lir.LIRInstructionClass;
-import jdk.compiler.graal.lir.SyncPort;
-import jdk.compiler.graal.lir.asm.ArrayDataPointerConstant;
-import jdk.compiler.graal.lir.asm.CompilationResultBuilder;
+import static jdk.graal.compiler.lir.amd64.AMD64LIRHelper.pointerConstant;
+import static jdk.graal.compiler.lir.amd64.AMD64LIRHelper.recordExternalAddress;
+
+import jdk.graal.compiler.asm.Label;
+import jdk.graal.compiler.asm.amd64.AMD64Address;
+import jdk.graal.compiler.asm.amd64.AMD64Assembler.ConditionFlag;
+import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler;
+import jdk.graal.compiler.core.common.Stride;
+import jdk.graal.compiler.lir.LIRInstructionClass;
+import jdk.graal.compiler.lir.SyncPort;
+import jdk.graal.compiler.lir.asm.ArrayDataPointerConstant;
+import jdk.graal.compiler.lir.asm.CompilationResultBuilder;
 
 /**
  * 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64MathIntrinsicBinaryOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64MathIntrinsicBinaryOp.java
similarity index 90%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64MathIntrinsicBinaryOp.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64MathIntrinsicBinaryOp.java
index cb8107f3f5c5..e449b1d1e9f1 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64MathIntrinsicBinaryOp.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64MathIntrinsicBinaryOp.java
@@ -22,16 +22,16 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.lir.amd64;
+package jdk.graal.compiler.lir.amd64;
 
 import static jdk.vm.ci.amd64.AMD64.xmm0;
 import static jdk.vm.ci.amd64.AMD64.xmm1;
-import static jdk.compiler.graal.lir.amd64.AMD64LIRHelper.registersToValues;
+import static jdk.graal.compiler.lir.amd64.AMD64LIRHelper.registersToValues;
 
-import jdk.compiler.graal.core.common.LIRKind;
-import jdk.compiler.graal.lir.LIRInstructionClass;
-import jdk.compiler.graal.lir.Variable;
-import jdk.compiler.graal.lir.gen.LIRGenerator;
+import jdk.graal.compiler.core.common.LIRKind;
+import jdk.graal.compiler.lir.LIRInstructionClass;
+import jdk.graal.compiler.lir.Variable;
+import jdk.graal.compiler.lir.gen.LIRGenerator;
 
 import jdk.vm.ci.amd64.AMD64Kind;
 import jdk.vm.ci.code.Register;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64MathIntrinsicUnaryOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64MathIntrinsicUnaryOp.java
similarity index 89%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64MathIntrinsicUnaryOp.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64MathIntrinsicUnaryOp.java
index 774cb08f07d6..ad68995bde36 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64MathIntrinsicUnaryOp.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64MathIntrinsicUnaryOp.java
@@ -22,15 +22,15 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.lir.amd64;
+package jdk.graal.compiler.lir.amd64;
 
 import static jdk.vm.ci.amd64.AMD64.xmm0;
-import static jdk.compiler.graal.lir.amd64.AMD64LIRHelper.registersToValues;
+import static jdk.graal.compiler.lir.amd64.AMD64LIRHelper.registersToValues;
 
-import jdk.compiler.graal.core.common.LIRKind;
-import jdk.compiler.graal.lir.LIRInstructionClass;
-import jdk.compiler.graal.lir.Variable;
-import jdk.compiler.graal.lir.gen.LIRGeneratorTool;
+import jdk.graal.compiler.core.common.LIRKind;
+import jdk.graal.compiler.lir.LIRInstructionClass;
+import jdk.graal.compiler.lir.Variable;
+import jdk.graal.compiler.lir.gen.LIRGeneratorTool;
 
 import jdk.vm.ci.amd64.AMD64Kind;
 import jdk.vm.ci.code.Register;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64MathLog10Op.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64MathLog10Op.java
similarity index 96%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64MathLog10Op.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64MathLog10Op.java
index 19c1e9c5793e..17d2d1928949 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64MathLog10Op.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64MathLog10Op.java
@@ -24,7 +24,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.lir.amd64;
+package jdk.graal.compiler.lir.amd64;
 
 import static jdk.vm.ci.amd64.AMD64.r11;
 import static jdk.vm.ci.amd64.AMD64.r8;
@@ -40,19 +40,19 @@
 import static jdk.vm.ci.amd64.AMD64.xmm5;
 import static jdk.vm.ci.amd64.AMD64.xmm6;
 import static jdk.vm.ci.amd64.AMD64.xmm7;
-import static jdk.compiler.graal.lir.amd64.AMD64LIRHelper.pointerConstant;
-import static jdk.compiler.graal.lir.amd64.AMD64LIRHelper.recordExternalAddress;
+import static jdk.graal.compiler.lir.amd64.AMD64LIRHelper.pointerConstant;
+import static jdk.graal.compiler.lir.amd64.AMD64LIRHelper.recordExternalAddress;
 
-import jdk.compiler.graal.asm.Label;
-import jdk.compiler.graal.asm.amd64.AMD64Address;
-import jdk.compiler.graal.asm.amd64.AMD64Assembler;
-import jdk.compiler.graal.asm.amd64.AMD64Assembler.ConditionFlag;
-import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler;
-import jdk.compiler.graal.core.common.Stride;
-import jdk.compiler.graal.lir.LIRInstructionClass;
-import jdk.compiler.graal.lir.SyncPort;
-import jdk.compiler.graal.lir.asm.ArrayDataPointerConstant;
-import jdk.compiler.graal.lir.asm.CompilationResultBuilder;
+import jdk.graal.compiler.asm.Label;
+import jdk.graal.compiler.asm.amd64.AMD64Address;
+import jdk.graal.compiler.asm.amd64.AMD64Assembler;
+import jdk.graal.compiler.asm.amd64.AMD64Assembler.ConditionFlag;
+import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler;
+import jdk.graal.compiler.core.common.Stride;
+import jdk.graal.compiler.lir.LIRInstructionClass;
+import jdk.graal.compiler.lir.SyncPort;
+import jdk.graal.compiler.lir.asm.ArrayDataPointerConstant;
+import jdk.graal.compiler.lir.asm.CompilationResultBuilder;
 
 /**
  * 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64MathLogOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64MathLogOp.java
similarity index 96%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64MathLogOp.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64MathLogOp.java
index 96c05e28d9e0..fe167923f66d 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64MathLogOp.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64MathLogOp.java
@@ -24,7 +24,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.lir.amd64;
+package jdk.graal.compiler.lir.amd64;
 
 import static jdk.vm.ci.amd64.AMD64.r11;
 import static jdk.vm.ci.amd64.AMD64.r8;
@@ -40,19 +40,19 @@
 import static jdk.vm.ci.amd64.AMD64.xmm5;
 import static jdk.vm.ci.amd64.AMD64.xmm6;
 import static jdk.vm.ci.amd64.AMD64.xmm7;
-import static jdk.compiler.graal.lir.amd64.AMD64LIRHelper.pointerConstant;
-import static jdk.compiler.graal.lir.amd64.AMD64LIRHelper.recordExternalAddress;
+import static jdk.graal.compiler.lir.amd64.AMD64LIRHelper.pointerConstant;
+import static jdk.graal.compiler.lir.amd64.AMD64LIRHelper.recordExternalAddress;
 
-import jdk.compiler.graal.asm.Label;
-import jdk.compiler.graal.asm.amd64.AMD64Address;
-import jdk.compiler.graal.asm.amd64.AMD64Assembler;
-import jdk.compiler.graal.asm.amd64.AMD64Assembler.ConditionFlag;
-import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler;
-import jdk.compiler.graal.core.common.Stride;
-import jdk.compiler.graal.lir.LIRInstructionClass;
-import jdk.compiler.graal.lir.SyncPort;
-import jdk.compiler.graal.lir.asm.ArrayDataPointerConstant;
-import jdk.compiler.graal.lir.asm.CompilationResultBuilder;
+import jdk.graal.compiler.asm.Label;
+import jdk.graal.compiler.asm.amd64.AMD64Address;
+import jdk.graal.compiler.asm.amd64.AMD64Assembler;
+import jdk.graal.compiler.asm.amd64.AMD64Assembler.ConditionFlag;
+import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler;
+import jdk.graal.compiler.core.common.Stride;
+import jdk.graal.compiler.lir.LIRInstructionClass;
+import jdk.graal.compiler.lir.SyncPort;
+import jdk.graal.compiler.lir.asm.ArrayDataPointerConstant;
+import jdk.graal.compiler.lir.asm.CompilationResultBuilder;
 
 import jdk.vm.ci.amd64.AMD64;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64MathPowOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64MathPowOp.java
similarity index 99%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64MathPowOp.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64MathPowOp.java
index d19fa8b9b279..d4163a80e906 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64MathPowOp.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64MathPowOp.java
@@ -24,7 +24,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.lir.amd64;
+package jdk.graal.compiler.lir.amd64;
 
 import static jdk.vm.ci.amd64.AMD64.r10;
 import static jdk.vm.ci.amd64.AMD64.r11;
@@ -42,18 +42,18 @@
 import static jdk.vm.ci.amd64.AMD64.xmm5;
 import static jdk.vm.ci.amd64.AMD64.xmm6;
 import static jdk.vm.ci.amd64.AMD64.xmm7;
-import static jdk.compiler.graal.lir.amd64.AMD64LIRHelper.pointerConstant;
-import static jdk.compiler.graal.lir.amd64.AMD64LIRHelper.recordExternalAddress;
-
-import jdk.compiler.graal.asm.Label;
-import jdk.compiler.graal.asm.amd64.AMD64Address;
-import jdk.compiler.graal.asm.amd64.AMD64Assembler.ConditionFlag;
-import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler;
-import jdk.compiler.graal.core.common.Stride;
-import jdk.compiler.graal.lir.LIRInstructionClass;
-import jdk.compiler.graal.lir.SyncPort;
-import jdk.compiler.graal.lir.asm.ArrayDataPointerConstant;
-import jdk.compiler.graal.lir.asm.CompilationResultBuilder;
+import static jdk.graal.compiler.lir.amd64.AMD64LIRHelper.pointerConstant;
+import static jdk.graal.compiler.lir.amd64.AMD64LIRHelper.recordExternalAddress;
+
+import jdk.graal.compiler.asm.Label;
+import jdk.graal.compiler.asm.amd64.AMD64Address;
+import jdk.graal.compiler.asm.amd64.AMD64Assembler.ConditionFlag;
+import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler;
+import jdk.graal.compiler.core.common.Stride;
+import jdk.graal.compiler.lir.LIRInstructionClass;
+import jdk.graal.compiler.lir.SyncPort;
+import jdk.graal.compiler.lir.asm.ArrayDataPointerConstant;
+import jdk.graal.compiler.lir.asm.CompilationResultBuilder;
 
 import jdk.vm.ci.code.Register;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64MathSignumOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64MathSignumOp.java
similarity index 87%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64MathSignumOp.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64MathSignumOp.java
index 198d7297a564..efb4453d3189 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64MathSignumOp.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64MathSignumOp.java
@@ -22,21 +22,21 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.lir.amd64;
+package jdk.graal.compiler.lir.amd64;
 
 import static jdk.vm.ci.code.ValueUtil.asRegister;
-import static jdk.compiler.graal.lir.amd64.AMD64LIRHelper.pointerConstant;
-import static jdk.compiler.graal.lir.amd64.AMD64LIRHelper.recordExternalAddress;
+import static jdk.graal.compiler.lir.amd64.AMD64LIRHelper.pointerConstant;
+import static jdk.graal.compiler.lir.amd64.AMD64LIRHelper.recordExternalAddress;
 
-import jdk.compiler.graal.asm.Label;
-import jdk.compiler.graal.asm.amd64.AMD64Assembler;
-import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler;
-import jdk.compiler.graal.core.common.LIRKind;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.lir.LIRInstructionClass;
-import jdk.compiler.graal.lir.asm.ArrayDataPointerConstant;
-import jdk.compiler.graal.lir.asm.CompilationResultBuilder;
-import jdk.compiler.graal.lir.gen.LIRGeneratorTool;
+import jdk.graal.compiler.asm.Label;
+import jdk.graal.compiler.asm.amd64.AMD64Assembler;
+import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler;
+import jdk.graal.compiler.core.common.LIRKind;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.lir.LIRInstructionClass;
+import jdk.graal.compiler.lir.asm.ArrayDataPointerConstant;
+import jdk.graal.compiler.lir.asm.CompilationResultBuilder;
+import jdk.graal.compiler.lir.gen.LIRGeneratorTool;
 
 import jdk.vm.ci.amd64.AMD64Kind;
 import jdk.vm.ci.code.Register;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64MathSinOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64MathSinOp.java
similarity index 98%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64MathSinOp.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64MathSinOp.java
index 968061839717..f8430efa2de3 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64MathSinOp.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64MathSinOp.java
@@ -24,7 +24,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.lir.amd64;
+package jdk.graal.compiler.lir.amd64;
 
 import static jdk.vm.ci.amd64.AMD64.r10;
 import static jdk.vm.ci.amd64.AMD64.r11;
@@ -45,17 +45,17 @@
 import static jdk.vm.ci.amd64.AMD64.xmm5;
 import static jdk.vm.ci.amd64.AMD64.xmm6;
 import static jdk.vm.ci.amd64.AMD64.xmm7;
-import static jdk.compiler.graal.lir.amd64.AMD64LIRHelper.pointerConstant;
-import static jdk.compiler.graal.lir.amd64.AMD64LIRHelper.recordExternalAddress;
-
-import jdk.compiler.graal.asm.Label;
-import jdk.compiler.graal.asm.amd64.AMD64Address;
-import jdk.compiler.graal.asm.amd64.AMD64Assembler.ConditionFlag;
-import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler;
-import jdk.compiler.graal.lir.LIRInstructionClass;
-import jdk.compiler.graal.lir.SyncPort;
-import jdk.compiler.graal.lir.asm.ArrayDataPointerConstant;
-import jdk.compiler.graal.lir.asm.CompilationResultBuilder;
+import static jdk.graal.compiler.lir.amd64.AMD64LIRHelper.pointerConstant;
+import static jdk.graal.compiler.lir.amd64.AMD64LIRHelper.recordExternalAddress;
+
+import jdk.graal.compiler.asm.Label;
+import jdk.graal.compiler.asm.amd64.AMD64Address;
+import jdk.graal.compiler.asm.amd64.AMD64Assembler.ConditionFlag;
+import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler;
+import jdk.graal.compiler.lir.LIRInstructionClass;
+import jdk.graal.compiler.lir.SyncPort;
+import jdk.graal.compiler.lir.asm.ArrayDataPointerConstant;
+import jdk.graal.compiler.lir.asm.CompilationResultBuilder;
 
 import jdk.vm.ci.amd64.AMD64;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64MathTanOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64MathTanOp.java
similarity index 98%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64MathTanOp.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64MathTanOp.java
index c93b83ea8ee7..331c725296d2 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64MathTanOp.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64MathTanOp.java
@@ -24,7 +24,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.lir.amd64;
+package jdk.graal.compiler.lir.amd64;
 
 import static jdk.vm.ci.amd64.AMD64.r10;
 import static jdk.vm.ci.amd64.AMD64.r11;
@@ -45,18 +45,18 @@
 import static jdk.vm.ci.amd64.AMD64.xmm5;
 import static jdk.vm.ci.amd64.AMD64.xmm6;
 import static jdk.vm.ci.amd64.AMD64.xmm7;
-import static jdk.compiler.graal.lir.amd64.AMD64LIRHelper.pointerConstant;
-import static jdk.compiler.graal.lir.amd64.AMD64LIRHelper.recordExternalAddress;
+import static jdk.graal.compiler.lir.amd64.AMD64LIRHelper.pointerConstant;
+import static jdk.graal.compiler.lir.amd64.AMD64LIRHelper.recordExternalAddress;
 
-import jdk.compiler.graal.asm.Label;
-import jdk.compiler.graal.asm.amd64.AMD64Address;
-import jdk.compiler.graal.asm.amd64.AMD64Assembler;
-import jdk.compiler.graal.asm.amd64.AMD64Assembler.ConditionFlag;
-import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler;
-import jdk.compiler.graal.lir.LIRInstructionClass;
-import jdk.compiler.graal.lir.SyncPort;
-import jdk.compiler.graal.lir.asm.ArrayDataPointerConstant;
-import jdk.compiler.graal.lir.asm.CompilationResultBuilder;
+import jdk.graal.compiler.asm.Label;
+import jdk.graal.compiler.asm.amd64.AMD64Address;
+import jdk.graal.compiler.asm.amd64.AMD64Assembler;
+import jdk.graal.compiler.asm.amd64.AMD64Assembler.ConditionFlag;
+import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler;
+import jdk.graal.compiler.lir.LIRInstructionClass;
+import jdk.graal.compiler.lir.SyncPort;
+import jdk.graal.compiler.lir.asm.ArrayDataPointerConstant;
+import jdk.graal.compiler.lir.asm.CompilationResultBuilder;
 
 import jdk.vm.ci.amd64.AMD64;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64Move.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64Move.java
similarity index 97%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64Move.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64Move.java
index 103d89eb9e3d..da95ae0682d0 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64Move.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64Move.java
@@ -22,36 +22,36 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.lir.amd64;
+package jdk.graal.compiler.lir.amd64;
 
 import static java.lang.Double.doubleToRawLongBits;
 import static java.lang.Float.floatToRawIntBits;
 import static jdk.vm.ci.code.ValueUtil.asRegister;
 import static jdk.vm.ci.code.ValueUtil.isRegister;
 import static jdk.vm.ci.code.ValueUtil.isStackSlot;
-import static jdk.compiler.graal.asm.amd64.AMD64Assembler.ConditionFlag.Equal;
-import static jdk.compiler.graal.asm.amd64.AMD64Assembler.ConditionFlag.NotEqual;
-
-import jdk.compiler.graal.asm.Label;
-import jdk.compiler.graal.asm.amd64.AMD64Address;
-import jdk.compiler.graal.asm.amd64.AMD64Assembler.AMD64MIOp;
-import jdk.compiler.graal.asm.amd64.AMD64Assembler.AMD64MOp;
-import jdk.compiler.graal.asm.amd64.AMD64BaseAssembler.OperandSize;
-import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler;
-import jdk.compiler.graal.core.common.CompressEncoding;
-import jdk.compiler.graal.core.common.LIRKind;
-import jdk.compiler.graal.core.common.NumUtil;
-import jdk.compiler.graal.core.common.Stride;
-import jdk.compiler.graal.core.common.spi.LIRKindTool;
-import jdk.compiler.graal.core.common.type.DataPointerConstant;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.lir.LIRFrameState;
-import jdk.compiler.graal.lir.LIRInstructionClass;
-import jdk.compiler.graal.lir.LIRValueUtil;
-import jdk.compiler.graal.lir.Opcode;
-import jdk.compiler.graal.lir.StandardOp;
-import jdk.compiler.graal.lir.VirtualStackSlot;
-import jdk.compiler.graal.lir.asm.CompilationResultBuilder;
+import static jdk.graal.compiler.asm.amd64.AMD64Assembler.ConditionFlag.Equal;
+import static jdk.graal.compiler.asm.amd64.AMD64Assembler.ConditionFlag.NotEqual;
+
+import jdk.graal.compiler.asm.Label;
+import jdk.graal.compiler.asm.amd64.AMD64Address;
+import jdk.graal.compiler.asm.amd64.AMD64Assembler.AMD64MIOp;
+import jdk.graal.compiler.asm.amd64.AMD64Assembler.AMD64MOp;
+import jdk.graal.compiler.asm.amd64.AMD64BaseAssembler.OperandSize;
+import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler;
+import jdk.graal.compiler.core.common.CompressEncoding;
+import jdk.graal.compiler.core.common.LIRKind;
+import jdk.graal.compiler.core.common.NumUtil;
+import jdk.graal.compiler.core.common.Stride;
+import jdk.graal.compiler.core.common.spi.LIRKindTool;
+import jdk.graal.compiler.core.common.type.DataPointerConstant;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.lir.LIRFrameState;
+import jdk.graal.compiler.lir.LIRInstructionClass;
+import jdk.graal.compiler.lir.LIRValueUtil;
+import jdk.graal.compiler.lir.Opcode;
+import jdk.graal.compiler.lir.StandardOp;
+import jdk.graal.compiler.lir.VirtualStackSlot;
+import jdk.graal.compiler.lir.asm.CompilationResultBuilder;
 
 import jdk.vm.ci.amd64.AMD64;
 import jdk.vm.ci.amd64.AMD64Kind;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64MulDivOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64MulDivOp.java
similarity index 85%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64MulDivOp.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64MulDivOp.java
index 44d094d944b0..b871a0986705 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64MulDivOp.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64MulDivOp.java
@@ -22,27 +22,27 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.lir.amd64;
+package jdk.graal.compiler.lir.amd64;
 
 import static jdk.vm.ci.code.ValueUtil.asRegister;
 import static jdk.vm.ci.code.ValueUtil.isIllegal;
 import static jdk.vm.ci.code.ValueUtil.isRegister;
 import static jdk.vm.ci.code.ValueUtil.isStackSlot;
-import static jdk.compiler.graal.asm.amd64.AMD64Assembler.AMD64MOp.DIV;
-import static jdk.compiler.graal.asm.amd64.AMD64Assembler.AMD64MOp.IDIV;
-import static jdk.compiler.graal.asm.amd64.AMD64Assembler.AMD64MOp.IMUL;
-import static jdk.compiler.graal.asm.amd64.AMD64Assembler.AMD64MOp.MUL;
-
-import jdk.compiler.graal.asm.amd64.AMD64Address;
-import jdk.compiler.graal.asm.amd64.AMD64Assembler.AMD64MOp;
-import jdk.compiler.graal.asm.amd64.AMD64BaseAssembler.OperandSize;
-import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler;
-import jdk.compiler.graal.core.common.LIRKind;
-import jdk.compiler.graal.lir.LIRFrameState;
-import jdk.compiler.graal.lir.LIRInstruction;
-import jdk.compiler.graal.lir.LIRInstructionClass;
-import jdk.compiler.graal.lir.Opcode;
-import jdk.compiler.graal.lir.asm.CompilationResultBuilder;
+import static jdk.graal.compiler.asm.amd64.AMD64Assembler.AMD64MOp.DIV;
+import static jdk.graal.compiler.asm.amd64.AMD64Assembler.AMD64MOp.IDIV;
+import static jdk.graal.compiler.asm.amd64.AMD64Assembler.AMD64MOp.IMUL;
+import static jdk.graal.compiler.asm.amd64.AMD64Assembler.AMD64MOp.MUL;
+
+import jdk.graal.compiler.asm.amd64.AMD64Address;
+import jdk.graal.compiler.asm.amd64.AMD64Assembler.AMD64MOp;
+import jdk.graal.compiler.asm.amd64.AMD64BaseAssembler.OperandSize;
+import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler;
+import jdk.graal.compiler.core.common.LIRKind;
+import jdk.graal.compiler.lir.LIRFrameState;
+import jdk.graal.compiler.lir.LIRInstruction;
+import jdk.graal.compiler.lir.LIRInstructionClass;
+import jdk.graal.compiler.lir.Opcode;
+import jdk.graal.compiler.lir.asm.CompilationResultBuilder;
 
 import jdk.vm.ci.amd64.AMD64;
 import jdk.vm.ci.meta.AllocatableValue;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64NormalizedUnsignedCompareOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64NormalizedUnsignedCompareOp.java
similarity index 89%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64NormalizedUnsignedCompareOp.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64NormalizedUnsignedCompareOp.java
index 25ff54e58ace..3765776b6971 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64NormalizedUnsignedCompareOp.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64NormalizedUnsignedCompareOp.java
@@ -22,17 +22,17 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.lir.amd64;
+package jdk.graal.compiler.lir.amd64;
 
 import static jdk.vm.ci.code.ValueUtil.asRegister;
 
-import jdk.compiler.graal.asm.Label;
-import jdk.compiler.graal.asm.amd64.AMD64Assembler;
-import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.lir.LIRInstructionClass;
-import jdk.compiler.graal.lir.SyncPort;
-import jdk.compiler.graal.lir.asm.CompilationResultBuilder;
+import jdk.graal.compiler.asm.Label;
+import jdk.graal.compiler.asm.amd64.AMD64Assembler;
+import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.lir.LIRInstructionClass;
+import jdk.graal.compiler.lir.SyncPort;
+import jdk.graal.compiler.lir.asm.CompilationResultBuilder;
 
 import jdk.vm.ci.amd64.AMD64Kind;
 import jdk.vm.ci.meta.AllocatableValue;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64PauseOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64PauseOp.java
similarity index 86%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64PauseOp.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64PauseOp.java
index 26698f7153aa..880503beab61 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64PauseOp.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64PauseOp.java
@@ -22,12 +22,12 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.lir.amd64;
+package jdk.graal.compiler.lir.amd64;
 
-import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler;
-import jdk.compiler.graal.lir.LIRInstructionClass;
-import jdk.compiler.graal.lir.Opcode;
-import jdk.compiler.graal.lir.asm.CompilationResultBuilder;
+import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler;
+import jdk.graal.compiler.lir.LIRInstructionClass;
+import jdk.graal.compiler.lir.Opcode;
+import jdk.graal.compiler.lir.asm.CompilationResultBuilder;
 
 /**
  * Emits a pause.
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64PrefetchOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64PrefetchOp.java
similarity index 90%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64PrefetchOp.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64PrefetchOp.java
index 712f0531faec..dd0a2a03b63a 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64PrefetchOp.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64PrefetchOp.java
@@ -23,12 +23,12 @@
  * questions.
  */
 
-package jdk.compiler.graal.lir.amd64;
+package jdk.graal.compiler.lir.amd64;
 
-import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.lir.LIRInstructionClass;
-import jdk.compiler.graal.lir.asm.CompilationResultBuilder;
+import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.lir.LIRInstructionClass;
+import jdk.graal.compiler.lir.asm.CompilationResultBuilder;
 
 public final class AMD64PrefetchOp extends AMD64LIRInstruction {
     public static final LIRInstructionClass TYPE = LIRInstructionClass.create(AMD64PrefetchOp.class);
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64ReadProcid.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64ReadProcid.java
similarity index 88%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64ReadProcid.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64ReadProcid.java
index 78d727db4402..b129425cb452 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64ReadProcid.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64ReadProcid.java
@@ -22,15 +22,15 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.lir.amd64;
+package jdk.graal.compiler.lir.amd64;
 
 import static jdk.vm.ci.code.ValueUtil.asRegister;
 
-import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler;
-import jdk.compiler.graal.lir.LIRInstruction;
-import jdk.compiler.graal.lir.LIRInstructionClass;
-import jdk.compiler.graal.lir.Opcode;
-import jdk.compiler.graal.lir.asm.CompilationResultBuilder;
+import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler;
+import jdk.graal.compiler.lir.LIRInstruction;
+import jdk.graal.compiler.lir.LIRInstructionClass;
+import jdk.graal.compiler.lir.Opcode;
+import jdk.graal.compiler.lir.asm.CompilationResultBuilder;
 
 import jdk.vm.ci.meta.AllocatableValue;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64ReadTimestampCounterWithProcid.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64ReadTimestampCounterWithProcid.java
similarity index 90%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64ReadTimestampCounterWithProcid.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64ReadTimestampCounterWithProcid.java
index 317b7fec021e..838fb30d0d48 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64ReadTimestampCounterWithProcid.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64ReadTimestampCounterWithProcid.java
@@ -22,13 +22,13 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.lir.amd64;
+package jdk.graal.compiler.lir.amd64;
 
-import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler;
-import jdk.compiler.graal.core.common.LIRKind;
-import jdk.compiler.graal.lir.LIRInstructionClass;
-import jdk.compiler.graal.lir.Opcode;
-import jdk.compiler.graal.lir.asm.CompilationResultBuilder;
+import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler;
+import jdk.graal.compiler.core.common.LIRKind;
+import jdk.graal.compiler.lir.LIRInstructionClass;
+import jdk.graal.compiler.lir.Opcode;
+import jdk.graal.compiler.lir.asm.CompilationResultBuilder;
 
 import jdk.vm.ci.amd64.AMD64;
 import jdk.vm.ci.amd64.AMD64Kind;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64RestoreRegistersOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64RestoreRegistersOp.java
similarity index 89%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64RestoreRegistersOp.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64RestoreRegistersOp.java
index 9e0e6cc74ef3..4288051753c2 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64RestoreRegistersOp.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64RestoreRegistersOp.java
@@ -22,20 +22,20 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.lir.amd64;
+package jdk.graal.compiler.lir.amd64;
 
 import static jdk.vm.ci.code.ValueUtil.asStackSlot;
 import static jdk.vm.ci.code.ValueUtil.isStackSlot;
 
 import java.util.Arrays;
 
-import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler;
-import jdk.compiler.graal.lir.LIRInstruction;
-import jdk.compiler.graal.lir.LIRInstructionClass;
-import jdk.compiler.graal.lir.LIRValueUtil;
-import jdk.compiler.graal.lir.Opcode;
-import jdk.compiler.graal.lir.StandardOp;
-import jdk.compiler.graal.lir.asm.CompilationResultBuilder;
+import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler;
+import jdk.graal.compiler.lir.LIRInstruction;
+import jdk.graal.compiler.lir.LIRInstructionClass;
+import jdk.graal.compiler.lir.LIRValueUtil;
+import jdk.graal.compiler.lir.Opcode;
+import jdk.graal.compiler.lir.StandardOp;
+import jdk.graal.compiler.lir.asm.CompilationResultBuilder;
 
 import jdk.vm.ci.amd64.AMD64Kind;
 import jdk.vm.ci.code.Register;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64RoundFloatToIntegerOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64RoundFloatToIntegerOp.java
similarity index 93%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64RoundFloatToIntegerOp.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64RoundFloatToIntegerOp.java
index e332cd21b6f9..bc0a857a8fdb 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64RoundFloatToIntegerOp.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64RoundFloatToIntegerOp.java
@@ -22,19 +22,19 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.lir.amd64;
+package jdk.graal.compiler.lir.amd64;
 
 import static jdk.vm.ci.code.ValueUtil.asRegister;
 
-import jdk.compiler.graal.asm.Label;
-import jdk.compiler.graal.asm.amd64.AMD64Assembler.ConditionFlag;
-import jdk.compiler.graal.asm.amd64.AMD64BaseAssembler.OperandSize;
-import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler;
-import jdk.compiler.graal.lir.LIRInstructionClass;
-import jdk.compiler.graal.lir.Opcode;
-import jdk.compiler.graal.lir.SyncPort;
-import jdk.compiler.graal.lir.asm.CompilationResultBuilder;
-import jdk.compiler.graal.lir.gen.LIRGeneratorTool;
+import jdk.graal.compiler.asm.Label;
+import jdk.graal.compiler.asm.amd64.AMD64Assembler.ConditionFlag;
+import jdk.graal.compiler.asm.amd64.AMD64BaseAssembler.OperandSize;
+import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler;
+import jdk.graal.compiler.lir.LIRInstructionClass;
+import jdk.graal.compiler.lir.Opcode;
+import jdk.graal.compiler.lir.SyncPort;
+import jdk.graal.compiler.lir.asm.CompilationResultBuilder;
+import jdk.graal.compiler.lir.gen.LIRGeneratorTool;
 
 import jdk.vm.ci.amd64.AMD64;
 import jdk.vm.ci.amd64.AMD64Kind;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64SHA1Op.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64SHA1Op.java
similarity index 94%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64SHA1Op.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64SHA1Op.java
index 59871fb4ac49..093cbea2f21c 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64SHA1Op.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64SHA1Op.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.lir.amd64;
+package jdk.graal.compiler.lir.amd64;
 
 import static jdk.vm.ci.amd64.AMD64.xmm0;
 import static jdk.vm.ci.amd64.AMD64.xmm1;
@@ -35,19 +35,19 @@
 import static jdk.vm.ci.amd64.AMD64.xmm8;
 import static jdk.vm.ci.amd64.AMD64.xmm9;
 import static jdk.vm.ci.code.ValueUtil.asRegister;
-import static jdk.compiler.graal.lir.amd64.AMD64LIRHelper.pointerConstant;
-import static jdk.compiler.graal.lir.amd64.AMD64LIRHelper.recordExternalAddress;
-
-import jdk.compiler.graal.asm.Label;
-import jdk.compiler.graal.asm.amd64.AMD64Address;
-import jdk.compiler.graal.asm.amd64.AMD64Assembler.ConditionFlag;
-import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.lir.LIRInstructionClass;
-import jdk.compiler.graal.lir.SyncPort;
-import jdk.compiler.graal.lir.asm.ArrayDataPointerConstant;
-import jdk.compiler.graal.lir.asm.CompilationResultBuilder;
-import jdk.compiler.graal.lir.gen.LIRGeneratorTool;
+import static jdk.graal.compiler.lir.amd64.AMD64LIRHelper.pointerConstant;
+import static jdk.graal.compiler.lir.amd64.AMD64LIRHelper.recordExternalAddress;
+
+import jdk.graal.compiler.asm.Label;
+import jdk.graal.compiler.asm.amd64.AMD64Address;
+import jdk.graal.compiler.asm.amd64.AMD64Assembler.ConditionFlag;
+import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.lir.LIRInstructionClass;
+import jdk.graal.compiler.lir.SyncPort;
+import jdk.graal.compiler.lir.asm.ArrayDataPointerConstant;
+import jdk.graal.compiler.lir.asm.CompilationResultBuilder;
+import jdk.graal.compiler.lir.gen.LIRGeneratorTool;
 
 import jdk.vm.ci.amd64.AMD64Kind;
 import jdk.vm.ci.code.Register;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64SHA256AVX2Op.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64SHA256AVX2Op.java
similarity index 97%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64SHA256AVX2Op.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64SHA256AVX2Op.java
index a2173de09743..07b6c10e0010 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64SHA256AVX2Op.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64SHA256AVX2Op.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.lir.amd64;
+package jdk.graal.compiler.lir.amd64;
 
 import static jdk.vm.ci.amd64.AMD64.r10;
 import static jdk.vm.ci.amd64.AMD64.r11;
@@ -55,23 +55,23 @@
 import static jdk.vm.ci.amd64.AMD64.xmm8;
 import static jdk.vm.ci.amd64.AMD64.xmm9;
 import static jdk.vm.ci.code.ValueUtil.asRegister;
-import static jdk.compiler.graal.asm.amd64.AMD64Assembler.ConditionFlag.Above;
-import static jdk.compiler.graal.asm.amd64.AMD64Assembler.ConditionFlag.AboveEqual;
-import static jdk.compiler.graal.asm.amd64.AMD64Assembler.ConditionFlag.Below;
-import static jdk.compiler.graal.asm.amd64.AMD64Assembler.ConditionFlag.Equal;
-import static jdk.compiler.graal.lir.amd64.AMD64LIRHelper.pointerConstant;
-import static jdk.compiler.graal.lir.amd64.AMD64LIRHelper.recordExternalAddress;
-
-import jdk.compiler.graal.asm.Label;
-import jdk.compiler.graal.asm.amd64.AMD64Address;
-import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler;
-import jdk.compiler.graal.asm.amd64.AVXKind.AVXSize;
-import jdk.compiler.graal.core.common.Stride;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.lir.LIRInstructionClass;
-import jdk.compiler.graal.lir.SyncPort;
-import jdk.compiler.graal.lir.asm.ArrayDataPointerConstant;
-import jdk.compiler.graal.lir.asm.CompilationResultBuilder;
+import static jdk.graal.compiler.asm.amd64.AMD64Assembler.ConditionFlag.Above;
+import static jdk.graal.compiler.asm.amd64.AMD64Assembler.ConditionFlag.AboveEqual;
+import static jdk.graal.compiler.asm.amd64.AMD64Assembler.ConditionFlag.Below;
+import static jdk.graal.compiler.asm.amd64.AMD64Assembler.ConditionFlag.Equal;
+import static jdk.graal.compiler.lir.amd64.AMD64LIRHelper.pointerConstant;
+import static jdk.graal.compiler.lir.amd64.AMD64LIRHelper.recordExternalAddress;
+
+import jdk.graal.compiler.asm.Label;
+import jdk.graal.compiler.asm.amd64.AMD64Address;
+import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler;
+import jdk.graal.compiler.asm.amd64.AVXKind.AVXSize;
+import jdk.graal.compiler.core.common.Stride;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.lir.LIRInstructionClass;
+import jdk.graal.compiler.lir.SyncPort;
+import jdk.graal.compiler.lir.asm.ArrayDataPointerConstant;
+import jdk.graal.compiler.lir.asm.CompilationResultBuilder;
 
 import jdk.vm.ci.code.Register;
 import jdk.vm.ci.meta.AllocatableValue;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64SHA256Op.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64SHA256Op.java
similarity index 95%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64SHA256Op.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64SHA256Op.java
index 4a54800423db..e7968927d9ba 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64SHA256Op.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64SHA256Op.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.lir.amd64;
+package jdk.graal.compiler.lir.amd64;
 
 import static jdk.vm.ci.amd64.AMD64.xmm0;
 import static jdk.vm.ci.amd64.AMD64.xmm1;
@@ -36,19 +36,19 @@
 import static jdk.vm.ci.amd64.AMD64.xmm8;
 import static jdk.vm.ci.amd64.AMD64.xmm9;
 import static jdk.vm.ci.code.ValueUtil.asRegister;
-import static jdk.compiler.graal.asm.amd64.AMD64Assembler.ConditionFlag.BelowEqual;
-import static jdk.compiler.graal.lir.amd64.AMD64LIRHelper.pointerConstant;
-import static jdk.compiler.graal.lir.amd64.AMD64LIRHelper.recordExternalAddress;
-
-import jdk.compiler.graal.asm.Label;
-import jdk.compiler.graal.asm.amd64.AMD64Address;
-import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.lir.LIRInstructionClass;
-import jdk.compiler.graal.lir.SyncPort;
-import jdk.compiler.graal.lir.asm.ArrayDataPointerConstant;
-import jdk.compiler.graal.lir.asm.CompilationResultBuilder;
-import jdk.compiler.graal.lir.gen.LIRGeneratorTool;
+import static jdk.graal.compiler.asm.amd64.AMD64Assembler.ConditionFlag.BelowEqual;
+import static jdk.graal.compiler.lir.amd64.AMD64LIRHelper.pointerConstant;
+import static jdk.graal.compiler.lir.amd64.AMD64LIRHelper.recordExternalAddress;
+
+import jdk.graal.compiler.asm.Label;
+import jdk.graal.compiler.asm.amd64.AMD64Address;
+import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.lir.LIRInstructionClass;
+import jdk.graal.compiler.lir.SyncPort;
+import jdk.graal.compiler.lir.asm.ArrayDataPointerConstant;
+import jdk.graal.compiler.lir.asm.CompilationResultBuilder;
+import jdk.graal.compiler.lir.gen.LIRGeneratorTool;
 
 import jdk.vm.ci.amd64.AMD64Kind;
 import jdk.vm.ci.code.Register;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64SHA512Op.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64SHA512Op.java
similarity index 97%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64SHA512Op.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64SHA512Op.java
index 3abc6c6fe798..23b91d7ccc10 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64SHA512Op.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64SHA512Op.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.lir.amd64;
+package jdk.graal.compiler.lir.amd64;
 
 import static jdk.vm.ci.amd64.AMD64.r10;
 import static jdk.vm.ci.amd64.AMD64.r11;
@@ -52,21 +52,21 @@
 import static jdk.vm.ci.amd64.AMD64.xmm8;
 import static jdk.vm.ci.amd64.AMD64.xmm9;
 import static jdk.vm.ci.code.ValueUtil.asRegister;
-import static jdk.compiler.graal.asm.amd64.AMD64Assembler.ConditionFlag.AboveEqual;
-import static jdk.compiler.graal.asm.amd64.AMD64Assembler.ConditionFlag.Equal;
-import static jdk.compiler.graal.asm.amd64.AMD64Assembler.ConditionFlag.NotEqual;
-import static jdk.compiler.graal.lir.amd64.AMD64LIRHelper.pointerConstant;
-import static jdk.compiler.graal.lir.amd64.AMD64LIRHelper.recordExternalAddress;
-
-import jdk.compiler.graal.asm.Label;
-import jdk.compiler.graal.asm.amd64.AMD64Address;
-import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler;
-import jdk.compiler.graal.asm.amd64.AVXKind.AVXSize;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.lir.LIRInstructionClass;
-import jdk.compiler.graal.lir.SyncPort;
-import jdk.compiler.graal.lir.asm.ArrayDataPointerConstant;
-import jdk.compiler.graal.lir.asm.CompilationResultBuilder;
+import static jdk.graal.compiler.asm.amd64.AMD64Assembler.ConditionFlag.AboveEqual;
+import static jdk.graal.compiler.asm.amd64.AMD64Assembler.ConditionFlag.Equal;
+import static jdk.graal.compiler.asm.amd64.AMD64Assembler.ConditionFlag.NotEqual;
+import static jdk.graal.compiler.lir.amd64.AMD64LIRHelper.pointerConstant;
+import static jdk.graal.compiler.lir.amd64.AMD64LIRHelper.recordExternalAddress;
+
+import jdk.graal.compiler.asm.Label;
+import jdk.graal.compiler.asm.amd64.AMD64Address;
+import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler;
+import jdk.graal.compiler.asm.amd64.AVXKind.AVXSize;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.lir.LIRInstructionClass;
+import jdk.graal.compiler.lir.SyncPort;
+import jdk.graal.compiler.lir.asm.ArrayDataPointerConstant;
+import jdk.graal.compiler.lir.asm.CompilationResultBuilder;
 
 import jdk.vm.ci.code.Register;
 import jdk.vm.ci.meta.AllocatableValue;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64SaveRegistersOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64SaveRegistersOp.java
similarity index 89%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64SaveRegistersOp.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64SaveRegistersOp.java
index 9b221ba8eafb..dd1f32ed576e 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64SaveRegistersOp.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64SaveRegistersOp.java
@@ -22,18 +22,18 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.lir.amd64;
+package jdk.graal.compiler.lir.amd64;
 
 import static jdk.vm.ci.code.ValueUtil.asStackSlot;
 import static jdk.vm.ci.code.ValueUtil.isStackSlot;
 
-import jdk.compiler.graal.lir.LIRInstructionClass;
-import jdk.compiler.graal.lir.Opcode;
-import jdk.compiler.graal.lir.StandardOp;
-import jdk.compiler.graal.lir.asm.CompilationResultBuilder;
+import jdk.graal.compiler.lir.LIRInstructionClass;
+import jdk.graal.compiler.lir.Opcode;
+import jdk.graal.compiler.lir.StandardOp;
+import jdk.graal.compiler.lir.asm.CompilationResultBuilder;
 import org.graalvm.collections.EconomicSet;
-import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler;
-import jdk.compiler.graal.lir.amd64.vector.AMD64VectorMove;
+import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler;
+import jdk.graal.compiler.lir.amd64.vector.AMD64VectorMove;
 
 import jdk.vm.ci.amd64.AMD64Kind;
 import jdk.vm.ci.code.Register;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64ShiftOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64ShiftOp.java
similarity index 87%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64ShiftOp.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64ShiftOp.java
index f84dd718371d..756c296cdf22 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64ShiftOp.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64ShiftOp.java
@@ -22,16 +22,16 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.lir.amd64;
+package jdk.graal.compiler.lir.amd64;
 
 import static jdk.vm.ci.code.ValueUtil.asRegister;
 
-import jdk.compiler.graal.asm.amd64.AMD64Assembler.AMD64MOp;
-import jdk.compiler.graal.asm.amd64.AMD64BaseAssembler.OperandSize;
-import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler;
-import jdk.compiler.graal.lir.LIRInstructionClass;
-import jdk.compiler.graal.lir.Opcode;
-import jdk.compiler.graal.lir.asm.CompilationResultBuilder;
+import jdk.graal.compiler.asm.amd64.AMD64Assembler.AMD64MOp;
+import jdk.graal.compiler.asm.amd64.AMD64BaseAssembler.OperandSize;
+import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler;
+import jdk.graal.compiler.lir.LIRInstructionClass;
+import jdk.graal.compiler.lir.Opcode;
+import jdk.graal.compiler.lir.asm.CompilationResultBuilder;
 
 import jdk.vm.ci.amd64.AMD64;
 import jdk.vm.ci.meta.AllocatableValue;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64SignExtendOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64SignExtendOp.java
similarity index 84%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64SignExtendOp.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64SignExtendOp.java
index 7a88a6b7f7ff..f9b0b24871db 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64SignExtendOp.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64SignExtendOp.java
@@ -22,18 +22,18 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.lir.amd64;
+package jdk.graal.compiler.lir.amd64;
 
 import static jdk.vm.ci.code.ValueUtil.asRegister;
-import static jdk.compiler.graal.asm.amd64.AMD64BaseAssembler.OperandSize.DWORD;
-import static jdk.compiler.graal.asm.amd64.AMD64BaseAssembler.OperandSize.QWORD;
+import static jdk.graal.compiler.asm.amd64.AMD64BaseAssembler.OperandSize.DWORD;
+import static jdk.graal.compiler.asm.amd64.AMD64BaseAssembler.OperandSize.QWORD;
 
-import jdk.compiler.graal.asm.amd64.AMD64BaseAssembler.OperandSize;
-import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler;
-import jdk.compiler.graal.core.common.LIRKind;
-import jdk.compiler.graal.lir.LIRInstructionClass;
-import jdk.compiler.graal.lir.Opcode;
-import jdk.compiler.graal.lir.asm.CompilationResultBuilder;
+import jdk.graal.compiler.asm.amd64.AMD64BaseAssembler.OperandSize;
+import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler;
+import jdk.graal.compiler.core.common.LIRKind;
+import jdk.graal.compiler.lir.LIRInstructionClass;
+import jdk.graal.compiler.lir.Opcode;
+import jdk.graal.compiler.lir.asm.CompilationResultBuilder;
 
 import jdk.vm.ci.amd64.AMD64;
 import jdk.vm.ci.meta.AllocatableValue;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64StringLatin1InflateOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64StringLatin1InflateOp.java
similarity index 94%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64StringLatin1InflateOp.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64StringLatin1InflateOp.java
index 07483e72a5c3..f492a462a81b 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64StringLatin1InflateOp.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64StringLatin1InflateOp.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.lir.amd64;
+package jdk.graal.compiler.lir.amd64;
 
 import static jdk.vm.ci.amd64.AMD64.k2;
 import static jdk.vm.ci.amd64.AMD64.rdi;
@@ -32,17 +32,17 @@
 
 import java.util.EnumSet;
 
-import jdk.compiler.graal.asm.Label;
-import jdk.compiler.graal.asm.amd64.AMD64Address;
-import jdk.compiler.graal.asm.amd64.AMD64Assembler.ConditionFlag;
-import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler;
-import jdk.compiler.graal.asm.amd64.AVXKind.AVXSize;
-import jdk.compiler.graal.core.common.LIRKind;
-import jdk.compiler.graal.core.common.Stride;
-import jdk.compiler.graal.lir.LIRInstructionClass;
-import jdk.compiler.graal.lir.Opcode;
-import jdk.compiler.graal.lir.asm.CompilationResultBuilder;
-import jdk.compiler.graal.lir.gen.LIRGeneratorTool;
+import jdk.graal.compiler.asm.Label;
+import jdk.graal.compiler.asm.amd64.AMD64Address;
+import jdk.graal.compiler.asm.amd64.AMD64Assembler.ConditionFlag;
+import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler;
+import jdk.graal.compiler.asm.amd64.AVXKind.AVXSize;
+import jdk.graal.compiler.core.common.LIRKind;
+import jdk.graal.compiler.core.common.Stride;
+import jdk.graal.compiler.lir.LIRInstructionClass;
+import jdk.graal.compiler.lir.Opcode;
+import jdk.graal.compiler.lir.asm.CompilationResultBuilder;
+import jdk.graal.compiler.lir.gen.LIRGeneratorTool;
 
 import jdk.vm.ci.amd64.AMD64;
 import jdk.vm.ci.amd64.AMD64.CPUFeature;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64StringUTF16CompressOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64StringUTF16CompressOp.java
similarity index 95%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64StringUTF16CompressOp.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64StringUTF16CompressOp.java
index 7355fec0dcc8..631a0052d2ba 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64StringUTF16CompressOp.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64StringUTF16CompressOp.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.lir.amd64;
+package jdk.graal.compiler.lir.amd64;
 
 import static jdk.vm.ci.amd64.AMD64.k2;
 import static jdk.vm.ci.amd64.AMD64.k3;
@@ -35,18 +35,18 @@
 
 import java.util.EnumSet;
 
-import jdk.compiler.graal.asm.Label;
-import jdk.compiler.graal.asm.amd64.AMD64Address;
-import jdk.compiler.graal.asm.amd64.AMD64Assembler.ConditionFlag;
-import jdk.compiler.graal.asm.amd64.AMD64BaseAssembler.EVEXComparisonPredicate;
-import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler;
-import jdk.compiler.graal.asm.amd64.AVXKind.AVXSize;
-import jdk.compiler.graal.core.common.LIRKind;
-import jdk.compiler.graal.core.common.Stride;
-import jdk.compiler.graal.lir.LIRInstructionClass;
-import jdk.compiler.graal.lir.Opcode;
-import jdk.compiler.graal.lir.asm.CompilationResultBuilder;
-import jdk.compiler.graal.lir.gen.LIRGeneratorTool;
+import jdk.graal.compiler.asm.Label;
+import jdk.graal.compiler.asm.amd64.AMD64Address;
+import jdk.graal.compiler.asm.amd64.AMD64Assembler.ConditionFlag;
+import jdk.graal.compiler.asm.amd64.AMD64BaseAssembler.EVEXComparisonPredicate;
+import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler;
+import jdk.graal.compiler.asm.amd64.AVXKind.AVXSize;
+import jdk.graal.compiler.core.common.LIRKind;
+import jdk.graal.compiler.core.common.Stride;
+import jdk.graal.compiler.lir.LIRInstructionClass;
+import jdk.graal.compiler.lir.Opcode;
+import jdk.graal.compiler.lir.asm.CompilationResultBuilder;
+import jdk.graal.compiler.lir.gen.LIRGeneratorTool;
 
 import jdk.vm.ci.amd64.AMD64;
 import jdk.vm.ci.amd64.AMD64.CPUFeature;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64Ternary.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64Ternary.java
similarity index 86%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64Ternary.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64Ternary.java
index 97c74ebeae32..a9c4a2b1a2b8 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64Ternary.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64Ternary.java
@@ -22,21 +22,21 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.lir.amd64;
+package jdk.graal.compiler.lir.amd64;
 
 import static jdk.vm.ci.code.ValueUtil.asRegister;
 import static jdk.vm.ci.code.ValueUtil.isRegister;
 import static jdk.vm.ci.code.ValueUtil.isStackSlot;
 
-import jdk.compiler.graal.asm.amd64.AMD64Address;
-import jdk.compiler.graal.asm.amd64.AMD64Assembler.VexRVMOp;
-import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler;
-import jdk.compiler.graal.asm.amd64.AVXKind.AVXSize;
-import jdk.compiler.graal.lir.LIRInstruction;
-import jdk.compiler.graal.lir.LIRInstructionClass;
-import jdk.compiler.graal.lir.Opcode;
-import jdk.compiler.graal.lir.asm.CompilationResultBuilder;
-import jdk.compiler.graal.lir.amd64.vector.AMD64VectorInstruction;
+import jdk.graal.compiler.asm.amd64.AMD64Address;
+import jdk.graal.compiler.asm.amd64.AMD64Assembler.VexRVMOp;
+import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler;
+import jdk.graal.compiler.asm.amd64.AVXKind.AVXSize;
+import jdk.graal.compiler.lir.LIRInstruction;
+import jdk.graal.compiler.lir.LIRInstructionClass;
+import jdk.graal.compiler.lir.Opcode;
+import jdk.graal.compiler.lir.asm.CompilationResultBuilder;
+import jdk.graal.compiler.lir.amd64.vector.AMD64VectorInstruction;
 
 import jdk.vm.ci.meta.AllocatableValue;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64Unary.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64Unary.java
similarity index 91%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64Unary.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64Unary.java
index b2ba534f8330..42aba2d57d63 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64Unary.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64Unary.java
@@ -22,23 +22,23 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.lir.amd64;
+package jdk.graal.compiler.lir.amd64;
 
 import static jdk.vm.ci.code.ValueUtil.asRegister;
 import static jdk.vm.ci.code.ValueUtil.isRegister;
 import static jdk.vm.ci.code.ValueUtil.isStackSlot;
 
-import jdk.compiler.graal.asm.amd64.AMD64Address;
-import jdk.compiler.graal.asm.amd64.AMD64Assembler.AMD64MOp;
-import jdk.compiler.graal.asm.amd64.AMD64Assembler.AMD64MROp;
-import jdk.compiler.graal.asm.amd64.AMD64Assembler.AMD64RMOp;
-import jdk.compiler.graal.asm.amd64.AMD64BaseAssembler.OperandSize;
-import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler;
-import jdk.compiler.graal.lir.LIRFrameState;
-import jdk.compiler.graal.lir.LIRInstructionClass;
-import jdk.compiler.graal.lir.Opcode;
-import jdk.compiler.graal.lir.StandardOp;
-import jdk.compiler.graal.lir.asm.CompilationResultBuilder;
+import jdk.graal.compiler.asm.amd64.AMD64Address;
+import jdk.graal.compiler.asm.amd64.AMD64Assembler.AMD64MOp;
+import jdk.graal.compiler.asm.amd64.AMD64Assembler.AMD64MROp;
+import jdk.graal.compiler.asm.amd64.AMD64Assembler.AMD64RMOp;
+import jdk.graal.compiler.asm.amd64.AMD64BaseAssembler.OperandSize;
+import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler;
+import jdk.graal.compiler.lir.LIRFrameState;
+import jdk.graal.compiler.lir.LIRInstructionClass;
+import jdk.graal.compiler.lir.Opcode;
+import jdk.graal.compiler.lir.StandardOp;
+import jdk.graal.compiler.lir.asm.CompilationResultBuilder;
 
 import jdk.vm.ci.meta.AllocatableValue;
 import jdk.vm.ci.meta.Value;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64UnaryConsumer.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64UnaryConsumer.java
similarity index 85%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64UnaryConsumer.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64UnaryConsumer.java
index ac59d1803495..722be7d78079 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64UnaryConsumer.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64UnaryConsumer.java
@@ -22,14 +22,14 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.lir.amd64;
-
-import jdk.compiler.graal.asm.amd64.AMD64Assembler.AMD64MOp;
-import jdk.compiler.graal.asm.amd64.AMD64BaseAssembler.OperandSize;
-import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler;
-import jdk.compiler.graal.lir.LIRInstructionClass;
-import jdk.compiler.graal.lir.Opcode;
-import jdk.compiler.graal.lir.asm.CompilationResultBuilder;
+package jdk.graal.compiler.lir.amd64;
+
+import jdk.graal.compiler.asm.amd64.AMD64Assembler.AMD64MOp;
+import jdk.graal.compiler.asm.amd64.AMD64BaseAssembler.OperandSize;
+import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler;
+import jdk.graal.compiler.lir.LIRInstructionClass;
+import jdk.graal.compiler.lir.Opcode;
+import jdk.graal.compiler.lir.asm.CompilationResultBuilder;
 
 /**
  * AMD64 LIR instructions that have one input and no output.
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64VZeroUpper.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64VZeroUpper.java
similarity index 95%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64VZeroUpper.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64VZeroUpper.java
index bca87402d544..739d4a1cc055 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64VZeroUpper.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64VZeroUpper.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.lir.amd64;
+package jdk.graal.compiler.lir.amd64;
 
 import static jdk.vm.ci.code.ValueUtil.asRegister;
 import static jdk.vm.ci.code.ValueUtil.isRegister;
@@ -30,10 +30,10 @@
 import java.util.ArrayList;
 import java.util.BitSet;
 
-import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler;
-import jdk.compiler.graal.lir.LIRInstructionClass;
-import jdk.compiler.graal.lir.asm.CompilationResultBuilder;
-import jdk.compiler.graal.lir.amd64.vector.AMD64VectorInstruction;
+import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler;
+import jdk.graal.compiler.lir.LIRInstructionClass;
+import jdk.graal.compiler.lir.asm.CompilationResultBuilder;
+import jdk.graal.compiler.lir.amd64.vector.AMD64VectorInstruction;
 
 import jdk.vm.ci.amd64.AMD64;
 import jdk.vm.ci.code.Register;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64VectorizedHashCodeOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64VectorizedHashCodeOp.java
similarity index 88%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64VectorizedHashCodeOp.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64VectorizedHashCodeOp.java
index 1506e9db6aa8..182acde59ba7 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64VectorizedHashCodeOp.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64VectorizedHashCodeOp.java
@@ -22,51 +22,51 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.lir.amd64;
+package jdk.graal.compiler.lir.amd64;
 
 import static jdk.vm.ci.amd64.AMD64Kind.QWORD;
 import static jdk.vm.ci.code.ValueUtil.asRegister;
-import static jdk.compiler.graal.asm.amd64.AMD64Assembler.VexMRIOp.VEXTRACTI128;
-import static jdk.compiler.graal.asm.amd64.AMD64Assembler.VexMoveOp.VMOVDQU32;
-import static jdk.compiler.graal.asm.amd64.AMD64Assembler.VexRMOp.VPBROADCASTD;
-import static jdk.compiler.graal.asm.amd64.AMD64Assembler.VexRMOp.VPMOVSXBD;
-import static jdk.compiler.graal.asm.amd64.AMD64Assembler.VexRMOp.VPMOVSXBQ;
-import static jdk.compiler.graal.asm.amd64.AMD64Assembler.VexRMOp.VPMOVSXBW;
-import static jdk.compiler.graal.asm.amd64.AMD64Assembler.VexRMOp.VPMOVSXDQ;
-import static jdk.compiler.graal.asm.amd64.AMD64Assembler.VexRMOp.VPMOVSXWD;
-import static jdk.compiler.graal.asm.amd64.AMD64Assembler.VexRMOp.VPMOVSXWQ;
-import static jdk.compiler.graal.asm.amd64.AMD64Assembler.VexRMOp.VPMOVZXBD;
-import static jdk.compiler.graal.asm.amd64.AMD64Assembler.VexRMOp.VPMOVZXBQ;
-import static jdk.compiler.graal.asm.amd64.AMD64Assembler.VexRMOp.VPMOVZXBW;
-import static jdk.compiler.graal.asm.amd64.AMD64Assembler.VexRMOp.VPMOVZXDQ;
-import static jdk.compiler.graal.asm.amd64.AMD64Assembler.VexRMOp.VPMOVZXWD;
-import static jdk.compiler.graal.asm.amd64.AMD64Assembler.VexRMOp.VPMOVZXWQ;
-import static jdk.compiler.graal.asm.amd64.AMD64Assembler.VexRVMOp.VPADDB;
-import static jdk.compiler.graal.asm.amd64.AMD64Assembler.VexRVMOp.VPADDD;
-import static jdk.compiler.graal.asm.amd64.AMD64Assembler.VexRVMOp.VPADDW;
-import static jdk.compiler.graal.asm.amd64.AMD64Assembler.VexRVMOp.VPHADDD;
-import static jdk.compiler.graal.asm.amd64.AMD64Assembler.VexRVMOp.VPMULLD;
-import static jdk.compiler.graal.asm.amd64.AVXKind.AVXSize.XMM;
-import static jdk.compiler.graal.asm.amd64.AVXKind.AVXSize.YMM;
-import static jdk.compiler.graal.asm.amd64.AVXKind.AVXSize.ZMM;
-import static jdk.compiler.graal.lir.amd64.AMD64LIRHelper.pointerConstant;
-import static jdk.compiler.graal.lir.amd64.AMD64LIRHelper.recordExternalAddress;
+import static jdk.graal.compiler.asm.amd64.AMD64Assembler.VexMRIOp.VEXTRACTI128;
+import static jdk.graal.compiler.asm.amd64.AMD64Assembler.VexMoveOp.VMOVDQU32;
+import static jdk.graal.compiler.asm.amd64.AMD64Assembler.VexRMOp.VPBROADCASTD;
+import static jdk.graal.compiler.asm.amd64.AMD64Assembler.VexRMOp.VPMOVSXBD;
+import static jdk.graal.compiler.asm.amd64.AMD64Assembler.VexRMOp.VPMOVSXBQ;
+import static jdk.graal.compiler.asm.amd64.AMD64Assembler.VexRMOp.VPMOVSXBW;
+import static jdk.graal.compiler.asm.amd64.AMD64Assembler.VexRMOp.VPMOVSXDQ;
+import static jdk.graal.compiler.asm.amd64.AMD64Assembler.VexRMOp.VPMOVSXWD;
+import static jdk.graal.compiler.asm.amd64.AMD64Assembler.VexRMOp.VPMOVSXWQ;
+import static jdk.graal.compiler.asm.amd64.AMD64Assembler.VexRMOp.VPMOVZXBD;
+import static jdk.graal.compiler.asm.amd64.AMD64Assembler.VexRMOp.VPMOVZXBQ;
+import static jdk.graal.compiler.asm.amd64.AMD64Assembler.VexRMOp.VPMOVZXBW;
+import static jdk.graal.compiler.asm.amd64.AMD64Assembler.VexRMOp.VPMOVZXDQ;
+import static jdk.graal.compiler.asm.amd64.AMD64Assembler.VexRMOp.VPMOVZXWD;
+import static jdk.graal.compiler.asm.amd64.AMD64Assembler.VexRMOp.VPMOVZXWQ;
+import static jdk.graal.compiler.asm.amd64.AMD64Assembler.VexRVMOp.VPADDB;
+import static jdk.graal.compiler.asm.amd64.AMD64Assembler.VexRVMOp.VPADDD;
+import static jdk.graal.compiler.asm.amd64.AMD64Assembler.VexRVMOp.VPADDW;
+import static jdk.graal.compiler.asm.amd64.AMD64Assembler.VexRVMOp.VPHADDD;
+import static jdk.graal.compiler.asm.amd64.AMD64Assembler.VexRVMOp.VPMULLD;
+import static jdk.graal.compiler.asm.amd64.AVXKind.AVXSize.XMM;
+import static jdk.graal.compiler.asm.amd64.AVXKind.AVXSize.YMM;
+import static jdk.graal.compiler.asm.amd64.AVXKind.AVXSize.ZMM;
+import static jdk.graal.compiler.lir.amd64.AMD64LIRHelper.pointerConstant;
+import static jdk.graal.compiler.lir.amd64.AMD64LIRHelper.recordExternalAddress;
 
 import java.util.EnumSet;
 
-import jdk.compiler.graal.asm.Label;
-import jdk.compiler.graal.asm.amd64.AMD64Address;
-import jdk.compiler.graal.asm.amd64.AMD64Assembler.ConditionFlag;
-import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler;
-import jdk.compiler.graal.asm.amd64.AVXKind;
-import jdk.compiler.graal.core.common.Stride;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.lir.LIRInstructionClass;
-import jdk.compiler.graal.lir.Opcode;
-import jdk.compiler.graal.lir.SyncPort;
-import jdk.compiler.graal.lir.asm.ArrayDataPointerConstant;
-import jdk.compiler.graal.lir.asm.CompilationResultBuilder;
-import jdk.compiler.graal.lir.gen.LIRGeneratorTool;
+import jdk.graal.compiler.asm.Label;
+import jdk.graal.compiler.asm.amd64.AMD64Address;
+import jdk.graal.compiler.asm.amd64.AMD64Assembler.ConditionFlag;
+import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler;
+import jdk.graal.compiler.asm.amd64.AVXKind;
+import jdk.graal.compiler.core.common.Stride;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.lir.LIRInstructionClass;
+import jdk.graal.compiler.lir.Opcode;
+import jdk.graal.compiler.lir.SyncPort;
+import jdk.graal.compiler.lir.asm.ArrayDataPointerConstant;
+import jdk.graal.compiler.lir.asm.CompilationResultBuilder;
+import jdk.graal.compiler.lir.gen.LIRGeneratorTool;
 
 import jdk.vm.ci.amd64.AMD64.CPUFeature;
 import jdk.vm.ci.code.Register;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64VectorizedMismatchOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64VectorizedMismatchOp.java
similarity index 94%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64VectorizedMismatchOp.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64VectorizedMismatchOp.java
index ae85c265bf27..47b8777d8e0e 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64VectorizedMismatchOp.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64VectorizedMismatchOp.java
@@ -22,32 +22,32 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.lir.amd64;
+package jdk.graal.compiler.lir.amd64;
 
 import static jdk.vm.ci.amd64.AMD64.rcx;
 import static jdk.vm.ci.amd64.AMD64.rdi;
 import static jdk.vm.ci.amd64.AMD64.rdx;
 import static jdk.vm.ci.amd64.AMD64.rsi;
 import static jdk.vm.ci.code.ValueUtil.asRegister;
-import static jdk.compiler.graal.asm.amd64.AVXKind.AVXSize.DWORD;
-import static jdk.compiler.graal.asm.amd64.AVXKind.AVXSize.QWORD;
-import static jdk.compiler.graal.asm.amd64.AVXKind.AVXSize.XMM;
-import static jdk.compiler.graal.asm.amd64.AVXKind.AVXSize.YMM;
+import static jdk.graal.compiler.asm.amd64.AVXKind.AVXSize.DWORD;
+import static jdk.graal.compiler.asm.amd64.AVXKind.AVXSize.QWORD;
+import static jdk.graal.compiler.asm.amd64.AVXKind.AVXSize.XMM;
+import static jdk.graal.compiler.asm.amd64.AVXKind.AVXSize.YMM;
 
 import java.util.EnumSet;
 
-import jdk.compiler.graal.asm.Label;
-import jdk.compiler.graal.asm.amd64.AMD64Address;
-import jdk.compiler.graal.asm.amd64.AMD64Assembler;
-import jdk.compiler.graal.asm.amd64.AMD64Assembler.ConditionFlag;
-import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler;
-import jdk.compiler.graal.core.common.Stride;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.lir.LIRInstructionClass;
-import jdk.compiler.graal.lir.Opcode;
-import jdk.compiler.graal.lir.SyncPort;
-import jdk.compiler.graal.lir.asm.CompilationResultBuilder;
-import jdk.compiler.graal.lir.gen.LIRGeneratorTool;
+import jdk.graal.compiler.asm.Label;
+import jdk.graal.compiler.asm.amd64.AMD64Address;
+import jdk.graal.compiler.asm.amd64.AMD64Assembler;
+import jdk.graal.compiler.asm.amd64.AMD64Assembler.ConditionFlag;
+import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler;
+import jdk.graal.compiler.core.common.Stride;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.lir.LIRInstructionClass;
+import jdk.graal.compiler.lir.Opcode;
+import jdk.graal.compiler.lir.SyncPort;
+import jdk.graal.compiler.lir.asm.CompilationResultBuilder;
+import jdk.graal.compiler.lir.gen.LIRGeneratorTool;
 
 import jdk.vm.ci.amd64.AMD64.CPUFeature;
 import jdk.vm.ci.amd64.AMD64Kind;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64ZapRegistersOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64ZapRegistersOp.java
similarity index 91%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64ZapRegistersOp.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64ZapRegistersOp.java
index 38de91e210bb..5963f74766f7 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64ZapRegistersOp.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64ZapRegistersOp.java
@@ -22,13 +22,13 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.lir.amd64;
+package jdk.graal.compiler.lir.amd64;
 
-import jdk.compiler.graal.asm.amd64.AMD64Address;
-import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler;
-import jdk.compiler.graal.lir.LIRInstructionClass;
-import jdk.compiler.graal.lir.Opcode;
-import jdk.compiler.graal.lir.asm.CompilationResultBuilder;
+import jdk.graal.compiler.asm.amd64.AMD64Address;
+import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler;
+import jdk.graal.compiler.lir.LIRInstructionClass;
+import jdk.graal.compiler.lir.Opcode;
+import jdk.graal.compiler.lir.asm.CompilationResultBuilder;
 
 import jdk.vm.ci.amd64.AMD64;
 import jdk.vm.ci.amd64.AMD64Kind;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64ZapStackOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64ZapStackOp.java
similarity index 90%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64ZapStackOp.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64ZapStackOp.java
index 26e389a405d2..815cffd1003d 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64ZapStackOp.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64ZapStackOp.java
@@ -22,12 +22,12 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.lir.amd64;
+package jdk.graal.compiler.lir.amd64;
 
-import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler;
-import jdk.compiler.graal.lir.LIRInstructionClass;
-import jdk.compiler.graal.lir.Opcode;
-import jdk.compiler.graal.lir.asm.CompilationResultBuilder;
+import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler;
+import jdk.graal.compiler.lir.LIRInstructionClass;
+import jdk.graal.compiler.lir.Opcode;
+import jdk.graal.compiler.lir.asm.CompilationResultBuilder;
 
 import jdk.vm.ci.code.StackSlot;
 import jdk.vm.ci.meta.JavaConstant;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64ZeroMemoryOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64ZeroMemoryOp.java
similarity index 89%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64ZeroMemoryOp.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64ZeroMemoryOp.java
index f559ef2d93a9..e32e77831cc7 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64ZeroMemoryOp.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/AMD64ZeroMemoryOp.java
@@ -22,13 +22,13 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.lir.amd64;
+package jdk.graal.compiler.lir.amd64;
 
-import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler;
-import jdk.compiler.graal.core.common.LIRKind;
-import jdk.compiler.graal.lir.LIRInstructionClass;
-import jdk.compiler.graal.lir.Opcode;
-import jdk.compiler.graal.lir.asm.CompilationResultBuilder;
+import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler;
+import jdk.graal.compiler.core.common.LIRKind;
+import jdk.graal.compiler.lir.LIRInstructionClass;
+import jdk.graal.compiler.lir.Opcode;
+import jdk.graal.compiler.lir.asm.CompilationResultBuilder;
 
 import jdk.vm.ci.amd64.AMD64;
 import jdk.vm.ci.amd64.AMD64Kind;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/EndbranchOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/EndbranchOp.java
similarity index 85%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/EndbranchOp.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/EndbranchOp.java
index 8d86b07c68ac..d915146c8cba 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/EndbranchOp.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/EndbranchOp.java
@@ -22,13 +22,13 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.lir.amd64;
+package jdk.graal.compiler.lir.amd64;
 
-import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler;
-import jdk.compiler.graal.lir.LIRInstruction;
-import jdk.compiler.graal.lir.LIRInstructionClass;
-import jdk.compiler.graal.lir.Opcode;
-import jdk.compiler.graal.lir.asm.CompilationResultBuilder;
+import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler;
+import jdk.graal.compiler.lir.LIRInstruction;
+import jdk.graal.compiler.lir.LIRInstructionClass;
+import jdk.graal.compiler.lir.Opcode;
+import jdk.graal.compiler.lir.asm.CompilationResultBuilder;
 
 @Opcode("ENDBR64")
 public final class EndbranchOp extends AMD64LIRInstruction {
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/phases/StackMoveOptimizationPhase.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/phases/StackMoveOptimizationPhase.java
similarity index 89%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/phases/StackMoveOptimizationPhase.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/phases/StackMoveOptimizationPhase.java
index 03abdd982b20..0967dd67cfb8 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/phases/StackMoveOptimizationPhase.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/phases/StackMoveOptimizationPhase.java
@@ -22,25 +22,25 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.lir.amd64.phases;
+package jdk.graal.compiler.lir.amd64.phases;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import jdk.compiler.graal.core.common.cfg.BasicBlock;
-import jdk.compiler.graal.debug.CounterKey;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.lir.LIR;
-import jdk.compiler.graal.lir.LIRInstruction;
-import jdk.compiler.graal.lir.RedundantMoveElimination;
-import jdk.compiler.graal.lir.amd64.AMD64Move;
-import jdk.compiler.graal.lir.gen.LIRGenerationResult;
-import jdk.compiler.graal.lir.phases.LIRPhase;
-import jdk.compiler.graal.lir.phases.PostAllocationOptimizationPhase;
-import jdk.compiler.graal.options.NestedBooleanOptionKey;
-import jdk.compiler.graal.options.Option;
-import jdk.compiler.graal.options.OptionType;
+import jdk.graal.compiler.core.common.cfg.BasicBlock;
+import jdk.graal.compiler.debug.CounterKey;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.lir.LIR;
+import jdk.graal.compiler.lir.LIRInstruction;
+import jdk.graal.compiler.lir.RedundantMoveElimination;
+import jdk.graal.compiler.lir.amd64.AMD64Move;
+import jdk.graal.compiler.lir.gen.LIRGenerationResult;
+import jdk.graal.compiler.lir.phases.LIRPhase;
+import jdk.graal.compiler.lir.phases.PostAllocationOptimizationPhase;
+import jdk.graal.compiler.options.NestedBooleanOptionKey;
+import jdk.graal.compiler.options.Option;
+import jdk.graal.compiler.options.OptionType;
 
 import jdk.vm.ci.code.Register;
 import jdk.vm.ci.code.TargetDescription;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/vector/AMD64VectorBinary.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/vector/AMD64VectorBinary.java
similarity index 89%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/vector/AMD64VectorBinary.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/vector/AMD64VectorBinary.java
index 57b506e8a054..b780ef63a3eb 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/vector/AMD64VectorBinary.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/vector/AMD64VectorBinary.java
@@ -22,24 +22,24 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.lir.amd64.vector;
+package jdk.graal.compiler.lir.amd64.vector;
 
 import static jdk.vm.ci.code.ValueUtil.asRegister;
 import static jdk.vm.ci.code.ValueUtil.isRegister;
-import static jdk.compiler.graal.asm.amd64.AMD64BaseAssembler.OperandSize.PD;
-import static jdk.compiler.graal.asm.amd64.AMD64BaseAssembler.OperandSize.PS;
-
-import jdk.compiler.graal.asm.amd64.AMD64Address;
-import jdk.compiler.graal.asm.amd64.AMD64Assembler.VexRRIOp;
-import jdk.compiler.graal.asm.amd64.AMD64Assembler.VexRVMOp;
-import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler;
-import jdk.compiler.graal.asm.amd64.AVXKind;
-import jdk.compiler.graal.lir.ConstantValue;
-import jdk.compiler.graal.lir.LIRFrameState;
-import jdk.compiler.graal.lir.LIRInstructionClass;
-import jdk.compiler.graal.lir.Opcode;
-import jdk.compiler.graal.lir.amd64.AMD64AddressValue;
-import jdk.compiler.graal.lir.asm.CompilationResultBuilder;
+import static jdk.graal.compiler.asm.amd64.AMD64BaseAssembler.OperandSize.PD;
+import static jdk.graal.compiler.asm.amd64.AMD64BaseAssembler.OperandSize.PS;
+
+import jdk.graal.compiler.asm.amd64.AMD64Address;
+import jdk.graal.compiler.asm.amd64.AMD64Assembler.VexRRIOp;
+import jdk.graal.compiler.asm.amd64.AMD64Assembler.VexRVMOp;
+import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler;
+import jdk.graal.compiler.asm.amd64.AVXKind;
+import jdk.graal.compiler.lir.ConstantValue;
+import jdk.graal.compiler.lir.LIRFrameState;
+import jdk.graal.compiler.lir.LIRInstructionClass;
+import jdk.graal.compiler.lir.Opcode;
+import jdk.graal.compiler.lir.amd64.AMD64AddressValue;
+import jdk.graal.compiler.lir.asm.CompilationResultBuilder;
 
 import jdk.vm.ci.amd64.AMD64Kind;
 import jdk.vm.ci.meta.AllocatableValue;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/vector/AMD64VectorBlend.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/vector/AMD64VectorBlend.java
similarity index 90%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/vector/AMD64VectorBlend.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/vector/AMD64VectorBlend.java
index 9fc3ce2ed752..57ff303721d9 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/vector/AMD64VectorBlend.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/vector/AMD64VectorBlend.java
@@ -22,19 +22,19 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.lir.amd64.vector;
+package jdk.graal.compiler.lir.amd64.vector;
 
 import static jdk.vm.ci.code.ValueUtil.asRegister;
 import static jdk.vm.ci.code.ValueUtil.isRegister;
 
-import jdk.compiler.graal.asm.amd64.AMD64Address;
-import jdk.compiler.graal.asm.amd64.AMD64Assembler;
-import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler;
-import jdk.compiler.graal.asm.amd64.AVXKind;
-import jdk.compiler.graal.lir.LIRInstructionClass;
-import jdk.compiler.graal.lir.Opcode;
-import jdk.compiler.graal.lir.amd64.AMD64LIRInstruction;
-import jdk.compiler.graal.lir.asm.CompilationResultBuilder;
+import jdk.graal.compiler.asm.amd64.AMD64Address;
+import jdk.graal.compiler.asm.amd64.AMD64Assembler;
+import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler;
+import jdk.graal.compiler.asm.amd64.AVXKind;
+import jdk.graal.compiler.lir.LIRInstructionClass;
+import jdk.graal.compiler.lir.Opcode;
+import jdk.graal.compiler.lir.amd64.AMD64LIRInstruction;
+import jdk.graal.compiler.lir.asm.CompilationResultBuilder;
 
 import jdk.vm.ci.meta.AllocatableValue;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/vector/AMD64VectorClearOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/vector/AMD64VectorClearOp.java
similarity index 82%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/vector/AMD64VectorClearOp.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/vector/AMD64VectorClearOp.java
index c468d2332e74..7b454d0cc68a 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/vector/AMD64VectorClearOp.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/vector/AMD64VectorClearOp.java
@@ -22,19 +22,19 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.lir.amd64.vector;
+package jdk.graal.compiler.lir.amd64.vector;
 
 import static jdk.vm.ci.code.ValueUtil.asRegister;
-import static jdk.compiler.graal.asm.amd64.AMD64Assembler.VexRVMOp.VPXOR;
-import static jdk.compiler.graal.asm.amd64.AMD64Assembler.VexRVMOp.VXORPD;
-import static jdk.compiler.graal.asm.amd64.AMD64Assembler.VexRVMOp.VXORPS;
-import static jdk.compiler.graal.asm.amd64.AVXKind.AVXSize.XMM;
+import static jdk.graal.compiler.asm.amd64.AMD64Assembler.VexRVMOp.VPXOR;
+import static jdk.graal.compiler.asm.amd64.AMD64Assembler.VexRVMOp.VXORPD;
+import static jdk.graal.compiler.asm.amd64.AMD64Assembler.VexRVMOp.VXORPS;
+import static jdk.graal.compiler.asm.amd64.AVXKind.AVXSize.XMM;
 
-import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler;
-import jdk.compiler.graal.asm.amd64.AVXKind;
-import jdk.compiler.graal.lir.LIRInstructionClass;
-import jdk.compiler.graal.lir.amd64.AMD64LIRInstruction;
-import jdk.compiler.graal.lir.asm.CompilationResultBuilder;
+import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler;
+import jdk.graal.compiler.asm.amd64.AVXKind;
+import jdk.graal.compiler.lir.LIRInstructionClass;
+import jdk.graal.compiler.lir.amd64.AMD64LIRInstruction;
+import jdk.graal.compiler.lir.asm.CompilationResultBuilder;
 
 import jdk.vm.ci.amd64.AMD64Kind;
 import jdk.vm.ci.code.Register;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/vector/AMD64VectorCompareOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/vector/AMD64VectorCompareOp.java
similarity index 85%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/vector/AMD64VectorCompareOp.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/vector/AMD64VectorCompareOp.java
index 279b9ad15216..c71af6786a56 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/vector/AMD64VectorCompareOp.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/vector/AMD64VectorCompareOp.java
@@ -22,18 +22,18 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.lir.amd64.vector;
+package jdk.graal.compiler.lir.amd64.vector;
 
 import static jdk.vm.ci.code.ValueUtil.asRegister;
 import static jdk.vm.ci.code.ValueUtil.isRegister;
 
-import jdk.compiler.graal.asm.amd64.AMD64Address;
-import jdk.compiler.graal.asm.amd64.AMD64Assembler.VexRMOp;
-import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler;
-import jdk.compiler.graal.asm.amd64.AVXKind.AVXSize;
-import jdk.compiler.graal.lir.LIRInstructionClass;
-import jdk.compiler.graal.lir.Opcode;
-import jdk.compiler.graal.lir.asm.CompilationResultBuilder;
+import jdk.graal.compiler.asm.amd64.AMD64Address;
+import jdk.graal.compiler.asm.amd64.AMD64Assembler.VexRMOp;
+import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler;
+import jdk.graal.compiler.asm.amd64.AVXKind.AVXSize;
+import jdk.graal.compiler.lir.LIRInstructionClass;
+import jdk.graal.compiler.lir.Opcode;
+import jdk.graal.compiler.lir.asm.CompilationResultBuilder;
 
 import jdk.vm.ci.meta.AllocatableValue;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/vector/AMD64VectorFloatCompareOp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/vector/AMD64VectorFloatCompareOp.java
similarity index 84%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/vector/AMD64VectorFloatCompareOp.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/vector/AMD64VectorFloatCompareOp.java
index 9819e3aacf95..7e219e51b8c6 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/vector/AMD64VectorFloatCompareOp.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/vector/AMD64VectorFloatCompareOp.java
@@ -22,19 +22,19 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.lir.amd64.vector;
+package jdk.graal.compiler.lir.amd64.vector;
 
 import static jdk.vm.ci.code.ValueUtil.asRegister;
 import static jdk.vm.ci.code.ValueUtil.isRegister;
 
-import jdk.compiler.graal.asm.amd64.AMD64Address;
-import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler;
-import jdk.compiler.graal.asm.amd64.AMD64Assembler.VexFloatCompareOp;
-import jdk.compiler.graal.asm.amd64.AVXKind.AVXSize;
-import jdk.compiler.graal.lir.LIRInstructionClass;
-import jdk.compiler.graal.lir.Opcode;
-import jdk.compiler.graal.lir.amd64.AMD64LIRInstruction;
-import jdk.compiler.graal.lir.asm.CompilationResultBuilder;
+import jdk.graal.compiler.asm.amd64.AMD64Address;
+import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler;
+import jdk.graal.compiler.asm.amd64.AMD64Assembler.VexFloatCompareOp;
+import jdk.graal.compiler.asm.amd64.AVXKind.AVXSize;
+import jdk.graal.compiler.lir.LIRInstructionClass;
+import jdk.graal.compiler.lir.Opcode;
+import jdk.graal.compiler.lir.amd64.AMD64LIRInstruction;
+import jdk.graal.compiler.lir.asm.CompilationResultBuilder;
 
 import jdk.vm.ci.meta.AllocatableValue;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/vector/AMD64VectorGather.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/vector/AMD64VectorGather.java
similarity index 89%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/vector/AMD64VectorGather.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/vector/AMD64VectorGather.java
index 04603cb9a52a..ef7a01dc71e9 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/vector/AMD64VectorGather.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/vector/AMD64VectorGather.java
@@ -22,20 +22,20 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.lir.amd64.vector;
+package jdk.graal.compiler.lir.amd64.vector;
 
 import static jdk.vm.ci.code.ValueUtil.asRegister;
 
-import jdk.compiler.graal.asm.amd64.AMD64Address;
-import jdk.compiler.graal.asm.amd64.AMD64Assembler;
-import jdk.compiler.graal.asm.amd64.AMD64BaseAssembler.EVEXPrefixConfig;
-import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler;
-import jdk.compiler.graal.asm.amd64.AVXKind;
-import jdk.compiler.graal.core.common.Stride;
-import jdk.compiler.graal.lir.LIRInstructionClass;
-import jdk.compiler.graal.lir.Opcode;
-import jdk.compiler.graal.lir.amd64.AMD64LIRInstruction;
-import jdk.compiler.graal.lir.asm.CompilationResultBuilder;
+import jdk.graal.compiler.asm.amd64.AMD64Address;
+import jdk.graal.compiler.asm.amd64.AMD64Assembler;
+import jdk.graal.compiler.asm.amd64.AMD64BaseAssembler.EVEXPrefixConfig;
+import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler;
+import jdk.graal.compiler.asm.amd64.AVXKind;
+import jdk.graal.compiler.core.common.Stride;
+import jdk.graal.compiler.lir.LIRInstructionClass;
+import jdk.graal.compiler.lir.Opcode;
+import jdk.graal.compiler.lir.amd64.AMD64LIRInstruction;
+import jdk.graal.compiler.lir.asm.CompilationResultBuilder;
 
 import jdk.vm.ci.meta.AllocatableValue;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/vector/AMD64VectorInstruction.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/vector/AMD64VectorInstruction.java
similarity index 89%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/vector/AMD64VectorInstruction.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/vector/AMD64VectorInstruction.java
index 815071bdbd29..d676d7c4b0e4 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/vector/AMD64VectorInstruction.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/vector/AMD64VectorInstruction.java
@@ -22,11 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.lir.amd64.vector;
+package jdk.graal.compiler.lir.amd64.vector;
 
-import jdk.compiler.graal.asm.amd64.AVXKind.AVXSize;
-import jdk.compiler.graal.lir.LIRInstructionClass;
-import jdk.compiler.graal.lir.amd64.AMD64LIRInstruction;
+import jdk.graal.compiler.asm.amd64.AVXKind.AVXSize;
+import jdk.graal.compiler.lir.LIRInstructionClass;
+import jdk.graal.compiler.lir.amd64.AMD64LIRInstruction;
 
 public abstract class AMD64VectorInstruction extends AMD64LIRInstruction {
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/vector/AMD64VectorMove.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/vector/AMD64VectorMove.java
similarity index 91%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/vector/AMD64VectorMove.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/vector/AMD64VectorMove.java
index 164ca23de8f3..ca725c201ead 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/vector/AMD64VectorMove.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/vector/AMD64VectorMove.java
@@ -22,37 +22,37 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.lir.amd64.vector;
+package jdk.graal.compiler.lir.amd64.vector;
 
 import static jdk.vm.ci.code.ValueUtil.asRegister;
 import static jdk.vm.ci.code.ValueUtil.isRegister;
 import static jdk.vm.ci.code.ValueUtil.isStackSlot;
-import static jdk.compiler.graal.asm.amd64.AMD64Assembler.VexMoveOp.VMOVD;
-import static jdk.compiler.graal.asm.amd64.AMD64Assembler.VexMoveOp.VMOVDQU32;
-import static jdk.compiler.graal.asm.amd64.AMD64Assembler.VexMoveOp.VMOVQ;
-import static jdk.compiler.graal.asm.amd64.AMD64Assembler.VexMoveOp.VMOVSD;
-import static jdk.compiler.graal.asm.amd64.AMD64Assembler.VexMoveOp.VMOVSS;
-import static jdk.compiler.graal.asm.amd64.AMD64Assembler.VexMoveOp.VMOVUPD;
-import static jdk.compiler.graal.asm.amd64.AMD64Assembler.VexMoveOp.VMOVUPS;
-import static jdk.compiler.graal.asm.amd64.AMD64Assembler.VexRVMOp.VXORPD;
-
-import jdk.compiler.graal.asm.amd64.AMD64Address;
-import jdk.compiler.graal.asm.amd64.AMD64Assembler.VexMoveOp;
-import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler;
-import jdk.compiler.graal.asm.amd64.AVXKind;
-import jdk.compiler.graal.asm.amd64.AVXKind.AVXSize;
-import jdk.compiler.graal.core.common.type.DataPointerConstant;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.lir.LIRFrameState;
-import jdk.compiler.graal.lir.LIRInstructionClass;
-import jdk.compiler.graal.lir.Opcode;
-import jdk.compiler.graal.lir.StandardOp;
-import jdk.compiler.graal.lir.amd64.AMD64AddressValue;
-import jdk.compiler.graal.lir.amd64.AMD64LIRInstruction;
-import jdk.compiler.graal.lir.amd64.AMD64Move;
-import jdk.compiler.graal.lir.amd64.AMD64RestoreRegistersOp;
-import jdk.compiler.graal.lir.amd64.AMD64SaveRegistersOp;
-import jdk.compiler.graal.lir.asm.CompilationResultBuilder;
+import static jdk.graal.compiler.asm.amd64.AMD64Assembler.VexMoveOp.VMOVD;
+import static jdk.graal.compiler.asm.amd64.AMD64Assembler.VexMoveOp.VMOVDQU32;
+import static jdk.graal.compiler.asm.amd64.AMD64Assembler.VexMoveOp.VMOVQ;
+import static jdk.graal.compiler.asm.amd64.AMD64Assembler.VexMoveOp.VMOVSD;
+import static jdk.graal.compiler.asm.amd64.AMD64Assembler.VexMoveOp.VMOVSS;
+import static jdk.graal.compiler.asm.amd64.AMD64Assembler.VexMoveOp.VMOVUPD;
+import static jdk.graal.compiler.asm.amd64.AMD64Assembler.VexMoveOp.VMOVUPS;
+import static jdk.graal.compiler.asm.amd64.AMD64Assembler.VexRVMOp.VXORPD;
+
+import jdk.graal.compiler.asm.amd64.AMD64Address;
+import jdk.graal.compiler.asm.amd64.AMD64Assembler.VexMoveOp;
+import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler;
+import jdk.graal.compiler.asm.amd64.AVXKind;
+import jdk.graal.compiler.asm.amd64.AVXKind.AVXSize;
+import jdk.graal.compiler.core.common.type.DataPointerConstant;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.lir.LIRFrameState;
+import jdk.graal.compiler.lir.LIRInstructionClass;
+import jdk.graal.compiler.lir.Opcode;
+import jdk.graal.compiler.lir.StandardOp;
+import jdk.graal.compiler.lir.amd64.AMD64AddressValue;
+import jdk.graal.compiler.lir.amd64.AMD64LIRInstruction;
+import jdk.graal.compiler.lir.amd64.AMD64Move;
+import jdk.graal.compiler.lir.amd64.AMD64RestoreRegistersOp;
+import jdk.graal.compiler.lir.amd64.AMD64SaveRegistersOp;
+import jdk.graal.compiler.lir.asm.CompilationResultBuilder;
 
 import jdk.vm.ci.amd64.AMD64Kind;
 import jdk.vm.ci.code.Register;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/vector/AMD64VectorShuffle.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/vector/AMD64VectorShuffle.java
similarity index 90%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/vector/AMD64VectorShuffle.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/vector/AMD64VectorShuffle.java
index a0c3415bc560..ce2e02821119 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/vector/AMD64VectorShuffle.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/vector/AMD64VectorShuffle.java
@@ -22,59 +22,59 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.lir.amd64.vector;
+package jdk.graal.compiler.lir.amd64.vector;
 
 import static jdk.vm.ci.code.ValueUtil.asRegister;
 import static jdk.vm.ci.code.ValueUtil.isRegister;
 import static jdk.vm.ci.code.ValueUtil.isStackSlot;
-import static jdk.compiler.graal.asm.amd64.AMD64Assembler.VexMRIOp.VEXTRACTF128;
-import static jdk.compiler.graal.asm.amd64.AMD64Assembler.VexMRIOp.VEXTRACTF32X4;
-import static jdk.compiler.graal.asm.amd64.AMD64Assembler.VexMRIOp.VEXTRACTF32X8;
-import static jdk.compiler.graal.asm.amd64.AMD64Assembler.VexMRIOp.VEXTRACTF64X2;
-import static jdk.compiler.graal.asm.amd64.AMD64Assembler.VexMRIOp.VEXTRACTF64X4;
-import static jdk.compiler.graal.asm.amd64.AMD64Assembler.VexMRIOp.VEXTRACTI128;
-import static jdk.compiler.graal.asm.amd64.AMD64Assembler.VexMRIOp.VEXTRACTI32X4;
-import static jdk.compiler.graal.asm.amd64.AMD64Assembler.VexMRIOp.VEXTRACTI32X8;
-import static jdk.compiler.graal.asm.amd64.AMD64Assembler.VexMRIOp.VEXTRACTI64X2;
-import static jdk.compiler.graal.asm.amd64.AMD64Assembler.VexMRIOp.VEXTRACTI64X4;
-import static jdk.compiler.graal.asm.amd64.AMD64Assembler.VexMRIOp.VPEXTRB;
-import static jdk.compiler.graal.asm.amd64.AMD64Assembler.VexMRIOp.VPEXTRD;
-import static jdk.compiler.graal.asm.amd64.AMD64Assembler.VexMRIOp.VPEXTRQ;
-import static jdk.compiler.graal.asm.amd64.AMD64Assembler.VexMRIOp.VPEXTRW;
-import static jdk.compiler.graal.asm.amd64.AMD64Assembler.VexMoveOp.VMOVD;
-import static jdk.compiler.graal.asm.amd64.AMD64Assembler.VexMoveOp.VMOVDQU64;
-import static jdk.compiler.graal.asm.amd64.AMD64Assembler.VexMoveOp.VMOVQ;
-import static jdk.compiler.graal.asm.amd64.AMD64Assembler.VexRVMIOp.VINSERTF128;
-import static jdk.compiler.graal.asm.amd64.AMD64Assembler.VexRVMIOp.VINSERTF32X4;
-import static jdk.compiler.graal.asm.amd64.AMD64Assembler.VexRVMIOp.VINSERTF32X8;
-import static jdk.compiler.graal.asm.amd64.AMD64Assembler.VexRVMIOp.VINSERTF64X2;
-import static jdk.compiler.graal.asm.amd64.AMD64Assembler.VexRVMIOp.VINSERTF64X4;
-import static jdk.compiler.graal.asm.amd64.AMD64Assembler.VexRVMIOp.VINSERTI128;
-import static jdk.compiler.graal.asm.amd64.AMD64Assembler.VexRVMIOp.VINSERTI32X4;
-import static jdk.compiler.graal.asm.amd64.AMD64Assembler.VexRVMIOp.VINSERTI32X8;
-import static jdk.compiler.graal.asm.amd64.AMD64Assembler.VexRVMIOp.VINSERTI64X2;
-import static jdk.compiler.graal.asm.amd64.AMD64Assembler.VexRVMIOp.VINSERTI64X4;
-import static jdk.compiler.graal.asm.amd64.AMD64Assembler.VexRVMIOp.VSHUFPD;
-import static jdk.compiler.graal.asm.amd64.AMD64Assembler.VexRVMIOp.VSHUFPS;
-import static jdk.compiler.graal.asm.amd64.AMD64Assembler.VexRVMOp.VPERMT2B;
-import static jdk.compiler.graal.asm.amd64.AMD64Assembler.VexRVMOp.VPSHUFB;
-import static jdk.compiler.graal.asm.amd64.AMD64Assembler.VexRVMOp.VPXOR;
-import static jdk.compiler.graal.asm.amd64.AVXKind.AVXSize.XMM;
-import static jdk.compiler.graal.asm.amd64.AVXKind.AVXSize.ZMM;
-
-import jdk.compiler.graal.asm.amd64.AMD64Address;
-import jdk.compiler.graal.asm.amd64.AMD64Assembler.VexMRIOp;
-import jdk.compiler.graal.asm.amd64.AMD64Assembler.VexRMIOp;
-import jdk.compiler.graal.asm.amd64.AMD64Assembler.VexRVMIOp;
-import jdk.compiler.graal.asm.amd64.AMD64BaseAssembler;
-import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler;
-import jdk.compiler.graal.asm.amd64.AVXKind;
-import jdk.compiler.graal.core.common.LIRKind;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.lir.LIRInstructionClass;
-import jdk.compiler.graal.lir.amd64.AMD64LIRInstruction;
-import jdk.compiler.graal.lir.asm.CompilationResultBuilder;
-import jdk.compiler.graal.lir.gen.LIRGeneratorTool;
+import static jdk.graal.compiler.asm.amd64.AMD64Assembler.VexMRIOp.VEXTRACTF128;
+import static jdk.graal.compiler.asm.amd64.AMD64Assembler.VexMRIOp.VEXTRACTF32X4;
+import static jdk.graal.compiler.asm.amd64.AMD64Assembler.VexMRIOp.VEXTRACTF32X8;
+import static jdk.graal.compiler.asm.amd64.AMD64Assembler.VexMRIOp.VEXTRACTF64X2;
+import static jdk.graal.compiler.asm.amd64.AMD64Assembler.VexMRIOp.VEXTRACTF64X4;
+import static jdk.graal.compiler.asm.amd64.AMD64Assembler.VexMRIOp.VEXTRACTI128;
+import static jdk.graal.compiler.asm.amd64.AMD64Assembler.VexMRIOp.VEXTRACTI32X4;
+import static jdk.graal.compiler.asm.amd64.AMD64Assembler.VexMRIOp.VEXTRACTI32X8;
+import static jdk.graal.compiler.asm.amd64.AMD64Assembler.VexMRIOp.VEXTRACTI64X2;
+import static jdk.graal.compiler.asm.amd64.AMD64Assembler.VexMRIOp.VEXTRACTI64X4;
+import static jdk.graal.compiler.asm.amd64.AMD64Assembler.VexMRIOp.VPEXTRB;
+import static jdk.graal.compiler.asm.amd64.AMD64Assembler.VexMRIOp.VPEXTRD;
+import static jdk.graal.compiler.asm.amd64.AMD64Assembler.VexMRIOp.VPEXTRQ;
+import static jdk.graal.compiler.asm.amd64.AMD64Assembler.VexMRIOp.VPEXTRW;
+import static jdk.graal.compiler.asm.amd64.AMD64Assembler.VexMoveOp.VMOVD;
+import static jdk.graal.compiler.asm.amd64.AMD64Assembler.VexMoveOp.VMOVDQU64;
+import static jdk.graal.compiler.asm.amd64.AMD64Assembler.VexMoveOp.VMOVQ;
+import static jdk.graal.compiler.asm.amd64.AMD64Assembler.VexRVMIOp.VINSERTF128;
+import static jdk.graal.compiler.asm.amd64.AMD64Assembler.VexRVMIOp.VINSERTF32X4;
+import static jdk.graal.compiler.asm.amd64.AMD64Assembler.VexRVMIOp.VINSERTF32X8;
+import static jdk.graal.compiler.asm.amd64.AMD64Assembler.VexRVMIOp.VINSERTF64X2;
+import static jdk.graal.compiler.asm.amd64.AMD64Assembler.VexRVMIOp.VINSERTF64X4;
+import static jdk.graal.compiler.asm.amd64.AMD64Assembler.VexRVMIOp.VINSERTI128;
+import static jdk.graal.compiler.asm.amd64.AMD64Assembler.VexRVMIOp.VINSERTI32X4;
+import static jdk.graal.compiler.asm.amd64.AMD64Assembler.VexRVMIOp.VINSERTI32X8;
+import static jdk.graal.compiler.asm.amd64.AMD64Assembler.VexRVMIOp.VINSERTI64X2;
+import static jdk.graal.compiler.asm.amd64.AMD64Assembler.VexRVMIOp.VINSERTI64X4;
+import static jdk.graal.compiler.asm.amd64.AMD64Assembler.VexRVMIOp.VSHUFPD;
+import static jdk.graal.compiler.asm.amd64.AMD64Assembler.VexRVMIOp.VSHUFPS;
+import static jdk.graal.compiler.asm.amd64.AMD64Assembler.VexRVMOp.VPERMT2B;
+import static jdk.graal.compiler.asm.amd64.AMD64Assembler.VexRVMOp.VPSHUFB;
+import static jdk.graal.compiler.asm.amd64.AMD64Assembler.VexRVMOp.VPXOR;
+import static jdk.graal.compiler.asm.amd64.AVXKind.AVXSize.XMM;
+import static jdk.graal.compiler.asm.amd64.AVXKind.AVXSize.ZMM;
+
+import jdk.graal.compiler.asm.amd64.AMD64Address;
+import jdk.graal.compiler.asm.amd64.AMD64Assembler.VexMRIOp;
+import jdk.graal.compiler.asm.amd64.AMD64Assembler.VexRMIOp;
+import jdk.graal.compiler.asm.amd64.AMD64Assembler.VexRVMIOp;
+import jdk.graal.compiler.asm.amd64.AMD64BaseAssembler;
+import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler;
+import jdk.graal.compiler.asm.amd64.AVXKind;
+import jdk.graal.compiler.core.common.LIRKind;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.lir.LIRInstructionClass;
+import jdk.graal.compiler.lir.amd64.AMD64LIRInstruction;
+import jdk.graal.compiler.lir.asm.CompilationResultBuilder;
+import jdk.graal.compiler.lir.gen.LIRGeneratorTool;
 
 import jdk.vm.ci.amd64.AMD64.CPUFeature;
 import jdk.vm.ci.amd64.AMD64Kind;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/vector/AMD64VectorUnary.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/vector/AMD64VectorUnary.java
similarity index 91%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/vector/AMD64VectorUnary.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/vector/AMD64VectorUnary.java
index fde74b54be43..1aa266aed41f 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/vector/AMD64VectorUnary.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/vector/AMD64VectorUnary.java
@@ -22,30 +22,30 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.lir.amd64.vector;
+package jdk.graal.compiler.lir.amd64.vector;
 
 import static jdk.vm.ci.code.ValueUtil.asRegister;
 import static jdk.vm.ci.code.ValueUtil.isRegister;
 
-import jdk.compiler.graal.asm.amd64.AMD64Address;
-import jdk.compiler.graal.asm.amd64.AMD64Assembler.EvexRMIOp;
-import jdk.compiler.graal.asm.amd64.AMD64Assembler.VexRMOp;
-import jdk.compiler.graal.asm.amd64.AMD64Assembler.VexRVMConvertOp;
-import jdk.compiler.graal.asm.amd64.AMD64Assembler.VexRVMOp;
-import jdk.compiler.graal.asm.amd64.AMD64BaseAssembler.EVEXPrefixConfig;
-import jdk.compiler.graal.asm.amd64.AMD64BaseAssembler.OperandSize;
-import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler;
-import jdk.compiler.graal.asm.amd64.AVXKind;
-import jdk.compiler.graal.core.common.LIRKind;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.lir.LIRFrameState;
-import jdk.compiler.graal.lir.LIRInstructionClass;
-import jdk.compiler.graal.lir.LIRValueUtil;
-import jdk.compiler.graal.lir.Opcode;
-import jdk.compiler.graal.lir.amd64.AMD64AddressValue;
-import jdk.compiler.graal.lir.amd64.AMD64LIRInstruction;
-import jdk.compiler.graal.lir.asm.CompilationResultBuilder;
-import jdk.compiler.graal.lir.gen.LIRGeneratorTool;
+import jdk.graal.compiler.asm.amd64.AMD64Address;
+import jdk.graal.compiler.asm.amd64.AMD64Assembler.EvexRMIOp;
+import jdk.graal.compiler.asm.amd64.AMD64Assembler.VexRMOp;
+import jdk.graal.compiler.asm.amd64.AMD64Assembler.VexRVMConvertOp;
+import jdk.graal.compiler.asm.amd64.AMD64Assembler.VexRVMOp;
+import jdk.graal.compiler.asm.amd64.AMD64BaseAssembler.EVEXPrefixConfig;
+import jdk.graal.compiler.asm.amd64.AMD64BaseAssembler.OperandSize;
+import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler;
+import jdk.graal.compiler.asm.amd64.AVXKind;
+import jdk.graal.compiler.core.common.LIRKind;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.lir.LIRFrameState;
+import jdk.graal.compiler.lir.LIRInstructionClass;
+import jdk.graal.compiler.lir.LIRValueUtil;
+import jdk.graal.compiler.lir.Opcode;
+import jdk.graal.compiler.lir.amd64.AMD64AddressValue;
+import jdk.graal.compiler.lir.amd64.AMD64LIRInstruction;
+import jdk.graal.compiler.lir.asm.CompilationResultBuilder;
+import jdk.graal.compiler.lir.gen.LIRGeneratorTool;
 
 import jdk.vm.ci.amd64.AMD64;
 import jdk.vm.ci.amd64.AMD64Kind;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/vector/AVX512Support.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/vector/AVX512Support.java
similarity index 98%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/vector/AVX512Support.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/vector/AVX512Support.java
index 313662b79e7e..e12b61c1ba12 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/vector/AVX512Support.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/amd64/vector/AVX512Support.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.lir.amd64.vector;
+package jdk.graal.compiler.lir.amd64.vector;
 
 import static jdk.vm.ci.code.ValueUtil.asRegister;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/asm/ArrayDataPointerConstant.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/asm/ArrayDataPointerConstant.java
similarity index 97%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/asm/ArrayDataPointerConstant.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/asm/ArrayDataPointerConstant.java
index 6a78790bd877..d042f504f997 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/asm/ArrayDataPointerConstant.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/asm/ArrayDataPointerConstant.java
@@ -22,13 +22,13 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.lir.asm;
+package jdk.graal.compiler.lir.asm;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.util.Arrays;
 
-import jdk.compiler.graal.core.common.type.DataPointerConstant;
+import jdk.graal.compiler.core.common.type.DataPointerConstant;
 
 /**
  * Class for chunks of data that go into the data section.
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/asm/CompilationResultBuilder.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/asm/CompilationResultBuilder.java
similarity index 94%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/asm/CompilationResultBuilder.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/asm/CompilationResultBuilder.java
index 3c18380bd1b9..4b4d9330bb41 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/asm/CompilationResultBuilder.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/asm/CompilationResultBuilder.java
@@ -22,11 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.lir.asm;
+package jdk.graal.compiler.lir.asm;
 
 import static jdk.vm.ci.code.ValueUtil.asStackSlot;
 import static jdk.vm.ci.code.ValueUtil.isStackSlot;
-import static jdk.compiler.graal.core.common.GraalOptions.IsolatedLoopHeaderAlignment;
+import static jdk.graal.compiler.core.common.GraalOptions.IsolatedLoopHeaderAlignment;
 
 import java.io.IOException;
 import java.nio.file.Files;
@@ -40,35 +40,35 @@
 
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.Equivalence;
-import jdk.compiler.graal.asm.AbstractAddress;
-import jdk.compiler.graal.asm.Assembler;
-import jdk.compiler.graal.asm.Label;
-import jdk.compiler.graal.code.CompilationResult;
-import jdk.compiler.graal.code.CompilationResult.CodeAnnotation;
-import jdk.compiler.graal.code.CompilationResult.JumpTable;
-import jdk.compiler.graal.code.DataSection.Data;
-import jdk.compiler.graal.core.common.cfg.AbstractControlFlowGraph;
-import jdk.compiler.graal.core.common.cfg.BasicBlock;
-import jdk.compiler.graal.core.common.spi.CodeGenProviders;
-import jdk.compiler.graal.core.common.spi.ForeignCallsProvider;
-import jdk.compiler.graal.core.common.type.DataPointerConstant;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.debug.DebugOptions;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.NodeSourcePosition;
-import jdk.compiler.graal.lir.ImplicitLIRFrameState;
-import jdk.compiler.graal.lir.LIR;
-import jdk.compiler.graal.lir.LIRFrameState;
-import jdk.compiler.graal.lir.LIRInstruction;
-import jdk.compiler.graal.lir.LIRInstructionVerifier;
-import jdk.compiler.graal.lir.LabelRef;
-import jdk.compiler.graal.lir.StandardOp;
-import jdk.compiler.graal.lir.StandardOp.LabelHoldingOp;
-import jdk.compiler.graal.lir.framemap.FrameMap;
-import jdk.compiler.graal.options.Option;
-import jdk.compiler.graal.options.OptionKey;
-import jdk.compiler.graal.options.OptionType;
-import jdk.compiler.graal.options.OptionValues;
+import jdk.graal.compiler.asm.AbstractAddress;
+import jdk.graal.compiler.asm.Assembler;
+import jdk.graal.compiler.asm.Label;
+import jdk.graal.compiler.code.CompilationResult;
+import jdk.graal.compiler.code.CompilationResult.CodeAnnotation;
+import jdk.graal.compiler.code.CompilationResult.JumpTable;
+import jdk.graal.compiler.code.DataSection.Data;
+import jdk.graal.compiler.core.common.cfg.AbstractControlFlowGraph;
+import jdk.graal.compiler.core.common.cfg.BasicBlock;
+import jdk.graal.compiler.core.common.spi.CodeGenProviders;
+import jdk.graal.compiler.core.common.spi.ForeignCallsProvider;
+import jdk.graal.compiler.core.common.type.DataPointerConstant;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.debug.DebugOptions;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.NodeSourcePosition;
+import jdk.graal.compiler.lir.ImplicitLIRFrameState;
+import jdk.graal.compiler.lir.LIR;
+import jdk.graal.compiler.lir.LIRFrameState;
+import jdk.graal.compiler.lir.LIRInstruction;
+import jdk.graal.compiler.lir.LIRInstructionVerifier;
+import jdk.graal.compiler.lir.LabelRef;
+import jdk.graal.compiler.lir.StandardOp;
+import jdk.graal.compiler.lir.StandardOp.LabelHoldingOp;
+import jdk.graal.compiler.lir.framemap.FrameMap;
+import jdk.graal.compiler.options.Option;
+import jdk.graal.compiler.options.OptionKey;
+import jdk.graal.compiler.options.OptionType;
+import jdk.graal.compiler.options.OptionValues;
 
 import jdk.vm.ci.code.BailoutException;
 import jdk.vm.ci.code.CodeCacheProvider;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/asm/CompilationResultBuilderFactory.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/asm/CompilationResultBuilderFactory.java
similarity index 90%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/asm/CompilationResultBuilderFactory.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/asm/CompilationResultBuilderFactory.java
index 005426238f7a..46387c81b49c 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/asm/CompilationResultBuilderFactory.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/asm/CompilationResultBuilderFactory.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.lir.asm;
+package jdk.graal.compiler.lir.asm;
 
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -34,18 +34,18 @@
 
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.Equivalence;
-import jdk.compiler.graal.asm.Assembler;
-import jdk.compiler.graal.code.CompilationResult;
-import jdk.compiler.graal.core.common.spi.CodeGenProviders;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.lir.LIR;
-import jdk.compiler.graal.lir.LIRInstructionVerifier;
-import jdk.compiler.graal.lir.framemap.FrameMap;
-import jdk.compiler.graal.options.Option;
-import jdk.compiler.graal.options.OptionKey;
-import jdk.compiler.graal.options.OptionType;
-import jdk.compiler.graal.options.OptionValues;
+import jdk.graal.compiler.asm.Assembler;
+import jdk.graal.compiler.code.CompilationResult;
+import jdk.graal.compiler.core.common.spi.CodeGenProviders;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.lir.LIR;
+import jdk.graal.compiler.lir.LIRInstructionVerifier;
+import jdk.graal.compiler.lir.framemap.FrameMap;
+import jdk.graal.compiler.options.Option;
+import jdk.graal.compiler.options.OptionKey;
+import jdk.graal.compiler.options.OptionType;
+import jdk.graal.compiler.options.OptionValues;
 
 import jdk.vm.ci.code.Register;
 import jdk.vm.ci.services.Services;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/asm/DataBuilder.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/asm/DataBuilder.java
similarity index 96%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/asm/DataBuilder.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/asm/DataBuilder.java
index de0860195ff2..db3266a40c1d 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/asm/DataBuilder.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/asm/DataBuilder.java
@@ -22,14 +22,14 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.lir.asm;
+package jdk.graal.compiler.lir.asm;
 
 import java.nio.ByteBuffer;
 
-import jdk.compiler.graal.code.DataSection;
-import jdk.compiler.graal.code.DataSection.Data;
-import jdk.compiler.graal.code.DataSection.Patches;
-import jdk.compiler.graal.code.DataSection.ZeroData;
+import jdk.graal.compiler.code.DataSection;
+import jdk.graal.compiler.code.DataSection.Data;
+import jdk.graal.compiler.code.DataSection.Patches;
+import jdk.graal.compiler.code.DataSection.ZeroData;
 
 import jdk.vm.ci.meta.Constant;
 import jdk.vm.ci.meta.SerializableConstant;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/asm/EntryPointDecorator.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/asm/EntryPointDecorator.java
similarity index 90%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/asm/EntryPointDecorator.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/asm/EntryPointDecorator.java
index 740272d62079..a6f4e61c126f 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/asm/EntryPointDecorator.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/asm/EntryPointDecorator.java
@@ -22,10 +22,10 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.lir.asm;
+package jdk.graal.compiler.lir.asm;
 
-import jdk.compiler.graal.core.common.spi.CodeGenProviders;
-import jdk.compiler.graal.lir.gen.LIRGenerationResult;
+import jdk.graal.compiler.core.common.spi.CodeGenProviders;
+import jdk.graal.compiler.lir.gen.LIRGenerationResult;
 
 /**
  * Helper class to allow emitting custom assembly at the normal entry point before any frame setup
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/asm/FrameContext.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/asm/FrameContext.java
similarity index 98%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/asm/FrameContext.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/asm/FrameContext.java
index 0613a2b332a0..f4eddc440d41 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/asm/FrameContext.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/asm/FrameContext.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.lir.asm;
+package jdk.graal.compiler.lir.asm;
 
 /**
  * Code for managing a method's native frame.
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/constopt/ConstantLoadOptimization.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/constopt/ConstantLoadOptimization.java
similarity index 93%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/constopt/ConstantLoadOptimization.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/constopt/ConstantLoadOptimization.java
index 83427a0aa147..3550298f200a 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/constopt/ConstantLoadOptimization.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/constopt/ConstantLoadOptimization.java
@@ -22,11 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.lir.constopt;
+package jdk.graal.compiler.lir.constopt;
 
-import static jdk.compiler.graal.lir.LIRValueUtil.asVariable;
-import static jdk.compiler.graal.lir.LIRValueUtil.isVariable;
-import static jdk.compiler.graal.lir.phases.LIRPhase.Options.LIROptimization;
+import static jdk.graal.compiler.lir.LIRValueUtil.asVariable;
+import static jdk.graal.compiler.lir.LIRValueUtil.isVariable;
+import static jdk.graal.compiler.lir.phases.LIRPhase.Options.LIROptimization;
 
 import java.util.ArrayDeque;
 import java.util.ArrayList;
@@ -36,28 +36,28 @@
 import java.util.EnumSet;
 import java.util.List;
 
-import jdk.compiler.graal.core.common.LIRKind;
-import jdk.compiler.graal.core.common.cfg.BasicBlock;
-import jdk.compiler.graal.core.common.cfg.BlockMap;
-import jdk.compiler.graal.debug.CounterKey;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.debug.Indent;
-import jdk.compiler.graal.lir.CastValue;
-import jdk.compiler.graal.lir.InstructionValueConsumer;
-import jdk.compiler.graal.lir.LIR;
-import jdk.compiler.graal.lir.LIRInsertionBuffer;
-import jdk.compiler.graal.lir.LIRInstruction;
-import jdk.compiler.graal.lir.LIRInstruction.OperandFlag;
-import jdk.compiler.graal.lir.LIRInstruction.OperandMode;
-import jdk.compiler.graal.lir.StandardOp.LoadConstantOp;
-import jdk.compiler.graal.lir.ValueConsumer;
-import jdk.compiler.graal.lir.Variable;
-import jdk.compiler.graal.lir.gen.LIRGenerationResult;
-import jdk.compiler.graal.lir.gen.LIRGeneratorTool;
-import jdk.compiler.graal.lir.phases.PreAllocationOptimizationPhase;
-import jdk.compiler.graal.options.NestedBooleanOptionKey;
-import jdk.compiler.graal.options.Option;
-import jdk.compiler.graal.options.OptionType;
+import jdk.graal.compiler.core.common.LIRKind;
+import jdk.graal.compiler.core.common.cfg.BasicBlock;
+import jdk.graal.compiler.core.common.cfg.BlockMap;
+import jdk.graal.compiler.debug.CounterKey;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.debug.Indent;
+import jdk.graal.compiler.lir.CastValue;
+import jdk.graal.compiler.lir.InstructionValueConsumer;
+import jdk.graal.compiler.lir.LIR;
+import jdk.graal.compiler.lir.LIRInsertionBuffer;
+import jdk.graal.compiler.lir.LIRInstruction;
+import jdk.graal.compiler.lir.LIRInstruction.OperandFlag;
+import jdk.graal.compiler.lir.LIRInstruction.OperandMode;
+import jdk.graal.compiler.lir.StandardOp.LoadConstantOp;
+import jdk.graal.compiler.lir.ValueConsumer;
+import jdk.graal.compiler.lir.Variable;
+import jdk.graal.compiler.lir.gen.LIRGenerationResult;
+import jdk.graal.compiler.lir.gen.LIRGeneratorTool;
+import jdk.graal.compiler.lir.phases.PreAllocationOptimizationPhase;
+import jdk.graal.compiler.options.NestedBooleanOptionKey;
+import jdk.graal.compiler.options.Option;
+import jdk.graal.compiler.options.OptionType;
 
 import jdk.vm.ci.code.TargetDescription;
 import jdk.vm.ci.meta.AllocatableValue;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/constopt/ConstantTree.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/constopt/ConstantTree.java
similarity index 94%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/constopt/ConstantTree.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/constopt/ConstantTree.java
index 6fc23222241e..08fea9135a1c 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/constopt/ConstantTree.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/constopt/ConstantTree.java
@@ -22,18 +22,18 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.lir.constopt;
+package jdk.graal.compiler.lir.constopt;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.function.BiConsumer;
 
-import jdk.compiler.graal.core.common.cfg.BasicBlock;
-import jdk.compiler.graal.core.common.cfg.AbstractControlFlowGraph;
-import jdk.compiler.graal.core.common.cfg.BlockMap;
-import jdk.compiler.graal.core.common.cfg.DominatorOptimizationProblem;
-import jdk.compiler.graal.core.common.cfg.PropertyConsumable;
+import jdk.graal.compiler.core.common.cfg.BasicBlock;
+import jdk.graal.compiler.core.common.cfg.AbstractControlFlowGraph;
+import jdk.graal.compiler.core.common.cfg.BlockMap;
+import jdk.graal.compiler.core.common.cfg.DominatorOptimizationProblem;
+import jdk.graal.compiler.core.common.cfg.PropertyConsumable;
 
 /**
  * Represents a dominator (sub-)tree for a constant definition.
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/constopt/ConstantTreeAnalyzer.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/constopt/ConstantTreeAnalyzer.java
similarity index 97%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/constopt/ConstantTreeAnalyzer.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/constopt/ConstantTreeAnalyzer.java
index 53d4866eebd0..0213711f2418 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/constopt/ConstantTreeAnalyzer.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/constopt/ConstantTreeAnalyzer.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.lir.constopt;
+package jdk.graal.compiler.lir.constopt;
 
 import java.util.ArrayDeque;
 import java.util.ArrayList;
@@ -30,9 +30,9 @@
 import java.util.Deque;
 import java.util.List;
 
-import jdk.compiler.graal.core.common.cfg.BasicBlock;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.debug.Indent;
+import jdk.graal.compiler.core.common.cfg.BasicBlock;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.debug.Indent;
 
 /**
  * Analyzes a {@link ConstantTree} and marks potential materialization positions.
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/constopt/DefUseTree.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/constopt/DefUseTree.java
similarity index 90%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/constopt/DefUseTree.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/constopt/DefUseTree.java
index 0a9b9a39fd84..2c40d84bc881 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/constopt/DefUseTree.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/constopt/DefUseTree.java
@@ -22,17 +22,17 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.lir.constopt;
+package jdk.graal.compiler.lir.constopt;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.function.Consumer;
 
-import jdk.compiler.graal.core.common.cfg.BasicBlock;
-import jdk.compiler.graal.lir.LIRInstruction;
-import jdk.compiler.graal.lir.LIRValueUtil;
-import jdk.compiler.graal.lir.StandardOp.LoadConstantOp;
-import jdk.compiler.graal.lir.Variable;
+import jdk.graal.compiler.core.common.cfg.BasicBlock;
+import jdk.graal.compiler.lir.LIRInstruction;
+import jdk.graal.compiler.lir.LIRValueUtil;
+import jdk.graal.compiler.lir.StandardOp.LoadConstantOp;
+import jdk.graal.compiler.lir.Variable;
 
 import jdk.vm.ci.meta.Constant;
 import jdk.vm.ci.meta.Value;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/constopt/UseEntry.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/constopt/UseEntry.java
similarity index 92%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/constopt/UseEntry.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/constopt/UseEntry.java
index fee0309e2c7b..9e2582687ef5 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/constopt/UseEntry.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/constopt/UseEntry.java
@@ -22,11 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.lir.constopt;
+package jdk.graal.compiler.lir.constopt;
 
-import jdk.compiler.graal.core.common.cfg.BasicBlock;
-import jdk.compiler.graal.lir.LIRInstruction;
-import jdk.compiler.graal.lir.ValueProcedure;
+import jdk.graal.compiler.core.common.cfg.BasicBlock;
+import jdk.graal.compiler.lir.LIRInstruction;
+import jdk.graal.compiler.lir.ValueProcedure;
 
 import jdk.vm.ci.meta.Value;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/constopt/VariableMap.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/constopt/VariableMap.java
similarity index 97%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/constopt/VariableMap.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/constopt/VariableMap.java
index 57ba1a5b7ca3..b76b844dd98d 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/constopt/VariableMap.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/constopt/VariableMap.java
@@ -22,13 +22,13 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.lir.constopt;
+package jdk.graal.compiler.lir.constopt;
 
 import java.util.ArrayList;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
 
-import jdk.compiler.graal.lir.Variable;
+import jdk.graal.compiler.lir.Variable;
 
 /**
  * Maps variables to a generic type.
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/debug/IntervalDumper.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/debug/IntervalDumper.java
similarity index 98%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/debug/IntervalDumper.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/debug/IntervalDumper.java
index 0544fd80401a..89e8dad2e421 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/debug/IntervalDumper.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/debug/IntervalDumper.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.lir.debug;
+package jdk.graal.compiler.lir.debug;
 
 import jdk.vm.ci.meta.Value;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/debug/LIRGenerationDebugContext.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/debug/LIRGenerationDebugContext.java
similarity index 94%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/debug/LIRGenerationDebugContext.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/debug/LIRGenerationDebugContext.java
index b77ebdaa9004..bf0996dfd537 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/debug/LIRGenerationDebugContext.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/debug/LIRGenerationDebugContext.java
@@ -22,10 +22,10 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.lir.debug;
+package jdk.graal.compiler.lir.debug;
 
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.lir.LIR;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.lir.LIR;
 
 import jdk.vm.ci.meta.Value;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/dfa/LocationMarker.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/dfa/LocationMarker.java
similarity index 91%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/dfa/LocationMarker.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/dfa/LocationMarker.java
index de8d496d10ee..67083b2f2b10 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/dfa/LocationMarker.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/dfa/LocationMarker.java
@@ -22,27 +22,27 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.lir.dfa;
+package jdk.graal.compiler.lir.dfa;
 
 import static jdk.vm.ci.code.ValueUtil.isIllegal;
 
 import java.util.ArrayList;
 import java.util.EnumSet;
 
-import jdk.compiler.graal.core.common.LIRKind;
-import jdk.compiler.graal.core.common.cfg.BasicBlock;
-import jdk.compiler.graal.core.common.cfg.BlockMap;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.debug.Indent;
-import jdk.compiler.graal.lir.InstructionStateProcedure;
-import jdk.compiler.graal.lir.LIR;
-import jdk.compiler.graal.lir.LIRFrameState;
-import jdk.compiler.graal.lir.LIRInstruction;
-import jdk.compiler.graal.lir.LIRValueUtil;
-import jdk.compiler.graal.lir.ValueConsumer;
-import jdk.compiler.graal.lir.framemap.FrameMap;
-import jdk.compiler.graal.lir.util.ValueSet;
+import jdk.graal.compiler.core.common.LIRKind;
+import jdk.graal.compiler.core.common.cfg.BasicBlock;
+import jdk.graal.compiler.core.common.cfg.BlockMap;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.debug.Indent;
+import jdk.graal.compiler.lir.InstructionStateProcedure;
+import jdk.graal.compiler.lir.LIR;
+import jdk.graal.compiler.lir.LIRFrameState;
+import jdk.graal.compiler.lir.LIRInstruction;
+import jdk.graal.compiler.lir.LIRValueUtil;
+import jdk.graal.compiler.lir.ValueConsumer;
+import jdk.graal.compiler.lir.framemap.FrameMap;
+import jdk.graal.compiler.lir.util.ValueSet;
 
 import jdk.vm.ci.code.Register;
 import jdk.vm.ci.meta.PlatformKind;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/dfa/LocationMarkerPhase.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/dfa/LocationMarkerPhase.java
similarity index 89%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/dfa/LocationMarkerPhase.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/dfa/LocationMarkerPhase.java
index 271e449e37ae..e90e0d4717f6 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/dfa/LocationMarkerPhase.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/dfa/LocationMarkerPhase.java
@@ -22,20 +22,20 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.lir.dfa;
+package jdk.graal.compiler.lir.dfa;
 
 import static jdk.vm.ci.code.ValueUtil.asRegister;
 import static jdk.vm.ci.code.ValueUtil.isRegister;
 import static jdk.vm.ci.code.ValueUtil.isStackSlot;
 
-import jdk.compiler.graal.core.common.LIRKind;
-import jdk.compiler.graal.lir.LIR;
-import jdk.compiler.graal.lir.LIRFrameState;
-import jdk.compiler.graal.lir.LIRInstruction;
-import jdk.compiler.graal.lir.framemap.FrameMap;
-import jdk.compiler.graal.lir.framemap.ReferenceMapBuilder;
-import jdk.compiler.graal.lir.gen.LIRGenerationResult;
-import jdk.compiler.graal.lir.phases.FinalCodeAnalysisPhase;
+import jdk.graal.compiler.core.common.LIRKind;
+import jdk.graal.compiler.lir.LIR;
+import jdk.graal.compiler.lir.LIRFrameState;
+import jdk.graal.compiler.lir.LIRInstruction;
+import jdk.graal.compiler.lir.framemap.FrameMap;
+import jdk.graal.compiler.lir.framemap.ReferenceMapBuilder;
+import jdk.graal.compiler.lir.gen.LIRGenerationResult;
+import jdk.graal.compiler.lir.phases.FinalCodeAnalysisPhase;
 
 import jdk.vm.ci.code.ReferenceMap;
 import jdk.vm.ci.code.Register;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/dfa/MarkBasePointersPhase.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/dfa/MarkBasePointersPhase.java
similarity index 93%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/dfa/MarkBasePointersPhase.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/dfa/MarkBasePointersPhase.java
index 46e1a614c8ba..c5c7f48b4f4c 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/dfa/MarkBasePointersPhase.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/dfa/MarkBasePointersPhase.java
@@ -22,24 +22,24 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.lir.dfa;
+package jdk.graal.compiler.lir.dfa;
 
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
-import jdk.compiler.graal.core.common.LIRKind;
-import jdk.compiler.graal.lir.LIR;
-import jdk.compiler.graal.lir.LIRFrameState;
-import jdk.compiler.graal.lir.LIRInstruction;
-import jdk.compiler.graal.lir.LIRValueUtil;
-import jdk.compiler.graal.lir.Variable;
-import jdk.compiler.graal.lir.framemap.FrameMap;
-import jdk.compiler.graal.lir.gen.LIRGenerationResult;
-import jdk.compiler.graal.lir.phases.AllocationPhase;
-import jdk.compiler.graal.lir.util.ValueSet;
-import jdk.compiler.graal.lir.util.IndexedValueMap;
+import jdk.graal.compiler.core.common.LIRKind;
+import jdk.graal.compiler.lir.LIR;
+import jdk.graal.compiler.lir.LIRFrameState;
+import jdk.graal.compiler.lir.LIRInstruction;
+import jdk.graal.compiler.lir.LIRValueUtil;
+import jdk.graal.compiler.lir.Variable;
+import jdk.graal.compiler.lir.framemap.FrameMap;
+import jdk.graal.compiler.lir.gen.LIRGenerationResult;
+import jdk.graal.compiler.lir.phases.AllocationPhase;
+import jdk.graal.compiler.lir.util.ValueSet;
+import jdk.graal.compiler.lir.util.IndexedValueMap;
 
 import jdk.vm.ci.code.TargetDescription;
 import jdk.vm.ci.meta.Value;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/dfa/RegStackValueSet.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/dfa/RegStackValueSet.java
similarity index 92%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/dfa/RegStackValueSet.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/dfa/RegStackValueSet.java
index 957973e5ef12..c701361a2e6c 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/dfa/RegStackValueSet.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/dfa/RegStackValueSet.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.lir.dfa;
+package jdk.graal.compiler.lir.dfa;
 
 import static jdk.vm.ci.code.ValueUtil.asRegister;
 import static jdk.vm.ci.code.ValueUtil.asStackSlot;
@@ -33,15 +33,15 @@
 import java.util.HashMap;
 import java.util.Objects;
 
-import jdk.compiler.graal.core.common.LIRKind;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.lir.LIRInstruction;
-import jdk.compiler.graal.lir.LIRValueUtil;
-import jdk.compiler.graal.lir.ValueConsumer;
-import jdk.compiler.graal.lir.framemap.FrameMap;
-import jdk.compiler.graal.lir.framemap.ReferenceMapBuilder;
-import jdk.compiler.graal.lir.util.IndexedValueMap;
-import jdk.compiler.graal.lir.util.ValueSet;
+import jdk.graal.compiler.core.common.LIRKind;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.lir.LIRInstruction;
+import jdk.graal.compiler.lir.LIRValueUtil;
+import jdk.graal.compiler.lir.ValueConsumer;
+import jdk.graal.compiler.lir.framemap.FrameMap;
+import jdk.graal.compiler.lir.framemap.ReferenceMapBuilder;
+import jdk.graal.compiler.lir.util.IndexedValueMap;
+import jdk.graal.compiler.lir.util.ValueSet;
 
 import jdk.vm.ci.meta.Value;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/dfa/UniqueWorkList.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/dfa/UniqueWorkList.java
similarity index 96%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/dfa/UniqueWorkList.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/dfa/UniqueWorkList.java
index e52d7f69ed07..ec9a11ab5809 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/dfa/UniqueWorkList.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/dfa/UniqueWorkList.java
@@ -22,13 +22,13 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.lir.dfa;
+package jdk.graal.compiler.lir.dfa;
 
 import java.util.ArrayDeque;
 import java.util.BitSet;
 import java.util.Collection;
 
-import jdk.compiler.graal.core.common.cfg.BasicBlock;
+import jdk.graal.compiler.core.common.cfg.BasicBlock;
 
 /**
  * Ensures that an element is only in the worklist once.
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/framemap/FrameMap.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/framemap/FrameMap.java
similarity index 97%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/framemap/FrameMap.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/framemap/FrameMap.java
index 674e97f25c5e..de2622e18878 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/framemap/FrameMap.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/framemap/FrameMap.java
@@ -22,17 +22,17 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.lir.framemap;
+package jdk.graal.compiler.lir.framemap;
 
 import static jdk.vm.ci.code.ValueUtil.asStackSlot;
 import static jdk.vm.ci.code.ValueUtil.isStackSlot;
 
-import jdk.compiler.graal.core.common.LIRKind;
-import jdk.compiler.graal.core.common.NumUtil;
-import jdk.compiler.graal.core.common.PermanentBailoutException;
-import jdk.compiler.graal.debug.GraalError;
+import jdk.graal.compiler.core.common.LIRKind;
+import jdk.graal.compiler.core.common.NumUtil;
+import jdk.graal.compiler.core.common.PermanentBailoutException;
+import jdk.graal.compiler.debug.GraalError;
 
-import jdk.compiler.graal.lir.StandardOp;
+import jdk.graal.compiler.lir.StandardOp;
 import jdk.vm.ci.code.Architecture;
 import jdk.vm.ci.code.CallingConvention;
 import jdk.vm.ci.code.CodeCacheProvider;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/framemap/FrameMapBuilder.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/framemap/FrameMapBuilder.java
similarity index 95%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/framemap/FrameMapBuilder.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/framemap/FrameMapBuilder.java
index 15357b5ab372..c99be6b422fe 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/framemap/FrameMapBuilder.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/framemap/FrameMapBuilder.java
@@ -22,10 +22,10 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.lir.framemap;
+package jdk.graal.compiler.lir.framemap;
 
-import jdk.compiler.graal.lir.VirtualStackSlot;
-import jdk.compiler.graal.lir.gen.LIRGenerationResult;
+import jdk.graal.compiler.lir.VirtualStackSlot;
+import jdk.graal.compiler.lir.gen.LIRGenerationResult;
 
 import jdk.vm.ci.code.CallingConvention;
 import jdk.vm.ci.code.CodeCacheProvider;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/framemap/FrameMapBuilderImpl.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/framemap/FrameMapBuilderImpl.java
similarity index 90%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/framemap/FrameMapBuilderImpl.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/framemap/FrameMapBuilderImpl.java
index cbb65c81892c..644cd734e5c8 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/framemap/FrameMapBuilderImpl.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/framemap/FrameMapBuilderImpl.java
@@ -22,22 +22,22 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.lir.framemap;
+package jdk.graal.compiler.lir.framemap;
 
 import java.util.ArrayList;
 import java.util.EnumSet;
 import java.util.List;
 
-import jdk.compiler.graal.core.common.LIRKind;
-import jdk.compiler.graal.core.common.cfg.BasicBlock;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.lir.InstructionValueConsumer;
-import jdk.compiler.graal.lir.LIR;
-import jdk.compiler.graal.lir.LIRInstruction;
-import jdk.compiler.graal.lir.LIRValueUtil;
-import jdk.compiler.graal.lir.VirtualStackSlot;
-import jdk.compiler.graal.lir.gen.LIRGenerationResult;
+import jdk.graal.compiler.core.common.LIRKind;
+import jdk.graal.compiler.core.common.cfg.BasicBlock;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.lir.InstructionValueConsumer;
+import jdk.graal.compiler.lir.LIR;
+import jdk.graal.compiler.lir.LIRInstruction;
+import jdk.graal.compiler.lir.LIRValueUtil;
+import jdk.graal.compiler.lir.VirtualStackSlot;
+import jdk.graal.compiler.lir.gen.LIRGenerationResult;
 
 import jdk.vm.ci.code.CallingConvention;
 import jdk.vm.ci.code.CodeCacheProvider;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/framemap/FrameMapBuilderTool.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/framemap/FrameMapBuilderTool.java
similarity index 95%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/framemap/FrameMapBuilderTool.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/framemap/FrameMapBuilderTool.java
index d5e49bae9d8b..2f1666877e38 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/framemap/FrameMapBuilderTool.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/framemap/FrameMapBuilderTool.java
@@ -22,11 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.lir.framemap;
+package jdk.graal.compiler.lir.framemap;
 
 import java.util.List;
 
-import jdk.compiler.graal.lir.VirtualStackSlot;
+import jdk.graal.compiler.lir.VirtualStackSlot;
 
 /**
  * A {@link FrameMapBuilder} that allows access to the underlying {@link FrameMap}.
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/framemap/ReferenceMapBuilder.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/framemap/ReferenceMapBuilder.java
similarity index 94%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/framemap/ReferenceMapBuilder.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/framemap/ReferenceMapBuilder.java
index 4b5d40e37598..d402d4599909 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/framemap/ReferenceMapBuilder.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/framemap/ReferenceMapBuilder.java
@@ -22,9 +22,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.lir.framemap;
+package jdk.graal.compiler.lir.framemap;
 
-import jdk.compiler.graal.lir.LIRFrameState;
+import jdk.graal.compiler.lir.LIRFrameState;
 
 import jdk.vm.ci.code.ReferenceMap;
 import jdk.vm.ci.meta.Value;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/framemap/SimpleVirtualStackSlot.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/framemap/SimpleVirtualStackSlot.java
similarity index 94%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/framemap/SimpleVirtualStackSlot.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/framemap/SimpleVirtualStackSlot.java
index 956299dc045a..1dc1d7a024a3 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/framemap/SimpleVirtualStackSlot.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/framemap/SimpleVirtualStackSlot.java
@@ -22,9 +22,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.lir.framemap;
+package jdk.graal.compiler.lir.framemap;
 
-import jdk.compiler.graal.lir.VirtualStackSlot;
+import jdk.graal.compiler.lir.VirtualStackSlot;
 
 import jdk.vm.ci.meta.ValueKind;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/framemap/SimpleVirtualStackSlotAlias.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/framemap/SimpleVirtualStackSlotAlias.java
similarity index 96%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/framemap/SimpleVirtualStackSlotAlias.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/framemap/SimpleVirtualStackSlotAlias.java
index 2721c162462e..92002b58f64d 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/framemap/SimpleVirtualStackSlotAlias.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/framemap/SimpleVirtualStackSlotAlias.java
@@ -22,9 +22,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.lir.framemap;
+package jdk.graal.compiler.lir.framemap;
 
-import jdk.compiler.graal.lir.VirtualStackSlot;
+import jdk.graal.compiler.lir.VirtualStackSlot;
 
 import jdk.vm.ci.meta.ValueKind;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/framemap/VirtualStackSlotRange.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/framemap/VirtualStackSlotRange.java
similarity index 93%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/framemap/VirtualStackSlotRange.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/framemap/VirtualStackSlotRange.java
index c9a80d6fe66d..a116b180b57f 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/framemap/VirtualStackSlotRange.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/framemap/VirtualStackSlotRange.java
@@ -22,10 +22,10 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.lir.framemap;
+package jdk.graal.compiler.lir.framemap;
 
-import jdk.compiler.graal.core.common.LIRKind;
-import jdk.compiler.graal.lir.VirtualStackSlot;
+import jdk.graal.compiler.core.common.LIRKind;
+import jdk.graal.compiler.lir.VirtualStackSlot;
 
 /**
  * Represents a contiguous and aligned range of memory in the frame of the method being compiled.
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/gen/ArithmeticLIRGenerator.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/gen/ArithmeticLIRGenerator.java
similarity index 97%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/gen/ArithmeticLIRGenerator.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/gen/ArithmeticLIRGenerator.java
index 72424f0a1993..612bc015fb54 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/gen/ArithmeticLIRGenerator.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/gen/ArithmeticLIRGenerator.java
@@ -22,10 +22,10 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.lir.gen;
+package jdk.graal.compiler.lir.gen;
 
-import jdk.compiler.graal.core.common.LIRKind;
-import jdk.compiler.graal.lir.Variable;
+import jdk.graal.compiler.core.common.LIRKind;
+import jdk.graal.compiler.lir.Variable;
 
 import jdk.vm.ci.meta.AllocatableValue;
 import jdk.vm.ci.meta.PlatformKind;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/gen/ArithmeticLIRGeneratorTool.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/gen/ArithmeticLIRGeneratorTool.java
similarity index 95%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/gen/ArithmeticLIRGeneratorTool.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/gen/ArithmeticLIRGeneratorTool.java
index 5edc1db3fb44..27c77878ccde 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/gen/ArithmeticLIRGeneratorTool.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/gen/ArithmeticLIRGeneratorTool.java
@@ -22,15 +22,15 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.lir.gen;
-
-import jdk.compiler.graal.core.common.LIRKind;
-import jdk.compiler.graal.core.common.calc.FloatConvert;
-import jdk.compiler.graal.core.common.memory.MemoryExtendKind;
-import jdk.compiler.graal.core.common.memory.MemoryOrderMode;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.lir.LIRFrameState;
-import jdk.compiler.graal.lir.Variable;
+package jdk.graal.compiler.lir.gen;
+
+import jdk.graal.compiler.core.common.LIRKind;
+import jdk.graal.compiler.core.common.calc.FloatConvert;
+import jdk.graal.compiler.core.common.memory.MemoryExtendKind;
+import jdk.graal.compiler.core.common.memory.MemoryOrderMode;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.lir.LIRFrameState;
+import jdk.graal.compiler.lir.Variable;
 
 import jdk.vm.ci.meta.Value;
 import jdk.vm.ci.meta.ValueKind;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/gen/BarrierSetLIRGenerator.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/gen/BarrierSetLIRGenerator.java
similarity index 97%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/gen/BarrierSetLIRGenerator.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/gen/BarrierSetLIRGenerator.java
index 6da0c96ca2e8..2a8a1d76a05a 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/gen/BarrierSetLIRGenerator.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/gen/BarrierSetLIRGenerator.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.lir.gen;
+package jdk.graal.compiler.lir.gen;
 
 public abstract class BarrierSetLIRGenerator implements BarrierSetLIRGeneratorTool {
     protected LIRGenerator lirGen;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/gen/BarrierSetLIRGeneratorTool.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/gen/BarrierSetLIRGeneratorTool.java
similarity index 86%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/gen/BarrierSetLIRGeneratorTool.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/gen/BarrierSetLIRGeneratorTool.java
index 7e6078eca331..144ff0f8447f 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/gen/BarrierSetLIRGeneratorTool.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/gen/BarrierSetLIRGeneratorTool.java
@@ -22,13 +22,13 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.lir.gen;
+package jdk.graal.compiler.lir.gen;
 
-import jdk.compiler.graal.core.common.LIRKind;
-import jdk.compiler.graal.core.common.memory.BarrierType;
-import jdk.compiler.graal.core.common.memory.MemoryOrderMode;
-import jdk.compiler.graal.lir.LIRFrameState;
-import jdk.compiler.graal.lir.Variable;
+import jdk.graal.compiler.core.common.LIRKind;
+import jdk.graal.compiler.core.common.memory.BarrierType;
+import jdk.graal.compiler.core.common.memory.MemoryOrderMode;
+import jdk.graal.compiler.lir.LIRFrameState;
+import jdk.graal.compiler.lir.Variable;
 
 import jdk.vm.ci.meta.Value;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/gen/DiagnosticLIRGeneratorTool.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/gen/DiagnosticLIRGeneratorTool.java
similarity index 97%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/gen/DiagnosticLIRGeneratorTool.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/gen/DiagnosticLIRGeneratorTool.java
index f5d1aedda77b..8ebdebdde079 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/gen/DiagnosticLIRGeneratorTool.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/gen/DiagnosticLIRGeneratorTool.java
@@ -22,9 +22,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.lir.gen;
+package jdk.graal.compiler.lir.gen;
 
-import jdk.compiler.graal.lir.LIRInstruction;
+import jdk.graal.compiler.lir.LIRInstruction;
 
 import jdk.vm.ci.code.Register;
 import jdk.vm.ci.code.RegisterConfig;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/gen/LIRGenerationResult.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/gen/LIRGenerationResult.java
similarity index 92%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/gen/LIRGenerationResult.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/gen/LIRGenerationResult.java
index 991da2d7f629..caaf54088b15 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/gen/LIRGenerationResult.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/gen/LIRGenerationResult.java
@@ -22,18 +22,18 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.lir.gen;
+package jdk.graal.compiler.lir.gen;
 
-import jdk.compiler.graal.lir.LIR;
-import jdk.compiler.graal.lir.LIRInstruction;
+import jdk.graal.compiler.lir.LIR;
+import jdk.graal.compiler.lir.LIRInstruction;
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.Equivalence;
-import jdk.compiler.graal.core.common.CompilationIdentifier;
-import jdk.compiler.graal.core.common.CompilationIdentifier.Verbosity;
-import jdk.compiler.graal.core.common.alloc.RegisterAllocationConfig;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.lir.framemap.FrameMap;
-import jdk.compiler.graal.lir.framemap.FrameMapBuilder;
+import jdk.graal.compiler.core.common.CompilationIdentifier;
+import jdk.graal.compiler.core.common.CompilationIdentifier.Verbosity;
+import jdk.graal.compiler.core.common.alloc.RegisterAllocationConfig;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.lir.framemap.FrameMap;
+import jdk.graal.compiler.lir.framemap.FrameMapBuilder;
 
 import jdk.vm.ci.code.CallingConvention;
 import jdk.vm.ci.code.RegisterConfig;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/gen/LIRGenerator.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/gen/LIRGenerator.java
similarity index 94%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/gen/LIRGenerator.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/gen/LIRGenerator.java
index cd1cc861af9b..cd99e593f834 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/gen/LIRGenerator.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/gen/LIRGenerator.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.lir.gen;
+package jdk.graal.compiler.lir.gen;
 
 import static jdk.vm.ci.code.ValueUtil.asAllocatableValue;
 import static jdk.vm.ci.code.ValueUtil.asStackSlot;
@@ -31,40 +31,40 @@
 import static jdk.vm.ci.code.ValueUtil.isLegal;
 import static jdk.vm.ci.code.ValueUtil.isRegister;
 import static jdk.vm.ci.code.ValueUtil.isStackSlot;
-import static jdk.compiler.graal.core.common.GraalOptions.LoopHeaderAlignment;
+import static jdk.graal.compiler.core.common.GraalOptions.LoopHeaderAlignment;
 
 import java.util.ArrayList;
 import java.util.EnumSet;
 import java.util.List;
 import java.util.Optional;
 
-import jdk.compiler.graal.asm.Label;
-import jdk.compiler.graal.core.common.LIRKind;
-import jdk.compiler.graal.core.common.calc.Condition;
-import jdk.compiler.graal.core.common.cfg.BasicBlock;
-import jdk.compiler.graal.core.common.spi.CodeGenProviders;
-import jdk.compiler.graal.core.common.spi.ForeignCallLinkage;
-import jdk.compiler.graal.core.common.spi.ForeignCallsProvider;
-import jdk.compiler.graal.core.common.spi.LIRKindTool;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.debug.DebugCloseable;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.debug.TTY;
-import jdk.compiler.graal.graph.NodeSourcePosition;
-import jdk.compiler.graal.lir.ConstantValue;
-import jdk.compiler.graal.lir.LIR;
-import jdk.compiler.graal.lir.LIRFrameState;
-import jdk.compiler.graal.lir.LIRInstruction;
-import jdk.compiler.graal.lir.LIRValueUtil;
-import jdk.compiler.graal.lir.LabelRef;
-import jdk.compiler.graal.lir.StandardOp;
-import jdk.compiler.graal.lir.SwitchStrategy;
-import jdk.compiler.graal.lir.Variable;
-import jdk.compiler.graal.lir.hashing.IntHasher;
-import jdk.compiler.graal.options.Option;
-import jdk.compiler.graal.options.OptionKey;
-import jdk.compiler.graal.options.OptionType;
-import jdk.compiler.graal.options.OptionValues;
+import jdk.graal.compiler.asm.Label;
+import jdk.graal.compiler.core.common.LIRKind;
+import jdk.graal.compiler.core.common.calc.Condition;
+import jdk.graal.compiler.core.common.cfg.BasicBlock;
+import jdk.graal.compiler.core.common.spi.CodeGenProviders;
+import jdk.graal.compiler.core.common.spi.ForeignCallLinkage;
+import jdk.graal.compiler.core.common.spi.ForeignCallsProvider;
+import jdk.graal.compiler.core.common.spi.LIRKindTool;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.debug.DebugCloseable;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.debug.TTY;
+import jdk.graal.compiler.graph.NodeSourcePosition;
+import jdk.graal.compiler.lir.ConstantValue;
+import jdk.graal.compiler.lir.LIR;
+import jdk.graal.compiler.lir.LIRFrameState;
+import jdk.graal.compiler.lir.LIRInstruction;
+import jdk.graal.compiler.lir.LIRValueUtil;
+import jdk.graal.compiler.lir.LabelRef;
+import jdk.graal.compiler.lir.StandardOp;
+import jdk.graal.compiler.lir.SwitchStrategy;
+import jdk.graal.compiler.lir.Variable;
+import jdk.graal.compiler.lir.hashing.IntHasher;
+import jdk.graal.compiler.options.Option;
+import jdk.graal.compiler.options.OptionKey;
+import jdk.graal.compiler.options.OptionType;
+import jdk.graal.compiler.options.OptionValues;
 
 import jdk.vm.ci.code.CallingConvention;
 import jdk.vm.ci.code.CodeCacheProvider;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/gen/LIRGeneratorTool.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/gen/LIRGeneratorTool.java
similarity index 96%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/gen/LIRGeneratorTool.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/gen/LIRGeneratorTool.java
index f48536e6ae7c..a7d429b91b5b 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/gen/LIRGeneratorTool.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/gen/LIRGeneratorTool.java
@@ -22,29 +22,29 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.lir.gen;
+package jdk.graal.compiler.lir.gen;
 
 import java.util.EnumSet;
 
-import jdk.compiler.graal.asm.VectorSize;
-import jdk.compiler.graal.core.common.CompressEncoding;
-import jdk.compiler.graal.core.common.LIRKind;
-import jdk.compiler.graal.core.common.Stride;
-import jdk.compiler.graal.core.common.calc.Condition;
-import jdk.compiler.graal.core.common.cfg.BasicBlock;
-import jdk.compiler.graal.core.common.memory.BarrierType;
-import jdk.compiler.graal.core.common.memory.MemoryOrderMode;
-import jdk.compiler.graal.core.common.spi.CodeGenProviders;
-import jdk.compiler.graal.core.common.spi.ForeignCallLinkage;
-import jdk.compiler.graal.core.common.spi.ForeignCallsProvider;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.lir.LIRFrameState;
-import jdk.compiler.graal.lir.LIRInstruction;
-import jdk.compiler.graal.lir.LIRValueUtil;
-import jdk.compiler.graal.lir.LabelRef;
-import jdk.compiler.graal.lir.Variable;
-import jdk.compiler.graal.lir.VirtualStackSlot;
+import jdk.graal.compiler.asm.VectorSize;
+import jdk.graal.compiler.core.common.CompressEncoding;
+import jdk.graal.compiler.core.common.LIRKind;
+import jdk.graal.compiler.core.common.Stride;
+import jdk.graal.compiler.core.common.calc.Condition;
+import jdk.graal.compiler.core.common.cfg.BasicBlock;
+import jdk.graal.compiler.core.common.memory.BarrierType;
+import jdk.graal.compiler.core.common.memory.MemoryOrderMode;
+import jdk.graal.compiler.core.common.spi.CodeGenProviders;
+import jdk.graal.compiler.core.common.spi.ForeignCallLinkage;
+import jdk.graal.compiler.core.common.spi.ForeignCallsProvider;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.lir.LIRFrameState;
+import jdk.graal.compiler.lir.LIRInstruction;
+import jdk.graal.compiler.lir.LIRValueUtil;
+import jdk.graal.compiler.lir.LabelRef;
+import jdk.graal.compiler.lir.Variable;
+import jdk.graal.compiler.lir.VirtualStackSlot;
 
 import jdk.vm.ci.code.CodeCacheProvider;
 import jdk.vm.ci.code.Register;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/gen/MoveFactory.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/gen/MoveFactory.java
similarity index 95%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/gen/MoveFactory.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/gen/MoveFactory.java
index cbb9972e0cb3..c8dfd73efb6c 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/gen/MoveFactory.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/gen/MoveFactory.java
@@ -22,14 +22,14 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.lir.gen;
+package jdk.graal.compiler.lir.gen;
 
-import jdk.compiler.graal.lir.LIRInstruction;
-import jdk.compiler.graal.lir.VirtualStackSlot;
+import jdk.graal.compiler.lir.LIRInstruction;
+import jdk.graal.compiler.lir.VirtualStackSlot;
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.Equivalence;
-import jdk.compiler.graal.core.common.LIRKind;
-import jdk.compiler.graal.lir.framemap.FrameMapBuilder;
+import jdk.graal.compiler.core.common.LIRKind;
+import jdk.graal.compiler.lir.framemap.FrameMapBuilder;
 
 import jdk.vm.ci.code.Architecture;
 import jdk.vm.ci.code.Register;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/gen/VerifyingMoveFactory.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/gen/VerifyingMoveFactory.java
similarity index 97%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/gen/VerifyingMoveFactory.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/gen/VerifyingMoveFactory.java
index 7149f9eabdb4..c02deb0491b9 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/gen/VerifyingMoveFactory.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/gen/VerifyingMoveFactory.java
@@ -22,13 +22,13 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.lir.gen;
+package jdk.graal.compiler.lir.gen;
 
 import java.util.EnumSet;
 
-import jdk.compiler.graal.lir.LIRInstruction;
-import jdk.compiler.graal.lir.LIRValueUtil;
-import jdk.compiler.graal.lir.StandardOp;
+import jdk.graal.compiler.lir.LIRInstruction;
+import jdk.graal.compiler.lir.LIRValueUtil;
+import jdk.graal.compiler.lir.StandardOp;
 
 import jdk.vm.ci.meta.AllocatableValue;
 import jdk.vm.ci.meta.Constant;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/hashing/IntHasher.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/hashing/IntHasher.java
similarity index 99%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/hashing/IntHasher.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/hashing/IntHasher.java
index d86f95da6936..9a4c1364c4a9 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/hashing/IntHasher.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/hashing/IntHasher.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.lir.hashing;
+package jdk.graal.compiler.lir.hashing;
 
 import java.util.Arrays;
 import java.util.Optional;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/phases/AllocationPhase.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/phases/AllocationPhase.java
similarity index 92%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/phases/AllocationPhase.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/phases/AllocationPhase.java
index 0252895e7663..b82e320ec5de 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/phases/AllocationPhase.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/phases/AllocationPhase.java
@@ -22,10 +22,10 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.lir.phases;
+package jdk.graal.compiler.lir.phases;
 
-import jdk.compiler.graal.core.common.alloc.RegisterAllocationConfig;
-import jdk.compiler.graal.lir.gen.MoveFactory;
+import jdk.graal.compiler.core.common.alloc.RegisterAllocationConfig;
+import jdk.graal.compiler.lir.gen.MoveFactory;
 
 public abstract class AllocationPhase extends LIRPhase {
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/phases/AllocationStage.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/phases/AllocationStage.java
similarity index 81%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/phases/AllocationStage.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/phases/AllocationStage.java
index 2fa311a57019..801ba4519cf1 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/phases/AllocationStage.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/phases/AllocationStage.java
@@ -22,15 +22,15 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.lir.phases;
+package jdk.graal.compiler.lir.phases;
 
-import jdk.compiler.graal.debug.Assertions;
-import jdk.compiler.graal.lir.alloc.AllocationStageVerifier;
-import jdk.compiler.graal.lir.stackslotalloc.LSStackSlotAllocator;
-import jdk.compiler.graal.lir.stackslotalloc.SimpleStackSlotAllocator;
-import jdk.compiler.graal.lir.alloc.lsra.LinearScanPhase;
-import jdk.compiler.graal.lir.dfa.MarkBasePointersPhase;
-import jdk.compiler.graal.options.OptionValues;
+import jdk.graal.compiler.debug.Assertions;
+import jdk.graal.compiler.lir.alloc.AllocationStageVerifier;
+import jdk.graal.compiler.lir.stackslotalloc.LSStackSlotAllocator;
+import jdk.graal.compiler.lir.stackslotalloc.SimpleStackSlotAllocator;
+import jdk.graal.compiler.lir.alloc.lsra.LinearScanPhase;
+import jdk.graal.compiler.lir.dfa.MarkBasePointersPhase;
+import jdk.graal.compiler.options.OptionValues;
 
 public class AllocationStage extends LIRPhaseSuite {
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/phases/EconomyAllocationStage.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/phases/EconomyAllocationStage.java
similarity index 85%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/phases/EconomyAllocationStage.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/phases/EconomyAllocationStage.java
index 5765cee3d88c..ab0cebf63c17 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/phases/EconomyAllocationStage.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/phases/EconomyAllocationStage.java
@@ -22,12 +22,12 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.lir.phases;
+package jdk.graal.compiler.lir.phases;
 
-import jdk.compiler.graal.lir.stackslotalloc.SimpleStackSlotAllocator;
-import jdk.compiler.graal.lir.alloc.lsra.LinearScanPhase;
-import jdk.compiler.graal.lir.dfa.MarkBasePointersPhase;
-import jdk.compiler.graal.options.OptionValues;
+import jdk.graal.compiler.lir.stackslotalloc.SimpleStackSlotAllocator;
+import jdk.graal.compiler.lir.alloc.lsra.LinearScanPhase;
+import jdk.graal.compiler.lir.dfa.MarkBasePointersPhase;
+import jdk.graal.compiler.options.OptionValues;
 
 public class EconomyAllocationStage extends LIRPhaseSuite {
     @SuppressWarnings("this-escape")
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/phases/EconomyFinalCodeAnalysisStage.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/phases/EconomyFinalCodeAnalysisStage.java
similarity index 90%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/phases/EconomyFinalCodeAnalysisStage.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/phases/EconomyFinalCodeAnalysisStage.java
index 80dbe7706b2a..af29aa7b07e9 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/phases/EconomyFinalCodeAnalysisStage.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/phases/EconomyFinalCodeAnalysisStage.java
@@ -22,10 +22,10 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.lir.phases;
+package jdk.graal.compiler.lir.phases;
 
-import jdk.compiler.graal.lir.dfa.LocationMarkerPhase;
-import jdk.compiler.graal.lir.phases.FinalCodeAnalysisPhase.FinalCodeAnalysisContext;
+import jdk.graal.compiler.lir.dfa.LocationMarkerPhase;
+import jdk.graal.compiler.lir.phases.FinalCodeAnalysisPhase.FinalCodeAnalysisContext;
 
 public class EconomyFinalCodeAnalysisStage extends LIRPhaseSuite {
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/phases/EconomyPostAllocationOptimizationStage.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/phases/EconomyPostAllocationOptimizationStage.java
similarity index 94%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/phases/EconomyPostAllocationOptimizationStage.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/phases/EconomyPostAllocationOptimizationStage.java
index b0ea2b3f774b..741b50eed30f 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/phases/EconomyPostAllocationOptimizationStage.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/phases/EconomyPostAllocationOptimizationStage.java
@@ -22,9 +22,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.lir.phases;
+package jdk.graal.compiler.lir.phases;
 
-import jdk.compiler.graal.lir.ComputeCodeEmissionOrder;
+import jdk.graal.compiler.lir.ComputeCodeEmissionOrder;
 
 public class EconomyPostAllocationOptimizationStage extends LIRPhaseSuite {
     @SuppressWarnings("this-escape")
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/phases/EconomyPreAllocationOptimizationStage.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/phases/EconomyPreAllocationOptimizationStage.java
similarity index 94%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/phases/EconomyPreAllocationOptimizationStage.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/phases/EconomyPreAllocationOptimizationStage.java
index f232905a9fee..e9e8c12bb622 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/phases/EconomyPreAllocationOptimizationStage.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/phases/EconomyPreAllocationOptimizationStage.java
@@ -22,9 +22,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.lir.phases;
+package jdk.graal.compiler.lir.phases;
 
-import jdk.compiler.graal.lir.alloc.SaveCalleeSaveRegisters;
+import jdk.graal.compiler.lir.alloc.SaveCalleeSaveRegisters;
 
 public class EconomyPreAllocationOptimizationStage extends LIRPhaseSuite {
     @SuppressWarnings("this-escape")
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/phases/FinalCodeAnalysisPhase.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/phases/FinalCodeAnalysisPhase.java
similarity index 94%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/phases/FinalCodeAnalysisPhase.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/phases/FinalCodeAnalysisPhase.java
index 875b351ba928..cffdb996b689 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/phases/FinalCodeAnalysisPhase.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/phases/FinalCodeAnalysisPhase.java
@@ -22,9 +22,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.lir.phases;
+package jdk.graal.compiler.lir.phases;
 
-import jdk.compiler.graal.lir.gen.LIRGeneratorTool;
+import jdk.graal.compiler.lir.gen.LIRGeneratorTool;
 
 public abstract class FinalCodeAnalysisPhase extends LIRPhase {
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/phases/FinalCodeAnalysisStage.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/phases/FinalCodeAnalysisStage.java
similarity index 87%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/phases/FinalCodeAnalysisStage.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/phases/FinalCodeAnalysisStage.java
index 30d3d7e0e366..b78d3e90b5e4 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/phases/FinalCodeAnalysisStage.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/phases/FinalCodeAnalysisStage.java
@@ -22,11 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.lir.phases;
+package jdk.graal.compiler.lir.phases;
 
-import jdk.compiler.graal.lir.dfa.LocationMarkerPhase;
-import jdk.compiler.graal.lir.phases.FinalCodeAnalysisPhase.FinalCodeAnalysisContext;
-import jdk.compiler.graal.options.OptionValues;
+import jdk.graal.compiler.lir.dfa.LocationMarkerPhase;
+import jdk.graal.compiler.lir.phases.FinalCodeAnalysisPhase.FinalCodeAnalysisContext;
+import jdk.graal.compiler.options.OptionValues;
 
 public class FinalCodeAnalysisStage extends LIRPhaseSuite {
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/phases/LIRPhase.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/phases/LIRPhase.java
similarity index 91%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/phases/LIRPhase.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/phases/LIRPhase.java
index bf5af1c82954..7337a7909ba9 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/phases/LIRPhase.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/phases/LIRPhase.java
@@ -22,20 +22,20 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.lir.phases;
+package jdk.graal.compiler.lir.phases;
 
 import java.util.regex.Pattern;
 
-import jdk.compiler.graal.debug.DebugCloseable;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.debug.DebugContext.CompilerPhaseScope;
-import jdk.compiler.graal.debug.MemUseTrackerKey;
-import jdk.compiler.graal.debug.TimerKey;
-import jdk.compiler.graal.lir.LIR;
-import jdk.compiler.graal.lir.gen.LIRGenerationResult;
-import jdk.compiler.graal.options.Option;
-import jdk.compiler.graal.options.OptionKey;
-import jdk.compiler.graal.options.OptionType;
+import jdk.graal.compiler.debug.DebugCloseable;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.debug.DebugContext.CompilerPhaseScope;
+import jdk.graal.compiler.debug.MemUseTrackerKey;
+import jdk.graal.compiler.debug.TimerKey;
+import jdk.graal.compiler.lir.LIR;
+import jdk.graal.compiler.lir.gen.LIRGenerationResult;
+import jdk.graal.compiler.options.Option;
+import jdk.graal.compiler.options.OptionKey;
+import jdk.graal.compiler.options.OptionType;
 
 import jdk.vm.ci.code.TargetDescription;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/phases/LIRPhaseSuite.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/phases/LIRPhaseSuite.java
similarity index 92%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/phases/LIRPhaseSuite.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/phases/LIRPhaseSuite.java
index 7f9c2ee499ce..96c2ecfc3f9d 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/phases/LIRPhaseSuite.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/phases/LIRPhaseSuite.java
@@ -22,19 +22,19 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.lir.phases;
+package jdk.graal.compiler.lir.phases;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.ListIterator;
 
-import jdk.compiler.graal.core.common.util.PhasePlan;
-import jdk.compiler.graal.debug.DebugCloseable;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.debug.TimerKey;
-import jdk.compiler.graal.lir.gen.LIRGenerationResult;
-import jdk.compiler.graal.serviceprovider.GraalServices;
+import jdk.graal.compiler.core.common.util.PhasePlan;
+import jdk.graal.compiler.debug.DebugCloseable;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.debug.TimerKey;
+import jdk.graal.compiler.lir.gen.LIRGenerationResult;
+import jdk.graal.compiler.serviceprovider.GraalServices;
 
 import jdk.vm.ci.code.TargetDescription;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/phases/LIRSuites.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/phases/LIRSuites.java
similarity index 91%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/phases/LIRSuites.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/phases/LIRSuites.java
index 036171019bb8..a9d9b3404951 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/phases/LIRSuites.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/phases/LIRSuites.java
@@ -22,16 +22,16 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.lir.phases;
+package jdk.graal.compiler.lir.phases;
 
-import jdk.compiler.graal.lir.LIR;
-import jdk.compiler.graal.lir.Variable;
-import jdk.compiler.graal.lir.VirtualStackSlot;
-import jdk.compiler.graal.lir.gen.LIRGenerationResult;
-import jdk.compiler.graal.lir.gen.LIRGeneratorTool;
-import jdk.compiler.graal.lir.phases.AllocationPhase.AllocationContext;
-import jdk.compiler.graal.lir.phases.FinalCodeAnalysisPhase.FinalCodeAnalysisContext;
-import jdk.compiler.graal.lir.phases.PostAllocationOptimizationPhase.PostAllocationOptimizationContext;
+import jdk.graal.compiler.lir.LIR;
+import jdk.graal.compiler.lir.Variable;
+import jdk.graal.compiler.lir.VirtualStackSlot;
+import jdk.graal.compiler.lir.gen.LIRGenerationResult;
+import jdk.graal.compiler.lir.gen.LIRGeneratorTool;
+import jdk.graal.compiler.lir.phases.AllocationPhase.AllocationContext;
+import jdk.graal.compiler.lir.phases.FinalCodeAnalysisPhase.FinalCodeAnalysisContext;
+import jdk.graal.compiler.lir.phases.PostAllocationOptimizationPhase.PostAllocationOptimizationContext;
 
 import jdk.vm.ci.code.ReferenceMap;
 import jdk.vm.ci.code.StackSlot;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/phases/PostAllocationOptimizationPhase.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/phases/PostAllocationOptimizationPhase.java
similarity index 91%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/phases/PostAllocationOptimizationPhase.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/phases/PostAllocationOptimizationPhase.java
index 1757cbdddb42..1e4108322666 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/phases/PostAllocationOptimizationPhase.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/phases/PostAllocationOptimizationPhase.java
@@ -22,10 +22,10 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.lir.phases;
+package jdk.graal.compiler.lir.phases;
 
-import jdk.compiler.graal.core.common.cfg.CodeEmissionOrder;
-import jdk.compiler.graal.lir.gen.DiagnosticLIRGeneratorTool;
+import jdk.graal.compiler.core.common.cfg.CodeEmissionOrder;
+import jdk.graal.compiler.lir.gen.DiagnosticLIRGeneratorTool;
 
 public abstract class PostAllocationOptimizationPhase extends LIRPhase {
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/phases/PostAllocationOptimizationStage.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/phases/PostAllocationOptimizationStage.java
similarity index 84%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/phases/PostAllocationOptimizationStage.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/phases/PostAllocationOptimizationStage.java
index 26158011b1a0..08e67c99804b 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/phases/PostAllocationOptimizationStage.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/phases/PostAllocationOptimizationStage.java
@@ -22,21 +22,21 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.lir.phases;
+package jdk.graal.compiler.lir.phases;
 
-import jdk.compiler.graal.lir.ComputeCodeEmissionOrder;
-import jdk.compiler.graal.lir.ControlFlowOptimizer;
-import jdk.compiler.graal.lir.EdgeMoveOptimizer;
-import jdk.compiler.graal.lir.NullCheckOptimizer;
-import jdk.compiler.graal.lir.RedundantMoveElimination;
-import jdk.compiler.graal.lir.profiling.MethodProfilingPhase;
-import jdk.compiler.graal.lir.profiling.MoveProfilingPhase;
-import jdk.compiler.graal.lir.phases.PostAllocationOptimizationPhase.PostAllocationOptimizationContext;
-import jdk.compiler.graal.options.NestedBooleanOptionKey;
-import jdk.compiler.graal.options.Option;
-import jdk.compiler.graal.options.OptionKey;
-import jdk.compiler.graal.options.OptionType;
-import jdk.compiler.graal.options.OptionValues;
+import jdk.graal.compiler.lir.ComputeCodeEmissionOrder;
+import jdk.graal.compiler.lir.ControlFlowOptimizer;
+import jdk.graal.compiler.lir.EdgeMoveOptimizer;
+import jdk.graal.compiler.lir.NullCheckOptimizer;
+import jdk.graal.compiler.lir.RedundantMoveElimination;
+import jdk.graal.compiler.lir.profiling.MethodProfilingPhase;
+import jdk.graal.compiler.lir.profiling.MoveProfilingPhase;
+import jdk.graal.compiler.lir.phases.PostAllocationOptimizationPhase.PostAllocationOptimizationContext;
+import jdk.graal.compiler.options.NestedBooleanOptionKey;
+import jdk.graal.compiler.options.Option;
+import jdk.graal.compiler.options.OptionKey;
+import jdk.graal.compiler.options.OptionType;
+import jdk.graal.compiler.options.OptionValues;
 
 public class PostAllocationOptimizationStage extends LIRPhaseSuite {
     public static class Options {
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/phases/PreAllocationOptimizationPhase.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/phases/PreAllocationOptimizationPhase.java
similarity index 94%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/phases/PreAllocationOptimizationPhase.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/phases/PreAllocationOptimizationPhase.java
index 28cb56115568..82fd9e05c412 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/phases/PreAllocationOptimizationPhase.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/phases/PreAllocationOptimizationPhase.java
@@ -22,9 +22,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.lir.phases;
+package jdk.graal.compiler.lir.phases;
 
-import jdk.compiler.graal.lir.gen.LIRGeneratorTool;
+import jdk.graal.compiler.lir.gen.LIRGeneratorTool;
 
 public abstract class PreAllocationOptimizationPhase extends LIRPhase {
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/phases/PreAllocationOptimizationStage.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/phases/PreAllocationOptimizationStage.java
similarity index 88%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/phases/PreAllocationOptimizationStage.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/phases/PreAllocationOptimizationStage.java
index c0f2329f8fe1..9113ae70319c 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/phases/PreAllocationOptimizationStage.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/phases/PreAllocationOptimizationStage.java
@@ -22,11 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.lir.phases;
+package jdk.graal.compiler.lir.phases;
 
-import jdk.compiler.graal.lir.alloc.SaveCalleeSaveRegisters;
-import jdk.compiler.graal.lir.constopt.ConstantLoadOptimization;
-import jdk.compiler.graal.options.OptionValues;
+import jdk.graal.compiler.lir.alloc.SaveCalleeSaveRegisters;
+import jdk.graal.compiler.lir.constopt.ConstantLoadOptimization;
+import jdk.graal.compiler.options.OptionValues;
 
 public class PreAllocationOptimizationStage extends LIRPhaseSuite {
     @SuppressWarnings("this-escape")
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/profiling/MethodProfilingPhase.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/profiling/MethodProfilingPhase.java
similarity index 86%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/profiling/MethodProfilingPhase.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/profiling/MethodProfilingPhase.java
index feb2e7587f52..9f5d3dcf8978 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/profiling/MethodProfilingPhase.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/profiling/MethodProfilingPhase.java
@@ -22,21 +22,21 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.lir.profiling;
+package jdk.graal.compiler.lir.profiling;
 
 import java.util.ArrayList;
 
-import jdk.compiler.graal.core.common.LIRKind;
-import jdk.compiler.graal.core.common.cfg.BasicBlock;
-import jdk.compiler.graal.lir.ConstantValue;
-import jdk.compiler.graal.lir.LIR;
-import jdk.compiler.graal.lir.LIRInsertionBuffer;
-import jdk.compiler.graal.lir.LIRInstruction;
-import jdk.compiler.graal.lir.StandardOp.BlockEndOp;
-import jdk.compiler.graal.lir.StandardOp.LabelOp;
-import jdk.compiler.graal.lir.gen.DiagnosticLIRGeneratorTool;
-import jdk.compiler.graal.lir.gen.LIRGenerationResult;
-import jdk.compiler.graal.lir.phases.PostAllocationOptimizationPhase;
+import jdk.graal.compiler.core.common.LIRKind;
+import jdk.graal.compiler.core.common.cfg.BasicBlock;
+import jdk.graal.compiler.lir.ConstantValue;
+import jdk.graal.compiler.lir.LIR;
+import jdk.graal.compiler.lir.LIRInsertionBuffer;
+import jdk.graal.compiler.lir.LIRInstruction;
+import jdk.graal.compiler.lir.StandardOp.BlockEndOp;
+import jdk.graal.compiler.lir.StandardOp.LabelOp;
+import jdk.graal.compiler.lir.gen.DiagnosticLIRGeneratorTool;
+import jdk.graal.compiler.lir.gen.LIRGenerationResult;
+import jdk.graal.compiler.lir.phases.PostAllocationOptimizationPhase;
 
 import jdk.vm.ci.code.TargetDescription;
 import jdk.vm.ci.meta.JavaConstant;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/profiling/MoveProfiler.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/profiling/MoveProfiler.java
similarity index 89%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/profiling/MoveProfiler.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/profiling/MoveProfiler.java
index 0c2a1aaac2e0..ac3420d5c661 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/profiling/MoveProfiler.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/profiling/MoveProfiler.java
@@ -22,17 +22,17 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.lir.profiling;
+package jdk.graal.compiler.lir.profiling;
 
 import java.util.ArrayList;
 
-import jdk.compiler.graal.core.common.cfg.BasicBlock;
-import jdk.compiler.graal.core.common.cfg.BlockMap;
-import jdk.compiler.graal.lir.LIR;
-import jdk.compiler.graal.lir.LIRInstruction;
-import jdk.compiler.graal.lir.StandardOp.BlockEndOp;
-import jdk.compiler.graal.lir.StandardOp.LabelOp;
-import jdk.compiler.graal.lir.StandardOp.MoveOp;
+import jdk.graal.compiler.core.common.cfg.BasicBlock;
+import jdk.graal.compiler.core.common.cfg.BlockMap;
+import jdk.graal.compiler.lir.LIR;
+import jdk.graal.compiler.lir.LIRInstruction;
+import jdk.graal.compiler.lir.StandardOp.BlockEndOp;
+import jdk.graal.compiler.lir.StandardOp.LabelOp;
+import jdk.graal.compiler.lir.StandardOp.MoveOp;
 
 public final class MoveProfiler {
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/profiling/MoveProfilingPhase.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/profiling/MoveProfilingPhase.java
similarity index 88%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/profiling/MoveProfilingPhase.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/profiling/MoveProfilingPhase.java
index b945d432ea55..2c9e27186b8d 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/profiling/MoveProfilingPhase.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/profiling/MoveProfilingPhase.java
@@ -22,25 +22,25 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.lir.profiling;
+package jdk.graal.compiler.lir.profiling;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import jdk.compiler.graal.core.common.LIRKind;
-import jdk.compiler.graal.core.common.cfg.BasicBlock;
-import jdk.compiler.graal.core.common.cfg.BlockMap;
-import jdk.compiler.graal.lir.ConstantValue;
-import jdk.compiler.graal.lir.LIR;
-import jdk.compiler.graal.lir.LIRInsertionBuffer;
-import jdk.compiler.graal.lir.LIRInstruction;
-import jdk.compiler.graal.lir.gen.DiagnosticLIRGeneratorTool;
-import jdk.compiler.graal.lir.gen.LIRGenerationResult;
-import jdk.compiler.graal.lir.phases.PostAllocationOptimizationPhase;
-import jdk.compiler.graal.lir.profiling.MoveProfiler.MoveStatistics;
-import jdk.compiler.graal.options.Option;
-import jdk.compiler.graal.options.OptionKey;
-import jdk.compiler.graal.options.OptionType;
+import jdk.graal.compiler.core.common.LIRKind;
+import jdk.graal.compiler.core.common.cfg.BasicBlock;
+import jdk.graal.compiler.core.common.cfg.BlockMap;
+import jdk.graal.compiler.lir.ConstantValue;
+import jdk.graal.compiler.lir.LIR;
+import jdk.graal.compiler.lir.LIRInsertionBuffer;
+import jdk.graal.compiler.lir.LIRInstruction;
+import jdk.graal.compiler.lir.gen.DiagnosticLIRGeneratorTool;
+import jdk.graal.compiler.lir.gen.LIRGenerationResult;
+import jdk.graal.compiler.lir.phases.PostAllocationOptimizationPhase;
+import jdk.graal.compiler.lir.profiling.MoveProfiler.MoveStatistics;
+import jdk.graal.compiler.options.Option;
+import jdk.graal.compiler.options.OptionKey;
+import jdk.graal.compiler.options.OptionType;
 
 import jdk.vm.ci.code.TargetDescription;
 import jdk.vm.ci.meta.JavaConstant;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/profiling/MoveType.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/profiling/MoveType.java
similarity index 90%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/profiling/MoveType.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/profiling/MoveType.java
index 2e98d1fd5c2a..6b033b63843e 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/profiling/MoveType.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/profiling/MoveType.java
@@ -22,16 +22,16 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.lir.profiling;
+package jdk.graal.compiler.lir.profiling;
 
 import static jdk.vm.ci.code.ValueUtil.isRegister;
 import static jdk.vm.ci.code.ValueUtil.isStackSlot;
 
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.lir.LIRInstruction;
-import jdk.compiler.graal.lir.StandardOp.LoadConstantOp;
-import jdk.compiler.graal.lir.StandardOp.MoveOp;
-import jdk.compiler.graal.lir.StandardOp.ValueMoveOp;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.lir.LIRInstruction;
+import jdk.graal.compiler.lir.StandardOp.LoadConstantOp;
+import jdk.graal.compiler.lir.StandardOp.MoveOp;
+import jdk.graal.compiler.lir.StandardOp.ValueMoveOp;
 
 import jdk.vm.ci.meta.AllocatableValue;
 import jdk.vm.ci.meta.Value;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/ssa/SSAUtil.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/ssa/SSAUtil.java
similarity index 95%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/ssa/SSAUtil.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/ssa/SSAUtil.java
index 8641b5956358..1d96a3c34df4 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/ssa/SSAUtil.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/ssa/SSAUtil.java
@@ -22,16 +22,16 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.lir.ssa;
+package jdk.graal.compiler.lir.ssa;
 
 import java.util.ArrayList;
 
-import jdk.compiler.graal.core.common.LIRKind;
-import jdk.compiler.graal.core.common.cfg.BasicBlock;
-import jdk.compiler.graal.debug.Assertions;
-import jdk.compiler.graal.lir.LIR;
-import jdk.compiler.graal.lir.LIRInstruction;
-import jdk.compiler.graal.lir.StandardOp;
+import jdk.graal.compiler.core.common.LIRKind;
+import jdk.graal.compiler.core.common.cfg.BasicBlock;
+import jdk.graal.compiler.debug.Assertions;
+import jdk.graal.compiler.lir.LIR;
+import jdk.graal.compiler.lir.LIRInstruction;
+import jdk.graal.compiler.lir.StandardOp;
 
 import jdk.vm.ci.meta.Value;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/ssa/SSAVerifier.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/ssa/SSAVerifier.java
similarity index 92%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/ssa/SSAVerifier.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/ssa/SSAVerifier.java
index 97bfcee1fa49..336a49e86a27 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/ssa/SSAVerifier.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/ssa/SSAVerifier.java
@@ -23,21 +23,21 @@
  * questions.
  */
 
-package jdk.compiler.graal.lir.ssa;
+package jdk.graal.compiler.lir.ssa;
 
 import static jdk.vm.ci.code.ValueUtil.isRegister;
 
 import java.util.EnumSet;
 import java.util.HashMap;
 
-import jdk.compiler.graal.core.common.cfg.BasicBlock;
-import jdk.compiler.graal.core.common.cfg.BasicBlockSet;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.debug.Indent;
-import jdk.compiler.graal.lir.InstructionValueConsumer;
-import jdk.compiler.graal.lir.LIR;
-import jdk.compiler.graal.lir.LIRInstruction;
-import jdk.compiler.graal.lir.LIRValueUtil;
+import jdk.graal.compiler.core.common.cfg.BasicBlock;
+import jdk.graal.compiler.core.common.cfg.BasicBlockSet;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.debug.Indent;
+import jdk.graal.compiler.lir.InstructionValueConsumer;
+import jdk.graal.compiler.lir.LIR;
+import jdk.graal.compiler.lir.LIRInstruction;
+import jdk.graal.compiler.lir.LIRValueUtil;
 
 import jdk.vm.ci.meta.Value;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/stackslotalloc/FixPointIntervalBuilder.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/stackslotalloc/FixPointIntervalBuilder.java
similarity index 93%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/stackslotalloc/FixPointIntervalBuilder.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/stackslotalloc/FixPointIntervalBuilder.java
index f84884c87b1e..7603bce08e52 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/stackslotalloc/FixPointIntervalBuilder.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/stackslotalloc/FixPointIntervalBuilder.java
@@ -22,10 +22,10 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.lir.stackslotalloc;
+package jdk.graal.compiler.lir.stackslotalloc;
 
-import static jdk.compiler.graal.lir.LIRValueUtil.asVirtualStackSlot;
-import static jdk.compiler.graal.lir.LIRValueUtil.isVirtualStackSlot;
+import static jdk.graal.compiler.lir.LIRValueUtil.asVirtualStackSlot;
+import static jdk.graal.compiler.lir.LIRValueUtil.isVirtualStackSlot;
 
 import java.util.ArrayDeque;
 import java.util.ArrayList;
@@ -35,19 +35,19 @@
 
 import org.graalvm.collections.EconomicSet;
 import org.graalvm.collections.Equivalence;
-import jdk.compiler.graal.core.common.cfg.BasicBlock;
-import jdk.compiler.graal.core.common.cfg.BlockMap;
-import jdk.compiler.graal.debug.CounterKey;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.debug.Indent;
-import jdk.compiler.graal.lir.InstructionValueConsumer;
-import jdk.compiler.graal.lir.InstructionValueProcedure;
-import jdk.compiler.graal.lir.LIR;
-import jdk.compiler.graal.lir.LIRInstruction;
-import jdk.compiler.graal.lir.LIRInstruction.OperandFlag;
-import jdk.compiler.graal.lir.LIRInstruction.OperandMode;
-import jdk.compiler.graal.lir.VirtualStackSlot;
-import jdk.compiler.graal.lir.framemap.SimpleVirtualStackSlotAlias;
+import jdk.graal.compiler.core.common.cfg.BasicBlock;
+import jdk.graal.compiler.core.common.cfg.BlockMap;
+import jdk.graal.compiler.debug.CounterKey;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.debug.Indent;
+import jdk.graal.compiler.lir.InstructionValueConsumer;
+import jdk.graal.compiler.lir.InstructionValueProcedure;
+import jdk.graal.compiler.lir.LIR;
+import jdk.graal.compiler.lir.LIRInstruction;
+import jdk.graal.compiler.lir.LIRInstruction.OperandFlag;
+import jdk.graal.compiler.lir.LIRInstruction.OperandMode;
+import jdk.graal.compiler.lir.VirtualStackSlot;
+import jdk.graal.compiler.lir.framemap.SimpleVirtualStackSlotAlias;
 
 import jdk.vm.ci.meta.Value;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/stackslotalloc/LSStackSlotAllocator.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/stackslotalloc/LSStackSlotAllocator.java
similarity index 92%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/stackslotalloc/LSStackSlotAllocator.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/stackslotalloc/LSStackSlotAllocator.java
index cc8b1dce5ddc..c1f4bd333d39 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/stackslotalloc/LSStackSlotAllocator.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/stackslotalloc/LSStackSlotAllocator.java
@@ -22,12 +22,12 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.lir.stackslotalloc;
+package jdk.graal.compiler.lir.stackslotalloc;
 
-import static jdk.compiler.graal.debug.DebugContext.BASIC_LEVEL;
-import static jdk.compiler.graal.lir.LIRValueUtil.asVirtualStackSlot;
-import static jdk.compiler.graal.lir.LIRValueUtil.isVirtualStackSlot;
-import static jdk.compiler.graal.lir.phases.LIRPhase.Options.LIROptimization;
+import static jdk.graal.compiler.debug.DebugContext.BASIC_LEVEL;
+import static jdk.graal.compiler.lir.LIRValueUtil.asVirtualStackSlot;
+import static jdk.graal.compiler.lir.LIRValueUtil.isVirtualStackSlot;
+import static jdk.graal.compiler.lir.phases.LIRPhase.Options.LIROptimization;
 
 import java.util.ArrayDeque;
 import java.util.ArrayList;
@@ -38,29 +38,29 @@
 import java.util.function.Predicate;
 
 import org.graalvm.collections.EconomicSet;
-import jdk.compiler.graal.core.common.LIRKind;
-import jdk.compiler.graal.core.common.cfg.BasicBlock;
-import jdk.compiler.graal.debug.DebugCloseable;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.debug.Indent;
-import jdk.compiler.graal.debug.TimerKey;
-import jdk.compiler.graal.lir.LIR;
-import jdk.compiler.graal.lir.LIRInstruction;
-import jdk.compiler.graal.lir.LIRInstruction.OperandFlag;
-import jdk.compiler.graal.lir.LIRInstruction.OperandMode;
-import jdk.compiler.graal.lir.ValueProcedure;
-import jdk.compiler.graal.lir.VirtualStackSlot;
-import jdk.compiler.graal.lir.framemap.FrameMap;
-import jdk.compiler.graal.lir.framemap.FrameMapBuilderTool;
-import jdk.compiler.graal.lir.framemap.SimpleVirtualStackSlot;
-import jdk.compiler.graal.lir.framemap.SimpleVirtualStackSlotAlias;
-import jdk.compiler.graal.lir.framemap.VirtualStackSlotRange;
-import jdk.compiler.graal.lir.gen.LIRGenerationResult;
-import jdk.compiler.graal.lir.phases.AllocationPhase;
-import jdk.compiler.graal.options.NestedBooleanOptionKey;
-import jdk.compiler.graal.options.Option;
-import jdk.compiler.graal.options.OptionType;
+import jdk.graal.compiler.core.common.LIRKind;
+import jdk.graal.compiler.core.common.cfg.BasicBlock;
+import jdk.graal.compiler.debug.DebugCloseable;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.debug.Indent;
+import jdk.graal.compiler.debug.TimerKey;
+import jdk.graal.compiler.lir.LIR;
+import jdk.graal.compiler.lir.LIRInstruction;
+import jdk.graal.compiler.lir.LIRInstruction.OperandFlag;
+import jdk.graal.compiler.lir.LIRInstruction.OperandMode;
+import jdk.graal.compiler.lir.ValueProcedure;
+import jdk.graal.compiler.lir.VirtualStackSlot;
+import jdk.graal.compiler.lir.framemap.FrameMap;
+import jdk.graal.compiler.lir.framemap.FrameMapBuilderTool;
+import jdk.graal.compiler.lir.framemap.SimpleVirtualStackSlot;
+import jdk.graal.compiler.lir.framemap.SimpleVirtualStackSlotAlias;
+import jdk.graal.compiler.lir.framemap.VirtualStackSlotRange;
+import jdk.graal.compiler.lir.gen.LIRGenerationResult;
+import jdk.graal.compiler.lir.phases.AllocationPhase;
+import jdk.graal.compiler.options.NestedBooleanOptionKey;
+import jdk.graal.compiler.options.Option;
+import jdk.graal.compiler.options.OptionType;
 
 import jdk.vm.ci.code.CodeUtil;
 import jdk.vm.ci.code.StackSlot;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/stackslotalloc/SimpleStackSlotAllocator.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/stackslotalloc/SimpleStackSlotAllocator.java
similarity index 86%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/stackslotalloc/SimpleStackSlotAllocator.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/stackslotalloc/SimpleStackSlotAllocator.java
index 5bc63c748aed..f0f80fc84668 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/stackslotalloc/SimpleStackSlotAllocator.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/stackslotalloc/SimpleStackSlotAllocator.java
@@ -22,24 +22,24 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.lir.stackslotalloc;
+package jdk.graal.compiler.lir.stackslotalloc;
 
-import static jdk.compiler.graal.lir.LIRValueUtil.asVirtualStackSlot;
-import static jdk.compiler.graal.lir.LIRValueUtil.isVirtualStackSlot;
+import static jdk.graal.compiler.lir.LIRValueUtil.asVirtualStackSlot;
+import static jdk.graal.compiler.lir.LIRValueUtil.isVirtualStackSlot;
 
-import jdk.compiler.graal.core.common.cfg.BasicBlock;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.debug.Indent;
-import jdk.compiler.graal.lir.LIRInstruction;
-import jdk.compiler.graal.lir.ValueProcedure;
-import jdk.compiler.graal.lir.VirtualStackSlot;
-import jdk.compiler.graal.lir.framemap.FrameMapBuilderTool;
-import jdk.compiler.graal.lir.framemap.SimpleVirtualStackSlot;
-import jdk.compiler.graal.lir.framemap.SimpleVirtualStackSlotAlias;
-import jdk.compiler.graal.lir.framemap.VirtualStackSlotRange;
-import jdk.compiler.graal.lir.gen.LIRGenerationResult;
-import jdk.compiler.graal.lir.phases.AllocationPhase;
+import jdk.graal.compiler.core.common.cfg.BasicBlock;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.debug.Indent;
+import jdk.graal.compiler.lir.LIRInstruction;
+import jdk.graal.compiler.lir.ValueProcedure;
+import jdk.graal.compiler.lir.VirtualStackSlot;
+import jdk.graal.compiler.lir.framemap.FrameMapBuilderTool;
+import jdk.graal.compiler.lir.framemap.SimpleVirtualStackSlot;
+import jdk.graal.compiler.lir.framemap.SimpleVirtualStackSlotAlias;
+import jdk.graal.compiler.lir.framemap.VirtualStackSlotRange;
+import jdk.graal.compiler.lir.gen.LIRGenerationResult;
+import jdk.graal.compiler.lir.phases.AllocationPhase;
 
 import jdk.vm.ci.code.StackSlot;
 import jdk.vm.ci.code.TargetDescription;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/stackslotalloc/StackInterval.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/stackslotalloc/StackInterval.java
similarity index 97%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/stackslotalloc/StackInterval.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/stackslotalloc/StackInterval.java
index d6965a663460..968d6fba25d0 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/stackslotalloc/StackInterval.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/stackslotalloc/StackInterval.java
@@ -22,9 +22,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.lir.stackslotalloc;
+package jdk.graal.compiler.lir.stackslotalloc;
 
-import jdk.compiler.graal.lir.VirtualStackSlot;
+import jdk.graal.compiler.lir.VirtualStackSlot;
 
 import jdk.vm.ci.code.StackSlot;
 import jdk.vm.ci.meta.ValueKind;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/stackslotalloc/StackIntervalDumper.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/stackslotalloc/StackIntervalDumper.java
similarity index 93%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/stackslotalloc/StackIntervalDumper.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/stackslotalloc/StackIntervalDumper.java
index 501dc81c981b..ee278167995c 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/stackslotalloc/StackIntervalDumper.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/stackslotalloc/StackIntervalDumper.java
@@ -22,10 +22,10 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.lir.stackslotalloc;
+package jdk.graal.compiler.lir.stackslotalloc;
 
-import jdk.compiler.graal.lir.debug.IntervalDumper;
-import jdk.compiler.graal.lir.VirtualStackSlot;
+import jdk.graal.compiler.lir.debug.IntervalDumper;
+import jdk.graal.compiler.lir.VirtualStackSlot;
 
 import jdk.vm.ci.meta.Value;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/stackslotalloc/StackSlotAllocatorUtil.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/stackslotalloc/StackSlotAllocatorUtil.java
similarity index 90%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/stackslotalloc/StackSlotAllocatorUtil.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/stackslotalloc/StackSlotAllocatorUtil.java
index 8645aded739d..70e3fc14e557 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/stackslotalloc/StackSlotAllocatorUtil.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/stackslotalloc/StackSlotAllocatorUtil.java
@@ -22,12 +22,12 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.lir.stackslotalloc;
+package jdk.graal.compiler.lir.stackslotalloc;
 
-import jdk.compiler.graal.debug.CounterKey;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.lir.VirtualStackSlot;
-import jdk.compiler.graal.lir.gen.LIRGenerationResult;
+import jdk.graal.compiler.debug.CounterKey;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.lir.VirtualStackSlot;
+import jdk.graal.compiler.lir.gen.LIRGenerationResult;
 
 import jdk.vm.ci.code.StackSlot;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/util/GenericValueMap.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/util/GenericValueMap.java
similarity index 98%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/util/GenericValueMap.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/util/GenericValueMap.java
index baf5b6ea6a90..cc84586bbd02 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/util/GenericValueMap.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/util/GenericValueMap.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.lir.util;
+package jdk.graal.compiler.lir.util;
 
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.Equivalence;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/util/IndexedValueMap.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/util/IndexedValueMap.java
similarity index 98%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/util/IndexedValueMap.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/util/IndexedValueMap.java
index 40d5d942c2f8..0155410ebe4e 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/util/IndexedValueMap.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/util/IndexedValueMap.java
@@ -22,17 +22,17 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.lir.util;
+package jdk.graal.compiler.lir.util;
 
 import java.util.EnumSet;
 import java.util.Objects;
 
-import jdk.compiler.graal.lir.InstructionValueConsumer;
-import jdk.compiler.graal.lir.InstructionValueProcedure;
-import jdk.compiler.graal.lir.LIRInstruction;
+import jdk.graal.compiler.lir.InstructionValueConsumer;
+import jdk.graal.compiler.lir.InstructionValueProcedure;
+import jdk.graal.compiler.lir.LIRInstruction;
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.MapCursor;
-import jdk.compiler.graal.debug.GraalError;
+import jdk.graal.compiler.debug.GraalError;
 
 import jdk.vm.ci.meta.Value;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/util/RegisterMap.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/util/RegisterMap.java
similarity index 98%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/util/RegisterMap.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/util/RegisterMap.java
index c5230102dfe3..01564897e7f3 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/util/RegisterMap.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/util/RegisterMap.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.lir.util;
+package jdk.graal.compiler.lir.util;
 
 import java.util.function.BiConsumer;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/util/ValueMap.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/util/ValueMap.java
similarity index 97%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/util/ValueMap.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/util/ValueMap.java
index 5bcb1e7d1d97..754cbf3f63d2 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/util/ValueMap.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/util/ValueMap.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.lir.util;
+package jdk.graal.compiler.lir.util;
 
 import jdk.vm.ci.meta.Value;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/util/ValueSet.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/util/ValueSet.java
similarity index 97%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/util/ValueSet.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/util/ValueSet.java
index 7724893e931c..2d8af36b14e5 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/util/ValueSet.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/lir/util/ValueSet.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.lir.util;
+package jdk.graal.compiler.lir.util;
 
 import jdk.vm.ci.meta.Value;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/loop/phases/ConvertDeoptimizeToGuardPhase.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/loop/phases/ConvertDeoptimizeToGuardPhase.java
similarity index 86%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/loop/phases/ConvertDeoptimizeToGuardPhase.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/loop/phases/ConvertDeoptimizeToGuardPhase.java
index 26ee77ab63ba..71d2709a4190 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/loop/phases/ConvertDeoptimizeToGuardPhase.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/loop/phases/ConvertDeoptimizeToGuardPhase.java
@@ -22,57 +22,57 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.loop.phases;
+package jdk.graal.compiler.loop.phases;
 
-import static jdk.compiler.graal.phases.common.DeadCodeEliminationPhase.Optionality.Optional;
+import static jdk.graal.compiler.phases.common.DeadCodeEliminationPhase.Optionality.Optional;
 
 import java.util.List;
 import java.util.Optional;
 
-import jdk.compiler.graal.core.common.GraalOptions;
-import jdk.compiler.graal.core.common.cfg.Loop;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.debug.DebugCloseable;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeSourcePosition;
-import jdk.compiler.graal.nodeinfo.InputType;
-import jdk.compiler.graal.nodes.AbstractBeginNode;
-import jdk.compiler.graal.nodes.AbstractEndNode;
-import jdk.compiler.graal.nodes.AbstractMergeNode;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.ControlSplitNode;
-import jdk.compiler.graal.nodes.DeoptimizeNode;
-import jdk.compiler.graal.nodes.EndNode;
-import jdk.compiler.graal.nodes.FixedGuardNode;
-import jdk.compiler.graal.nodes.FixedNode;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.GraphState;
-import jdk.compiler.graal.nodes.GraphState.StageFlag;
-import jdk.compiler.graal.nodes.GuardNode;
-import jdk.compiler.graal.nodes.IfNode;
-import jdk.compiler.graal.nodes.LogicNode;
-import jdk.compiler.graal.nodes.LoopExitNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ProxyNode;
-import jdk.compiler.graal.nodes.StartNode;
-import jdk.compiler.graal.nodes.StaticDeoptimizingNode;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.ValuePhiNode;
-import jdk.compiler.graal.nodes.calc.CompareNode;
-import jdk.compiler.graal.nodes.calc.IntegerEqualsNode;
-import jdk.compiler.graal.nodes.cfg.HIRBlock;
-import jdk.compiler.graal.nodes.extended.BranchProbabilityNode;
-import jdk.compiler.graal.nodes.loop.LoopEx;
-import jdk.compiler.graal.nodes.loop.LoopsData;
-import jdk.compiler.graal.nodes.spi.CoreProviders;
-import jdk.compiler.graal.nodes.spi.Simplifiable;
-import jdk.compiler.graal.nodes.spi.SimplifierTool;
-import jdk.compiler.graal.nodes.util.GraphUtil;
-import jdk.compiler.graal.phases.common.CanonicalizerPhase;
-import jdk.compiler.graal.phases.common.DeadCodeEliminationPhase;
-import jdk.compiler.graal.phases.common.LazyValue;
-import jdk.compiler.graal.phases.common.PostRunCanonicalizationPhase;
+import jdk.graal.compiler.core.common.GraalOptions;
+import jdk.graal.compiler.core.common.cfg.Loop;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.debug.DebugCloseable;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeSourcePosition;
+import jdk.graal.compiler.nodeinfo.InputType;
+import jdk.graal.compiler.nodes.AbstractBeginNode;
+import jdk.graal.compiler.nodes.AbstractEndNode;
+import jdk.graal.compiler.nodes.AbstractMergeNode;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.ControlSplitNode;
+import jdk.graal.compiler.nodes.DeoptimizeNode;
+import jdk.graal.compiler.nodes.EndNode;
+import jdk.graal.compiler.nodes.FixedGuardNode;
+import jdk.graal.compiler.nodes.FixedNode;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.GraphState;
+import jdk.graal.compiler.nodes.GraphState.StageFlag;
+import jdk.graal.compiler.nodes.GuardNode;
+import jdk.graal.compiler.nodes.IfNode;
+import jdk.graal.compiler.nodes.LogicNode;
+import jdk.graal.compiler.nodes.LoopExitNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ProxyNode;
+import jdk.graal.compiler.nodes.StartNode;
+import jdk.graal.compiler.nodes.StaticDeoptimizingNode;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.ValuePhiNode;
+import jdk.graal.compiler.nodes.calc.CompareNode;
+import jdk.graal.compiler.nodes.calc.IntegerEqualsNode;
+import jdk.graal.compiler.nodes.cfg.HIRBlock;
+import jdk.graal.compiler.nodes.extended.BranchProbabilityNode;
+import jdk.graal.compiler.nodes.loop.LoopEx;
+import jdk.graal.compiler.nodes.loop.LoopsData;
+import jdk.graal.compiler.nodes.spi.CoreProviders;
+import jdk.graal.compiler.nodes.spi.Simplifiable;
+import jdk.graal.compiler.nodes.spi.SimplifierTool;
+import jdk.graal.compiler.nodes.util.GraphUtil;
+import jdk.graal.compiler.phases.common.CanonicalizerPhase;
+import jdk.graal.compiler.phases.common.DeadCodeEliminationPhase;
+import jdk.graal.compiler.phases.common.LazyValue;
+import jdk.graal.compiler.phases.common.PostRunCanonicalizationPhase;
 
 import jdk.vm.ci.meta.Constant;
 import jdk.vm.ci.meta.TriState;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/loop/phases/LoopFullUnrollPhase.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/loop/phases/LoopFullUnrollPhase.java
similarity index 90%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/loop/phases/LoopFullUnrollPhase.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/loop/phases/LoopFullUnrollPhase.java
index 0ff4f5bcd8c7..a380ee986b24 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/loop/phases/LoopFullUnrollPhase.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/loop/phases/LoopFullUnrollPhase.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.loop.phases;
+package jdk.graal.compiler.loop.phases;
 
 import java.util.Comparator;
 import java.util.List;
@@ -30,22 +30,22 @@
 import java.util.function.ToDoubleFunction;
 import java.util.function.ToIntFunction;
 
-import jdk.compiler.graal.core.common.GraalOptions;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.nodeinfo.NodeSize;
-import jdk.compiler.graal.nodes.GraphState;
-import jdk.compiler.graal.nodes.GraphState.StageFlag;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.loop.LoopEx;
-import jdk.compiler.graal.nodes.loop.LoopPolicies;
-import jdk.compiler.graal.nodes.loop.LoopsData;
-import jdk.compiler.graal.nodes.spi.CoreProviders;
-import jdk.compiler.graal.options.Option;
-import jdk.compiler.graal.options.OptionKey;
-import jdk.compiler.graal.options.OptionType;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.common.CanonicalizerPhase;
-import jdk.compiler.graal.phases.contract.NodeCostUtil;
+import jdk.graal.compiler.core.common.GraalOptions;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.nodeinfo.NodeSize;
+import jdk.graal.compiler.nodes.GraphState;
+import jdk.graal.compiler.nodes.GraphState.StageFlag;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.loop.LoopEx;
+import jdk.graal.compiler.nodes.loop.LoopPolicies;
+import jdk.graal.compiler.nodes.loop.LoopsData;
+import jdk.graal.compiler.nodes.spi.CoreProviders;
+import jdk.graal.compiler.options.Option;
+import jdk.graal.compiler.options.OptionKey;
+import jdk.graal.compiler.options.OptionType;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.common.CanonicalizerPhase;
+import jdk.graal.compiler.phases.contract.NodeCostUtil;
 
 public class LoopFullUnrollPhase extends LoopPhase {
     public static class Options {
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/loop/phases/LoopPartialUnrollPhase.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/loop/phases/LoopPartialUnrollPhase.java
similarity index 89%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/loop/phases/LoopPartialUnrollPhase.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/loop/phases/LoopPartialUnrollPhase.java
index 8f835427bedb..01b468bbfbc2 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/loop/phases/LoopPartialUnrollPhase.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/loop/phases/LoopPartialUnrollPhase.java
@@ -22,26 +22,26 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.loop.phases;
+package jdk.graal.compiler.loop.phases;
 
 import java.util.Optional;
 
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.Equivalence;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.graph.Graph;
-import jdk.compiler.graal.nodes.GraphState;
-import jdk.compiler.graal.nodes.GraphState.StageFlag;
-import jdk.compiler.graal.nodes.LoopBeginNode;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.extended.OpaqueNode;
-import jdk.compiler.graal.nodes.loop.LoopEx;
-import jdk.compiler.graal.nodes.loop.LoopPolicies;
-import jdk.compiler.graal.nodes.loop.LoopsData;
-import jdk.compiler.graal.nodes.spi.CoreProviders;
-import jdk.compiler.graal.nodes.spi.LoopsDataProvider;
-import jdk.compiler.graal.phases.common.CanonicalizerPhase;
-import jdk.compiler.graal.phases.common.util.EconomicSetNodeEventListener;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.graph.Graph;
+import jdk.graal.compiler.nodes.GraphState;
+import jdk.graal.compiler.nodes.GraphState.StageFlag;
+import jdk.graal.compiler.nodes.LoopBeginNode;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.extended.OpaqueNode;
+import jdk.graal.compiler.nodes.loop.LoopEx;
+import jdk.graal.compiler.nodes.loop.LoopPolicies;
+import jdk.graal.compiler.nodes.loop.LoopsData;
+import jdk.graal.compiler.nodes.spi.CoreProviders;
+import jdk.graal.compiler.nodes.spi.LoopsDataProvider;
+import jdk.graal.compiler.phases.common.CanonicalizerPhase;
+import jdk.graal.compiler.phases.common.util.EconomicSetNodeEventListener;
 
 public class LoopPartialUnrollPhase extends LoopPhase {
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/loop/phases/LoopPeelingPhase.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/loop/phases/LoopPeelingPhase.java
similarity index 88%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/loop/phases/LoopPeelingPhase.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/loop/phases/LoopPeelingPhase.java
index 3f2edef583d9..a69bee1b076a 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/loop/phases/LoopPeelingPhase.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/loop/phases/LoopPeelingPhase.java
@@ -22,21 +22,21 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.loop.phases;
+package jdk.graal.compiler.loop.phases;
 
 import java.util.Optional;
 
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.nodes.GraphState;
-import jdk.compiler.graal.nodes.GraphState.StageFlag;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.loop.LoopEx;
-import jdk.compiler.graal.nodes.loop.LoopPolicies;
-import jdk.compiler.graal.nodes.loop.LoopsData;
-import jdk.compiler.graal.nodes.spi.CoreProviders;
-import jdk.compiler.graal.options.Option;
-import jdk.compiler.graal.options.OptionKey;
-import jdk.compiler.graal.phases.common.CanonicalizerPhase;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.nodes.GraphState;
+import jdk.graal.compiler.nodes.GraphState.StageFlag;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.loop.LoopEx;
+import jdk.graal.compiler.nodes.loop.LoopPolicies;
+import jdk.graal.compiler.nodes.loop.LoopsData;
+import jdk.graal.compiler.nodes.spi.CoreProviders;
+import jdk.graal.compiler.options.Option;
+import jdk.graal.compiler.options.OptionKey;
+import jdk.graal.compiler.phases.common.CanonicalizerPhase;
 
 public class LoopPeelingPhase extends LoopPhase {
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/loop/phases/LoopPhase.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/loop/phases/LoopPhase.java
similarity index 86%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/loop/phases/LoopPhase.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/loop/phases/LoopPhase.java
index 8e9ff268ab0e..a53c988b219e 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/loop/phases/LoopPhase.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/loop/phases/LoopPhase.java
@@ -22,12 +22,12 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.loop.phases;
+package jdk.graal.compiler.loop.phases;
 
-import jdk.compiler.graal.nodes.loop.LoopPolicies;
-import jdk.compiler.graal.nodes.spi.CoreProviders;
-import jdk.compiler.graal.phases.common.CanonicalizerPhase;
-import jdk.compiler.graal.phases.common.PostRunCanonicalizationPhase;
+import jdk.graal.compiler.nodes.loop.LoopPolicies;
+import jdk.graal.compiler.nodes.spi.CoreProviders;
+import jdk.graal.compiler.phases.common.CanonicalizerPhase;
+import jdk.graal.compiler.phases.common.PostRunCanonicalizationPhase;
 
 public abstract class LoopPhase
 extends PostRunCanonicalizationPhase {
     private final P policies;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/loop/phases/LoopPredicationPhase.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/loop/phases/LoopPredicationPhase.java
similarity index 84%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/loop/phases/LoopPredicationPhase.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/loop/phases/LoopPredicationPhase.java
index add4efb4efd6..7c44206b9671 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/loop/phases/LoopPredicationPhase.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/loop/phases/LoopPredicationPhase.java
@@ -24,50 +24,50 @@
  * questions.
  */
 
-package jdk.compiler.graal.loop.phases;
+package jdk.graal.compiler.loop.phases;
 
-import static jdk.compiler.graal.core.common.GraalOptions.LoopPredicationMainPath;
-import static jdk.compiler.graal.core.common.calc.Condition.EQ;
-import static jdk.compiler.graal.core.common.calc.Condition.NE;
+import static jdk.graal.compiler.core.common.GraalOptions.LoopPredicationMainPath;
+import static jdk.graal.compiler.core.common.calc.Condition.EQ;
+import static jdk.graal.compiler.core.common.calc.Condition.NE;
 
 import java.util.Optional;
 
 import org.graalvm.collections.EconomicMap;
-import jdk.compiler.graal.core.common.calc.Condition;
-import jdk.compiler.graal.core.common.cfg.AbstractControlFlowGraph;
-import jdk.compiler.graal.core.common.type.IntegerStamp;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.iterators.NodeIterable;
-import jdk.compiler.graal.nodes.AbstractBeginNode;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.FrameState;
-import jdk.compiler.graal.nodes.GraphState;
-import jdk.compiler.graal.nodes.GuardNode;
-import jdk.compiler.graal.nodes.GuardedValueNode;
-import jdk.compiler.graal.nodes.LogicNode;
-import jdk.compiler.graal.nodes.LoopEndNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.calc.CompareNode;
-import jdk.compiler.graal.nodes.calc.IntegerBelowNode;
-import jdk.compiler.graal.nodes.calc.IntegerConvertNode;
-import jdk.compiler.graal.nodes.cfg.HIRBlock;
-import jdk.compiler.graal.nodes.cfg.ControlFlowGraph;
-import jdk.compiler.graal.nodes.extended.AnchoringNode;
-import jdk.compiler.graal.nodes.extended.GuardingNode;
-import jdk.compiler.graal.nodes.extended.MultiGuardNode;
-import jdk.compiler.graal.nodes.loop.CountedLoopInfo;
-import jdk.compiler.graal.nodes.loop.InductionVariable;
-import jdk.compiler.graal.nodes.loop.LoopEx;
-import jdk.compiler.graal.nodes.loop.LoopsData;
-import jdk.compiler.graal.nodes.loop.MathUtil;
-import jdk.compiler.graal.phases.Speculative;
-import jdk.compiler.graal.phases.common.CanonicalizerPhase;
-import jdk.compiler.graal.phases.common.PostRunCanonicalizationPhase;
-import jdk.compiler.graal.phases.tiers.MidTierContext;
-import jdk.compiler.graal.serviceprovider.SpeculationReasonGroup;
+import jdk.graal.compiler.core.common.calc.Condition;
+import jdk.graal.compiler.core.common.cfg.AbstractControlFlowGraph;
+import jdk.graal.compiler.core.common.type.IntegerStamp;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.iterators.NodeIterable;
+import jdk.graal.compiler.nodes.AbstractBeginNode;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.FrameState;
+import jdk.graal.compiler.nodes.GraphState;
+import jdk.graal.compiler.nodes.GuardNode;
+import jdk.graal.compiler.nodes.GuardedValueNode;
+import jdk.graal.compiler.nodes.LogicNode;
+import jdk.graal.compiler.nodes.LoopEndNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.calc.CompareNode;
+import jdk.graal.compiler.nodes.calc.IntegerBelowNode;
+import jdk.graal.compiler.nodes.calc.IntegerConvertNode;
+import jdk.graal.compiler.nodes.cfg.HIRBlock;
+import jdk.graal.compiler.nodes.cfg.ControlFlowGraph;
+import jdk.graal.compiler.nodes.extended.AnchoringNode;
+import jdk.graal.compiler.nodes.extended.GuardingNode;
+import jdk.graal.compiler.nodes.extended.MultiGuardNode;
+import jdk.graal.compiler.nodes.loop.CountedLoopInfo;
+import jdk.graal.compiler.nodes.loop.InductionVariable;
+import jdk.graal.compiler.nodes.loop.LoopEx;
+import jdk.graal.compiler.nodes.loop.LoopsData;
+import jdk.graal.compiler.nodes.loop.MathUtil;
+import jdk.graal.compiler.phases.Speculative;
+import jdk.graal.compiler.phases.common.CanonicalizerPhase;
+import jdk.graal.compiler.phases.common.PostRunCanonicalizationPhase;
+import jdk.graal.compiler.phases.tiers.MidTierContext;
+import jdk.graal.compiler.serviceprovider.SpeculationReasonGroup;
 
 import jdk.vm.ci.code.BytecodePosition;
 import jdk.vm.ci.meta.SpeculationLog;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/loop/phases/LoopSafepointEliminationPhase.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/loop/phases/LoopSafepointEliminationPhase.java
similarity index 90%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/loop/phases/LoopSafepointEliminationPhase.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/loop/phases/LoopSafepointEliminationPhase.java
index 348c3a2cd14c..97035b413b48 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/loop/phases/LoopSafepointEliminationPhase.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/loop/phases/LoopSafepointEliminationPhase.java
@@ -22,29 +22,29 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.loop.phases;
+package jdk.graal.compiler.loop.phases;
 
 import java.util.Optional;
 
-import jdk.compiler.graal.core.common.type.IntegerStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.nodes.FixedNode;
-import jdk.compiler.graal.nodes.GraphState;
-import jdk.compiler.graal.nodes.Invoke;
-import jdk.compiler.graal.nodes.LoopEndNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.cfg.HIRBlock;
-import jdk.compiler.graal.nodes.extended.ForeignCall;
-import jdk.compiler.graal.nodes.loop.InductionVariable;
-import jdk.compiler.graal.nodes.loop.LoopEx;
-import jdk.compiler.graal.nodes.loop.LoopsData;
-import jdk.compiler.graal.nodes.spi.CoreProviders;
-import jdk.compiler.graal.options.Option;
-import jdk.compiler.graal.options.OptionKey;
-import jdk.compiler.graal.options.OptionType;
-import jdk.compiler.graal.phases.BasePhase;
-import jdk.compiler.graal.phases.tiers.MidTierContext;
+import jdk.graal.compiler.core.common.type.IntegerStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.nodes.FixedNode;
+import jdk.graal.compiler.nodes.GraphState;
+import jdk.graal.compiler.nodes.Invoke;
+import jdk.graal.compiler.nodes.LoopEndNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.cfg.HIRBlock;
+import jdk.graal.compiler.nodes.extended.ForeignCall;
+import jdk.graal.compiler.nodes.loop.InductionVariable;
+import jdk.graal.compiler.nodes.loop.LoopEx;
+import jdk.graal.compiler.nodes.loop.LoopsData;
+import jdk.graal.compiler.nodes.spi.CoreProviders;
+import jdk.graal.compiler.options.Option;
+import jdk.graal.compiler.options.OptionKey;
+import jdk.graal.compiler.options.OptionType;
+import jdk.graal.compiler.phases.BasePhase;
+import jdk.graal.compiler.phases.tiers.MidTierContext;
 
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/loop/phases/LoopTransformations.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/loop/phases/LoopTransformations.java
similarity index 93%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/loop/phases/LoopTransformations.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/loop/phases/LoopTransformations.java
index 470afbde073a..90f47f590e8c 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/loop/phases/LoopTransformations.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/loop/phases/LoopTransformations.java
@@ -22,9 +22,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.loop.phases;
+package jdk.graal.compiler.loop.phases;
 
-import static jdk.compiler.graal.core.common.GraalOptions.MaximumDesiredSize;
+import static jdk.graal.compiler.core.common.GraalOptions.MaximumDesiredSize;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -32,62 +32,62 @@
 
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.Equivalence;
-import jdk.compiler.graal.core.common.RetryableBailoutException;
-import jdk.compiler.graal.core.common.calc.CanonicalCondition;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.Graph.Mark;
-import jdk.compiler.graal.graph.Graph.NodeEventScope;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.Position;
-import jdk.compiler.graal.nodeinfo.InputType;
-import jdk.compiler.graal.nodes.AbstractBeginNode;
-import jdk.compiler.graal.nodes.AbstractEndNode;
-import jdk.compiler.graal.nodes.AbstractMergeNode;
-import jdk.compiler.graal.nodes.BeginNode;
-import jdk.compiler.graal.nodes.ControlSplitNode;
-import jdk.compiler.graal.nodes.EndNode;
-import jdk.compiler.graal.nodes.FixedGuardNode;
-import jdk.compiler.graal.nodes.FixedNode;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.FrameState;
-import jdk.compiler.graal.nodes.GraphState.GuardsStage;
-import jdk.compiler.graal.nodes.GraphState.StageFlag;
-import jdk.compiler.graal.nodes.GuardPhiNode;
-import jdk.compiler.graal.nodes.IfNode;
-import jdk.compiler.graal.nodes.LogicNode;
-import jdk.compiler.graal.nodes.LoopBeginNode;
-import jdk.compiler.graal.nodes.LoopExitNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.PhiNode;
-import jdk.compiler.graal.nodes.ProfileData.BranchProbabilityData;
-import jdk.compiler.graal.nodes.ProxyNode;
-import jdk.compiler.graal.nodes.SafepointNode;
-import jdk.compiler.graal.nodes.StateSplit;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.ValueProxyNode;
-import jdk.compiler.graal.nodes.VirtualState.NodePositionClosure;
-import jdk.compiler.graal.nodes.calc.AddNode;
-import jdk.compiler.graal.nodes.calc.CompareNode;
-import jdk.compiler.graal.nodes.calc.ConditionalNode;
-import jdk.compiler.graal.nodes.extended.OpaqueNode;
-import jdk.compiler.graal.nodes.extended.SwitchNode;
-import jdk.compiler.graal.nodes.loop.CountedLoopInfo;
-import jdk.compiler.graal.nodes.loop.DefaultLoopPolicies;
-import jdk.compiler.graal.nodes.loop.InductionVariable.Direction;
-import jdk.compiler.graal.nodes.loop.LoopEx;
-import jdk.compiler.graal.nodes.loop.LoopFragment;
-import jdk.compiler.graal.nodes.loop.LoopFragmentInside;
-import jdk.compiler.graal.nodes.loop.LoopFragmentWhole;
-import jdk.compiler.graal.nodes.spi.CoreProviders;
-import jdk.compiler.graal.nodes.spi.Simplifiable;
-import jdk.compiler.graal.nodes.spi.SimplifierTool;
-import jdk.compiler.graal.nodes.util.GraphUtil;
-import jdk.compiler.graal.nodes.util.IntegerHelper;
-import jdk.compiler.graal.nodes.virtual.VirtualObjectNode;
-import jdk.compiler.graal.phases.common.CanonicalizerPhase;
-import jdk.compiler.graal.phases.common.util.EconomicSetNodeEventListener;
+import jdk.graal.compiler.core.common.RetryableBailoutException;
+import jdk.graal.compiler.core.common.calc.CanonicalCondition;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.Graph.Mark;
+import jdk.graal.compiler.graph.Graph.NodeEventScope;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.Position;
+import jdk.graal.compiler.nodeinfo.InputType;
+import jdk.graal.compiler.nodes.AbstractBeginNode;
+import jdk.graal.compiler.nodes.AbstractEndNode;
+import jdk.graal.compiler.nodes.AbstractMergeNode;
+import jdk.graal.compiler.nodes.BeginNode;
+import jdk.graal.compiler.nodes.ControlSplitNode;
+import jdk.graal.compiler.nodes.EndNode;
+import jdk.graal.compiler.nodes.FixedGuardNode;
+import jdk.graal.compiler.nodes.FixedNode;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.FrameState;
+import jdk.graal.compiler.nodes.GraphState.GuardsStage;
+import jdk.graal.compiler.nodes.GraphState.StageFlag;
+import jdk.graal.compiler.nodes.GuardPhiNode;
+import jdk.graal.compiler.nodes.IfNode;
+import jdk.graal.compiler.nodes.LogicNode;
+import jdk.graal.compiler.nodes.LoopBeginNode;
+import jdk.graal.compiler.nodes.LoopExitNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.PhiNode;
+import jdk.graal.compiler.nodes.ProfileData.BranchProbabilityData;
+import jdk.graal.compiler.nodes.ProxyNode;
+import jdk.graal.compiler.nodes.SafepointNode;
+import jdk.graal.compiler.nodes.StateSplit;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.ValueProxyNode;
+import jdk.graal.compiler.nodes.VirtualState.NodePositionClosure;
+import jdk.graal.compiler.nodes.calc.AddNode;
+import jdk.graal.compiler.nodes.calc.CompareNode;
+import jdk.graal.compiler.nodes.calc.ConditionalNode;
+import jdk.graal.compiler.nodes.extended.OpaqueNode;
+import jdk.graal.compiler.nodes.extended.SwitchNode;
+import jdk.graal.compiler.nodes.loop.CountedLoopInfo;
+import jdk.graal.compiler.nodes.loop.DefaultLoopPolicies;
+import jdk.graal.compiler.nodes.loop.InductionVariable.Direction;
+import jdk.graal.compiler.nodes.loop.LoopEx;
+import jdk.graal.compiler.nodes.loop.LoopFragment;
+import jdk.graal.compiler.nodes.loop.LoopFragmentInside;
+import jdk.graal.compiler.nodes.loop.LoopFragmentWhole;
+import jdk.graal.compiler.nodes.spi.CoreProviders;
+import jdk.graal.compiler.nodes.spi.Simplifiable;
+import jdk.graal.compiler.nodes.spi.SimplifierTool;
+import jdk.graal.compiler.nodes.util.GraphUtil;
+import jdk.graal.compiler.nodes.util.IntegerHelper;
+import jdk.graal.compiler.nodes.virtual.VirtualObjectNode;
+import jdk.graal.compiler.phases.common.CanonicalizerPhase;
+import jdk.graal.compiler.phases.common.util.EconomicSetNodeEventListener;
 
 public abstract class LoopTransformations {
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/loop/phases/LoopUnswitchingPhase.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/loop/phases/LoopUnswitchingPhase.java
similarity index 85%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/loop/phases/LoopUnswitchingPhase.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/loop/phases/LoopUnswitchingPhase.java
index cae3807c6e49..b4574f16daa8 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/loop/phases/LoopUnswitchingPhase.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/loop/phases/LoopUnswitchingPhase.java
@@ -22,28 +22,28 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.loop.phases;
+package jdk.graal.compiler.loop.phases;
 
 import java.util.Iterator;
 import java.util.List;
 import java.util.Optional;
 
 import org.graalvm.collections.EconomicMap;
-import jdk.compiler.graal.debug.CounterKey;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.nodes.AbstractBeginNode;
-import jdk.compiler.graal.nodes.ControlSplitNode;
-import jdk.compiler.graal.nodes.GraphState;
-import jdk.compiler.graal.nodes.GraphState.StageFlag;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.loop.LoopEx;
-import jdk.compiler.graal.nodes.loop.LoopPolicies;
-import jdk.compiler.graal.nodes.loop.LoopPolicies.UnswitchingDecision;
-import jdk.compiler.graal.nodes.loop.LoopsData;
-import jdk.compiler.graal.nodes.spi.CoreProviders;
-import jdk.compiler.graal.phases.common.CanonicalizerPhase;
+import jdk.graal.compiler.debug.CounterKey;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.nodes.AbstractBeginNode;
+import jdk.graal.compiler.nodes.ControlSplitNode;
+import jdk.graal.compiler.nodes.GraphState;
+import jdk.graal.compiler.nodes.GraphState.StageFlag;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.loop.LoopEx;
+import jdk.graal.compiler.nodes.loop.LoopPolicies;
+import jdk.graal.compiler.nodes.loop.LoopPolicies.UnswitchingDecision;
+import jdk.graal.compiler.nodes.loop.LoopsData;
+import jdk.graal.compiler.nodes.spi.CoreProviders;
+import jdk.graal.compiler.phases.common.CanonicalizerPhase;
 
 public class LoopUnswitchingPhase extends LoopPhase {
     private static final CounterKey UNSWITCH_CANDIDATES = DebugContext.counter("UnswitchCandidates");
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/loop/phases/SpeculativeGuardMovementPhase.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/loop/phases/SpeculativeGuardMovementPhase.java
similarity index 94%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/loop/phases/SpeculativeGuardMovementPhase.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/loop/phases/SpeculativeGuardMovementPhase.java
index e949f721fff7..14a1e889fc68 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/loop/phases/SpeculativeGuardMovementPhase.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/loop/phases/SpeculativeGuardMovementPhase.java
@@ -22,64 +22,64 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.loop.phases;
+package jdk.graal.compiler.loop.phases;
 
 import java.util.EnumSet;
 import java.util.Optional;
 
-import jdk.compiler.graal.core.common.NumUtil;
-import jdk.compiler.graal.core.common.cfg.Loop;
-import jdk.compiler.graal.core.common.type.IntegerStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.debug.DebugCloseable;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.Graph;
-import jdk.compiler.graal.graph.Graph.NodeEventScope;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeBitMap;
-import jdk.compiler.graal.graph.NodeMap;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.FrameState;
-import jdk.compiler.graal.nodes.GraphState;
-import jdk.compiler.graal.nodes.GraphState.StageFlag;
-import jdk.compiler.graal.nodes.GuardNode;
-import jdk.compiler.graal.nodes.GuardedValueNode;
-import jdk.compiler.graal.nodes.LogicConstantNode;
-import jdk.compiler.graal.nodes.LogicNode;
-import jdk.compiler.graal.nodes.LoopBeginNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.PhiNode;
-import jdk.compiler.graal.nodes.ProfileData.BranchProbabilityData;
-import jdk.compiler.graal.nodes.ProfileData.ProfileSource;
-import jdk.compiler.graal.nodes.ShortCircuitOrNode;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.WithExceptionNode;
-import jdk.compiler.graal.nodes.calc.CompareNode;
-import jdk.compiler.graal.nodes.calc.IntegerBelowNode;
-import jdk.compiler.graal.nodes.calc.IntegerConvertNode;
-import jdk.compiler.graal.nodes.calc.IntegerDivRemNode;
-import jdk.compiler.graal.nodes.calc.IntegerLessThanNode;
-import jdk.compiler.graal.nodes.cfg.ControlFlowGraph;
-import jdk.compiler.graal.nodes.cfg.HIRBlock;
-import jdk.compiler.graal.nodes.extended.AnchoringNode;
-import jdk.compiler.graal.nodes.extended.GuardingNode;
-import jdk.compiler.graal.nodes.extended.MultiGuardNode;
-import jdk.compiler.graal.nodes.java.InstanceOfNode;
-import jdk.compiler.graal.nodes.loop.CountedLoopInfo;
-import jdk.compiler.graal.nodes.loop.InductionVariable;
-import jdk.compiler.graal.nodes.loop.InductionVariable.Direction;
-import jdk.compiler.graal.nodes.loop.LoopEx;
-import jdk.compiler.graal.nodes.loop.LoopsData;
-import jdk.compiler.graal.phases.FloatingGuardPhase;
-import jdk.compiler.graal.phases.common.CanonicalizerPhase;
-import jdk.compiler.graal.phases.common.PostRunCanonicalizationPhase;
-import jdk.compiler.graal.phases.common.util.EconomicSetNodeEventListener;
-import jdk.compiler.graal.phases.schedule.SchedulePhase;
-import jdk.compiler.graal.phases.tiers.MidTierContext;
-import jdk.compiler.graal.serviceprovider.SpeculationReasonGroup;
+import jdk.graal.compiler.core.common.NumUtil;
+import jdk.graal.compiler.core.common.cfg.Loop;
+import jdk.graal.compiler.core.common.type.IntegerStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.debug.DebugCloseable;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.Graph;
+import jdk.graal.compiler.graph.Graph.NodeEventScope;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeBitMap;
+import jdk.graal.compiler.graph.NodeMap;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.FrameState;
+import jdk.graal.compiler.nodes.GraphState;
+import jdk.graal.compiler.nodes.GraphState.StageFlag;
+import jdk.graal.compiler.nodes.GuardNode;
+import jdk.graal.compiler.nodes.GuardedValueNode;
+import jdk.graal.compiler.nodes.LogicConstantNode;
+import jdk.graal.compiler.nodes.LogicNode;
+import jdk.graal.compiler.nodes.LoopBeginNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.PhiNode;
+import jdk.graal.compiler.nodes.ProfileData.BranchProbabilityData;
+import jdk.graal.compiler.nodes.ProfileData.ProfileSource;
+import jdk.graal.compiler.nodes.ShortCircuitOrNode;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.WithExceptionNode;
+import jdk.graal.compiler.nodes.calc.CompareNode;
+import jdk.graal.compiler.nodes.calc.IntegerBelowNode;
+import jdk.graal.compiler.nodes.calc.IntegerConvertNode;
+import jdk.graal.compiler.nodes.calc.IntegerDivRemNode;
+import jdk.graal.compiler.nodes.calc.IntegerLessThanNode;
+import jdk.graal.compiler.nodes.cfg.ControlFlowGraph;
+import jdk.graal.compiler.nodes.cfg.HIRBlock;
+import jdk.graal.compiler.nodes.extended.AnchoringNode;
+import jdk.graal.compiler.nodes.extended.GuardingNode;
+import jdk.graal.compiler.nodes.extended.MultiGuardNode;
+import jdk.graal.compiler.nodes.java.InstanceOfNode;
+import jdk.graal.compiler.nodes.loop.CountedLoopInfo;
+import jdk.graal.compiler.nodes.loop.InductionVariable;
+import jdk.graal.compiler.nodes.loop.InductionVariable.Direction;
+import jdk.graal.compiler.nodes.loop.LoopEx;
+import jdk.graal.compiler.nodes.loop.LoopsData;
+import jdk.graal.compiler.phases.FloatingGuardPhase;
+import jdk.graal.compiler.phases.common.CanonicalizerPhase;
+import jdk.graal.compiler.phases.common.PostRunCanonicalizationPhase;
+import jdk.graal.compiler.phases.common.util.EconomicSetNodeEventListener;
+import jdk.graal.compiler.phases.schedule.SchedulePhase;
+import jdk.graal.compiler.phases.tiers.MidTierContext;
+import jdk.graal.compiler.serviceprovider.SpeculationReasonGroup;
 
 import jdk.vm.ci.meta.DefaultProfilingInfo;
 import jdk.vm.ci.meta.DeoptimizationAction;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodeinfo/InputType.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodeinfo/InputType.java
similarity index 98%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodeinfo/InputType.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodeinfo/InputType.java
index c982c9ab2285..22066dccf2a0 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodeinfo/InputType.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodeinfo/InputType.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodeinfo;
+package jdk.graal.compiler.nodeinfo;
 
 /**
  * Constants denoting how a node is using an input node.
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodeinfo/NodeCycles.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodeinfo/NodeCycles.java
similarity index 99%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodeinfo/NodeCycles.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodeinfo/NodeCycles.java
index 26a0060a11d6..f0019defb1fe 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodeinfo/NodeCycles.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodeinfo/NodeCycles.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodeinfo;
+package jdk.graal.compiler.nodeinfo;
 
 /**
  * Constants representing an estimation of the number of CPU cycles needed to execute a certain
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodeinfo/NodeInfo.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodeinfo/NodeInfo.java
similarity index 98%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodeinfo/NodeInfo.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodeinfo/NodeInfo.java
index e343af8a460f..5a0b2bfac486 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodeinfo/NodeInfo.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodeinfo/NodeInfo.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodeinfo;
+package jdk.graal.compiler.nodeinfo;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodeinfo/NodeSize.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodeinfo/NodeSize.java
similarity index 99%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodeinfo/NodeSize.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodeinfo/NodeSize.java
index 587e5a5d1729..472893737237 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodeinfo/NodeSize.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodeinfo/NodeSize.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodeinfo;
+package jdk.graal.compiler.nodeinfo;
 
 /**
  * Constants representing the abstract number of CPU instructions needed to represent a node. This
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodeinfo/StructuralInput.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodeinfo/StructuralInput.java
similarity index 98%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodeinfo/StructuralInput.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodeinfo/StructuralInput.java
index 06ebc90add66..13236ef76d5c 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodeinfo/StructuralInput.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodeinfo/StructuralInput.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodeinfo;
+package jdk.graal.compiler.nodeinfo;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Inherited;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodeinfo/Verbosity.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodeinfo/Verbosity.java
similarity index 97%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodeinfo/Verbosity.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodeinfo/Verbosity.java
index d2abf8a52c17..54a8a9617cfa 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodeinfo/Verbosity.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodeinfo/Verbosity.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodeinfo;
+package jdk.graal.compiler.nodeinfo;
 
 public enum Verbosity {
     /**
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/AbstractBeginNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/AbstractBeginNode.java
similarity index 88%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/AbstractBeginNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/AbstractBeginNode.java
index 516d7cd422da..3696d6bd11e5 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/AbstractBeginNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/AbstractBeginNode.java
@@ -22,24 +22,24 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes;
+package jdk.graal.compiler.nodes;
 
 import java.util.Iterator;
 import java.util.NoSuchElementException;
 
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.IterableNodeType;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.graph.Position;
-import jdk.compiler.graal.graph.iterators.NodeIterable;
-import jdk.compiler.graal.nodeinfo.InputType;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.extended.AnchoringNode;
-import jdk.compiler.graal.nodes.extended.GuardingNode;
-import jdk.compiler.graal.nodes.spi.LIRLowerable;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.IterableNodeType;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.graph.Position;
+import jdk.graal.compiler.graph.iterators.NodeIterable;
+import jdk.graal.compiler.nodeinfo.InputType;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.extended.AnchoringNode;
+import jdk.graal.compiler.nodes.extended.GuardingNode;
+import jdk.graal.compiler.nodes.spi.LIRLowerable;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
 
 @NodeInfo(allowedUsageTypes = {InputType.Guard, InputType.Anchor})
 public abstract class AbstractBeginNode extends FixedWithNextNode implements LIRLowerable, GuardingNode, AnchoringNode, IterableNodeType {
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/AbstractDeoptimizeNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/AbstractDeoptimizeNode.java
similarity index 87%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/AbstractDeoptimizeNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/AbstractDeoptimizeNode.java
index 2cfa4bf880ed..328e915cc941 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/AbstractDeoptimizeNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/AbstractDeoptimizeNode.java
@@ -22,16 +22,16 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes;
+package jdk.graal.compiler.nodes;
 
-import static jdk.compiler.graal.nodeinfo.InputType.State;
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_UNKNOWN;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_UNKNOWN;
+import static jdk.graal.compiler.nodeinfo.InputType.State;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_UNKNOWN;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_UNKNOWN;
 
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.IterableNodeType;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.IterableNodeType;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
 
 import jdk.vm.ci.meta.MetaAccessProvider;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/AbstractEndNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/AbstractEndNode.java
similarity index 83%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/AbstractEndNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/AbstractEndNode.java
index cba24558ef03..677b06c45d12 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/AbstractEndNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/AbstractEndNode.java
@@ -22,19 +22,19 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes;
+package jdk.graal.compiler.nodes;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_0;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_0;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_0;
 
 import java.util.Collections;
 
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.spi.LIRLowerable;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.spi.LIRLowerable;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
 
 @NodeInfo(cycles = CYCLES_0, size = SIZE_0)
 public abstract class AbstractEndNode extends FixedNode implements LIRLowerable {
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/AbstractFixedGuardNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/AbstractFixedGuardNode.java
similarity index 90%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/AbstractFixedGuardNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/AbstractFixedGuardNode.java
index cdd0f6270871..ebf8da7d5f70 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/AbstractFixedGuardNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/AbstractFixedGuardNode.java
@@ -22,20 +22,20 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes;
-
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.debug.DebugCloseable;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.graph.NodeSourcePosition;
-import jdk.compiler.graal.nodes.extended.BranchProbabilityNode;
-import jdk.compiler.graal.nodes.extended.GuardingNode;
-import jdk.compiler.graal.nodes.spi.Simplifiable;
-import jdk.compiler.graal.nodes.spi.SimplifierTool;
-import jdk.compiler.graal.nodeinfo.InputType;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodeinfo.Verbosity;
-import jdk.compiler.graal.nodes.util.GraphUtil;
+package jdk.graal.compiler.nodes;
+
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.debug.DebugCloseable;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.graph.NodeSourcePosition;
+import jdk.graal.compiler.nodes.extended.BranchProbabilityNode;
+import jdk.graal.compiler.nodes.extended.GuardingNode;
+import jdk.graal.compiler.nodes.spi.Simplifiable;
+import jdk.graal.compiler.nodes.spi.SimplifierTool;
+import jdk.graal.compiler.nodeinfo.InputType;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodeinfo.Verbosity;
+import jdk.graal.compiler.nodes.util.GraphUtil;
 
 import jdk.vm.ci.meta.DeoptimizationAction;
 import jdk.vm.ci.meta.DeoptimizationReason;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/AbstractLocalNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/AbstractLocalNode.java
similarity index 84%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/AbstractLocalNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/AbstractLocalNode.java
index f1c3d8387d27..f87267cf0d57 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/AbstractLocalNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/AbstractLocalNode.java
@@ -22,16 +22,16 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes;
+package jdk.graal.compiler.nodes;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_0;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_1;
 
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodeinfo.Verbosity;
-import jdk.compiler.graal.nodes.calc.FloatingNode;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodeinfo.Verbosity;
+import jdk.graal.compiler.nodes.calc.FloatingNode;
 
 @NodeInfo(cycles = CYCLES_0, size = SIZE_1)
 public abstract class AbstractLocalNode extends FloatingNode {
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/AbstractMergeNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/AbstractMergeNode.java
similarity index 91%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/AbstractMergeNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/AbstractMergeNode.java
index 6fc51a875049..08cd6736a9b5 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/AbstractMergeNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/AbstractMergeNode.java
@@ -22,27 +22,27 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes;
+package jdk.graal.compiler.nodes;
 
-import static jdk.compiler.graal.nodeinfo.InputType.Association;
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_0;
+import static jdk.graal.compiler.nodeinfo.InputType.Association;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_0;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_0;
 
 import java.util.List;
 
-import jdk.compiler.graal.debug.DebugCloseable;
-import jdk.compiler.graal.graph.IterableNodeType;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.graph.NodeInputList;
-import jdk.compiler.graal.graph.iterators.NodeIterable;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.memory.MemoryPhiNode;
-import jdk.compiler.graal.nodes.spi.LIRLowerable;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
-import jdk.compiler.graal.nodes.spi.Simplifiable;
-import jdk.compiler.graal.nodes.spi.SimplifierTool;
-import jdk.compiler.graal.nodes.util.GraphUtil;
+import jdk.graal.compiler.debug.DebugCloseable;
+import jdk.graal.compiler.graph.IterableNodeType;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.graph.NodeInputList;
+import jdk.graal.compiler.graph.iterators.NodeIterable;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.memory.MemoryPhiNode;
+import jdk.graal.compiler.nodes.spi.LIRLowerable;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.nodes.spi.Simplifiable;
+import jdk.graal.compiler.nodes.spi.SimplifierTool;
+import jdk.graal.compiler.nodes.util.GraphUtil;
 
 /**
  * Denotes the merging of multiple control-flow paths.
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/AbstractStateSplit.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/AbstractStateSplit.java
similarity index 92%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/AbstractStateSplit.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/AbstractStateSplit.java
index 28ebda464def..57085ca34577 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/AbstractStateSplit.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/AbstractStateSplit.java
@@ -22,12 +22,12 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes;
+package jdk.graal.compiler.nodes;
 
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.InputType;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.InputType;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
 
 /**
  * Provides an implementation of {@link StateSplit}.
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/ArithmeticOperation.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/ArithmeticOperation.java
similarity index 89%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/ArithmeticOperation.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/ArithmeticOperation.java
index 6c6c256ed941..0bee0056292d 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/ArithmeticOperation.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/ArithmeticOperation.java
@@ -22,10 +22,10 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes;
+package jdk.graal.compiler.nodes;
 
-import jdk.compiler.graal.core.common.type.ArithmeticOpTable.Op;
-import jdk.compiler.graal.graph.Node.IndirectCanonicalization;
+import jdk.graal.compiler.core.common.type.ArithmeticOpTable.Op;
+import jdk.graal.compiler.graph.Node.IndirectCanonicalization;
 
 /**
  * An {@code ArithmeticOperation} is an operation that does primitive value arithmetic without side
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/BeginNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/BeginNode.java
similarity index 83%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/BeginNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/BeginNode.java
index c2b43b217659..2bdef94cb4f7 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/BeginNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/BeginNode.java
@@ -22,18 +22,18 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes;
+package jdk.graal.compiler.nodes;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_0;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_0;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_0;
 
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.debug.DebugCloseable;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.spi.Simplifiable;
-import jdk.compiler.graal.nodes.spi.SimplifierTool;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.debug.DebugCloseable;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.spi.Simplifiable;
+import jdk.graal.compiler.nodes.spi.SimplifierTool;
 
 @NodeInfo(cycles = CYCLES_0, size = SIZE_0)
 public final class BeginNode extends AbstractBeginNode implements Simplifiable {
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/BeginStateSplitNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/BeginStateSplitNode.java
similarity index 90%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/BeginStateSplitNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/BeginStateSplitNode.java
index 458d4a3d2d9b..cb1dc8569766 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/BeginStateSplitNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/BeginStateSplitNode.java
@@ -22,13 +22,13 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes;
+package jdk.graal.compiler.nodes;
 
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.InputType;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.InputType;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
 
 /**
  * Base class for {@link AbstractBeginNode}s that are associated with a frame state.
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/BinaryOpLogicNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/BinaryOpLogicNode.java
similarity index 91%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/BinaryOpLogicNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/BinaryOpLogicNode.java
index 9b9973b949e2..be4a96f261e9 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/BinaryOpLogicNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/BinaryOpLogicNode.java
@@ -22,14 +22,14 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes;
+package jdk.graal.compiler.nodes;
 
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.graph.Graph;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodes.spi.Canonicalizable;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.graph.Graph;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodes.spi.Canonicalizable;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
 
 import jdk.vm.ci.meta.TriState;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/BreakpointNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/BreakpointNode.java
similarity index 86%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/BreakpointNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/BreakpointNode.java
index 7dcd5da352a7..e7c431150740 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/BreakpointNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/BreakpointNode.java
@@ -22,17 +22,17 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes;
+package jdk.graal.compiler.nodes;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_IGNORED;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_IGNORED;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_IGNORED;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_IGNORED;
 
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.graph.NodeInputList;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.spi.LIRLowerable;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.graph.NodeInputList;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.spi.LIRLowerable;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
 
 /**
  * A node that results in a platform-dependent breakpoint instruction being emitted. A number of
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/CallTargetNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/CallTargetNode.java
similarity index 90%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/CallTargetNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/CallTargetNode.java
index 591b9fec880c..d66357801fdc 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/CallTargetNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/CallTargetNode.java
@@ -22,19 +22,19 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes;
-
-import static jdk.compiler.graal.nodeinfo.InputType.Extension;
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_0;
-
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.core.common.type.StampPair;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.graph.NodeInputList;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.spi.LIRLowerable;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
+package jdk.graal.compiler.nodes;
+
+import static jdk.graal.compiler.nodeinfo.InputType.Extension;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_0;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_0;
+
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.core.common.type.StampPair;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.graph.NodeInputList;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.spi.LIRLowerable;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
 
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 import jdk.vm.ci.meta.ResolvedJavaType;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/Cancellable.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/Cancellable.java
similarity index 94%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/Cancellable.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/Cancellable.java
index 6d60f7c4d762..d55c06d099f0 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/Cancellable.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/Cancellable.java
@@ -22,9 +22,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes;
+package jdk.graal.compiler.nodes;
 
-import jdk.compiler.graal.core.common.CancellationBailoutException;
+import jdk.graal.compiler.core.common.CancellationBailoutException;
 
 /**
  * An interface for supporting co-operative cancellation of tasks. An external entity gives a
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/CanonicalizableLocation.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/CanonicalizableLocation.java
similarity index 94%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/CanonicalizableLocation.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/CanonicalizableLocation.java
index 2c2db96d4c14..739315fd4450 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/CanonicalizableLocation.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/CanonicalizableLocation.java
@@ -22,9 +22,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes;
+package jdk.graal.compiler.nodes;
 
-import jdk.compiler.graal.nodes.spi.CoreProviders;
+import jdk.graal.compiler.nodes.spi.CoreProviders;
 
 public interface CanonicalizableLocation {
     ValueNode canonicalizeRead(ValueNode read, ValueNode object, ValueNode offset, CoreProviders tool);
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/CompanionObjectEncoder.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/CompanionObjectEncoder.java
similarity index 98%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/CompanionObjectEncoder.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/CompanionObjectEncoder.java
index 8cd1663af12d..9e31d061cfa7 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/CompanionObjectEncoder.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/CompanionObjectEncoder.java
@@ -22,10 +22,10 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes;
+package jdk.graal.compiler.nodes;
 
 import org.graalvm.collections.EconomicMap;
-import jdk.compiler.graal.graph.Node;
+import jdk.graal.compiler.graph.Node;
 
 import java.util.function.Consumer;
 import java.util.function.Function;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/CompressionNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/CompressionNode.java
similarity index 87%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/CompressionNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/CompressionNode.java
index 77bdea0ee938..f23dd5cfb6e8 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/CompressionNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/CompressionNode.java
@@ -22,24 +22,24 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes;
-
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_2;
-
-import jdk.compiler.graal.core.common.CompressEncoding;
-import jdk.compiler.graal.core.common.type.AbstractObjectStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.lir.gen.LIRGeneratorTool;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodes.spi.LIRLowerable;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
-import jdk.compiler.graal.nodes.type.StampTool;
-import jdk.compiler.graal.nodes.calc.ConvertNode;
-import jdk.compiler.graal.nodes.calc.UnaryNode;
+package jdk.graal.compiler.nodes;
+
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_2;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_2;
+
+import jdk.graal.compiler.core.common.CompressEncoding;
+import jdk.graal.compiler.core.common.type.AbstractObjectStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.lir.gen.LIRGeneratorTool;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodes.spi.LIRLowerable;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.nodes.type.StampTool;
+import jdk.graal.compiler.nodes.calc.ConvertNode;
+import jdk.graal.compiler.nodes.calc.UnaryNode;
 
 import jdk.vm.ci.meta.Constant;
 import jdk.vm.ci.meta.ConstantReflectionProvider;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/ComputeObjectAddressNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/ComputeObjectAddressNode.java
similarity index 84%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/ComputeObjectAddressNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/ComputeObjectAddressNode.java
index 9d73dfd046fa..ad8e50b188ff 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/ComputeObjectAddressNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/ComputeObjectAddressNode.java
@@ -22,17 +22,17 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes;
+package jdk.graal.compiler.nodes;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_1;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_1;
 
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodeinfo.NodeSize;
-import jdk.compiler.graal.nodes.spi.Lowerable;
-import jdk.compiler.graal.nodes.calc.SignExtendNode;
-import jdk.compiler.graal.nodes.debug.ControlFlowAnchored;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodeinfo.NodeSize;
+import jdk.graal.compiler.nodes.spi.Lowerable;
+import jdk.graal.compiler.nodes.calc.SignExtendNode;
+import jdk.graal.compiler.nodes.debug.ControlFlowAnchored;
 
 import jdk.vm.ci.meta.JavaKind;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/ConditionAnchorNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/ConditionAnchorNode.java
similarity index 81%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/ConditionAnchorNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/ConditionAnchorNode.java
index d332455d75eb..b9a3b5553775 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/ConditionAnchorNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/ConditionAnchorNode.java
@@ -22,24 +22,24 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes;
+package jdk.graal.compiler.nodes;
 
-import static jdk.compiler.graal.nodeinfo.InputType.Condition;
-import static jdk.compiler.graal.nodeinfo.InputType.Guard;
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_0;
+import static jdk.graal.compiler.nodeinfo.InputType.Condition;
+import static jdk.graal.compiler.nodeinfo.InputType.Guard;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_0;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_0;
 
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodeinfo.Verbosity;
-import jdk.compiler.graal.nodes.extended.GuardingNode;
-import jdk.compiler.graal.nodes.extended.ValueAnchorNode;
-import jdk.compiler.graal.nodes.spi.Canonicalizable;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodes.spi.Lowerable;
-import jdk.compiler.graal.nodes.spi.LoweringTool;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodeinfo.Verbosity;
+import jdk.graal.compiler.nodes.extended.GuardingNode;
+import jdk.graal.compiler.nodes.extended.ValueAnchorNode;
+import jdk.graal.compiler.nodes.spi.Canonicalizable;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodes.spi.Lowerable;
+import jdk.graal.compiler.nodes.spi.LoweringTool;
 
 @NodeInfo(nameTemplate = "ConditionAnchor(!={p#negated})", allowedUsageTypes = Guard, cycles = CYCLES_0, size = SIZE_0)
 public final class ConditionAnchorNode extends FixedWithNextNode implements Canonicalizable.Unary, Lowerable, GuardingNode {
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/ConstantNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/ConstantNode.java
similarity index 94%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/ConstantNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/ConstantNode.java
index 658aa7587298..0edcde54ee0b 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/ConstantNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/ConstantNode.java
@@ -22,33 +22,33 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes;
+package jdk.graal.compiler.nodes;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_0;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_1;
 
 import java.util.Map;
 
-import jdk.compiler.graal.core.common.LIRKind;
-import jdk.compiler.graal.core.common.type.AbstractObjectStamp;
-import jdk.compiler.graal.core.common.type.FloatStamp;
-import jdk.compiler.graal.core.common.type.IntegerStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.graph.NodeMap;
-import jdk.compiler.graal.graph.iterators.NodeIterable;
-import jdk.compiler.graal.lir.ConstantValue;
-import jdk.compiler.graal.lir.gen.LIRGeneratorTool;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodeinfo.Verbosity;
-import jdk.compiler.graal.nodes.cfg.HIRBlock;
-import jdk.compiler.graal.nodes.spi.ArrayLengthProvider;
-import jdk.compiler.graal.nodes.spi.LIRLowerable;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
-import jdk.compiler.graal.nodes.calc.FloatingNode;
+import jdk.graal.compiler.core.common.LIRKind;
+import jdk.graal.compiler.core.common.type.AbstractObjectStamp;
+import jdk.graal.compiler.core.common.type.FloatStamp;
+import jdk.graal.compiler.core.common.type.IntegerStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.graph.NodeMap;
+import jdk.graal.compiler.graph.iterators.NodeIterable;
+import jdk.graal.compiler.lir.ConstantValue;
+import jdk.graal.compiler.lir.gen.LIRGeneratorTool;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodeinfo.Verbosity;
+import jdk.graal.compiler.nodes.cfg.HIRBlock;
+import jdk.graal.compiler.nodes.spi.ArrayLengthProvider;
+import jdk.graal.compiler.nodes.spi.LIRLowerable;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.nodes.calc.FloatingNode;
 
 import jdk.vm.ci.code.CodeUtil;
 import jdk.vm.ci.meta.Constant;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/ControlSinkNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/ControlSinkNode.java
similarity index 89%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/ControlSinkNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/ControlSinkNode.java
index 6205aa93daca..f56e96556d92 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/ControlSinkNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/ControlSinkNode.java
@@ -22,11 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes;
+package jdk.graal.compiler.nodes;
 
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
 
 @NodeInfo
 public abstract class ControlSinkNode extends FixedNode {
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/ControlSplitNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/ControlSplitNode.java
similarity index 94%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/ControlSplitNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/ControlSplitNode.java
index 9299b6383175..7bf51af3aecc 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/ControlSplitNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/ControlSplitNode.java
@@ -22,12 +22,12 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes;
+package jdk.graal.compiler.nodes;
 
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
 
 /**
  * The {@code ControlSplitNode} is a base class for all instructions that split the control flow
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/DeadEndNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/DeadEndNode.java
similarity index 85%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/DeadEndNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/DeadEndNode.java
index f55f17da36bd..099afe700df0 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/DeadEndNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/DeadEndNode.java
@@ -22,16 +22,16 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes;
+package jdk.graal.compiler.nodes;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_UNKNOWN;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_UNKNOWN;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_UNKNOWN;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_UNKNOWN;
 
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.IterableNodeType;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.spi.Lowerable;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.IterableNodeType;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.spi.Lowerable;
 
 /**
  * Control sink that should be never be reached because the previous node will never follow the edge
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/DeoptBciSupplier.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/DeoptBciSupplier.java
similarity index 98%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/DeoptBciSupplier.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/DeoptBciSupplier.java
index 5bbe75868f7e..ffad14ced2be 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/DeoptBciSupplier.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/DeoptBciSupplier.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes;
+package jdk.graal.compiler.nodes;
 
 /**
  * A marker interface for nodes that represent operations that can deoptimize and thus need a BCI to
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/DeoptimizeNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/DeoptimizeNode.java
similarity index 93%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/DeoptimizeNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/DeoptimizeNode.java
index 137bae3fc3d9..61b72464b3c5 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/DeoptimizeNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/DeoptimizeNode.java
@@ -22,15 +22,15 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes;
-
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.lir.gen.LIRGeneratorTool;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.spi.LIRLowerable;
-import jdk.compiler.graal.nodes.spi.Lowerable;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
+package jdk.graal.compiler.nodes;
+
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.lir.gen.LIRGeneratorTool;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.spi.LIRLowerable;
+import jdk.graal.compiler.nodes.spi.Lowerable;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
 
 import jdk.vm.ci.meta.DeoptimizationAction;
 import jdk.vm.ci.meta.DeoptimizationReason;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/DeoptimizingFixedWithNextNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/DeoptimizingFixedWithNextNode.java
similarity index 90%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/DeoptimizingFixedWithNextNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/DeoptimizingFixedWithNextNode.java
index 5726ca578c4c..b905a482e712 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/DeoptimizingFixedWithNextNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/DeoptimizingFixedWithNextNode.java
@@ -22,12 +22,12 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes;
+package jdk.graal.compiler.nodes;
 
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.InputType;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.InputType;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
 
 @NodeInfo
 public abstract class DeoptimizingFixedWithNextNode extends FixedWithNextNode implements DeoptimizingNode.DeoptBefore {
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/DeoptimizingGuard.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/DeoptimizingGuard.java
similarity index 93%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/DeoptimizingGuard.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/DeoptimizingGuard.java
index 85e892aeab6f..967568ef6b1e 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/DeoptimizingGuard.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/DeoptimizingGuard.java
@@ -22,10 +22,10 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes;
+package jdk.graal.compiler.nodes;
 
-import jdk.compiler.graal.graph.NodeSourcePosition;
-import jdk.compiler.graal.nodes.extended.GuardingNode;
+import jdk.graal.compiler.graph.NodeSourcePosition;
+import jdk.graal.compiler.nodes.extended.GuardingNode;
 
 /**
  * Shared interface to capture core methods of {@link AbstractFixedGuardNode} and {@link GuardNode}.
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/DeoptimizingNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/DeoptimizingNode.java
similarity index 97%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/DeoptimizingNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/DeoptimizingNode.java
index 03bb2235d59d..e7abc42d9755 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/DeoptimizingNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/DeoptimizingNode.java
@@ -22,9 +22,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes;
+package jdk.graal.compiler.nodes;
 
-import jdk.compiler.graal.nodes.spi.NodeWithState;
+import jdk.graal.compiler.nodes.spi.NodeWithState;
 
 /**
  * Interface implemented by nodes which may need {@linkplain FrameState deoptimization information}.
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/DirectCallTargetNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/DirectCallTargetNode.java
similarity index 92%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/DirectCallTargetNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/DirectCallTargetNode.java
index bf56e0ad8dd1..0b1a06d1ba46 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/DirectCallTargetNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/DirectCallTargetNode.java
@@ -22,11 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes;
+package jdk.graal.compiler.nodes;
 
-import jdk.compiler.graal.core.common.type.StampPair;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
+import jdk.graal.compiler.core.common.type.StampPair;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
 
 import jdk.vm.ci.code.CallingConvention;
 import jdk.vm.ci.meta.JavaType;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/DynamicDeoptimizeNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/DynamicDeoptimizeNode.java
similarity index 88%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/DynamicDeoptimizeNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/DynamicDeoptimizeNode.java
index 7b5887815e7f..f5a2af6d3dc2 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/DynamicDeoptimizeNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/DynamicDeoptimizeNode.java
@@ -22,16 +22,16 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes;
+package jdk.graal.compiler.nodes;
 
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodes.spi.Canonicalizable;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodes.spi.LIRLowerable;
-import jdk.compiler.graal.nodes.spi.Lowerable;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodes.spi.Canonicalizable;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodes.spi.LIRLowerable;
+import jdk.graal.compiler.nodes.spi.Lowerable;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
 
 import jdk.vm.ci.meta.JavaConstant;
 import jdk.vm.ci.meta.MetaAccessProvider;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/DynamicPiNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/DynamicPiNode.java
similarity index 90%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/DynamicPiNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/DynamicPiNode.java
index b94da1ae79c1..a7eb92995123 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/DynamicPiNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/DynamicPiNode.java
@@ -22,16 +22,16 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes;
+package jdk.graal.compiler.nodes;
 
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.core.common.type.TypeReference;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodes.extended.GuardingNode;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.core.common.type.TypeReference;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodes.extended.GuardingNode;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
 
 import jdk.vm.ci.meta.Assumptions;
 import jdk.vm.ci.meta.ConstantReflectionProvider;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/EncodedGraph.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/EncodedGraph.java
similarity index 97%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/EncodedGraph.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/EncodedGraph.java
index 600493d6294e..b18520c408d4 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/EncodedGraph.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/EncodedGraph.java
@@ -22,14 +22,14 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes;
+package jdk.graal.compiler.nodes;
 
 import java.util.List;
 import java.util.Objects;
 
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
 
 import jdk.vm.ci.meta.Assumptions;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/EndNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/EndNode.java
similarity index 89%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/EndNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/EndNode.java
index 537c78312025..637ac5099cda 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/EndNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/EndNode.java
@@ -22,11 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes;
+package jdk.graal.compiler.nodes;
 
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.InputType;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.InputType;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
 
 @NodeInfo(allowedUsageTypes = {InputType.Association}, nameTemplate = "End")
 public final class EndNode extends AbstractEndNode {
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/EntryMarkerNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/EntryMarkerNode.java
similarity index 80%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/EntryMarkerNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/EntryMarkerNode.java
index 640ac94a1003..d750deb51811 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/EntryMarkerNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/EntryMarkerNode.java
@@ -22,20 +22,20 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes;
+package jdk.graal.compiler.nodes;
 
-import static jdk.compiler.graal.nodeinfo.InputType.Association;
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_0;
+import static jdk.graal.compiler.nodeinfo.InputType.Association;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_0;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_0;
 
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.IterableNodeType;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.graph.iterators.NodeIterable;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.spi.LIRLowerable;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.IterableNodeType;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.graph.iterators.NodeIterable;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.spi.LIRLowerable;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
 
 /**
  * This node will be inserted at point specified by {@link StructuredGraph#getEntryBCI()}, usually
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/EntryProxyNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/EntryProxyNode.java
similarity index 82%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/EntryProxyNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/EntryProxyNode.java
index 1c697fd86013..47e120b7c5f2 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/EntryProxyNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/EntryProxyNode.java
@@ -22,17 +22,17 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes;
+package jdk.graal.compiler.nodes;
 
-import static jdk.compiler.graal.nodeinfo.InputType.Association;
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_0;
+import static jdk.graal.compiler.nodeinfo.InputType.Association;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_0;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_0;
 
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.extended.GuardingNode;
-import jdk.compiler.graal.nodes.spi.ValueProxy;
-import jdk.compiler.graal.nodes.calc.FloatingNode;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.extended.GuardingNode;
+import jdk.graal.compiler.nodes.spi.ValueProxy;
+import jdk.graal.compiler.nodes.calc.FloatingNode;
 
 /**
  * Proxy node that is used in OSR. This node drops the stamp information from the value, since the
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/FieldLocationIdentity.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/FieldLocationIdentity.java
similarity index 98%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/FieldLocationIdentity.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/FieldLocationIdentity.java
index 5d675ae5a244..5cf2ee89c3e7 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/FieldLocationIdentity.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/FieldLocationIdentity.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes;
+package jdk.graal.compiler.nodes;
 
 import jdk.vm.ci.meta.JavaKind.FormatWithToString;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/FixedGuardNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/FixedGuardNode.java
similarity index 92%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/FixedGuardNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/FixedGuardNode.java
index 5a37c334356c..d4e77c2a341a 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/FixedGuardNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/FixedGuardNode.java
@@ -22,24 +22,24 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes;
-
-import static jdk.compiler.graal.nodeinfo.InputType.Guard;
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_2;
-
-import jdk.compiler.graal.debug.DebugCloseable;
-import jdk.compiler.graal.graph.IterableNodeType;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.graph.NodeSourcePosition;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.extended.ValueAnchorNode;
-import jdk.compiler.graal.nodes.spi.Lowerable;
-import jdk.compiler.graal.nodes.spi.LoweringTool;
-import jdk.compiler.graal.nodes.spi.SimplifierTool;
-import jdk.compiler.graal.nodes.spi.SwitchFoldable;
-import jdk.compiler.graal.nodes.calc.IntegerEqualsNode;
+package jdk.graal.compiler.nodes;
+
+import static jdk.graal.compiler.nodeinfo.InputType.Guard;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_2;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_2;
+
+import jdk.graal.compiler.debug.DebugCloseable;
+import jdk.graal.compiler.graph.IterableNodeType;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.graph.NodeSourcePosition;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.extended.ValueAnchorNode;
+import jdk.graal.compiler.nodes.spi.Lowerable;
+import jdk.graal.compiler.nodes.spi.LoweringTool;
+import jdk.graal.compiler.nodes.spi.SimplifierTool;
+import jdk.graal.compiler.nodes.spi.SwitchFoldable;
+import jdk.graal.compiler.nodes.calc.IntegerEqualsNode;
 
 import jdk.vm.ci.meta.DeoptimizationAction;
 import jdk.vm.ci.meta.DeoptimizationReason;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/FixedNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/FixedNode.java
similarity index 91%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/FixedNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/FixedNode.java
index 65a6da895725..ebb2b18dd2db 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/FixedNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/FixedNode.java
@@ -22,11 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes;
+package jdk.graal.compiler.nodes;
 
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
 
 @NodeInfo
 public abstract class FixedNode extends ValueNode implements FixedNodeInterface {
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/FixedNodeInterface.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/FixedNodeInterface.java
similarity index 97%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/FixedNodeInterface.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/FixedNodeInterface.java
index 21b1bd9b6329..63808fec2017 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/FixedNodeInterface.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/FixedNodeInterface.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes;
+package jdk.graal.compiler.nodes;
 
 /**
  * See {@link ValueNodeInterface} for details about these node interfaces.
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/FixedWithNextNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/FixedWithNextNode.java
similarity index 92%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/FixedWithNextNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/FixedWithNextNode.java
index 2ddb32184cb5..f202421eda27 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/FixedWithNextNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/FixedWithNextNode.java
@@ -22,11 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes;
+package jdk.graal.compiler.nodes;
 
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
 
 /**
  * Base class of all nodes that are fixed within the control flow graph and have an immediate
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/FixedWithNextNodeInterface.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/FixedWithNextNodeInterface.java
similarity index 97%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/FixedWithNextNodeInterface.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/FixedWithNextNodeInterface.java
index 622d4683dae8..929cde64a0f5 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/FixedWithNextNodeInterface.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/FixedWithNextNodeInterface.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes;
+package jdk.graal.compiler.nodes;
 
 /**
  * See {@link ValueNodeInterface} for details about these node interfaces.
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/FloatingAnchoredNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/FloatingAnchoredNode.java
similarity index 84%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/FloatingAnchoredNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/FloatingAnchoredNode.java
index bf7be387ddc6..3ded7d8999a1 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/FloatingAnchoredNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/FloatingAnchoredNode.java
@@ -22,14 +22,14 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes;
+package jdk.graal.compiler.nodes;
 
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.InputType;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.extended.AnchoringNode;
-import jdk.compiler.graal.nodes.calc.FloatingNode;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.InputType;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.extended.AnchoringNode;
+import jdk.graal.compiler.nodes.calc.FloatingNode;
 
 @NodeInfo
 public abstract class FloatingAnchoredNode extends FloatingNode {
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/FloatingGuardedNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/FloatingGuardedNode.java
similarity index 83%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/FloatingGuardedNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/FloatingGuardedNode.java
index d40300fd3f18..01c99ea1bc48 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/FloatingGuardedNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/FloatingGuardedNode.java
@@ -22,15 +22,15 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes;
+package jdk.graal.compiler.nodes;
 
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.InputType;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.extended.GuardedNode;
-import jdk.compiler.graal.nodes.extended.GuardingNode;
-import jdk.compiler.graal.nodes.calc.FloatingNode;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.InputType;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.extended.GuardedNode;
+import jdk.graal.compiler.nodes.extended.GuardingNode;
+import jdk.graal.compiler.nodes.calc.FloatingNode;
 
 @NodeInfo
 public abstract class FloatingGuardedNode extends FloatingNode implements GuardedNode {
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/FrameState.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/FrameState.java
similarity index 96%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/FrameState.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/FrameState.java
index ed80956a0355..129d30577dc6 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/FrameState.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/FrameState.java
@@ -22,16 +22,16 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes;
+package jdk.graal.compiler.nodes;
 
 import static jdk.vm.ci.code.BytecodeFrame.getPlaceholderBciName;
 import static jdk.vm.ci.code.BytecodeFrame.isPlaceholderBci;
-import static jdk.compiler.graal.nodeinfo.InputType.Association;
-import static jdk.compiler.graal.nodeinfo.InputType.State;
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0;
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_IGNORED;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_IGNORED;
+import static jdk.graal.compiler.nodeinfo.InputType.Association;
+import static jdk.graal.compiler.nodeinfo.InputType.State;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_0;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_IGNORED;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_1;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_IGNORED;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -40,24 +40,24 @@
 import java.util.Map;
 import java.util.Objects;
 
-import jdk.compiler.graal.bytecode.Bytecode;
-import jdk.compiler.graal.bytecode.Bytecodes;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.IterableNodeType;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.graph.NodeInputList;
-import jdk.compiler.graal.graph.NodeSourcePosition;
-import jdk.compiler.graal.graph.Position;
-import jdk.compiler.graal.nodeinfo.InputType;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodeinfo.Verbosity;
-import jdk.compiler.graal.nodes.java.ExceptionObjectNode;
-import jdk.compiler.graal.nodes.java.MonitorIdNode;
-import jdk.compiler.graal.nodes.virtual.EscapeObjectState;
-import jdk.compiler.graal.nodes.virtual.MaterializedObjectState;
-import jdk.compiler.graal.nodes.virtual.VirtualObjectNode;
+import jdk.graal.compiler.bytecode.Bytecode;
+import jdk.graal.compiler.bytecode.Bytecodes;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.IterableNodeType;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.graph.NodeInputList;
+import jdk.graal.compiler.graph.NodeSourcePosition;
+import jdk.graal.compiler.graph.Position;
+import jdk.graal.compiler.nodeinfo.InputType;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodeinfo.Verbosity;
+import jdk.graal.compiler.nodes.java.ExceptionObjectNode;
+import jdk.graal.compiler.nodes.java.MonitorIdNode;
+import jdk.graal.compiler.nodes.virtual.EscapeObjectState;
+import jdk.graal.compiler.nodes.virtual.MaterializedObjectState;
+import jdk.graal.compiler.nodes.virtual.VirtualObjectNode;
 
 import jdk.vm.ci.code.BytecodeFrame;
 import jdk.vm.ci.code.CodeUtil;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/FullInfopointNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/FullInfopointNode.java
similarity index 82%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/FullInfopointNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/FullInfopointNode.java
index d02f7a7a4bd3..819923d067c9 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/FullInfopointNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/FullInfopointNode.java
@@ -22,20 +22,20 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes;
+package jdk.graal.compiler.nodes;
 
-import static jdk.compiler.graal.nodeinfo.InputType.State;
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_0;
+import static jdk.graal.compiler.nodeinfo.InputType.State;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_0;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_0;
 
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodes.spi.LIRLowerable;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
-import jdk.compiler.graal.nodes.spi.NodeWithState;
-import jdk.compiler.graal.nodes.spi.Simplifiable;
-import jdk.compiler.graal.nodes.spi.SimplifierTool;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodes.spi.LIRLowerable;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.nodes.spi.NodeWithState;
+import jdk.graal.compiler.nodes.spi.Simplifiable;
+import jdk.graal.compiler.nodes.spi.SimplifierTool;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
 
 import jdk.vm.ci.code.site.InfopointReason;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/GetObjectAddressNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/GetObjectAddressNode.java
similarity index 85%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/GetObjectAddressNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/GetObjectAddressNode.java
index c947238439a9..5d4438880789 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/GetObjectAddressNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/GetObjectAddressNode.java
@@ -22,18 +22,18 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes;
+package jdk.graal.compiler.nodes;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_2;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_1;
 
-import jdk.compiler.graal.core.common.LIRKind;
-import jdk.compiler.graal.core.common.type.AbstractPointerStamp;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.spi.LIRLowerable;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.core.common.LIRKind;
+import jdk.graal.compiler.core.common.type.AbstractPointerStamp;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.spi.LIRLowerable;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
 
 import jdk.vm.ci.meta.AllocatableValue;
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/GraphDecoder.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/GraphDecoder.java
similarity index 98%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/GraphDecoder.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/GraphDecoder.java
index ce8962ff2e28..0c4405427f7d 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/GraphDecoder.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/GraphDecoder.java
@@ -22,11 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes;
+package jdk.graal.compiler.nodes;
 
-import static jdk.compiler.graal.debug.GraalError.shouldNotReachHere;
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_IGNORED;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_IGNORED;
+import static jdk.graal.compiler.debug.GraalError.shouldNotReachHere;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_IGNORED;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_IGNORED;
 
 import java.util.ArrayDeque;
 import java.util.ArrayList;
@@ -40,38 +40,38 @@
 import java.util.SortedMap;
 import java.util.TreeMap;
 
-import jdk.compiler.graal.nodes.extended.IntegerSwitchNode;
-import jdk.compiler.graal.nodes.extended.SwitchNode;
-import jdk.compiler.graal.nodes.graphbuilderconf.LoopExplosionPlugin;
-import jdk.compiler.graal.nodes.spi.Canonicalizable;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodes.extended.IntegerSwitchNode;
+import jdk.graal.compiler.nodes.extended.SwitchNode;
+import jdk.graal.compiler.nodes.graphbuilderconf.LoopExplosionPlugin;
+import jdk.graal.compiler.nodes.spi.Canonicalizable;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.EconomicSet;
 import org.graalvm.collections.Equivalence;
-import jdk.compiler.graal.core.common.Fields;
-import jdk.compiler.graal.core.common.PermanentBailoutException;
-import jdk.compiler.graal.core.common.util.TypeReader;
-import jdk.compiler.graal.core.common.util.UnsafeArrayTypeReader;
-import jdk.compiler.graal.debug.DebugCloseable;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.debug.TimerKey;
-import jdk.compiler.graal.graph.Edges;
-import jdk.compiler.graal.graph.Graph;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeBitMap;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.graph.NodeInputList;
-import jdk.compiler.graal.graph.NodeList;
-import jdk.compiler.graal.graph.NodeSourcePosition;
-import jdk.compiler.graal.graph.NodeSuccessorList;
-import jdk.compiler.graal.nodeinfo.InputType;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.GraphDecoder.MethodScope;
-import jdk.compiler.graal.nodes.GraphDecoder.ProxyPlaceholder;
-import jdk.compiler.graal.nodes.calc.FloatingNode;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.replacements.nodes.MethodHandleWithExceptionNode;
+import jdk.graal.compiler.core.common.Fields;
+import jdk.graal.compiler.core.common.PermanentBailoutException;
+import jdk.graal.compiler.core.common.util.TypeReader;
+import jdk.graal.compiler.core.common.util.UnsafeArrayTypeReader;
+import jdk.graal.compiler.debug.DebugCloseable;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.debug.TimerKey;
+import jdk.graal.compiler.graph.Edges;
+import jdk.graal.compiler.graph.Graph;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeBitMap;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.graph.NodeInputList;
+import jdk.graal.compiler.graph.NodeList;
+import jdk.graal.compiler.graph.NodeSourcePosition;
+import jdk.graal.compiler.graph.NodeSuccessorList;
+import jdk.graal.compiler.nodeinfo.InputType;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.GraphDecoder.MethodScope;
+import jdk.graal.compiler.nodes.GraphDecoder.ProxyPlaceholder;
+import jdk.graal.compiler.nodes.calc.FloatingNode;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.replacements.nodes.MethodHandleWithExceptionNode;
 
 import jdk.vm.ci.code.Architecture;
 import jdk.vm.ci.meta.Assumptions;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/GraphEncoder.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/GraphEncoder.java
similarity index 97%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/GraphEncoder.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/GraphEncoder.java
index feb3058934be..9d350ecd7543 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/GraphEncoder.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/GraphEncoder.java
@@ -22,31 +22,31 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes;
+package jdk.graal.compiler.nodes;
 
 import java.util.ArrayDeque;
 import java.util.Deque;
 import java.util.Iterator;
 import java.util.Objects;
 
-import jdk.compiler.graal.nodes.java.ExceptionObjectNode;
+import jdk.graal.compiler.nodes.java.ExceptionObjectNode;
 import org.graalvm.collections.Pair;
 import org.graalvm.collections.UnmodifiableMapCursor;
-import jdk.compiler.graal.core.common.Fields;
-import jdk.compiler.graal.core.common.util.FrequencyEncoder;
-import jdk.compiler.graal.core.common.util.TypeConversion;
-import jdk.compiler.graal.core.common.util.TypeReader;
-import jdk.compiler.graal.core.common.util.TypeWriter;
-import jdk.compiler.graal.core.common.util.UnsafeArrayTypeWriter;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.Edges;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.graph.NodeList;
-import jdk.compiler.graal.graph.NodeMap;
-import jdk.compiler.graal.graph.iterators.NodeIterable;
-import jdk.compiler.graal.replacements.nodes.MethodHandleWithExceptionNode;
+import jdk.graal.compiler.core.common.Fields;
+import jdk.graal.compiler.core.common.util.FrequencyEncoder;
+import jdk.graal.compiler.core.common.util.TypeConversion;
+import jdk.graal.compiler.core.common.util.TypeReader;
+import jdk.graal.compiler.core.common.util.TypeWriter;
+import jdk.graal.compiler.core.common.util.UnsafeArrayTypeWriter;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.Edges;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.graph.NodeList;
+import jdk.graal.compiler.graph.NodeMap;
+import jdk.graal.compiler.graph.iterators.NodeIterable;
+import jdk.graal.compiler.replacements.nodes.MethodHandleWithExceptionNode;
 
 import jdk.vm.ci.code.Architecture;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/GraphState.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/GraphState.java
similarity index 99%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/GraphState.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/GraphState.java
index 60075cc387e6..19daf9c99006 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/GraphState.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/GraphState.java
@@ -22,16 +22,16 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes;
+package jdk.graal.compiler.nodes;
 
 import java.util.EnumSet;
 import java.util.Formatter;
 import java.util.Objects;
 
-import jdk.compiler.graal.api.replacements.Snippet;
-import jdk.compiler.graal.graph.Graph;
-import jdk.compiler.graal.nodes.util.GraphUtil;
-import jdk.compiler.graal.nodes.calc.FloatingNode;
+import jdk.graal.compiler.api.replacements.Snippet;
+import jdk.graal.compiler.graph.Graph;
+import jdk.graal.compiler.nodes.util.GraphUtil;
+import jdk.graal.compiler.nodes.calc.FloatingNode;
 
 import jdk.vm.ci.meta.SpeculationLog;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/GuardNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/GuardNode.java
similarity index 89%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/GuardNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/GuardNode.java
index 73abcd0d6c4c..74c01f470e4f 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/GuardNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/GuardNode.java
@@ -22,24 +22,24 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes;
-
-import static jdk.compiler.graal.nodeinfo.InputType.Condition;
-import static jdk.compiler.graal.nodeinfo.InputType.Guard;
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_2;
-
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.IterableNodeType;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.graph.NodeSourcePosition;
-import jdk.compiler.graal.nodes.extended.AnchoringNode;
-import jdk.compiler.graal.nodes.extended.GuardingNode;
-import jdk.compiler.graal.nodes.spi.Canonicalizable;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodeinfo.Verbosity;
+package jdk.graal.compiler.nodes;
+
+import static jdk.graal.compiler.nodeinfo.InputType.Condition;
+import static jdk.graal.compiler.nodeinfo.InputType.Guard;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_2;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_2;
+
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.IterableNodeType;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.graph.NodeSourcePosition;
+import jdk.graal.compiler.nodes.extended.AnchoringNode;
+import jdk.graal.compiler.nodes.extended.GuardingNode;
+import jdk.graal.compiler.nodes.spi.Canonicalizable;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodeinfo.Verbosity;
 
 import jdk.vm.ci.meta.DeoptimizationAction;
 import jdk.vm.ci.meta.DeoptimizationReason;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/GuardPhiNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/GuardPhiNode.java
similarity index 89%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/GuardPhiNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/GuardPhiNode.java
index 117f7f3b375b..3132510c16cf 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/GuardPhiNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/GuardPhiNode.java
@@ -22,15 +22,15 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes;
+package jdk.graal.compiler.nodes;
 
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.graph.NodeInputList;
-import jdk.compiler.graal.nodeinfo.InputType;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.extended.GuardingNode;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.graph.NodeInputList;
+import jdk.graal.compiler.nodeinfo.InputType;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.extended.GuardingNode;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
 
 /**
  * Guard {@link PhiNode}s merge guard dependencies at control flow merges.
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/GuardProxyNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/GuardProxyNode.java
similarity index 88%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/GuardProxyNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/GuardProxyNode.java
index 614c5da662c5..8426725ac8a0 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/GuardProxyNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/GuardProxyNode.java
@@ -22,13 +22,13 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes;
+package jdk.graal.compiler.nodes;
 
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.InputType;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.extended.GuardingNode;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.InputType;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.extended.GuardingNode;
 
 @NodeInfo(allowedUsageTypes = {InputType.Guard}, nameTemplate = "GuardProxy({i#value})")
 public final class GuardProxyNode extends ProxyNode implements GuardingNode {
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/GuardedValueNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/GuardedValueNode.java
similarity index 82%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/GuardedValueNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/GuardedValueNode.java
index 67693c243b51..447064aca9a1 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/GuardedValueNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/GuardedValueNode.java
@@ -22,23 +22,23 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes;
+package jdk.graal.compiler.nodes;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_0;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_0;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_0;
 
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodes.extended.GuardingNode;
-import jdk.compiler.graal.nodes.spi.Canonicalizable;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodes.spi.LIRLowerable;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
-import jdk.compiler.graal.nodes.spi.ValueProxy;
-import jdk.compiler.graal.nodes.spi.Virtualizable;
-import jdk.compiler.graal.nodes.spi.VirtualizerTool;
-import jdk.compiler.graal.nodes.virtual.VirtualObjectNode;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodes.extended.GuardingNode;
+import jdk.graal.compiler.nodes.spi.Canonicalizable;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodes.spi.LIRLowerable;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.nodes.spi.ValueProxy;
+import jdk.graal.compiler.nodes.spi.Virtualizable;
+import jdk.graal.compiler.nodes.spi.VirtualizerTool;
+import jdk.graal.compiler.nodes.virtual.VirtualObjectNode;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
 
 import jdk.vm.ci.meta.JavaKind;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/IfNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/IfNode.java
similarity index 97%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/IfNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/IfNode.java
index 20ea6c817be5..86b08391e611 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/IfNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/IfNode.java
@@ -22,66 +22,66 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes;
+package jdk.graal.compiler.nodes;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_1;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_2;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_1;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_2;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
 
-import jdk.compiler.graal.nodes.cfg.HIRBlock;
-import jdk.compiler.graal.nodes.extended.BranchProbabilityNode;
-import jdk.compiler.graal.nodes.extended.UnboxNode;
-import jdk.compiler.graal.nodes.java.InstanceOfNode;
-import jdk.compiler.graal.nodes.java.LoadFieldNode;
-import jdk.compiler.graal.nodes.memory.MemoryAnchorNode;
-import jdk.compiler.graal.nodes.spi.Canonicalizable;
-import jdk.compiler.graal.nodes.spi.LIRLowerable;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
-import jdk.compiler.graal.nodes.spi.Simplifiable;
-import jdk.compiler.graal.nodes.spi.SimplifierTool;
-import jdk.compiler.graal.nodes.spi.SwitchFoldable;
+import jdk.graal.compiler.nodes.cfg.HIRBlock;
+import jdk.graal.compiler.nodes.extended.BranchProbabilityNode;
+import jdk.graal.compiler.nodes.extended.UnboxNode;
+import jdk.graal.compiler.nodes.java.InstanceOfNode;
+import jdk.graal.compiler.nodes.java.LoadFieldNode;
+import jdk.graal.compiler.nodes.memory.MemoryAnchorNode;
+import jdk.graal.compiler.nodes.spi.Canonicalizable;
+import jdk.graal.compiler.nodes.spi.LIRLowerable;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.nodes.spi.Simplifiable;
+import jdk.graal.compiler.nodes.spi.SimplifierTool;
+import jdk.graal.compiler.nodes.spi.SwitchFoldable;
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.Equivalence;
-import jdk.compiler.graal.core.common.calc.Condition;
-import jdk.compiler.graal.core.common.type.FloatStamp;
-import jdk.compiler.graal.core.common.type.IntegerStamp;
-import jdk.compiler.graal.core.common.type.PrimitiveStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.core.common.util.CompilationAlarm;
-import jdk.compiler.graal.debug.CounterKey;
-import jdk.compiler.graal.debug.DebugCloseable;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.IterableNodeType;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.graph.NodeSourcePosition;
-import jdk.compiler.graal.graph.Position;
-import jdk.compiler.graal.graph.iterators.NodeIterable;
-import jdk.compiler.graal.nodeinfo.InputType;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.GraphState.StageFlag;
-import jdk.compiler.graal.nodes.ProfileData.BranchProbabilityData;
-import jdk.compiler.graal.nodes.ProfileData.ProfileSource;
-import jdk.compiler.graal.nodes.VirtualState.NodePositionClosure;
-import jdk.compiler.graal.nodes.calc.AddNode;
-import jdk.compiler.graal.nodes.calc.CompareNode;
-import jdk.compiler.graal.nodes.calc.ConditionalNode;
-import jdk.compiler.graal.nodes.calc.FloatNormalizeCompareNode;
-import jdk.compiler.graal.nodes.calc.IntegerBelowNode;
-import jdk.compiler.graal.nodes.calc.IntegerEqualsNode;
-import jdk.compiler.graal.nodes.calc.IntegerLessThanNode;
-import jdk.compiler.graal.nodes.calc.IntegerNormalizeCompareNode;
-import jdk.compiler.graal.nodes.calc.IsNullNode;
-import jdk.compiler.graal.nodes.calc.ObjectEqualsNode;
-import jdk.compiler.graal.nodes.calc.SubNode;
-import jdk.compiler.graal.nodes.debug.ControlFlowAnchored;
-import jdk.compiler.graal.nodes.util.GraphUtil;
+import jdk.graal.compiler.core.common.calc.Condition;
+import jdk.graal.compiler.core.common.type.FloatStamp;
+import jdk.graal.compiler.core.common.type.IntegerStamp;
+import jdk.graal.compiler.core.common.type.PrimitiveStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.core.common.util.CompilationAlarm;
+import jdk.graal.compiler.debug.CounterKey;
+import jdk.graal.compiler.debug.DebugCloseable;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.IterableNodeType;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.graph.NodeSourcePosition;
+import jdk.graal.compiler.graph.Position;
+import jdk.graal.compiler.graph.iterators.NodeIterable;
+import jdk.graal.compiler.nodeinfo.InputType;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.GraphState.StageFlag;
+import jdk.graal.compiler.nodes.ProfileData.BranchProbabilityData;
+import jdk.graal.compiler.nodes.ProfileData.ProfileSource;
+import jdk.graal.compiler.nodes.VirtualState.NodePositionClosure;
+import jdk.graal.compiler.nodes.calc.AddNode;
+import jdk.graal.compiler.nodes.calc.CompareNode;
+import jdk.graal.compiler.nodes.calc.ConditionalNode;
+import jdk.graal.compiler.nodes.calc.FloatNormalizeCompareNode;
+import jdk.graal.compiler.nodes.calc.IntegerBelowNode;
+import jdk.graal.compiler.nodes.calc.IntegerEqualsNode;
+import jdk.graal.compiler.nodes.calc.IntegerLessThanNode;
+import jdk.graal.compiler.nodes.calc.IntegerNormalizeCompareNode;
+import jdk.graal.compiler.nodes.calc.IsNullNode;
+import jdk.graal.compiler.nodes.calc.ObjectEqualsNode;
+import jdk.graal.compiler.nodes.calc.SubNode;
+import jdk.graal.compiler.nodes.debug.ControlFlowAnchored;
+import jdk.graal.compiler.nodes.util.GraphUtil;
 
 import jdk.vm.ci.code.CodeUtil;
 import jdk.vm.ci.meta.Constant;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/ImplicitNullCheckNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/ImplicitNullCheckNode.java
similarity index 93%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/ImplicitNullCheckNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/ImplicitNullCheckNode.java
index 7a2d588f49e9..7958a181021c 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/ImplicitNullCheckNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/ImplicitNullCheckNode.java
@@ -22,11 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes;
+package jdk.graal.compiler.nodes;
 
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
 
 import jdk.vm.ci.meta.JavaConstant;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/IndirectCallTargetNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/IndirectCallTargetNode.java
similarity index 93%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/IndirectCallTargetNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/IndirectCallTargetNode.java
index f445ab384d48..d3ef1afd08ca 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/IndirectCallTargetNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/IndirectCallTargetNode.java
@@ -22,11 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes;
+package jdk.graal.compiler.nodes;
 
-import jdk.compiler.graal.core.common.type.StampPair;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
+import jdk.graal.compiler.core.common.type.StampPair;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
 
 import jdk.vm.ci.code.CallingConvention;
 import jdk.vm.ci.meta.JavaType;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/InliningLog.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/InliningLog.java
similarity index 99%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/InliningLog.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/InliningLog.java
index e5433145dc4f..b52d6c956f12 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/InliningLog.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/InliningLog.java
@@ -22,25 +22,25 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes;
+package jdk.graal.compiler.nodes;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 import java.util.function.BiConsumer;
 
-import jdk.compiler.graal.nodes.java.MethodCallTargetNode;
+import jdk.graal.compiler.nodes.java.MethodCallTargetNode;
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.Equivalence;
 import org.graalvm.collections.MapCursor;
 import org.graalvm.collections.UnmodifiableEconomicMap;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.Node;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.Node;
 
 import jdk.vm.ci.meta.JavaTypeProfile;
 import jdk.vm.ci.meta.MetaUtil;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
-import jdk.compiler.graal.util.CollectionsUtil;
+import jdk.graal.compiler.util.CollectionsUtil;
 
 /**
  * This class contains all inlining decisions performed on a graph during the compilation.
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/InliningLogCodec.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/InliningLogCodec.java
similarity index 99%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/InliningLogCodec.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/InliningLogCodec.java
index 12dccc6a136e..598b5bc7083c 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/InliningLogCodec.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/InliningLogCodec.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes;
+package jdk.graal.compiler.nodes;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -33,8 +33,8 @@
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.Equivalence;
 import org.graalvm.collections.Pair;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.util.CollectionsUtil;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.util.CollectionsUtil;
 
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/Invokable.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/Invokable.java
similarity index 97%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/Invokable.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/Invokable.java
index a8e330309834..2d8a570a4e4f 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/Invokable.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/Invokable.java
@@ -22,10 +22,10 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes;
+package jdk.graal.compiler.nodes;
 
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.Node;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.Node;
 
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 import jdk.vm.ci.meta.ResolvedJavaType;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/Invoke.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/Invoke.java
similarity index 93%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/Invoke.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/Invoke.java
index 457b54e7f6c7..0bb122569b1c 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/Invoke.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/Invoke.java
@@ -22,13 +22,13 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes;
+package jdk.graal.compiler.nodes;
 
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.nodes.java.MethodCallTargetNode;
-import jdk.compiler.graal.nodes.memory.SingleMemoryKill;
-import jdk.compiler.graal.nodes.spi.Lowerable;
-import jdk.compiler.graal.nodes.type.StampTool;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.nodes.java.MethodCallTargetNode;
+import jdk.graal.compiler.nodes.memory.SingleMemoryKill;
+import jdk.graal.compiler.nodes.spi.Lowerable;
+import jdk.graal.compiler.nodes.type.StampTool;
 
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 import jdk.vm.ci.meta.ResolvedJavaType;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/InvokeNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/InvokeNode.java
similarity index 82%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/InvokeNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/InvokeNode.java
index 1063c74c9d4e..ed774bfec369 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/InvokeNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/InvokeNode.java
@@ -22,36 +22,36 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes;
-
-import static jdk.compiler.graal.nodeinfo.InputType.Extension;
-import static jdk.compiler.graal.nodeinfo.InputType.Memory;
-import static jdk.compiler.graal.nodeinfo.InputType.State;
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2;
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_64;
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_8;
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_UNKNOWN;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_2;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_64;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_8;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_UNKNOWN;
-import static jdk.compiler.graal.nodes.Invoke.CYCLES_UNKNOWN_RATIONALE;
-import static jdk.compiler.graal.nodes.Invoke.SIZE_UNKNOWN_RATIONALE;
+package jdk.graal.compiler.nodes;
+
+import static jdk.graal.compiler.nodeinfo.InputType.Extension;
+import static jdk.graal.compiler.nodeinfo.InputType.Memory;
+import static jdk.graal.compiler.nodeinfo.InputType.State;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_2;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_64;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_8;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_UNKNOWN;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_2;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_64;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_8;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_UNKNOWN;
+import static jdk.graal.compiler.nodes.Invoke.CYCLES_UNKNOWN_RATIONALE;
+import static jdk.graal.compiler.nodes.Invoke.SIZE_UNKNOWN_RATIONALE;
 
 import java.util.Map;
 
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeCycles;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodeinfo.NodeSize;
-import jdk.compiler.graal.nodeinfo.Verbosity;
-import jdk.compiler.graal.nodes.memory.AbstractMemoryCheckpoint;
-import jdk.compiler.graal.nodes.memory.SingleMemoryKill;
-import jdk.compiler.graal.nodes.spi.LIRLowerable;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
-import jdk.compiler.graal.nodes.spi.UncheckedInterfaceProvider;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeCycles;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodeinfo.NodeSize;
+import jdk.graal.compiler.nodeinfo.Verbosity;
+import jdk.graal.compiler.nodes.memory.AbstractMemoryCheckpoint;
+import jdk.graal.compiler.nodes.memory.SingleMemoryKill;
+import jdk.graal.compiler.nodes.spi.LIRLowerable;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.nodes.spi.UncheckedInterfaceProvider;
 import org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.code.BytecodeFrame;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/InvokeWithExceptionNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/InvokeWithExceptionNode.java
similarity index 85%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/InvokeWithExceptionNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/InvokeWithExceptionNode.java
index 1c74b11615e5..d22890f78954 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/InvokeWithExceptionNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/InvokeWithExceptionNode.java
@@ -22,33 +22,33 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes;
+package jdk.graal.compiler.nodes;
 
-import static jdk.compiler.graal.nodeinfo.InputType.Extension;
-import static jdk.compiler.graal.nodeinfo.InputType.Memory;
-import static jdk.compiler.graal.nodeinfo.InputType.State;
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_UNKNOWN;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_UNKNOWN;
-import static jdk.compiler.graal.nodes.Invoke.CYCLES_UNKNOWN_RATIONALE;
-import static jdk.compiler.graal.nodes.Invoke.SIZE_UNKNOWN_RATIONALE;
+import static jdk.graal.compiler.nodeinfo.InputType.Extension;
+import static jdk.graal.compiler.nodeinfo.InputType.Memory;
+import static jdk.graal.compiler.nodeinfo.InputType.State;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_UNKNOWN;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_UNKNOWN;
+import static jdk.graal.compiler.nodes.Invoke.CYCLES_UNKNOWN_RATIONALE;
+import static jdk.graal.compiler.nodes.Invoke.SIZE_UNKNOWN_RATIONALE;
 
 import java.util.Map;
 
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.graph.IterableNodeType;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeCycles;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodeinfo.NodeSize;
-import jdk.compiler.graal.nodeinfo.Verbosity;
-import jdk.compiler.graal.nodes.memory.SingleMemoryKill;
-import jdk.compiler.graal.nodes.spi.LIRLowerable;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
-import jdk.compiler.graal.nodes.spi.Simplifiable;
-import jdk.compiler.graal.nodes.spi.SimplifierTool;
-import jdk.compiler.graal.nodes.spi.UncheckedInterfaceProvider;
-import jdk.compiler.graal.nodes.util.GraphUtil;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.graph.IterableNodeType;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeCycles;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodeinfo.NodeSize;
+import jdk.graal.compiler.nodeinfo.Verbosity;
+import jdk.graal.compiler.nodes.memory.SingleMemoryKill;
+import jdk.graal.compiler.nodes.spi.LIRLowerable;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.nodes.spi.Simplifiable;
+import jdk.graal.compiler.nodes.spi.SimplifierTool;
+import jdk.graal.compiler.nodes.spi.UncheckedInterfaceProvider;
+import jdk.graal.compiler.nodes.util.GraphUtil;
 import org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.code.BytecodeFrame;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/LIRLowerableLogicNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/LIRLowerableLogicNode.java
similarity index 83%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/LIRLowerableLogicNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/LIRLowerableLogicNode.java
index 6d55a51f1d7d..9e6205bf1e25 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/LIRLowerableLogicNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/LIRLowerableLogicNode.java
@@ -22,15 +22,15 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes;
+package jdk.graal.compiler.nodes;
 
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.spi.LIRLowerable;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.spi.LIRLowerable;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
 
-import static jdk.compiler.graal.nodeinfo.InputType.Condition;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1;
+import static jdk.graal.compiler.nodeinfo.InputType.Condition;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_1;
 
 @NodeInfo(allowedUsageTypes = {Condition}, size = SIZE_1)
 public abstract class LIRLowerableLogicNode extends LogicNode implements LIRLowerable {
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/LogicConstantNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/LogicConstantNode.java
similarity index 90%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/LogicConstantNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/LogicConstantNode.java
index b66bebf6e633..c09a8f10f6ec 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/LogicConstantNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/LogicConstantNode.java
@@ -22,15 +22,15 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes;
+package jdk.graal.compiler.nodes;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_0;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_0;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_0;
 
-import jdk.compiler.graal.graph.Graph;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.spi.LIRLowerable;
+import jdk.graal.compiler.graph.Graph;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.spi.LIRLowerable;
 
 /**
  * The {@code LogicConstantNode} represents a boolean constant.
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/LogicNegationNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/LogicNegationNode.java
similarity index 87%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/LogicNegationNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/LogicNegationNode.java
index 26645e195ba2..b99de42f263c 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/LogicNegationNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/LogicNegationNode.java
@@ -22,16 +22,16 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes;
+package jdk.graal.compiler.nodes;
 
-import static jdk.compiler.graal.nodeinfo.InputType.Condition;
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_0;
+import static jdk.graal.compiler.nodeinfo.InputType.Condition;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_0;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_0;
 
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodes.spi.Canonicalizable;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodes.spi.Canonicalizable;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
 
 import jdk.vm.ci.meta.TriState;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/LogicNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/LogicNode.java
similarity index 89%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/LogicNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/LogicNode.java
index e6eb520073f5..5ec0b7625359 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/LogicNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/LogicNode.java
@@ -22,17 +22,17 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes;
+package jdk.graal.compiler.nodes;
 
-import static jdk.compiler.graal.nodeinfo.InputType.Condition;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1;
+import static jdk.graal.compiler.nodeinfo.InputType.Condition;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_1;
 
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.Node.IndirectCanonicalization;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.ProfileData.BranchProbabilityData;
-import jdk.compiler.graal.nodes.calc.FloatingNode;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.Node.IndirectCanonicalization;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.ProfileData.BranchProbabilityData;
+import jdk.graal.compiler.nodes.calc.FloatingNode;
 
 import jdk.vm.ci.meta.TriState;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/LoopBeginNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/LoopBeginNode.java
similarity index 95%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/LoopBeginNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/LoopBeginNode.java
index 67dc2cd9cacb..f993f8df4722 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/LoopBeginNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/LoopBeginNode.java
@@ -22,28 +22,28 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes;
-
-import static jdk.compiler.graal.graph.iterators.NodePredicates.isNotA;
-
-import jdk.compiler.graal.core.common.type.IntegerStamp;
-import jdk.compiler.graal.debug.CounterKey;
-import jdk.compiler.graal.debug.DebugCloseable;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.IterableNodeType;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.graph.iterators.NodeIterable;
-import jdk.compiler.graal.nodeinfo.InputType;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.extended.GuardingNode;
-import jdk.compiler.graal.nodes.spi.LIRLowerable;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
-import jdk.compiler.graal.nodes.spi.SimplifierTool;
-import jdk.compiler.graal.nodes.util.GraphUtil;
-import jdk.compiler.graal.nodes.calc.AddNode;
-import jdk.compiler.graal.serviceprovider.SpeculationReasonGroup;
+package jdk.graal.compiler.nodes;
+
+import static jdk.graal.compiler.graph.iterators.NodePredicates.isNotA;
+
+import jdk.graal.compiler.core.common.type.IntegerStamp;
+import jdk.graal.compiler.debug.CounterKey;
+import jdk.graal.compiler.debug.DebugCloseable;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.IterableNodeType;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.graph.iterators.NodeIterable;
+import jdk.graal.compiler.nodeinfo.InputType;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.extended.GuardingNode;
+import jdk.graal.compiler.nodes.spi.LIRLowerable;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.nodes.spi.SimplifierTool;
+import jdk.graal.compiler.nodes.util.GraphUtil;
+import jdk.graal.compiler.nodes.calc.AddNode;
+import jdk.graal.compiler.serviceprovider.SpeculationReasonGroup;
 
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 import jdk.vm.ci.meta.SpeculationLog;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/LoopEndNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/LoopEndNode.java
similarity index 90%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/LoopEndNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/LoopEndNode.java
index 7e4426f437aa..86499cbc1c9f 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/LoopEndNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/LoopEndNode.java
@@ -22,24 +22,24 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes;
+package jdk.graal.compiler.nodes;
 
-import static jdk.compiler.graal.nodeinfo.InputType.Association;
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_1;
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2;
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_UNKNOWN;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_2;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_UNKNOWN;
+import static jdk.graal.compiler.nodeinfo.InputType.Association;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_1;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_2;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_UNKNOWN;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_1;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_2;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_UNKNOWN;
 
 import java.util.Collections;
 
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeCycles;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodeinfo.NodeSize;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeCycles;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodeinfo.NodeSize;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
 
 /**
  * LoopEnd nodes represent a loop back-edge. When a LoopEnd is reached, execution continues at the
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/LoopExitNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/LoopExitNode.java
similarity index 90%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/LoopExitNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/LoopExitNode.java
index 43a93a02d981..9359ddb0d147 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/LoopExitNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/LoopExitNode.java
@@ -22,21 +22,21 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes;
-
-import static jdk.compiler.graal.nodeinfo.InputType.Association;
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_4;
-
-import jdk.compiler.graal.core.common.util.CompilationAlarm;
-import jdk.compiler.graal.graph.IterableNodeType;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.graph.iterators.NodeIterable;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.spi.Simplifiable;
-import jdk.compiler.graal.nodes.spi.SimplifierTool;
-import jdk.compiler.graal.nodes.util.GraphUtil;
+package jdk.graal.compiler.nodes;
+
+import static jdk.graal.compiler.nodeinfo.InputType.Association;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_0;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_4;
+
+import jdk.graal.compiler.core.common.util.CompilationAlarm;
+import jdk.graal.compiler.graph.IterableNodeType;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.graph.iterators.NodeIterable;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.spi.Simplifiable;
+import jdk.graal.compiler.nodes.spi.SimplifierTool;
+import jdk.graal.compiler.nodes.util.GraphUtil;
 
 @NodeInfo(allowedUsageTypes = {Association}, cycles = CYCLES_0, size = SIZE_4)
 public final class LoopExitNode extends BeginStateSplitNode implements IterableNodeType, Simplifiable {
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/LoweredCallTargetNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/LoweredCallTargetNode.java
similarity index 92%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/LoweredCallTargetNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/LoweredCallTargetNode.java
index 0caad8e67963..72987edd5601 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/LoweredCallTargetNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/LoweredCallTargetNode.java
@@ -22,11 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes;
+package jdk.graal.compiler.nodes;
 
-import jdk.compiler.graal.core.common.type.StampPair;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
+import jdk.graal.compiler.core.common.type.StampPair;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
 
 import jdk.vm.ci.code.CallingConvention;
 import jdk.vm.ci.meta.JavaType;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/MemoryMapControlSinkNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/MemoryMapControlSinkNode.java
similarity index 86%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/MemoryMapControlSinkNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/MemoryMapControlSinkNode.java
index e2a0e04020f7..3291253dfe2b 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/MemoryMapControlSinkNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/MemoryMapControlSinkNode.java
@@ -22,15 +22,15 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes;
+package jdk.graal.compiler.nodes;
 
-import static jdk.compiler.graal.nodeinfo.InputType.Extension;
+import static jdk.graal.compiler.nodeinfo.InputType.Extension;
 
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.IterableNodeType;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.memory.MemoryMapNode;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.IterableNodeType;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.memory.MemoryMapNode;
 
 /**
  * {@link ControlSinkNode}that might have a {@link MemoryMapNode} attached. This map can be used to
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/MemoryProxyNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/MemoryProxyNode.java
similarity index 86%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/MemoryProxyNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/MemoryProxyNode.java
index cbc622d4c1de..e95eb1594d55 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/MemoryProxyNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/MemoryProxyNode.java
@@ -22,15 +22,15 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes;
+package jdk.graal.compiler.nodes;
 
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.InputType;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.memory.MemoryKill;
-import jdk.compiler.graal.nodes.memory.MemoryPhiNode;
-import jdk.compiler.graal.nodes.memory.SingleMemoryKill;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.InputType;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.memory.MemoryKill;
+import jdk.graal.compiler.nodes.memory.MemoryPhiNode;
+import jdk.graal.compiler.nodes.memory.SingleMemoryKill;
 import org.graalvm.word.LocationIdentity;
 
 @NodeInfo(allowedUsageTypes = {InputType.Memory}, nameTemplate = "MemoryProxy({i#value})")
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/MergeNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/MergeNode.java
similarity index 94%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/MergeNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/MergeNode.java
index 5ae3bf683dac..e0090049c545 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/MergeNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/MergeNode.java
@@ -22,10 +22,10 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes;
+package jdk.graal.compiler.nodes;
 
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
 
 /**
  * Denotes the merging of multiple control-flow paths.
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/NamedLocationIdentity.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/NamedLocationIdentity.java
similarity index 99%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/NamedLocationIdentity.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/NamedLocationIdentity.java
index 571ada5d4e3d..181fe6746ac2 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/NamedLocationIdentity.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/NamedLocationIdentity.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes;
+package jdk.graal.compiler.nodes;
 
 import java.util.EnumMap;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/NodeView.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/NodeView.java
similarity index 94%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/NodeView.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/NodeView.java
index ae5a939a6c0f..b8d402e73a81 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/NodeView.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/NodeView.java
@@ -22,10 +22,10 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes;
+package jdk.graal.compiler.nodes;
 
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
 
 /**
  * Interface that overrides properties of a node, such as the node's stamp.
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/OptimizationLog.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/OptimizationLog.java
similarity index 96%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/OptimizationLog.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/OptimizationLog.java
index 5f26328c3962..1379a06e2461 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/OptimizationLog.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/OptimizationLog.java
@@ -22,26 +22,26 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes;
+package jdk.graal.compiler.nodes;
 
 import java.util.function.Function;
 import java.util.function.Supplier;
 
-import jdk.compiler.graal.debug.CounterKey;
-import jdk.compiler.graal.nodes.virtual.VirtualObjectNode;
+import jdk.graal.compiler.debug.CounterKey;
+import jdk.graal.compiler.nodes.virtual.VirtualObjectNode;
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.EconomicSet;
 import org.graalvm.collections.Equivalence;
-import jdk.compiler.graal.debug.DebugCloseable;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.debug.DebugOptions;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.graph.NodeSourcePosition;
-import jdk.compiler.graal.nodeinfo.NodeCycles;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodeinfo.NodeSize;
-import jdk.compiler.graal.options.OptionValues;
+import jdk.graal.compiler.debug.DebugCloseable;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.debug.DebugOptions;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.graph.NodeSourcePosition;
+import jdk.graal.compiler.nodeinfo.NodeCycles;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodeinfo.NodeSize;
+import jdk.graal.compiler.options.OptionValues;
 
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/OptimizationLogCodec.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/OptimizationLogCodec.java
similarity index 97%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/OptimizationLogCodec.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/OptimizationLogCodec.java
index e4f8a2203574..21326d677ee6 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/OptimizationLogCodec.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/OptimizationLogCodec.java
@@ -22,16 +22,16 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes;
+package jdk.graal.compiler.nodes;
 
 import java.util.function.Function;
 
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.EconomicMapUtil;
 import org.graalvm.collections.UnmodifiableEconomicMap;
-import jdk.compiler.graal.graph.Graph;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.util.CollectionsUtil;
+import jdk.graal.compiler.graph.Graph;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.util.CollectionsUtil;
 
 /**
  * Encodes and decodes the {@link OptimizationLog}.
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/OptimizationLogImpl.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/OptimizationLogImpl.java
similarity index 97%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/OptimizationLogImpl.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/OptimizationLogImpl.java
index 3ac96b3fecf2..2754491d2cb8 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/OptimizationLogImpl.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/OptimizationLogImpl.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes;
+package jdk.graal.compiler.nodes;
 
 import java.io.IOException;
 import java.io.OutputStream;
@@ -32,31 +32,31 @@
 import java.util.function.Function;
 import java.util.function.Supplier;
 
-import jdk.compiler.graal.nodes.virtual.VirtualObjectNode;
+import jdk.graal.compiler.nodes.virtual.VirtualObjectNode;
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.EconomicSet;
 import org.graalvm.collections.Equivalence;
 import org.graalvm.collections.MapCursor;
 import org.graalvm.collections.UnmodifiableEconomicMap;
-import jdk.compiler.graal.core.common.CompilationIdentifier;
-import jdk.compiler.graal.core.common.GraalOptions;
-import jdk.compiler.graal.debug.DebugCloseable;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.debug.DebugOptions;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.debug.PathUtilities;
-import jdk.compiler.graal.debug.TTY;
-import jdk.compiler.graal.graph.Graph;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.graph.NodeSourcePosition;
-import jdk.compiler.graal.graph.NodeSuccessorList;
-import jdk.compiler.graal.nodeinfo.NodeCycles;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodeinfo.NodeSize;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.serviceprovider.IsolateUtil;
-import jdk.compiler.graal.util.json.JSONFormatter;
+import jdk.graal.compiler.core.common.CompilationIdentifier;
+import jdk.graal.compiler.core.common.GraalOptions;
+import jdk.graal.compiler.debug.DebugCloseable;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.debug.DebugOptions;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.debug.PathUtilities;
+import jdk.graal.compiler.debug.TTY;
+import jdk.graal.compiler.graph.Graph;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.graph.NodeSourcePosition;
+import jdk.graal.compiler.graph.NodeSuccessorList;
+import jdk.graal.compiler.nodeinfo.NodeCycles;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodeinfo.NodeSize;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.serviceprovider.IsolateUtil;
+import jdk.graal.compiler.util.json.JSONFormatter;
 
 import jdk.vm.ci.meta.JavaTypeProfile;
 import jdk.vm.ci.meta.ProfilingInfo;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/ParameterNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/ParameterNode.java
similarity index 84%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/ParameterNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/ParameterNode.java
index 382dc8cf07b2..54895f9e79ae 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/ParameterNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/ParameterNode.java
@@ -22,14 +22,14 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes;
+package jdk.graal.compiler.nodes;
 
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.core.common.type.StampPair;
-import jdk.compiler.graal.graph.IterableNodeType;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.spi.UncheckedInterfaceProvider;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.core.common.type.StampPair;
+import jdk.graal.compiler.graph.IterableNodeType;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.spi.UncheckedInterfaceProvider;
 
 /**
  * The {@code Parameter} instruction is a placeholder for an incoming argument to a function call.
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/PauseNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/PauseNode.java
similarity index 82%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/PauseNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/PauseNode.java
index 4589c3cec14f..f5e1746bf37c 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/PauseNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/PauseNode.java
@@ -22,16 +22,16 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes;
+package jdk.graal.compiler.nodes;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_IGNORED;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_IGNORED;
 
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodeinfo.NodeSize;
-import jdk.compiler.graal.nodes.spi.LIRLowerable;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodeinfo.NodeSize;
+import jdk.graal.compiler.nodes.spi.LIRLowerable;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
 
 /** A node that results in a platform dependent pause instruction being emitted. */
 // @formatter:off
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/PhiNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/PhiNode.java
similarity index 92%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/PhiNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/PhiNode.java
index a4be7ed3039d..ba424086128b 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/PhiNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/PhiNode.java
@@ -22,24 +22,24 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes;
-
-import static jdk.compiler.graal.nodeinfo.InputType.Association;
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1;
-
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.graph.NodeInputList;
-import jdk.compiler.graal.graph.iterators.NodeIterable;
-import jdk.compiler.graal.nodeinfo.InputType;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodeinfo.Verbosity;
-import jdk.compiler.graal.nodes.spi.Canonicalizable;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodes.calc.FloatingNode;
+package jdk.graal.compiler.nodes;
+
+import static jdk.graal.compiler.nodeinfo.InputType.Association;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_0;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_1;
+
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.graph.NodeInputList;
+import jdk.graal.compiler.graph.iterators.NodeIterable;
+import jdk.graal.compiler.nodeinfo.InputType;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodeinfo.Verbosity;
+import jdk.graal.compiler.nodes.spi.Canonicalizable;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodes.calc.FloatingNode;
 
 /**
  * {@code PhiNode}s represent the merging of edges at a control flow merges (
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/PiArrayNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/PiArrayNode.java
similarity index 85%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/PiArrayNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/PiArrayNode.java
index 1e138d7d4c9f..c24d502b7f74 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/PiArrayNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/PiArrayNode.java
@@ -22,20 +22,20 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes;
+package jdk.graal.compiler.nodes;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_0;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_0;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_0;
 
-import jdk.compiler.graal.nodes.java.ArrayLengthNode;
-import jdk.compiler.graal.nodes.spi.ArrayLengthProvider;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodes.util.GraphUtil;
+import jdk.graal.compiler.nodes.java.ArrayLengthNode;
+import jdk.graal.compiler.nodes.spi.ArrayLengthProvider;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodes.util.GraphUtil;
 import jdk.vm.ci.meta.ConstantReflectionProvider;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
 
 /**
  * A {@link PiNode} that also provides an array length in addition to a more refined stamp. A usage
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/PiNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/PiNode.java
similarity index 92%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/PiNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/PiNode.java
index 7e602d195a9e..4336e30cb83c 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/PiNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/PiNode.java
@@ -22,35 +22,35 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes;
-
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_0;
-
-import jdk.compiler.graal.core.common.type.AbstractPointerStamp;
-import jdk.compiler.graal.core.common.type.ObjectStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.core.common.type.TypeReference;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.Node.NodeIntrinsicFactory;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.extended.GuardingNode;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext;
-import jdk.compiler.graal.nodes.memory.ReadNode;
-import jdk.compiler.graal.nodes.spi.Canonicalizable;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodes.spi.LIRLowerable;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
-import jdk.compiler.graal.nodes.spi.SimplifierTool;
-import jdk.compiler.graal.nodes.spi.ValueProxy;
-import jdk.compiler.graal.nodes.spi.Virtualizable;
-import jdk.compiler.graal.nodes.spi.VirtualizerTool;
-import jdk.compiler.graal.nodes.type.StampTool;
-import jdk.compiler.graal.nodes.virtual.VirtualObjectNode;
+package jdk.graal.compiler.nodes;
+
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_0;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_0;
+
+import jdk.graal.compiler.core.common.type.AbstractPointerStamp;
+import jdk.graal.compiler.core.common.type.ObjectStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.core.common.type.TypeReference;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.Node.NodeIntrinsicFactory;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.extended.GuardingNode;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext;
+import jdk.graal.compiler.nodes.memory.ReadNode;
+import jdk.graal.compiler.nodes.spi.Canonicalizable;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodes.spi.LIRLowerable;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.nodes.spi.SimplifierTool;
+import jdk.graal.compiler.nodes.spi.ValueProxy;
+import jdk.graal.compiler.nodes.spi.Virtualizable;
+import jdk.graal.compiler.nodes.spi.VirtualizerTool;
+import jdk.graal.compiler.nodes.type.StampTool;
+import jdk.graal.compiler.nodes.virtual.VirtualObjectNode;
 
 import jdk.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.ResolvedJavaType;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/PluginReplacementInterface.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/PluginReplacementInterface.java
similarity index 87%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/PluginReplacementInterface.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/PluginReplacementInterface.java
index 6ade3a25e0b0..b93d9b1415cb 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/PluginReplacementInterface.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/PluginReplacementInterface.java
@@ -22,11 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes;
+package jdk.graal.compiler.nodes;
 
-import jdk.compiler.graal.nodes.graphbuilderconf.GeneratedPluginInjectionProvider;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin;
+import jdk.graal.compiler.nodes.graphbuilderconf.GeneratedPluginInjectionProvider;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin;
 
 /**
  * Interface for nodes responsible for {@linkplain GraphBuilderContext#shouldDeferPlugin deferring}
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/PluginReplacementNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/PluginReplacementNode.java
similarity index 85%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/PluginReplacementNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/PluginReplacementNode.java
index abeed8a91f8f..b54697795970 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/PluginReplacementNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/PluginReplacementNode.java
@@ -22,19 +22,19 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes;
+package jdk.graal.compiler.nodes;
 
 import java.util.Map;
 
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.graph.NodeInputList;
-import jdk.compiler.graal.nodeinfo.NodeCycles;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodeinfo.NodeSize;
-import jdk.compiler.graal.nodeinfo.Verbosity;
-import jdk.compiler.graal.nodes.graphbuilderconf.GeneratedPluginInjectionProvider;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.graph.NodeInputList;
+import jdk.graal.compiler.nodeinfo.NodeCycles;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodeinfo.NodeSize;
+import jdk.graal.compiler.nodeinfo.Verbosity;
+import jdk.graal.compiler.nodes.graphbuilderconf.GeneratedPluginInjectionProvider;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext;
 
 @NodeInfo(nameTemplate = "PluginReplacement/{p#pluginName}", cycles = NodeCycles.CYCLES_IGNORED, size = NodeSize.SIZE_IGNORED)
 public final class PluginReplacementNode extends FixedWithNextNode implements PluginReplacementInterface {
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/PluginReplacementWithExceptionNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/PluginReplacementWithExceptionNode.java
similarity index 85%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/PluginReplacementWithExceptionNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/PluginReplacementWithExceptionNode.java
index 5fdbdfb9602a..0f578a6be5f9 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/PluginReplacementWithExceptionNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/PluginReplacementWithExceptionNode.java
@@ -22,19 +22,19 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes;
+package jdk.graal.compiler.nodes;
 
 import java.util.Map;
 
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.graph.NodeInputList;
-import jdk.compiler.graal.nodeinfo.NodeCycles;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodeinfo.NodeSize;
-import jdk.compiler.graal.nodeinfo.Verbosity;
-import jdk.compiler.graal.nodes.graphbuilderconf.GeneratedPluginInjectionProvider;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.graph.NodeInputList;
+import jdk.graal.compiler.nodeinfo.NodeCycles;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodeinfo.NodeSize;
+import jdk.graal.compiler.nodeinfo.Verbosity;
+import jdk.graal.compiler.nodes.graphbuilderconf.GeneratedPluginInjectionProvider;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext;
 
 @NodeInfo(nameTemplate = "PluginReplacementWithException/{p#pluginName}", cycles = NodeCycles.CYCLES_IGNORED, size = NodeSize.SIZE_IGNORED)
 public final class PluginReplacementWithExceptionNode extends WithExceptionNode implements PluginReplacementInterface {
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/PrefetchAllocateNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/PrefetchAllocateNode.java
similarity index 76%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/PrefetchAllocateNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/PrefetchAllocateNode.java
index 19351fd8a317..6ee19074db6c 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/PrefetchAllocateNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/PrefetchAllocateNode.java
@@ -23,19 +23,19 @@
  * questions.
  */
 
-package jdk.compiler.graal.nodes;
-
-import static jdk.compiler.graal.nodeinfo.InputType.Association;
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_2;
-
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.spi.LIRLowerable;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
-import jdk.compiler.graal.nodes.memory.address.AddressNode;
-import jdk.compiler.graal.nodes.memory.address.AddressNode.Address;
+package jdk.graal.compiler.nodes;
+
+import static jdk.graal.compiler.nodeinfo.InputType.Association;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_2;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_2;
+
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.spi.LIRLowerable;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.nodes.memory.address.AddressNode;
+import jdk.graal.compiler.nodes.memory.address.AddressNode.Address;
 
 @NodeInfo(cycles = CYCLES_2, size = SIZE_2)
 public final class PrefetchAllocateNode extends FixedWithNextNode implements LIRLowerable {
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/ProfileData.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/ProfileData.java
similarity index 99%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/ProfileData.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/ProfileData.java
index 91674bb3c4ca..6975f5548b2b 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/ProfileData.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/ProfileData.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes;
+package jdk.graal.compiler.nodes;
 
 import java.util.Arrays;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/ProxyNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/ProxyNode.java
similarity index 81%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/ProxyNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/ProxyNode.java
index 6e1db325035b..a0bf05b6970f 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/ProxyNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/ProxyNode.java
@@ -22,23 +22,23 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes;
-
-import static jdk.compiler.graal.nodeinfo.InputType.Association;
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_0;
-
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.Node.ValueNumberable;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodes.extended.GuardingNode;
-import jdk.compiler.graal.nodes.memory.MemoryKill;
-import jdk.compiler.graal.nodes.spi.Canonicalizable;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodes.spi.Proxy;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.calc.FloatingNode;
+package jdk.graal.compiler.nodes;
+
+import static jdk.graal.compiler.nodeinfo.InputType.Association;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_0;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_0;
+
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.Node.ValueNumberable;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodes.extended.GuardingNode;
+import jdk.graal.compiler.nodes.memory.MemoryKill;
+import jdk.graal.compiler.nodes.spi.Canonicalizable;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodes.spi.Proxy;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.calc.FloatingNode;
 import org.graalvm.word.LocationIdentity;
 
 /**
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/ReturnNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/ReturnNode.java
similarity index 87%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/ReturnNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/ReturnNode.java
index abfcb6b8e0b4..88a801e33dd5 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/ReturnNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/ReturnNode.java
@@ -22,16 +22,16 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes;
+package jdk.graal.compiler.nodes;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_4;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_2;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_4;
 
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.spi.LIRLowerable;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
-import jdk.compiler.graal.nodes.memory.MemoryMapNode;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.spi.LIRLowerable;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.nodes.memory.MemoryMapNode;
 
 import jdk.vm.ci.code.TargetDescription;
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/SafepointNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/SafepointNode.java
similarity index 80%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/SafepointNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/SafepointNode.java
index 14d056e74766..3dd07b88bbb4 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/SafepointNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/SafepointNode.java
@@ -22,17 +22,17 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes;
+package jdk.graal.compiler.nodes;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_2;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_1;
 
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.spi.LIRLowerable;
-import jdk.compiler.graal.nodes.spi.Lowerable;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.spi.LIRLowerable;
+import jdk.graal.compiler.nodes.spi.Lowerable;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
 
 /**
  * Marks a position in the graph where a safepoint should be emitted.
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/ShortCircuitOrNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/ShortCircuitOrNode.java
similarity index 95%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/ShortCircuitOrNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/ShortCircuitOrNode.java
index 1bdb388ecc6b..f8330b43aaa7 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/ShortCircuitOrNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/ShortCircuitOrNode.java
@@ -22,24 +22,24 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes;
-
-import static jdk.compiler.graal.nodeinfo.InputType.Condition;
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_0;
-
-import jdk.compiler.graal.core.common.type.IntegerStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.graph.IterableNodeType;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.spi.Canonicalizable;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodes.spi.CoreProvidersDelegate;
-import jdk.compiler.graal.nodes.calc.CompareNode;
-import jdk.compiler.graal.nodes.calc.IntegerBelowNode;
-import jdk.compiler.graal.nodes.calc.IntegerLessThanNode;
-import jdk.compiler.graal.options.OptionValues;
+package jdk.graal.compiler.nodes;
+
+import static jdk.graal.compiler.nodeinfo.InputType.Condition;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_0;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_0;
+
+import jdk.graal.compiler.core.common.type.IntegerStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.graph.IterableNodeType;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.spi.Canonicalizable;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodes.spi.CoreProvidersDelegate;
+import jdk.graal.compiler.nodes.calc.CompareNode;
+import jdk.graal.compiler.nodes.calc.IntegerBelowNode;
+import jdk.graal.compiler.nodes.calc.IntegerLessThanNode;
+import jdk.graal.compiler.options.OptionValues;
 
 import jdk.vm.ci.meta.Assumptions;
 import jdk.vm.ci.meta.TriState;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/SimplifyingGraphDecoder.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/SimplifyingGraphDecoder.java
similarity index 92%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/SimplifyingGraphDecoder.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/SimplifyingGraphDecoder.java
index 75f9c413ad3d..9c01d930132f 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/SimplifyingGraphDecoder.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/SimplifyingGraphDecoder.java
@@ -22,38 +22,38 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes;
+package jdk.graal.compiler.nodes;
 
-import static jdk.compiler.graal.nodeinfo.InputType.Guard;
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_IGNORED;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_IGNORED;
+import static jdk.graal.compiler.nodeinfo.InputType.Guard;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_IGNORED;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_IGNORED;
 
 import java.util.List;
 
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.debug.Assertions;
-import jdk.compiler.graal.debug.DebugCloseable;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.debug.TimerKey;
-import jdk.compiler.graal.graph.Edges;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.InputType;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.extended.AnchoringNode;
-import jdk.compiler.graal.nodes.extended.GuardingNode;
-import jdk.compiler.graal.nodes.extended.IntegerSwitchNode;
-import jdk.compiler.graal.nodes.extended.UnsafeAccessNode;
-import jdk.compiler.graal.nodes.java.ArrayLengthNode;
-import jdk.compiler.graal.nodes.java.LoadFieldNode;
-import jdk.compiler.graal.nodes.java.LoadIndexedNode;
-import jdk.compiler.graal.nodes.spi.Canonicalizable;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodes.spi.CoreProviders;
-import jdk.compiler.graal.nodes.spi.CoreProvidersDelegate;
-import jdk.compiler.graal.nodes.util.GraphUtil;
-import jdk.compiler.graal.nodes.calc.FloatingNode;
-import jdk.compiler.graal.options.OptionValues;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.debug.Assertions;
+import jdk.graal.compiler.debug.DebugCloseable;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.debug.TimerKey;
+import jdk.graal.compiler.graph.Edges;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.InputType;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.extended.AnchoringNode;
+import jdk.graal.compiler.nodes.extended.GuardingNode;
+import jdk.graal.compiler.nodes.extended.IntegerSwitchNode;
+import jdk.graal.compiler.nodes.extended.UnsafeAccessNode;
+import jdk.graal.compiler.nodes.java.ArrayLengthNode;
+import jdk.graal.compiler.nodes.java.LoadFieldNode;
+import jdk.graal.compiler.nodes.java.LoadIndexedNode;
+import jdk.graal.compiler.nodes.spi.Canonicalizable;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodes.spi.CoreProviders;
+import jdk.graal.compiler.nodes.spi.CoreProvidersDelegate;
+import jdk.graal.compiler.nodes.util.GraphUtil;
+import jdk.graal.compiler.nodes.calc.FloatingNode;
+import jdk.graal.compiler.options.OptionValues;
 
 import jdk.vm.ci.code.Architecture;
 import jdk.vm.ci.meta.Assumptions;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/SnippetAnchorNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/SnippetAnchorNode.java
similarity index 74%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/SnippetAnchorNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/SnippetAnchorNode.java
index 616edd3294db..b22f6bd2b3e9 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/SnippetAnchorNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/SnippetAnchorNode.java
@@ -22,21 +22,21 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes;
+package jdk.graal.compiler.nodes;
 
-import static jdk.compiler.graal.nodeinfo.InputType.Anchor;
-import static jdk.compiler.graal.nodeinfo.InputType.Guard;
-import static jdk.compiler.graal.nodeinfo.InputType.Value;
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_0;
+import static jdk.graal.compiler.nodeinfo.InputType.Anchor;
+import static jdk.graal.compiler.nodeinfo.InputType.Guard;
+import static jdk.graal.compiler.nodeinfo.InputType.Value;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_0;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_0;
 
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.extended.AnchoringNode;
-import jdk.compiler.graal.nodes.extended.GuardingNode;
-import jdk.compiler.graal.nodes.spi.Simplifiable;
-import jdk.compiler.graal.nodes.spi.SimplifierTool;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.extended.AnchoringNode;
+import jdk.graal.compiler.nodes.extended.GuardingNode;
+import jdk.graal.compiler.nodes.spi.Simplifiable;
+import jdk.graal.compiler.nodes.spi.SimplifierTool;
 
 @NodeInfo(allowedUsageTypes = {Value, Anchor, Guard}, cycles = CYCLES_0, size = SIZE_0)
 public final class SnippetAnchorNode extends FixedWithNextNode implements Simplifiable, GuardingNode, AnchoringNode {
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/SpinWaitNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/SpinWaitNode.java
similarity index 81%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/SpinWaitNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/SpinWaitNode.java
index ac5b6954008d..4716922efde9 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/SpinWaitNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/SpinWaitNode.java
@@ -22,16 +22,16 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes;
+package jdk.graal.compiler.nodes;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_IGNORED;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_IGNORED;
 
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodeinfo.NodeSize;
-import jdk.compiler.graal.nodes.spi.LIRLowerable;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodeinfo.NodeSize;
+import jdk.graal.compiler.nodes.spi.LIRLowerable;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
 
 /**
  * A node that results in a platform dependent spin_wait instruction being emitted.
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/StartNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/StartNode.java
similarity index 83%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/StartNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/StartNode.java
index a938e4d722a9..d435bca9239b 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/StartNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/StartNode.java
@@ -22,15 +22,15 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes;
+package jdk.graal.compiler.nodes;
 
-import static jdk.compiler.graal.nodeinfo.InputType.Memory;
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_0;
+import static jdk.graal.compiler.nodeinfo.InputType.Memory;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_0;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_0;
 
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.memory.SingleMemoryKill;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.memory.SingleMemoryKill;
 import org.graalvm.word.LocationIdentity;
 
 /**
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/StateSplit.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/StateSplit.java
similarity index 95%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/StateSplit.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/StateSplit.java
index b9bca0f0774f..d194bf33b068 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/StateSplit.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/StateSplit.java
@@ -22,9 +22,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes;
+package jdk.graal.compiler.nodes;
 
-import jdk.compiler.graal.nodes.spi.NodeWithState;
+import jdk.graal.compiler.nodes.spi.NodeWithState;
 
 /**
  * A state split is a node that may have a frame state associated with it.
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/StaticDeoptimizingNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/StaticDeoptimizingNode.java
similarity index 97%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/StaticDeoptimizingNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/StaticDeoptimizingNode.java
index 9b183cc90cee..bb7cc929cde3 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/StaticDeoptimizingNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/StaticDeoptimizingNode.java
@@ -22,9 +22,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes;
+package jdk.graal.compiler.nodes;
 
-import jdk.compiler.graal.debug.GraalError;
+import jdk.graal.compiler.debug.GraalError;
 
 import jdk.vm.ci.meta.DeoptimizationAction;
 import jdk.vm.ci.meta.DeoptimizationReason;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/StructuredGraph.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/StructuredGraph.java
similarity index 97%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/StructuredGraph.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/StructuredGraph.java
index ecd719a9a7a1..5ea38196f38e 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/StructuredGraph.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/StructuredGraph.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes;
+package jdk.graal.compiler.nodes;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -36,32 +36,32 @@
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
-import jdk.compiler.graal.nodes.cfg.ControlFlowGraph;
-import jdk.compiler.graal.nodes.cfg.HIRBlock;
-import jdk.compiler.graal.nodes.java.ExceptionObjectNode;
-import jdk.compiler.graal.nodes.java.MethodCallTargetNode;
-import jdk.compiler.graal.nodes.spi.ProfileProvider;
-import jdk.compiler.graal.nodes.spi.ResolvedJavaMethodProfileProvider;
-import jdk.compiler.graal.nodes.spi.VirtualizableAllocation;
-import jdk.compiler.graal.nodes.util.GraphUtil;
+import jdk.graal.compiler.nodes.cfg.ControlFlowGraph;
+import jdk.graal.compiler.nodes.cfg.HIRBlock;
+import jdk.graal.compiler.nodes.java.ExceptionObjectNode;
+import jdk.graal.compiler.nodes.java.MethodCallTargetNode;
+import jdk.graal.compiler.nodes.spi.ProfileProvider;
+import jdk.graal.compiler.nodes.spi.ResolvedJavaMethodProfileProvider;
+import jdk.graal.compiler.nodes.spi.VirtualizableAllocation;
+import jdk.graal.compiler.nodes.util.GraphUtil;
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.Equivalence;
 import org.graalvm.collections.UnmodifiableEconomicMap;
-import jdk.compiler.graal.api.replacements.Snippet;
-import jdk.compiler.graal.core.common.CancellationBailoutException;
-import jdk.compiler.graal.core.common.CompilationIdentifier;
-import jdk.compiler.graal.core.common.GraalOptions;
-import jdk.compiler.graal.core.common.cfg.BlockMap;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.debug.JavaMethodContext;
-import jdk.compiler.graal.debug.TTY;
-import jdk.compiler.graal.graph.Graph;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeMap;
-import jdk.compiler.graal.graph.NodeSourcePosition;
-import jdk.compiler.graal.nodes.calc.FloatingNode;
-import jdk.compiler.graal.options.OptionValues;
+import jdk.graal.compiler.api.replacements.Snippet;
+import jdk.graal.compiler.core.common.CancellationBailoutException;
+import jdk.graal.compiler.core.common.CompilationIdentifier;
+import jdk.graal.compiler.core.common.GraalOptions;
+import jdk.graal.compiler.core.common.cfg.BlockMap;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.debug.JavaMethodContext;
+import jdk.graal.compiler.debug.TTY;
+import jdk.graal.compiler.graph.Graph;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeMap;
+import jdk.graal.compiler.graph.NodeSourcePosition;
+import jdk.graal.compiler.nodes.calc.FloatingNode;
+import jdk.graal.compiler.options.OptionValues;
 
 import jdk.vm.ci.code.BytecodeFrame;
 import jdk.vm.ci.meta.Assumptions;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/TypeCheckHints.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/TypeCheckHints.java
similarity index 98%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/TypeCheckHints.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/TypeCheckHints.java
index 7920cd98dfd9..c1dfa535d348 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/TypeCheckHints.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/TypeCheckHints.java
@@ -22,11 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes;
+package jdk.graal.compiler.nodes;
 
 import java.util.Arrays;
 
-import jdk.compiler.graal.core.common.type.TypeReference;
+import jdk.graal.compiler.core.common.type.TypeReference;
 
 import jdk.vm.ci.meta.Assumptions;
 import jdk.vm.ci.meta.JavaTypeProfile;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/UnaryOpLogicNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/UnaryOpLogicNode.java
similarity index 90%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/UnaryOpLogicNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/UnaryOpLogicNode.java
index accd288b221e..1ccee7be3569 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/UnaryOpLogicNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/UnaryOpLogicNode.java
@@ -22,15 +22,15 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes;
+package jdk.graal.compiler.nodes;
 
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.spi.Canonicalizable;
-import jdk.compiler.graal.nodes.spi.ValueProxy;
-import jdk.compiler.graal.nodes.spi.Virtualizable;
-import jdk.compiler.graal.nodes.spi.VirtualizerTool;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.spi.Canonicalizable;
+import jdk.graal.compiler.nodes.spi.ValueProxy;
+import jdk.graal.compiler.nodes.spi.Virtualizable;
+import jdk.graal.compiler.nodes.spi.VirtualizerTool;
 
 import jdk.vm.ci.meta.TriState;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/UnreachableBeginNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/UnreachableBeginNode.java
similarity index 88%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/UnreachableBeginNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/UnreachableBeginNode.java
index 698e2b9d86a2..f668be337618 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/UnreachableBeginNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/UnreachableBeginNode.java
@@ -22,14 +22,14 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes;
+package jdk.graal.compiler.nodes;
 
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeCycles;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodeinfo.NodeSize;
-import jdk.compiler.graal.nodes.memory.MemoryKill;
-import jdk.compiler.graal.nodes.memory.SingleMemoryKill;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeCycles;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodeinfo.NodeSize;
+import jdk.graal.compiler.nodes.memory.MemoryKill;
+import jdk.graal.compiler.nodes.memory.SingleMemoryKill;
 import org.graalvm.word.LocationIdentity;
 
 /**
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/UnreachableControlSinkNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/UnreachableControlSinkNode.java
similarity index 85%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/UnreachableControlSinkNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/UnreachableControlSinkNode.java
index 3ae65c3a6f18..b93dda95c517 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/UnreachableControlSinkNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/UnreachableControlSinkNode.java
@@ -22,13 +22,13 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes;
+package jdk.graal.compiler.nodes;
 
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeCycles;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodeinfo.NodeSize;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeCycles;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodeinfo.NodeSize;
 
 /**
  * See also {@link UnreachableBeginNode}.
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/UnreachableNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/UnreachableNode.java
similarity index 83%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/UnreachableNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/UnreachableNode.java
index 6dcc63a83f34..a78c74c150a7 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/UnreachableNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/UnreachableNode.java
@@ -22,16 +22,16 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes;
+package jdk.graal.compiler.nodes;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_IGNORED;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_IGNORED;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_IGNORED;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_IGNORED;
 
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.spi.Simplifiable;
-import jdk.compiler.graal.nodes.spi.SimplifierTool;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.spi.Simplifiable;
+import jdk.graal.compiler.nodes.spi.SimplifierTool;
 
 /**
  * Node for marking a branch in a snippet as unreachable. Usage example:
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/UnwindNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/UnwindNode.java
similarity index 83%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/UnwindNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/UnwindNode.java
index 11cf60952c28..c280ed817bf0 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/UnwindNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/UnwindNode.java
@@ -22,16 +22,16 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes;
+package jdk.graal.compiler.nodes;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_8;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_8;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_8;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_8;
 
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.spi.LIRLowerable;
-import jdk.compiler.graal.nodes.spi.Lowerable;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.spi.LIRLowerable;
+import jdk.graal.compiler.nodes.spi.Lowerable;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
 
 import jdk.vm.ci.meta.JavaKind;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/ValueNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/ValueNode.java
similarity index 94%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/ValueNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/ValueNode.java
index 9d362e919df6..f11bd40abecb 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/ValueNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/ValueNode.java
@@ -22,25 +22,25 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes;
+package jdk.graal.compiler.nodes;
 
 import java.util.Iterator;
 
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeBitMap;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.graph.NodeStack;
-import jdk.compiler.graal.graph.Position;
-import jdk.compiler.graal.graph.iterators.NodePredicate;
-import jdk.compiler.graal.graph.spi.NodeWithIdentity;
-import jdk.compiler.graal.nodeinfo.InputType;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodeinfo.Verbosity;
-import jdk.compiler.graal.nodes.spi.NodeValueMap;
-import jdk.compiler.graal.nodes.calc.FloatingNode;
-import jdk.compiler.graal.nodes.memory.MemoryAccess;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeBitMap;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.graph.NodeStack;
+import jdk.graal.compiler.graph.Position;
+import jdk.graal.compiler.graph.iterators.NodePredicate;
+import jdk.graal.compiler.graph.spi.NodeWithIdentity;
+import jdk.graal.compiler.nodeinfo.InputType;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodeinfo.Verbosity;
+import jdk.graal.compiler.nodes.spi.NodeValueMap;
+import jdk.graal.compiler.nodes.calc.FloatingNode;
+import jdk.graal.compiler.nodes.memory.MemoryAccess;
 
 import jdk.vm.ci.meta.Constant;
 import jdk.vm.ci.meta.JavaConstant;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/ValueNodeInterface.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/ValueNodeInterface.java
similarity index 98%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/ValueNodeInterface.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/ValueNodeInterface.java
index fd68ff54deaf..3cb731243ae2 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/ValueNodeInterface.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/ValueNodeInterface.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes;
+package jdk.graal.compiler.nodes;
 
 /**
  * When Graal {@link ValueNode} classes implement interfaces, it is frequently necessary to convert
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/ValuePhiNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/ValuePhiNode.java
similarity index 94%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/ValuePhiNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/ValuePhiNode.java
index 739b02ebea71..1ef330d6ed7a 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/ValuePhiNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/ValuePhiNode.java
@@ -22,21 +22,21 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes;
+package jdk.graal.compiler.nodes;
 
 import java.util.Map;
 
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.graph.NodeFlood;
-import jdk.compiler.graal.graph.NodeInputList;
-import jdk.compiler.graal.nodeinfo.InputType;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.spi.LimitedValueProxy;
-import jdk.compiler.graal.nodes.type.StampTool;
-import jdk.compiler.graal.util.CollectionsUtil;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.graph.NodeFlood;
+import jdk.graal.compiler.graph.NodeInputList;
+import jdk.graal.compiler.nodeinfo.InputType;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.spi.LimitedValueProxy;
+import jdk.graal.compiler.nodes.type.StampTool;
+import jdk.graal.compiler.util.CollectionsUtil;
 
 /**
  * Value {@link PhiNode}s merge data flow values at control flow merges.
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/ValueProxyNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/ValueProxyNode.java
similarity index 85%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/ValueProxyNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/ValueProxyNode.java
index d0e6c482a9ae..cae915c437e4 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/ValueProxyNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/ValueProxyNode.java
@@ -22,19 +22,19 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes;
+package jdk.graal.compiler.nodes;
 
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodes.extended.GuardingNode;
-import jdk.compiler.graal.nodes.spi.Canonicalizable;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodes.spi.ValueProxy;
-import jdk.compiler.graal.nodes.spi.Virtualizable;
-import jdk.compiler.graal.nodes.spi.VirtualizerTool;
-import jdk.compiler.graal.nodes.virtual.VirtualObjectNode;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodes.extended.GuardingNode;
+import jdk.graal.compiler.nodes.spi.Canonicalizable;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodes.spi.ValueProxy;
+import jdk.graal.compiler.nodes.spi.Virtualizable;
+import jdk.graal.compiler.nodes.spi.VirtualizerTool;
+import jdk.graal.compiler.nodes.virtual.VirtualObjectNode;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
 
 @NodeInfo(nameTemplate = "ValueProxy({i#value})")
 public final class ValueProxyNode extends ProxyNode implements Canonicalizable, Virtualizable, ValueProxy {
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/VirtualState.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/VirtualState.java
similarity index 90%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/VirtualState.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/VirtualState.java
index f1b4e77eab2d..531920604d4b 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/VirtualState.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/VirtualState.java
@@ -22,13 +22,13 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes;
+package jdk.graal.compiler.nodes;
 
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.graph.Position;
-import jdk.compiler.graal.nodeinfo.InputType;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.graph.Position;
+import jdk.graal.compiler.nodeinfo.InputType;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
 
 /**
  * Base class for nodes that contain "virtual" state, like FrameState and VirtualObjectState.
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/WithExceptionNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/WithExceptionNode.java
similarity index 92%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/WithExceptionNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/WithExceptionNode.java
index fe70c9e4bc48..f5af1c1603d1 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/WithExceptionNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/WithExceptionNode.java
@@ -22,14 +22,14 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes;
-
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.extended.ForeignCallNode;
-import jdk.compiler.graal.nodes.java.ExceptionObjectNode;
-import jdk.compiler.graal.nodes.util.GraphUtil;
+package jdk.graal.compiler.nodes;
+
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.extended.ForeignCallNode;
+import jdk.graal.compiler.nodes.java.ExceptionObjectNode;
+import jdk.graal.compiler.nodes.util.GraphUtil;
 
 /**
  * Base class for fixed nodes that have exactly two successors: A "next" successor for normal
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/AbsNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/AbsNode.java
similarity index 83%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/AbsNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/AbsNode.java
index c674f54a1600..97cb744e9b5f 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/AbsNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/AbsNode.java
@@ -22,23 +22,23 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.calc;
+package jdk.graal.compiler.nodes.calc;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_2;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_1;
 
-import jdk.compiler.graal.core.common.type.ArithmeticOpTable;
-import jdk.compiler.graal.core.common.type.ArithmeticOpTable.UnaryOp;
-import jdk.compiler.graal.core.common.type.ArithmeticOpTable.UnaryOp.Abs;
-import jdk.compiler.graal.core.common.type.IntegerStamp;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.lir.gen.ArithmeticLIRGeneratorTool;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.ArithmeticLIRLowerable;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.core.common.type.ArithmeticOpTable;
+import jdk.graal.compiler.core.common.type.ArithmeticOpTable.UnaryOp;
+import jdk.graal.compiler.core.common.type.ArithmeticOpTable.UnaryOp.Abs;
+import jdk.graal.compiler.core.common.type.IntegerStamp;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.lir.gen.ArithmeticLIRGeneratorTool;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.ArithmeticLIRLowerable;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
 
 import jdk.vm.ci.code.CodeUtil;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/AbstractNormalizeCompareNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/AbstractNormalizeCompareNode.java
similarity index 85%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/AbstractNormalizeCompareNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/AbstractNormalizeCompareNode.java
index 1c0fc86c9926..e46343a02719 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/AbstractNormalizeCompareNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/AbstractNormalizeCompareNode.java
@@ -22,23 +22,23 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.calc;
+package jdk.graal.compiler.nodes.calc;
 
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_2;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_2;
 
-import jdk.compiler.graal.core.common.calc.CanonicalCondition;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.IterableNodeType;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeCycles;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.LogicConstantNode;
-import jdk.compiler.graal.nodes.LogicNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.options.OptionValues;
+import jdk.graal.compiler.core.common.calc.CanonicalCondition;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.IterableNodeType;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeCycles;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.LogicConstantNode;
+import jdk.graal.compiler.nodes.LogicNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.options.OptionValues;
 
 import jdk.vm.ci.meta.ConstantReflectionProvider;
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/AddNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/AddNode.java
similarity index 93%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/AddNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/AddNode.java
index 3d34a3ee3590..be139dfcb702 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/AddNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/AddNode.java
@@ -22,23 +22,23 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.calc;
+package jdk.graal.compiler.nodes.calc;
 
-import jdk.compiler.graal.core.common.type.ArithmeticOpTable;
-import jdk.compiler.graal.core.common.type.ArithmeticOpTable.BinaryOp;
-import jdk.compiler.graal.core.common.type.ArithmeticOpTable.BinaryOp.Add;
-import jdk.compiler.graal.core.common.type.IntegerStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.lir.gen.ArithmeticLIRGeneratorTool;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.Canonicalizable;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.core.common.type.ArithmeticOpTable;
+import jdk.graal.compiler.core.common.type.ArithmeticOpTable.BinaryOp;
+import jdk.graal.compiler.core.common.type.ArithmeticOpTable.BinaryOp.Add;
+import jdk.graal.compiler.core.common.type.IntegerStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.lir.gen.ArithmeticLIRGeneratorTool;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.Canonicalizable;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
 
 import jdk.vm.ci.code.CodeUtil;
 import jdk.vm.ci.meta.Constant;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/AndNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/AndNode.java
similarity index 91%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/AndNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/AndNode.java
index b2d2faa78fc1..f7187f1cc11a 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/AndNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/AndNode.java
@@ -22,23 +22,23 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.calc;
-
-import jdk.compiler.graal.core.common.type.ArithmeticOpTable;
-import jdk.compiler.graal.core.common.type.ArithmeticOpTable.BinaryOp;
-import jdk.compiler.graal.core.common.type.ArithmeticOpTable.BinaryOp.And;
-import jdk.compiler.graal.core.common.type.IntegerStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.lir.gen.ArithmeticLIRGeneratorTool;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.Canonicalizable;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
-import jdk.compiler.graal.nodes.util.GraphUtil;
+package jdk.graal.compiler.nodes.calc;
+
+import jdk.graal.compiler.core.common.type.ArithmeticOpTable;
+import jdk.graal.compiler.core.common.type.ArithmeticOpTable.BinaryOp;
+import jdk.graal.compiler.core.common.type.ArithmeticOpTable.BinaryOp.And;
+import jdk.graal.compiler.core.common.type.IntegerStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.lir.gen.ArithmeticLIRGeneratorTool;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.Canonicalizable;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.nodes.util.GraphUtil;
 
 import jdk.vm.ci.meta.Constant;
 import jdk.vm.ci.meta.PrimitiveConstant;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/BinaryArithmeticNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/BinaryArithmeticNode.java
similarity index 96%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/BinaryArithmeticNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/BinaryArithmeticNode.java
index 16474fd0069d..e5c1307933e8 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/BinaryArithmeticNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/BinaryArithmeticNode.java
@@ -22,35 +22,35 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.calc;
+package jdk.graal.compiler.nodes.calc;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_1;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_1;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_1;
 
 import java.util.Set;
 
-import jdk.compiler.graal.core.common.type.ArithmeticOpTable;
-import jdk.compiler.graal.core.common.type.ArithmeticOpTable.BinaryOp;
-import jdk.compiler.graal.core.common.type.FloatStamp;
-import jdk.compiler.graal.core.common.type.IntegerStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.Graph;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.graph.iterators.NodePredicate;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.ArithmeticOperation;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.ValuePhiNode;
-import jdk.compiler.graal.nodes.extended.GuardedNode;
-import jdk.compiler.graal.nodes.spi.ArithmeticLIRLowerable;
-import jdk.compiler.graal.nodes.spi.Canonicalizable;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodes.spi.NodeValueMap;
+import jdk.graal.compiler.core.common.type.ArithmeticOpTable;
+import jdk.graal.compiler.core.common.type.ArithmeticOpTable.BinaryOp;
+import jdk.graal.compiler.core.common.type.FloatStamp;
+import jdk.graal.compiler.core.common.type.IntegerStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.Graph;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.graph.iterators.NodePredicate;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.ArithmeticOperation;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.ValuePhiNode;
+import jdk.graal.compiler.nodes.extended.GuardedNode;
+import jdk.graal.compiler.nodes.spi.ArithmeticLIRLowerable;
+import jdk.graal.compiler.nodes.spi.Canonicalizable;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodes.spi.NodeValueMap;
 
 import jdk.vm.ci.meta.Constant;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/BinaryNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/BinaryNode.java
similarity index 90%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/BinaryNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/BinaryNode.java
index 5f51bb36eeac..c4dae11a737e 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/BinaryNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/BinaryNode.java
@@ -22,14 +22,14 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.calc;
+package jdk.graal.compiler.nodes.calc;
 
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.Canonicalizable;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.Canonicalizable;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
 
 /**
  * The {@code BinaryNode} class is the base of arithmetic and logic operations with two inputs.
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/CompareNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/CompareNode.java
similarity index 94%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/CompareNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/CompareNode.java
index 1ee438045c82..950dd22bd818 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/CompareNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/CompareNode.java
@@ -22,34 +22,34 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.calc;
-
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_1;
-
-import jdk.compiler.graal.core.common.PermanentBailoutException;
-import jdk.compiler.graal.core.common.calc.CanonicalCondition;
-import jdk.compiler.graal.core.common.calc.Condition;
-import jdk.compiler.graal.core.common.type.AbstractObjectStamp;
-import jdk.compiler.graal.core.common.type.AbstractPointerStamp;
-import jdk.compiler.graal.core.common.type.FloatStamp;
-import jdk.compiler.graal.core.common.type.IntegerStamp;
-import jdk.compiler.graal.core.common.type.PrimitiveStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.InputType;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.BinaryOpLogicNode;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.LogicConstantNode;
-import jdk.compiler.graal.nodes.LogicNegationNode;
-import jdk.compiler.graal.nodes.LogicNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.Canonicalizable;
-import jdk.compiler.graal.nodes.util.GraphUtil;
-import jdk.compiler.graal.options.OptionValues;
+package jdk.graal.compiler.nodes.calc;
+
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_1;
+
+import jdk.graal.compiler.core.common.PermanentBailoutException;
+import jdk.graal.compiler.core.common.calc.CanonicalCondition;
+import jdk.graal.compiler.core.common.calc.Condition;
+import jdk.graal.compiler.core.common.type.AbstractObjectStamp;
+import jdk.graal.compiler.core.common.type.AbstractPointerStamp;
+import jdk.graal.compiler.core.common.type.FloatStamp;
+import jdk.graal.compiler.core.common.type.IntegerStamp;
+import jdk.graal.compiler.core.common.type.PrimitiveStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.InputType;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.BinaryOpLogicNode;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.LogicConstantNode;
+import jdk.graal.compiler.nodes.LogicNegationNode;
+import jdk.graal.compiler.nodes.LogicNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.Canonicalizable;
+import jdk.graal.compiler.nodes.util.GraphUtil;
+import jdk.graal.compiler.options.OptionValues;
 
 import jdk.vm.ci.meta.Constant;
 import jdk.vm.ci.meta.ConstantReflectionProvider;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/CompressBitsNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/CompressBitsNode.java
similarity index 86%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/CompressBitsNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/CompressBitsNode.java
index 7c154a8cd053..d3261bc41604 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/CompressBitsNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/CompressBitsNode.java
@@ -23,23 +23,23 @@
  * questions.
  */
 
-package jdk.compiler.graal.nodes.calc;
+package jdk.graal.compiler.nodes.calc;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_2;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_2;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_2;
 
-import jdk.compiler.graal.core.common.type.ArithmeticOpTable;
-import jdk.compiler.graal.core.common.type.ArithmeticOpTable.BinaryOp;
-import jdk.compiler.graal.core.common.type.ArithmeticOpTable.BinaryOp.Compress;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.lir.gen.ArithmeticLIRGeneratorTool;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.core.common.type.ArithmeticOpTable;
+import jdk.graal.compiler.core.common.type.ArithmeticOpTable.BinaryOp;
+import jdk.graal.compiler.core.common.type.ArithmeticOpTable.BinaryOp.Compress;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.lir.gen.ArithmeticLIRGeneratorTool;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
 
 import jdk.vm.ci.meta.JavaConstant;
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/ConditionalNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/ConditionalNode.java
similarity index 91%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/ConditionalNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/ConditionalNode.java
index 422319421f75..dade9e228315 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/ConditionalNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/ConditionalNode.java
@@ -22,31 +22,31 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.calc;
+package jdk.graal.compiler.nodes.calc;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_1;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_2;
-import static jdk.compiler.graal.nodes.calc.CompareNode.createCompareNode;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_1;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_2;
+import static jdk.graal.compiler.nodes.calc.CompareNode.createCompareNode;
 
-import jdk.compiler.graal.core.common.calc.CanonicalCondition;
-import jdk.compiler.graal.core.common.calc.FloatConvert;
-import jdk.compiler.graal.core.common.type.IntegerStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.lir.gen.ArithmeticLIRGeneratorTool.RoundingMode;
-import jdk.compiler.graal.nodeinfo.InputType;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.LogicConstantNode;
-import jdk.compiler.graal.nodes.LogicNegationNode;
-import jdk.compiler.graal.nodes.LogicNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.Canonicalizable;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodes.spi.LIRLowerable;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.core.common.calc.CanonicalCondition;
+import jdk.graal.compiler.core.common.calc.FloatConvert;
+import jdk.graal.compiler.core.common.type.IntegerStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.lir.gen.ArithmeticLIRGeneratorTool.RoundingMode;
+import jdk.graal.compiler.nodeinfo.InputType;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.LogicConstantNode;
+import jdk.graal.compiler.nodes.LogicNegationNode;
+import jdk.graal.compiler.nodes.LogicNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.Canonicalizable;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodes.spi.LIRLowerable;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
 
 /**
  * The {@code ConditionalNode} class represents a comparison that yields one of two (eagerly
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/ConvertNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/ConvertNode.java
similarity index 93%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/ConvertNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/ConvertNode.java
index 5007ab4518f1..ee315777672e 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/ConvertNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/ConvertNode.java
@@ -22,11 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.calc;
+package jdk.graal.compiler.nodes.calc;
 
-import jdk.compiler.graal.core.common.calc.CanonicalCondition;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.ValueNodeInterface;
+import jdk.graal.compiler.core.common.calc.CanonicalCondition;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.ValueNodeInterface;
 
 import jdk.vm.ci.meta.Constant;
 import jdk.vm.ci.meta.ConstantReflectionProvider;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/CopySignNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/CopySignNode.java
similarity index 90%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/CopySignNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/CopySignNode.java
index 03e1a6696d38..4d10a768d0a7 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/CopySignNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/CopySignNode.java
@@ -22,24 +22,24 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.calc;
+package jdk.graal.compiler.nodes.calc;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_2;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_1;
 
-import jdk.compiler.graal.core.common.type.FloatStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.lir.gen.ArithmeticLIRGeneratorTool;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.ArithmeticLIRLowerable;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.core.common.type.FloatStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.lir.gen.ArithmeticLIRGeneratorTool;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.ArithmeticLIRLowerable;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
 
 import jdk.vm.ci.meta.JavaKind;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/ExpandBitsNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/ExpandBitsNode.java
similarity index 87%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/ExpandBitsNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/ExpandBitsNode.java
index e306327ef68d..0b44278e3ecd 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/ExpandBitsNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/ExpandBitsNode.java
@@ -23,23 +23,23 @@
  * questions.
  */
 
-package jdk.compiler.graal.nodes.calc;
-
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_2;
-
-import jdk.compiler.graal.core.common.type.ArithmeticOpTable;
-import jdk.compiler.graal.core.common.type.ArithmeticOpTable.BinaryOp;
-import jdk.compiler.graal.core.common.type.ArithmeticOpTable.BinaryOp.Expand;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.lir.gen.ArithmeticLIRGeneratorTool;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
+package jdk.graal.compiler.nodes.calc;
+
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_2;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_2;
+
+import jdk.graal.compiler.core.common.type.ArithmeticOpTable;
+import jdk.graal.compiler.core.common.type.ArithmeticOpTable.BinaryOp;
+import jdk.graal.compiler.core.common.type.ArithmeticOpTable.BinaryOp.Expand;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.lir.gen.ArithmeticLIRGeneratorTool;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
 
 import jdk.vm.ci.meta.JavaConstant;
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/FixedBinaryNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/FixedBinaryNode.java
similarity index 85%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/FixedBinaryNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/FixedBinaryNode.java
index fc92c0da5f96..e02edcbb67ca 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/FixedBinaryNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/FixedBinaryNode.java
@@ -22,14 +22,14 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.calc;
+package jdk.graal.compiler.nodes.calc;
 
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodes.DeoptimizingFixedWithNextNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.Canonicalizable;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodes.DeoptimizingFixedWithNextNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.Canonicalizable;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
 
 @NodeInfo
 public abstract class FixedBinaryNode extends DeoptimizingFixedWithNextNode implements Canonicalizable.Binary {
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/FloatConvertNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/FloatConvertNode.java
similarity index 83%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/FloatConvertNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/FloatConvertNode.java
index b28b68b02382..5277eb6fbc20 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/FloatConvertNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/FloatConvertNode.java
@@ -22,26 +22,26 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.calc;
-
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_8;
-
-import jdk.compiler.graal.core.common.calc.FloatConvert;
-import jdk.compiler.graal.core.common.type.ArithmeticOpTable;
-import jdk.compiler.graal.core.common.type.ArithmeticOpTable.FloatConvertOp;
-import jdk.compiler.graal.core.common.type.ArithmeticOpTable.UnaryOp;
-import jdk.compiler.graal.core.common.type.FloatStamp;
-import jdk.compiler.graal.core.common.type.IntegerStamp;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.ArithmeticLIRLowerable;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodes.spi.Lowerable;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
-import jdk.compiler.graal.lir.gen.ArithmeticLIRGeneratorTool;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
+package jdk.graal.compiler.nodes.calc;
+
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_8;
+
+import jdk.graal.compiler.core.common.calc.FloatConvert;
+import jdk.graal.compiler.core.common.type.ArithmeticOpTable;
+import jdk.graal.compiler.core.common.type.ArithmeticOpTable.FloatConvertOp;
+import jdk.graal.compiler.core.common.type.ArithmeticOpTable.UnaryOp;
+import jdk.graal.compiler.core.common.type.FloatStamp;
+import jdk.graal.compiler.core.common.type.IntegerStamp;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.ArithmeticLIRLowerable;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodes.spi.Lowerable;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.lir.gen.ArithmeticLIRGeneratorTool;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
 
 import jdk.vm.ci.meta.Constant;
 import jdk.vm.ci.meta.ConstantReflectionProvider;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/FloatDivNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/FloatDivNode.java
similarity index 81%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/FloatDivNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/FloatDivNode.java
index c756c60eada7..5143d98730f8 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/FloatDivNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/FloatDivNode.java
@@ -22,22 +22,22 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.calc;
+package jdk.graal.compiler.nodes.calc;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_32;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_32;
 
-import jdk.compiler.graal.core.common.type.ArithmeticOpTable;
-import jdk.compiler.graal.core.common.type.ArithmeticOpTable.BinaryOp;
-import jdk.compiler.graal.core.common.type.ArithmeticOpTable.BinaryOp.Div;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
-import jdk.compiler.graal.lir.gen.ArithmeticLIRGeneratorTool;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
+import jdk.graal.compiler.core.common.type.ArithmeticOpTable;
+import jdk.graal.compiler.core.common.type.ArithmeticOpTable.BinaryOp;
+import jdk.graal.compiler.core.common.type.ArithmeticOpTable.BinaryOp.Div;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.lir.gen.ArithmeticLIRGeneratorTool;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
 
 import jdk.vm.ci.meta.Constant;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/FloatEqualsNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/FloatEqualsNode.java
similarity index 88%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/FloatEqualsNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/FloatEqualsNode.java
index a58434f1b6a9..3d41a1740107 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/FloatEqualsNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/FloatEqualsNode.java
@@ -22,26 +22,26 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.calc;
+package jdk.graal.compiler.nodes.calc;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_2;
 
-import jdk.compiler.graal.core.common.calc.CanonicalCondition;
-import jdk.compiler.graal.core.common.type.FloatStamp;
-import jdk.compiler.graal.core.common.type.IntegerStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.LogicConstantNode;
-import jdk.compiler.graal.nodes.LogicNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.Canonicalizable;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodes.util.GraphUtil;
-import jdk.compiler.graal.options.OptionValues;
+import jdk.graal.compiler.core.common.calc.CanonicalCondition;
+import jdk.graal.compiler.core.common.type.FloatStamp;
+import jdk.graal.compiler.core.common.type.IntegerStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.LogicConstantNode;
+import jdk.graal.compiler.nodes.LogicNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.Canonicalizable;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodes.util.GraphUtil;
+import jdk.graal.compiler.options.OptionValues;
 
 import jdk.vm.ci.meta.ConstantReflectionProvider;
 import jdk.vm.ci.meta.MetaAccessProvider;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/FloatLessThanNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/FloatLessThanNode.java
similarity index 86%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/FloatLessThanNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/FloatLessThanNode.java
index 4a174ecbcceb..c235ada55925 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/FloatLessThanNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/FloatLessThanNode.java
@@ -22,25 +22,25 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.calc;
+package jdk.graal.compiler.nodes.calc;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_2;
 
-import jdk.compiler.graal.core.common.calc.CanonicalCondition;
-import jdk.compiler.graal.core.common.type.FloatStamp;
-import jdk.compiler.graal.core.common.type.IntegerStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.LogicConstantNode;
-import jdk.compiler.graal.nodes.LogicNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodes.util.GraphUtil;
-import jdk.compiler.graal.options.OptionValues;
+import jdk.graal.compiler.core.common.calc.CanonicalCondition;
+import jdk.graal.compiler.core.common.type.FloatStamp;
+import jdk.graal.compiler.core.common.type.IntegerStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.LogicConstantNode;
+import jdk.graal.compiler.nodes.LogicNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodes.util.GraphUtil;
+import jdk.graal.compiler.options.OptionValues;
 
 import jdk.vm.ci.meta.ConstantReflectionProvider;
 import jdk.vm.ci.meta.MetaAccessProvider;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/FloatNormalizeCompareNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/FloatNormalizeCompareNode.java
similarity index 91%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/FloatNormalizeCompareNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/FloatNormalizeCompareNode.java
index d92a16be2aa6..5ae817b04ba1 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/FloatNormalizeCompareNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/FloatNormalizeCompareNode.java
@@ -22,15 +22,15 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.calc;
+package jdk.graal.compiler.nodes.calc;
 
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodes.LogicNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.options.OptionValues;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodes.LogicNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.options.OptionValues;
 
 import jdk.vm.ci.meta.ConstantReflectionProvider;
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/FloatTypeTestNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/FloatTypeTestNode.java
similarity index 83%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/FloatTypeTestNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/FloatTypeTestNode.java
index 7de5c69de129..41e18a38a81e 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/FloatTypeTestNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/FloatTypeTestNode.java
@@ -22,22 +22,22 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.calc;
+package jdk.graal.compiler.nodes.calc;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_2;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_1;
 
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.lir.gen.ArithmeticLIRGeneratorTool;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.ArithmeticLIRLowerable;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.lir.gen.ArithmeticLIRGeneratorTool;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.ArithmeticLIRLowerable;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
 
 import jdk.vm.ci.meta.JavaKind;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/FloatingIntegerDivRemNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/FloatingIntegerDivRemNode.java
similarity index 84%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/FloatingIntegerDivRemNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/FloatingIntegerDivRemNode.java
index a99bf552d81c..bb137dea2724 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/FloatingIntegerDivRemNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/FloatingIntegerDivRemNode.java
@@ -23,30 +23,30 @@
  * questions.
  */
 
-package jdk.compiler.graal.nodes.calc;
-
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_32;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1;
-
-import jdk.compiler.graal.core.common.type.ArithmeticOpTable.BinaryOp;
-import jdk.compiler.graal.core.common.type.IntegerStamp;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.IterableNodeType;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.InputType;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.AbstractBeginNode;
-import jdk.compiler.graal.nodes.FixedGuardNode;
-import jdk.compiler.graal.nodes.GraphState;
-import jdk.compiler.graal.nodes.GuardNode;
-import jdk.compiler.graal.nodes.IfNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.extended.GuardedNode;
-import jdk.compiler.graal.nodes.extended.GuardingNode;
-import jdk.compiler.graal.nodes.extended.MultiGuardNode;
-import jdk.compiler.graal.nodes.spi.Lowerable;
-import jdk.compiler.graal.nodes.spi.LoweringProvider;
+package jdk.graal.compiler.nodes.calc;
+
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_32;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_1;
+
+import jdk.graal.compiler.core.common.type.ArithmeticOpTable.BinaryOp;
+import jdk.graal.compiler.core.common.type.IntegerStamp;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.IterableNodeType;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.InputType;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.AbstractBeginNode;
+import jdk.graal.compiler.nodes.FixedGuardNode;
+import jdk.graal.compiler.nodes.GraphState;
+import jdk.graal.compiler.nodes.GuardNode;
+import jdk.graal.compiler.nodes.IfNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.extended.GuardedNode;
+import jdk.graal.compiler.nodes.extended.GuardingNode;
+import jdk.graal.compiler.nodes.extended.MultiGuardNode;
+import jdk.graal.compiler.nodes.spi.Lowerable;
+import jdk.graal.compiler.nodes.spi.LoweringProvider;
 
 /**
  * {@link FloatingNode} version of {@link IntegerDivRemNode} if it is known that this node cannot
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/FloatingNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/FloatingNode.java
similarity index 84%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/FloatingNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/FloatingNode.java
index bb14861e1f85..699eaec508c3 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/FloatingNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/FloatingNode.java
@@ -22,13 +22,13 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.calc;
+package jdk.graal.compiler.nodes.calc;
 
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.graph.Node.ValueNumberable;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.ValueNode;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.graph.Node.ValueNumberable;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.ValueNode;
 
 @NodeInfo
 public abstract class FloatingNode extends ValueNode implements ValueNumberable {
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/IntegerBelowNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/IntegerBelowNode.java
similarity index 94%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/IntegerBelowNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/IntegerBelowNode.java
index 4660abb78c93..5d2067f81686 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/IntegerBelowNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/IntegerBelowNode.java
@@ -22,23 +22,23 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.calc;
+package jdk.graal.compiler.nodes.calc;
 
-import jdk.compiler.graal.core.common.NumUtil;
-import jdk.compiler.graal.core.common.calc.CanonicalCondition;
-import jdk.compiler.graal.core.common.type.IntegerStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.LogicConstantNode;
-import jdk.compiler.graal.nodes.LogicNegationNode;
-import jdk.compiler.graal.nodes.LogicNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.options.OptionValues;
+import jdk.graal.compiler.core.common.NumUtil;
+import jdk.graal.compiler.core.common.calc.CanonicalCondition;
+import jdk.graal.compiler.core.common.type.IntegerStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.LogicConstantNode;
+import jdk.graal.compiler.nodes.LogicNegationNode;
+import jdk.graal.compiler.nodes.LogicNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.options.OptionValues;
 
 import jdk.vm.ci.code.CodeUtil;
 import jdk.vm.ci.meta.Constant;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/IntegerConvertNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/IntegerConvertNode.java
similarity index 89%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/IntegerConvertNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/IntegerConvertNode.java
index 5454093925a8..2ddce4bc7f09 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/IntegerConvertNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/IntegerConvertNode.java
@@ -22,24 +22,24 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.calc;
-
-import jdk.compiler.graal.core.common.type.ArithmeticOpTable;
-import jdk.compiler.graal.core.common.type.ArithmeticOpTable.IntegerConvertOp;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.core.common.type.IntegerStamp;
-import jdk.compiler.graal.core.common.type.PrimitiveStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.ArithmeticOperation;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.ArithmeticLIRLowerable;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodes.spi.StampInverter;
+package jdk.graal.compiler.nodes.calc;
+
+import jdk.graal.compiler.core.common.type.ArithmeticOpTable;
+import jdk.graal.compiler.core.common.type.ArithmeticOpTable.IntegerConvertOp;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.core.common.type.IntegerStamp;
+import jdk.graal.compiler.core.common.type.PrimitiveStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.ArithmeticOperation;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.ArithmeticLIRLowerable;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodes.spi.StampInverter;
 
 import jdk.vm.ci.meta.Constant;
 import jdk.vm.ci.meta.ConstantReflectionProvider;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/IntegerDivRemNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/IntegerDivRemNode.java
similarity index 84%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/IntegerDivRemNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/IntegerDivRemNode.java
index 3229f0ccf3a8..747bc73070a9 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/IntegerDivRemNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/IntegerDivRemNode.java
@@ -22,23 +22,23 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.calc;
-
-import static jdk.compiler.graal.nodeinfo.InputType.Guard;
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_32;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1;
-
-import jdk.compiler.graal.core.common.type.IntegerStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.graph.IterableNodeType;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.InputType;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.extended.GuardingNode;
-import jdk.compiler.graal.nodes.spi.Lowerable;
+package jdk.graal.compiler.nodes.calc;
+
+import static jdk.graal.compiler.nodeinfo.InputType.Guard;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_32;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_1;
+
+import jdk.graal.compiler.core.common.type.IntegerStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.graph.IterableNodeType;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.InputType;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.extended.GuardingNode;
+import jdk.graal.compiler.nodes.spi.Lowerable;
 
 import jdk.vm.ci.meta.JavaConstant;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/IntegerEqualsNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/IntegerEqualsNode.java
similarity index 95%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/IntegerEqualsNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/IntegerEqualsNode.java
index 009e0466ffe6..350e157c267e 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/IntegerEqualsNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/IntegerEqualsNode.java
@@ -22,27 +22,27 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.calc;
+package jdk.graal.compiler.nodes.calc;
 
-import jdk.compiler.graal.core.common.calc.CanonicalCondition;
-import jdk.compiler.graal.core.common.type.AbstractPointerStamp;
-import jdk.compiler.graal.core.common.type.FloatStamp;
-import jdk.compiler.graal.core.common.type.IntegerStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.LogicConstantNode;
-import jdk.compiler.graal.nodes.LogicNegationNode;
-import jdk.compiler.graal.nodes.LogicNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.Canonicalizable;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodes.util.GraphUtil;
-import jdk.compiler.graal.options.OptionValues;
+import jdk.graal.compiler.core.common.calc.CanonicalCondition;
+import jdk.graal.compiler.core.common.type.AbstractPointerStamp;
+import jdk.graal.compiler.core.common.type.FloatStamp;
+import jdk.graal.compiler.core.common.type.IntegerStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.LogicConstantNode;
+import jdk.graal.compiler.nodes.LogicNegationNode;
+import jdk.graal.compiler.nodes.LogicNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.Canonicalizable;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodes.util.GraphUtil;
+import jdk.graal.compiler.options.OptionValues;
 
 import jdk.vm.ci.meta.Constant;
 import jdk.vm.ci.meta.ConstantReflectionProvider;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/IntegerLessThanNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/IntegerLessThanNode.java
similarity index 93%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/IntegerLessThanNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/IntegerLessThanNode.java
index 575ccd3df43b..652f582a19ef 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/IntegerLessThanNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/IntegerLessThanNode.java
@@ -22,28 +22,28 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.calc;
-
-import static jdk.compiler.graal.core.common.calc.CanonicalCondition.LT;
-
-import jdk.compiler.graal.core.common.GraalOptions;
-import jdk.compiler.graal.core.common.NumUtil;
-import jdk.compiler.graal.core.common.calc.CanonicalCondition;
-import jdk.compiler.graal.core.common.type.FloatStamp;
-import jdk.compiler.graal.core.common.type.IntegerStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.LogicConstantNode;
-import jdk.compiler.graal.nodes.LogicNegationNode;
-import jdk.compiler.graal.nodes.LogicNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.options.OptionValues;
+package jdk.graal.compiler.nodes.calc;
+
+import static jdk.graal.compiler.core.common.calc.CanonicalCondition.LT;
+
+import jdk.graal.compiler.core.common.GraalOptions;
+import jdk.graal.compiler.core.common.NumUtil;
+import jdk.graal.compiler.core.common.calc.CanonicalCondition;
+import jdk.graal.compiler.core.common.type.FloatStamp;
+import jdk.graal.compiler.core.common.type.IntegerStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.LogicConstantNode;
+import jdk.graal.compiler.nodes.LogicNegationNode;
+import jdk.graal.compiler.nodes.LogicNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.options.OptionValues;
 
 import jdk.vm.ci.code.CodeUtil;
 import jdk.vm.ci.meta.Constant;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/IntegerLowerThanNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/IntegerLowerThanNode.java
similarity index 97%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/IntegerLowerThanNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/IntegerLowerThanNode.java
index a21d5529dd04..057d851ab70f 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/IntegerLowerThanNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/IntegerLowerThanNode.java
@@ -22,25 +22,25 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.calc;
+package jdk.graal.compiler.nodes.calc;
 
 import static jdk.vm.ci.code.CodeUtil.mask;
 
-import jdk.compiler.graal.core.common.calc.CanonicalCondition;
-import jdk.compiler.graal.core.common.type.ArithmeticOpTable;
-import jdk.compiler.graal.core.common.type.IntegerStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.LogicConstantNode;
-import jdk.compiler.graal.nodes.LogicNegationNode;
-import jdk.compiler.graal.nodes.LogicNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.PiNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.util.GraphUtil;
-import jdk.compiler.graal.options.OptionValues;
+import jdk.graal.compiler.core.common.calc.CanonicalCondition;
+import jdk.graal.compiler.core.common.type.ArithmeticOpTable;
+import jdk.graal.compiler.core.common.type.IntegerStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.LogicConstantNode;
+import jdk.graal.compiler.nodes.LogicNegationNode;
+import jdk.graal.compiler.nodes.LogicNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.PiNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.util.GraphUtil;
+import jdk.graal.compiler.options.OptionValues;
 
 import jdk.vm.ci.code.CodeUtil;
 import jdk.vm.ci.meta.ConstantReflectionProvider;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/IntegerMulHighNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/IntegerMulHighNode.java
similarity index 80%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/IntegerMulHighNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/IntegerMulHighNode.java
index 6c7015c91e34..ee7abfb8ac12 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/IntegerMulHighNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/IntegerMulHighNode.java
@@ -22,23 +22,23 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.calc;
+package jdk.graal.compiler.nodes.calc;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_2;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_2;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_2;
 
-import jdk.compiler.graal.core.common.type.ArithmeticOpTable;
-import jdk.compiler.graal.core.common.type.ArithmeticOpTable.BinaryOp;
-import jdk.compiler.graal.core.common.type.ArithmeticOpTable.BinaryOp.MulHigh;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.Canonicalizable;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
-import jdk.compiler.graal.lir.gen.ArithmeticLIRGeneratorTool;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
+import jdk.graal.compiler.core.common.type.ArithmeticOpTable;
+import jdk.graal.compiler.core.common.type.ArithmeticOpTable.BinaryOp;
+import jdk.graal.compiler.core.common.type.ArithmeticOpTable.BinaryOp.MulHigh;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.Canonicalizable;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.lir.gen.ArithmeticLIRGeneratorTool;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
 
 import jdk.vm.ci.meta.Constant;
 import jdk.vm.ci.meta.PrimitiveConstant;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/IntegerNormalizeCompareNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/IntegerNormalizeCompareNode.java
similarity index 91%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/IntegerNormalizeCompareNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/IntegerNormalizeCompareNode.java
index c6bcca088e63..d17c5a027261 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/IntegerNormalizeCompareNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/IntegerNormalizeCompareNode.java
@@ -22,15 +22,15 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.calc;
+package jdk.graal.compiler.nodes.calc;
 
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.LogicNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.options.OptionValues;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.LogicNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.options.OptionValues;
 
 import jdk.vm.ci.meta.ConstantReflectionProvider;
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/IntegerTestNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/IntegerTestNode.java
similarity index 89%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/IntegerTestNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/IntegerTestNode.java
index 7f0ed6fd6f1a..016dca0beb63 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/IntegerTestNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/IntegerTestNode.java
@@ -22,22 +22,22 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.calc;
+package jdk.graal.compiler.nodes.calc;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_2;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_2;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_2;
 
-import jdk.compiler.graal.core.common.type.IntegerStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.BinaryOpLogicNode;
-import jdk.compiler.graal.nodes.LogicConstantNode;
-import jdk.compiler.graal.nodes.LogicNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.Canonicalizable;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.core.common.type.IntegerStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.BinaryOpLogicNode;
+import jdk.graal.compiler.nodes.LogicConstantNode;
+import jdk.graal.compiler.nodes.LogicNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.Canonicalizable;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
 
 import jdk.vm.ci.meta.TriState;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/IsNullNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/IsNullNode.java
similarity index 85%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/IsNullNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/IsNullNode.java
index 54dcca970844..b55497fc214e 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/IsNullNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/IsNullNode.java
@@ -22,27 +22,27 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.calc;
-
-import jdk.compiler.graal.core.common.type.AbstractPointerStamp;
-import jdk.compiler.graal.core.common.type.ObjectStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.core.common.util.CompilationAlarm;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeCycles;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.CompressionNode;
-import jdk.compiler.graal.nodes.LogicConstantNode;
-import jdk.compiler.graal.nodes.LogicNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.UnaryOpLogicNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodes.spi.LIRLowerable;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
-import jdk.compiler.graal.nodes.type.NarrowOopStamp;
-import jdk.compiler.graal.nodes.type.StampTool;
+package jdk.graal.compiler.nodes.calc;
+
+import jdk.graal.compiler.core.common.type.AbstractPointerStamp;
+import jdk.graal.compiler.core.common.type.ObjectStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.core.common.util.CompilationAlarm;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeCycles;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.CompressionNode;
+import jdk.graal.compiler.nodes.LogicConstantNode;
+import jdk.graal.compiler.nodes.LogicNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.UnaryOpLogicNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodes.spi.LIRLowerable;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.nodes.type.NarrowOopStamp;
+import jdk.graal.compiler.nodes.type.StampTool;
 
 import jdk.vm.ci.meta.JavaConstant;
 import jdk.vm.ci.meta.TriState;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/LeftShiftNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/LeftShiftNode.java
similarity index 89%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/LeftShiftNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/LeftShiftNode.java
index 24c54a0a4633..0efae4121a32 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/LeftShiftNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/LeftShiftNode.java
@@ -22,21 +22,21 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.calc;
+package jdk.graal.compiler.nodes.calc;
 
-import jdk.compiler.graal.core.common.type.ArithmeticOpTable;
-import jdk.compiler.graal.core.common.type.ArithmeticOpTable.ShiftOp;
-import jdk.compiler.graal.core.common.type.ArithmeticOpTable.ShiftOp.Shl;
-import jdk.compiler.graal.core.common.type.IntegerStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.lir.gen.ArithmeticLIRGeneratorTool;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.core.common.type.ArithmeticOpTable;
+import jdk.graal.compiler.core.common.type.ArithmeticOpTable.ShiftOp;
+import jdk.graal.compiler.core.common.type.ArithmeticOpTable.ShiftOp.Shl;
+import jdk.graal.compiler.core.common.type.IntegerStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.lir.gen.ArithmeticLIRGeneratorTool;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
 
 import jdk.vm.ci.meta.Constant;
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/MaxNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/MaxNode.java
similarity index 81%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/MaxNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/MaxNode.java
index b145207460c4..b2c29ee41186 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/MaxNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/MaxNode.java
@@ -23,20 +23,20 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.calc;
+package jdk.graal.compiler.nodes.calc;
 
-import jdk.compiler.graal.core.common.NumUtil.Signedness;
-import jdk.compiler.graal.core.common.type.ArithmeticOpTable;
-import jdk.compiler.graal.core.common.type.ArithmeticOpTable.BinaryOp;
-import jdk.compiler.graal.core.common.type.ArithmeticOpTable.BinaryOp.Max;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.LogicNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.LoweringProvider;
+import jdk.graal.compiler.core.common.NumUtil.Signedness;
+import jdk.graal.compiler.core.common.type.ArithmeticOpTable;
+import jdk.graal.compiler.core.common.type.ArithmeticOpTable.BinaryOp;
+import jdk.graal.compiler.core.common.type.ArithmeticOpTable.BinaryOp.Max;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.LogicNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.LoweringProvider;
 
 @NodeInfo(shortName = "Max")
 public class MaxNode extends MinMaxNode {
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/MinMaxNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/MinMaxNode.java
similarity index 92%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/MinMaxNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/MinMaxNode.java
index 205e963970cc..013aa4f5ee46 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/MinMaxNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/MinMaxNode.java
@@ -24,27 +24,27 @@
  * questions.
  */
 
-package jdk.compiler.graal.nodes.calc;
+package jdk.graal.compiler.nodes.calc;
 
-import jdk.compiler.graal.core.common.NumUtil;
-import jdk.compiler.graal.core.common.NumUtil.Signedness;
-import jdk.compiler.graal.core.common.type.ArithmeticOpTable.BinaryOp;
-import jdk.compiler.graal.core.common.type.IntegerStamp;
-import jdk.compiler.graal.core.common.type.PrimitiveStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.lir.gen.ArithmeticLIRGeneratorTool;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.LogicNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.Canonicalizable;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodes.spi.LoweringProvider;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.core.common.NumUtil;
+import jdk.graal.compiler.core.common.NumUtil.Signedness;
+import jdk.graal.compiler.core.common.type.ArithmeticOpTable.BinaryOp;
+import jdk.graal.compiler.core.common.type.IntegerStamp;
+import jdk.graal.compiler.core.common.type.PrimitiveStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.lir.gen.ArithmeticLIRGeneratorTool;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.LogicNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.Canonicalizable;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodes.spi.LoweringProvider;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
 
 import jdk.vm.ci.meta.JavaConstant;
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/MinNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/MinNode.java
similarity index 81%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/MinNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/MinNode.java
index 28f252ebd58d..f3dd271ed0ad 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/MinNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/MinNode.java
@@ -23,20 +23,20 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.calc;
+package jdk.graal.compiler.nodes.calc;
 
-import jdk.compiler.graal.core.common.NumUtil.Signedness;
-import jdk.compiler.graal.core.common.type.ArithmeticOpTable;
-import jdk.compiler.graal.core.common.type.ArithmeticOpTable.BinaryOp;
-import jdk.compiler.graal.core.common.type.ArithmeticOpTable.BinaryOp.Min;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.LogicNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.LoweringProvider;
+import jdk.graal.compiler.core.common.NumUtil.Signedness;
+import jdk.graal.compiler.core.common.type.ArithmeticOpTable;
+import jdk.graal.compiler.core.common.type.ArithmeticOpTable.BinaryOp;
+import jdk.graal.compiler.core.common.type.ArithmeticOpTable.BinaryOp.Min;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.LogicNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.LoweringProvider;
 
 @NodeInfo(shortName = "Min")
 public class MinNode extends MinMaxNode {
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/MulNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/MulNode.java
similarity index 89%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/MulNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/MulNode.java
index c6c0092292c7..0c5471dd9874 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/MulNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/MulNode.java
@@ -22,24 +22,24 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.calc;
-
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2;
-
-import jdk.compiler.graal.core.common.type.ArithmeticOpTable;
-import jdk.compiler.graal.core.common.type.ArithmeticOpTable.BinaryOp;
-import jdk.compiler.graal.core.common.type.ArithmeticOpTable.BinaryOp.Mul;
-import jdk.compiler.graal.core.common.type.IntegerStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.lir.gen.ArithmeticLIRGeneratorTool;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.Canonicalizable;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
+package jdk.graal.compiler.nodes.calc;
+
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_2;
+
+import jdk.graal.compiler.core.common.type.ArithmeticOpTable;
+import jdk.graal.compiler.core.common.type.ArithmeticOpTable.BinaryOp;
+import jdk.graal.compiler.core.common.type.ArithmeticOpTable.BinaryOp.Mul;
+import jdk.graal.compiler.core.common.type.IntegerStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.lir.gen.ArithmeticLIRGeneratorTool;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.Canonicalizable;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
 
 import jdk.vm.ci.code.CodeUtil;
 import jdk.vm.ci.meta.Constant;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/NarrowNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/NarrowNode.java
similarity index 89%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/NarrowNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/NarrowNode.java
index d144d7d0a01f..27c5bc00834e 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/NarrowNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/NarrowNode.java
@@ -22,26 +22,26 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.calc;
-
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_1;
-
-import jdk.compiler.graal.core.common.calc.CanonicalCondition;
-import jdk.compiler.graal.core.common.type.ArithmeticOpTable;
-import jdk.compiler.graal.core.common.type.ArithmeticOpTable.IntegerConvertOp;
-import jdk.compiler.graal.core.common.type.ArithmeticOpTable.IntegerConvertOp.Narrow;
-import jdk.compiler.graal.core.common.type.IntegerStamp;
-import jdk.compiler.graal.core.common.type.PrimitiveStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.lir.gen.ArithmeticLIRGeneratorTool;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.GraphState;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
+package jdk.graal.compiler.nodes.calc;
+
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_1;
+
+import jdk.graal.compiler.core.common.calc.CanonicalCondition;
+import jdk.graal.compiler.core.common.type.ArithmeticOpTable;
+import jdk.graal.compiler.core.common.type.ArithmeticOpTable.IntegerConvertOp;
+import jdk.graal.compiler.core.common.type.ArithmeticOpTable.IntegerConvertOp.Narrow;
+import jdk.graal.compiler.core.common.type.IntegerStamp;
+import jdk.graal.compiler.core.common.type.PrimitiveStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.lir.gen.ArithmeticLIRGeneratorTool;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.GraphState;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
 
 import jdk.vm.ci.code.CodeUtil;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/NarrowableArithmeticNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/NarrowableArithmeticNode.java
similarity index 94%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/NarrowableArithmeticNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/NarrowableArithmeticNode.java
index 26e044162407..550ca5501828 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/NarrowableArithmeticNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/NarrowableArithmeticNode.java
@@ -22,9 +22,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.calc;
+package jdk.graal.compiler.nodes.calc;
 
-import jdk.compiler.graal.nodes.ArithmeticOperation;
+import jdk.graal.compiler.nodes.ArithmeticOperation;
 
 /**
  * Marker interface for nodes where it is valid to apply a {@link NarrowNode} to its inputs and do a
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/NegateNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/NegateNode.java
similarity index 81%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/NegateNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/NegateNode.java
index baf1d03ade99..19169334d5be 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/NegateNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/NegateNode.java
@@ -22,25 +22,25 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.calc;
+package jdk.graal.compiler.nodes.calc;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_2;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_1;
 
-import jdk.compiler.graal.core.common.type.ArithmeticOpTable;
-import jdk.compiler.graal.core.common.type.ArithmeticOpTable.UnaryOp;
-import jdk.compiler.graal.core.common.type.ArithmeticOpTable.UnaryOp.Neg;
-import jdk.compiler.graal.core.common.type.IntegerStamp;
-import jdk.compiler.graal.core.common.type.FloatStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
-import jdk.compiler.graal.nodes.spi.StampInverter;
-import jdk.compiler.graal.lir.gen.ArithmeticLIRGeneratorTool;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
+import jdk.graal.compiler.core.common.type.ArithmeticOpTable;
+import jdk.graal.compiler.core.common.type.ArithmeticOpTable.UnaryOp;
+import jdk.graal.compiler.core.common.type.ArithmeticOpTable.UnaryOp.Neg;
+import jdk.graal.compiler.core.common.type.IntegerStamp;
+import jdk.graal.compiler.core.common.type.FloatStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.nodes.spi.StampInverter;
+import jdk.graal.compiler.lir.gen.ArithmeticLIRGeneratorTool;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
 
 /**
  * The {@code NegateNode} node negates its operand.
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/NotNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/NotNode.java
similarity index 76%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/NotNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/NotNode.java
index 1aa694607264..7ed049ab8a4a 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/NotNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/NotNode.java
@@ -22,23 +22,23 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.calc;
+package jdk.graal.compiler.nodes.calc;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_1;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_1;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_1;
 
-import jdk.compiler.graal.core.common.type.ArithmeticOpTable;
-import jdk.compiler.graal.core.common.type.ArithmeticOpTable.UnaryOp;
-import jdk.compiler.graal.core.common.type.ArithmeticOpTable.UnaryOp.Not;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.ArithmeticLIRLowerable;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
-import jdk.compiler.graal.nodes.spi.StampInverter;
-import jdk.compiler.graal.lir.gen.ArithmeticLIRGeneratorTool;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
+import jdk.graal.compiler.core.common.type.ArithmeticOpTable;
+import jdk.graal.compiler.core.common.type.ArithmeticOpTable.UnaryOp;
+import jdk.graal.compiler.core.common.type.ArithmeticOpTable.UnaryOp.Not;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.ArithmeticLIRLowerable;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.nodes.spi.StampInverter;
+import jdk.graal.compiler.lir.gen.ArithmeticLIRGeneratorTool;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
 
 /**
  * Binary negation of long or integer values.
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/ObjectEqualsNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/ObjectEqualsNode.java
similarity index 87%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/ObjectEqualsNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/ObjectEqualsNode.java
index 34f5696dfa2a..172b39f9759f 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/ObjectEqualsNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/ObjectEqualsNode.java
@@ -22,33 +22,33 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.calc;
-
-import jdk.compiler.graal.core.common.calc.CanonicalCondition;
-import jdk.compiler.graal.core.common.type.AbstractObjectStamp;
-import jdk.compiler.graal.core.common.type.AbstractPointerStamp;
-import jdk.compiler.graal.core.common.type.ObjectStamp;
-import jdk.compiler.graal.core.common.type.TypeReference;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.LogicConstantNode;
-import jdk.compiler.graal.nodes.LogicNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.extended.BoxNode;
-import jdk.compiler.graal.nodes.extended.GetClassNode;
-import jdk.compiler.graal.nodes.java.AbstractNewObjectNode;
-import jdk.compiler.graal.nodes.java.InstanceOfNode;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodes.spi.Virtualizable;
-import jdk.compiler.graal.nodes.spi.VirtualizerTool;
-import jdk.compiler.graal.nodes.virtual.AllocatedObjectNode;
-import jdk.compiler.graal.nodes.virtual.VirtualBoxingNode;
-import jdk.compiler.graal.nodes.virtual.VirtualObjectNode;
-import jdk.compiler.graal.options.OptionValues;
+package jdk.graal.compiler.nodes.calc;
+
+import jdk.graal.compiler.core.common.calc.CanonicalCondition;
+import jdk.graal.compiler.core.common.type.AbstractObjectStamp;
+import jdk.graal.compiler.core.common.type.AbstractPointerStamp;
+import jdk.graal.compiler.core.common.type.ObjectStamp;
+import jdk.graal.compiler.core.common.type.TypeReference;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.LogicConstantNode;
+import jdk.graal.compiler.nodes.LogicNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.extended.BoxNode;
+import jdk.graal.compiler.nodes.extended.GetClassNode;
+import jdk.graal.compiler.nodes.java.AbstractNewObjectNode;
+import jdk.graal.compiler.nodes.java.InstanceOfNode;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodes.spi.Virtualizable;
+import jdk.graal.compiler.nodes.spi.VirtualizerTool;
+import jdk.graal.compiler.nodes.virtual.AllocatedObjectNode;
+import jdk.graal.compiler.nodes.virtual.VirtualBoxingNode;
+import jdk.graal.compiler.nodes.virtual.VirtualObjectNode;
+import jdk.graal.compiler.options.OptionValues;
 
 import jdk.vm.ci.meta.Constant;
 import jdk.vm.ci.meta.ConstantReflectionProvider;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/OrNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/OrNode.java
similarity index 84%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/OrNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/OrNode.java
index af4b8372892c..5a17936ea44f 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/OrNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/OrNode.java
@@ -22,23 +22,23 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.calc;
+package jdk.graal.compiler.nodes.calc;
 
-import jdk.compiler.graal.core.common.type.ArithmeticOpTable;
-import jdk.compiler.graal.core.common.type.ArithmeticOpTable.BinaryOp;
-import jdk.compiler.graal.core.common.type.ArithmeticOpTable.BinaryOp.Or;
-import jdk.compiler.graal.core.common.type.IntegerStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.lir.gen.ArithmeticLIRGeneratorTool;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.Canonicalizable;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
-import jdk.compiler.graal.nodes.util.GraphUtil;
+import jdk.graal.compiler.core.common.type.ArithmeticOpTable;
+import jdk.graal.compiler.core.common.type.ArithmeticOpTable.BinaryOp;
+import jdk.graal.compiler.core.common.type.ArithmeticOpTable.BinaryOp.Or;
+import jdk.graal.compiler.core.common.type.IntegerStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.lir.gen.ArithmeticLIRGeneratorTool;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.Canonicalizable;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.nodes.util.GraphUtil;
 
 import jdk.vm.ci.meta.Constant;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/PointerEqualsNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/PointerEqualsNode.java
similarity index 89%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/PointerEqualsNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/PointerEqualsNode.java
index 0591ce9c3332..d5b5095b2e05 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/PointerEqualsNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/PointerEqualsNode.java
@@ -22,31 +22,31 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.calc;
-
-import jdk.compiler.graal.core.common.calc.CanonicalCondition;
-import jdk.compiler.graal.core.common.type.AbstractPointerStamp;
-import jdk.compiler.graal.core.common.type.ObjectStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.LogicConstantNode;
-import jdk.compiler.graal.nodes.LogicNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ParameterNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.extended.AbstractBoxingNode;
-import jdk.compiler.graal.nodes.extended.BoxNode;
-import jdk.compiler.graal.nodes.extended.LoadHubNode;
-import jdk.compiler.graal.nodes.extended.LoadMethodNode;
-import jdk.compiler.graal.nodes.java.AbstractNewObjectNode;
-import jdk.compiler.graal.nodes.spi.Canonicalizable;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodes.type.StampTool;
-import jdk.compiler.graal.nodes.util.GraphUtil;
-import jdk.compiler.graal.nodes.virtual.AllocatedObjectNode;
-import jdk.compiler.graal.options.OptionValues;
+package jdk.graal.compiler.nodes.calc;
+
+import jdk.graal.compiler.core.common.calc.CanonicalCondition;
+import jdk.graal.compiler.core.common.type.AbstractPointerStamp;
+import jdk.graal.compiler.core.common.type.ObjectStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.LogicConstantNode;
+import jdk.graal.compiler.nodes.LogicNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ParameterNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.extended.AbstractBoxingNode;
+import jdk.graal.compiler.nodes.extended.BoxNode;
+import jdk.graal.compiler.nodes.extended.LoadHubNode;
+import jdk.graal.compiler.nodes.extended.LoadMethodNode;
+import jdk.graal.compiler.nodes.java.AbstractNewObjectNode;
+import jdk.graal.compiler.nodes.spi.Canonicalizable;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodes.type.StampTool;
+import jdk.graal.compiler.nodes.util.GraphUtil;
+import jdk.graal.compiler.nodes.virtual.AllocatedObjectNode;
+import jdk.graal.compiler.options.OptionValues;
 
 import jdk.vm.ci.meta.ConstantReflectionProvider;
 import jdk.vm.ci.meta.MetaAccessProvider;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/ReinterpretNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/ReinterpretNode.java
similarity index 81%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/ReinterpretNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/ReinterpretNode.java
index 91af3be6a9dc..25c3fc91d3bf 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/ReinterpretNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/ReinterpretNode.java
@@ -22,29 +22,29 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.calc;
-
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_1;
-
-import jdk.compiler.graal.core.common.LIRKind;
-import jdk.compiler.graal.core.common.calc.ReinterpretUtils;
-import jdk.compiler.graal.core.common.type.ArithmeticOpTable.ReinterpretOp;
-import jdk.compiler.graal.core.common.type.ArithmeticOpTable;
-import jdk.compiler.graal.core.common.type.ArithmeticStamp;
-import jdk.compiler.graal.core.common.type.FloatStamp;
-import jdk.compiler.graal.core.common.type.IntegerStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodes.ArithmeticOperation;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.ArithmeticLIRLowerable;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
-import jdk.compiler.graal.lir.gen.ArithmeticLIRGeneratorTool;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
+package jdk.graal.compiler.nodes.calc;
+
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_1;
+
+import jdk.graal.compiler.core.common.LIRKind;
+import jdk.graal.compiler.core.common.calc.ReinterpretUtils;
+import jdk.graal.compiler.core.common.type.ArithmeticOpTable.ReinterpretOp;
+import jdk.graal.compiler.core.common.type.ArithmeticOpTable;
+import jdk.graal.compiler.core.common.type.ArithmeticStamp;
+import jdk.graal.compiler.core.common.type.FloatStamp;
+import jdk.graal.compiler.core.common.type.IntegerStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodes.ArithmeticOperation;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.ArithmeticLIRLowerable;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.lir.gen.ArithmeticLIRGeneratorTool;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
 
 import jdk.vm.ci.meta.Constant;
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/RemNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/RemNode.java
similarity index 77%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/RemNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/RemNode.java
index afd3412b9207..802f63419a50 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/RemNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/RemNode.java
@@ -22,22 +22,22 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.calc;
+package jdk.graal.compiler.nodes.calc;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_32;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_32;
 
-import jdk.compiler.graal.core.common.type.ArithmeticOpTable;
-import jdk.compiler.graal.core.common.type.ArithmeticOpTable.BinaryOp;
-import jdk.compiler.graal.core.common.type.ArithmeticOpTable.BinaryOp.Rem;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.lir.gen.ArithmeticLIRGeneratorTool;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.Lowerable;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.core.common.type.ArithmeticOpTable;
+import jdk.graal.compiler.core.common.type.ArithmeticOpTable.BinaryOp;
+import jdk.graal.compiler.core.common.type.ArithmeticOpTable.BinaryOp.Rem;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.lir.gen.ArithmeticLIRGeneratorTool;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.Lowerable;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
 
 @NodeInfo(shortName = "%", cycles = CYCLES_32/* div */)
 public class RemNode extends BinaryArithmeticNode implements Lowerable {
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/RightShiftNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/RightShiftNode.java
similarity index 90%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/RightShiftNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/RightShiftNode.java
index 4da105296e9c..3bab3e5f00ee 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/RightShiftNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/RightShiftNode.java
@@ -22,21 +22,21 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.calc;
-
-import jdk.compiler.graal.core.common.type.ArithmeticOpTable;
-import jdk.compiler.graal.core.common.type.ArithmeticOpTable.ShiftOp;
-import jdk.compiler.graal.core.common.type.ArithmeticOpTable.ShiftOp.Shr;
-import jdk.compiler.graal.core.common.type.IntegerStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.lir.gen.ArithmeticLIRGeneratorTool;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
+package jdk.graal.compiler.nodes.calc;
+
+import jdk.graal.compiler.core.common.type.ArithmeticOpTable;
+import jdk.graal.compiler.core.common.type.ArithmeticOpTable.ShiftOp;
+import jdk.graal.compiler.core.common.type.ArithmeticOpTable.ShiftOp.Shr;
+import jdk.graal.compiler.core.common.type.IntegerStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.lir.gen.ArithmeticLIRGeneratorTool;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
 
 import jdk.vm.ci.code.CodeUtil;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/RoundFloatToIntegerNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/RoundFloatToIntegerNode.java
similarity index 83%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/RoundFloatToIntegerNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/RoundFloatToIntegerNode.java
index aab7a72e6640..53c559a47ba0 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/RoundFloatToIntegerNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/RoundFloatToIntegerNode.java
@@ -23,23 +23,23 @@
  * questions.
  */
 
-package jdk.compiler.graal.nodes.calc;
+package jdk.graal.compiler.nodes.calc;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_32;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_32;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_32;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_32;
 
-import jdk.compiler.graal.core.common.type.FloatStamp;
-import jdk.compiler.graal.core.common.type.IntegerStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.lir.gen.ArithmeticLIRGeneratorTool;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.ArithmeticLIRLowerable;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.core.common.type.FloatStamp;
+import jdk.graal.compiler.core.common.type.IntegerStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.lir.gen.ArithmeticLIRGeneratorTool;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.ArithmeticLIRLowerable;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
 
 import jdk.vm.ci.meta.JavaConstant;
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/RoundNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/RoundNode.java
similarity index 82%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/RoundNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/RoundNode.java
index 369bf5da0c28..70f09e4b3a42 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/RoundNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/RoundNode.java
@@ -23,24 +23,24 @@
  * questions.
  */
 
-package jdk.compiler.graal.nodes.calc;
-
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_1;
-
-import jdk.compiler.graal.core.common.type.FloatStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.ArithmeticLIRLowerable;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodes.spi.LoweringProvider;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
-import jdk.compiler.graal.lir.gen.ArithmeticLIRGeneratorTool;
-import jdk.compiler.graal.lir.gen.ArithmeticLIRGeneratorTool.RoundingMode;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
+package jdk.graal.compiler.nodes.calc;
+
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_1;
+
+import jdk.graal.compiler.core.common.type.FloatStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.ArithmeticLIRLowerable;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodes.spi.LoweringProvider;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.lir.gen.ArithmeticLIRGeneratorTool;
+import jdk.graal.compiler.lir.gen.ArithmeticLIRGeneratorTool.RoundingMode;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
 
 import jdk.vm.ci.meta.JavaConstant;
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/ShiftNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/ShiftNode.java
similarity index 86%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/ShiftNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/ShiftNode.java
index b5b46e377800..8c43c3097420 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/ShiftNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/ShiftNode.java
@@ -22,26 +22,26 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.calc;
+package jdk.graal.compiler.nodes.calc;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_1;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_1;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_1;
 
 import java.util.Set;
 
-import jdk.compiler.graal.core.common.type.ArithmeticOpTable;
-import jdk.compiler.graal.core.common.type.ArithmeticOpTable.ShiftOp;
-import jdk.compiler.graal.core.common.type.IntegerStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.ArithmeticOperation;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.ArithmeticLIRLowerable;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.core.common.type.ArithmeticOpTable;
+import jdk.graal.compiler.core.common.type.ArithmeticOpTable.ShiftOp;
+import jdk.graal.compiler.core.common.type.IntegerStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.ArithmeticOperation;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.ArithmeticLIRLowerable;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
 
 import jdk.vm.ci.code.CodeUtil;
 import jdk.vm.ci.meta.JavaConstant;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/SignExtendNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/SignExtendNode.java
similarity index 88%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/SignExtendNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/SignExtendNode.java
index 96a7250a80ea..648efb937cbc 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/SignExtendNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/SignExtendNode.java
@@ -22,24 +22,24 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.calc;
-
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_1;
-
-import jdk.compiler.graal.core.common.type.ArithmeticOpTable;
-import jdk.compiler.graal.core.common.type.ArithmeticOpTable.IntegerConvertOp;
-import jdk.compiler.graal.core.common.type.ArithmeticOpTable.IntegerConvertOp.Narrow;
-import jdk.compiler.graal.core.common.type.ArithmeticOpTable.IntegerConvertOp.SignExtend;
-import jdk.compiler.graal.core.common.type.IntegerStamp;
-import jdk.compiler.graal.core.common.type.PrimitiveStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.lir.gen.ArithmeticLIRGeneratorTool;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
+package jdk.graal.compiler.nodes.calc;
+
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_1;
+
+import jdk.graal.compiler.core.common.type.ArithmeticOpTable;
+import jdk.graal.compiler.core.common.type.ArithmeticOpTable.IntegerConvertOp;
+import jdk.graal.compiler.core.common.type.ArithmeticOpTable.IntegerConvertOp.Narrow;
+import jdk.graal.compiler.core.common.type.ArithmeticOpTable.IntegerConvertOp.SignExtend;
+import jdk.graal.compiler.core.common.type.IntegerStamp;
+import jdk.graal.compiler.core.common.type.PrimitiveStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.lir.gen.ArithmeticLIRGeneratorTool;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
 
 import jdk.vm.ci.code.CodeUtil;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/SignedDivNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/SignedDivNode.java
similarity index 91%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/SignedDivNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/SignedDivNode.java
index 0d260a0694e3..26d7beb7aab8 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/SignedDivNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/SignedDivNode.java
@@ -22,24 +22,24 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.calc;
-
-import jdk.compiler.graal.core.common.GraalOptions;
-import jdk.compiler.graal.core.common.NumUtil;
-import jdk.compiler.graal.core.common.type.IntegerStamp;
-import jdk.compiler.graal.core.common.type.PrimitiveStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.FrameState;
-import jdk.compiler.graal.nodes.GraphState;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.extended.GuardingNode;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodes.spi.LIRLowerable;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
+package jdk.graal.compiler.nodes.calc;
+
+import jdk.graal.compiler.core.common.GraalOptions;
+import jdk.graal.compiler.core.common.NumUtil;
+import jdk.graal.compiler.core.common.type.IntegerStamp;
+import jdk.graal.compiler.core.common.type.PrimitiveStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.FrameState;
+import jdk.graal.compiler.nodes.GraphState;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.extended.GuardingNode;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodes.spi.LIRLowerable;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
 
 import jdk.vm.ci.code.CodeUtil;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/SignedFloatingIntegerDivNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/SignedFloatingIntegerDivNode.java
similarity index 81%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/SignedFloatingIntegerDivNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/SignedFloatingIntegerDivNode.java
index 6ec401148177..ee764d8f657e 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/SignedFloatingIntegerDivNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/SignedFloatingIntegerDivNode.java
@@ -23,26 +23,26 @@
  * questions.
  */
 
-package jdk.compiler.graal.nodes.calc;
+package jdk.graal.compiler.nodes.calc;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_32;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_32;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_1;
 
-import jdk.compiler.graal.core.common.type.ArithmeticOpTable;
-import jdk.compiler.graal.core.common.type.ArithmeticOpTable.BinaryOp;
-import jdk.compiler.graal.core.common.type.ArithmeticOpTable.BinaryOp.Div;
-import jdk.compiler.graal.core.common.type.IntegerStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.lir.gen.ArithmeticLIRGeneratorTool;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.extended.GuardingNode;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.core.common.type.ArithmeticOpTable;
+import jdk.graal.compiler.core.common.type.ArithmeticOpTable.BinaryOp;
+import jdk.graal.compiler.core.common.type.ArithmeticOpTable.BinaryOp.Div;
+import jdk.graal.compiler.core.common.type.IntegerStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.lir.gen.ArithmeticLIRGeneratorTool;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.extended.GuardingNode;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
 
 @NodeInfo(cycles = CYCLES_32, size = SIZE_1, shortName = "/")
 public class SignedFloatingIntegerDivNode extends FloatingIntegerDivRemNode {
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/SignedFloatingIntegerRemNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/SignedFloatingIntegerRemNode.java
similarity index 81%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/SignedFloatingIntegerRemNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/SignedFloatingIntegerRemNode.java
index 80148cdc2e4d..2e8ca9f8cd15 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/SignedFloatingIntegerRemNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/SignedFloatingIntegerRemNode.java
@@ -23,26 +23,26 @@
  * questions.
  */
 
-package jdk.compiler.graal.nodes.calc;
+package jdk.graal.compiler.nodes.calc;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_32;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_32;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_1;
 
-import jdk.compiler.graal.core.common.type.ArithmeticOpTable;
-import jdk.compiler.graal.core.common.type.ArithmeticOpTable.BinaryOp;
-import jdk.compiler.graal.core.common.type.ArithmeticOpTable.BinaryOp.Rem;
-import jdk.compiler.graal.core.common.type.IntegerStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.lir.gen.ArithmeticLIRGeneratorTool;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.extended.GuardingNode;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.core.common.type.ArithmeticOpTable;
+import jdk.graal.compiler.core.common.type.ArithmeticOpTable.BinaryOp;
+import jdk.graal.compiler.core.common.type.ArithmeticOpTable.BinaryOp.Rem;
+import jdk.graal.compiler.core.common.type.IntegerStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.lir.gen.ArithmeticLIRGeneratorTool;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.extended.GuardingNode;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
 
 @NodeInfo(cycles = CYCLES_32, size = SIZE_1, shortName = "%")
 public class SignedFloatingIntegerRemNode extends FloatingIntegerDivRemNode {
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/SignedRemNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/SignedRemNode.java
similarity index 92%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/SignedRemNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/SignedRemNode.java
index 263f8747eff5..1a421fda35ba 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/SignedRemNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/SignedRemNode.java
@@ -22,22 +22,22 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.calc;
-
-import jdk.compiler.graal.core.common.GraalOptions;
-import jdk.compiler.graal.core.common.type.IntegerStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.GraphState;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.extended.GuardingNode;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodes.spi.LIRLowerable;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
+package jdk.graal.compiler.nodes.calc;
+
+import jdk.graal.compiler.core.common.GraalOptions;
+import jdk.graal.compiler.core.common.type.IntegerStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.GraphState;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.extended.GuardingNode;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodes.spi.LIRLowerable;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
 
 import jdk.vm.ci.code.CodeUtil;
 import jdk.vm.ci.meta.Constant;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/SignumNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/SignumNode.java
similarity index 82%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/SignumNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/SignumNode.java
index 0b17f27b2d74..233f249c87ee 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/SignumNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/SignumNode.java
@@ -22,24 +22,24 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.calc;
+package jdk.graal.compiler.nodes.calc;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_2;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_1;
 
-import jdk.compiler.graal.core.common.type.FloatStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.lir.gen.ArithmeticLIRGeneratorTool;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.ArithmeticLIRLowerable;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.core.common.type.FloatStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.lir.gen.ArithmeticLIRGeneratorTool;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.ArithmeticLIRLowerable;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
 
 import jdk.vm.ci.meta.JavaConstant;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/SqrtNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/SqrtNode.java
similarity index 75%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/SqrtNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/SqrtNode.java
index 3ba97c1cd8dd..5a04996ff28e 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/SqrtNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/SqrtNode.java
@@ -22,22 +22,22 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.calc;
+package jdk.graal.compiler.nodes.calc;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_16;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_16;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_1;
 
-import jdk.compiler.graal.core.common.type.ArithmeticOpTable;
-import jdk.compiler.graal.core.common.type.ArithmeticOpTable.UnaryOp;
-import jdk.compiler.graal.core.common.type.ArithmeticOpTable.UnaryOp.Sqrt;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.lir.gen.ArithmeticLIRGeneratorTool;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.ArithmeticLIRLowerable;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.core.common.type.ArithmeticOpTable;
+import jdk.graal.compiler.core.common.type.ArithmeticOpTable.UnaryOp;
+import jdk.graal.compiler.core.common.type.ArithmeticOpTable.UnaryOp.Sqrt;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.lir.gen.ArithmeticLIRGeneratorTool;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.ArithmeticLIRLowerable;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
 
 /**
  * Square root.
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/SubNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/SubNode.java
similarity index 89%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/SubNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/SubNode.java
index de83253bb22a..a6af1b4fde08 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/SubNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/SubNode.java
@@ -22,23 +22,23 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.calc;
+package jdk.graal.compiler.nodes.calc;
 
-import jdk.compiler.graal.core.common.type.ArithmeticOpTable;
-import jdk.compiler.graal.core.common.type.ArithmeticOpTable.BinaryOp;
-import jdk.compiler.graal.core.common.type.ArithmeticOpTable.BinaryOp.Sub;
-import jdk.compiler.graal.core.common.type.IntegerStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.lir.gen.ArithmeticLIRGeneratorTool;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
-import jdk.compiler.graal.nodes.util.GraphUtil;
+import jdk.graal.compiler.core.common.type.ArithmeticOpTable;
+import jdk.graal.compiler.core.common.type.ArithmeticOpTable.BinaryOp;
+import jdk.graal.compiler.core.common.type.ArithmeticOpTable.BinaryOp.Sub;
+import jdk.graal.compiler.core.common.type.IntegerStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.lir.gen.ArithmeticLIRGeneratorTool;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.nodes.util.GraphUtil;
 
 import jdk.vm.ci.meta.Constant;
 import jdk.vm.ci.meta.PrimitiveConstant;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/TernaryNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/TernaryNode.java
similarity index 90%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/TernaryNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/TernaryNode.java
index ff2a60e40332..783dd7fb585c 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/TernaryNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/TernaryNode.java
@@ -22,15 +22,15 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.calc;
+package jdk.graal.compiler.nodes.calc;
 
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.Canonicalizable;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.Canonicalizable;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
 
 /**
  * The {@code TernaryNode} class is the base of arithmetic and logic operations with three inputs.
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/UnaryArithmeticNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/UnaryArithmeticNode.java
similarity index 85%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/UnaryArithmeticNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/UnaryArithmeticNode.java
index 78614f96d9ae..9e750a19fc1f 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/UnaryArithmeticNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/UnaryArithmeticNode.java
@@ -22,25 +22,25 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.calc;
+package jdk.graal.compiler.nodes.calc;
 
 import java.util.Set;
 
-import jdk.compiler.graal.core.common.type.ArithmeticOpTable;
-import jdk.compiler.graal.core.common.type.ArithmeticOpTable.UnaryOp;
-import jdk.compiler.graal.core.common.type.FloatStamp;
-import jdk.compiler.graal.core.common.type.IntegerStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.ArithmeticOperation;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.ArithmeticLIRLowerable;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.core.common.type.ArithmeticOpTable;
+import jdk.graal.compiler.core.common.type.ArithmeticOpTable.UnaryOp;
+import jdk.graal.compiler.core.common.type.FloatStamp;
+import jdk.graal.compiler.core.common.type.IntegerStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.ArithmeticOperation;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.ArithmeticLIRLowerable;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
 
 @NodeInfo
 public abstract class UnaryArithmeticNode extends UnaryNode implements ArithmeticOperation, ArithmeticLIRLowerable {
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/UnaryNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/UnaryNode.java
similarity index 87%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/UnaryNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/UnaryNode.java
index d4d65039a6e9..ad8e73268697 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/UnaryNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/UnaryNode.java
@@ -22,16 +22,16 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.calc;
+package jdk.graal.compiler.nodes.calc;
 
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_1;
 
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.Canonicalizable;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.Canonicalizable;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
 
 /**
  * The {@code UnaryNode} class is the base of arithmetic and bit logic operations with exactly one
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/UnpackEndianHalfNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/UnpackEndianHalfNode.java
similarity index 86%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/UnpackEndianHalfNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/UnpackEndianHalfNode.java
index 13cfa61d05ea..7850270c922c 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/UnpackEndianHalfNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/UnpackEndianHalfNode.java
@@ -22,20 +22,20 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.calc;
+package jdk.graal.compiler.nodes.calc;
 
 import java.nio.ByteOrder;
 
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodes.spi.Lowerable;
-import jdk.compiler.graal.nodeinfo.NodeCycles;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodes.spi.Lowerable;
+import jdk.graal.compiler.nodeinfo.NodeCycles;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
 
 import jdk.vm.ci.meta.JavaKind;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/UnsignedDivNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/UnsignedDivNode.java
similarity index 86%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/UnsignedDivNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/UnsignedDivNode.java
index fc3a31ba29ae..c73bb7a3ff0a 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/UnsignedDivNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/UnsignedDivNode.java
@@ -22,19 +22,19 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.calc;
+package jdk.graal.compiler.nodes.calc;
 
-import jdk.compiler.graal.core.common.type.IntegerStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.extended.GuardingNode;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodes.spi.LIRLowerable;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
+import jdk.graal.compiler.core.common.type.IntegerStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.extended.GuardingNode;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodes.spi.LIRLowerable;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
 
 import jdk.vm.ci.code.CodeUtil;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/UnsignedMaxNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/UnsignedMaxNode.java
similarity index 81%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/UnsignedMaxNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/UnsignedMaxNode.java
index d96c84a6f753..c3adc699be88 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/UnsignedMaxNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/UnsignedMaxNode.java
@@ -23,20 +23,20 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.calc;
+package jdk.graal.compiler.nodes.calc;
 
-import jdk.compiler.graal.core.common.NumUtil.Signedness;
-import jdk.compiler.graal.core.common.type.ArithmeticOpTable;
-import jdk.compiler.graal.core.common.type.ArithmeticOpTable.BinaryOp;
-import jdk.compiler.graal.core.common.type.ArithmeticOpTable.BinaryOp.UMax;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.LogicNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.LoweringProvider;
+import jdk.graal.compiler.core.common.NumUtil.Signedness;
+import jdk.graal.compiler.core.common.type.ArithmeticOpTable;
+import jdk.graal.compiler.core.common.type.ArithmeticOpTable.BinaryOp;
+import jdk.graal.compiler.core.common.type.ArithmeticOpTable.BinaryOp.UMax;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.LogicNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.LoweringProvider;
 
 @NodeInfo(shortName = "UnsignedMax")
 public class UnsignedMaxNode extends MinMaxNode {
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/UnsignedMinNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/UnsignedMinNode.java
similarity index 81%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/UnsignedMinNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/UnsignedMinNode.java
index bb0acd18d4a7..1cb1ca43c30e 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/UnsignedMinNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/UnsignedMinNode.java
@@ -23,20 +23,20 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.calc;
+package jdk.graal.compiler.nodes.calc;
 
-import jdk.compiler.graal.core.common.NumUtil.Signedness;
-import jdk.compiler.graal.core.common.type.ArithmeticOpTable;
-import jdk.compiler.graal.core.common.type.ArithmeticOpTable.BinaryOp;
-import jdk.compiler.graal.core.common.type.ArithmeticOpTable.BinaryOp.UMin;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.LogicNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.LoweringProvider;
+import jdk.graal.compiler.core.common.NumUtil.Signedness;
+import jdk.graal.compiler.core.common.type.ArithmeticOpTable;
+import jdk.graal.compiler.core.common.type.ArithmeticOpTable.BinaryOp;
+import jdk.graal.compiler.core.common.type.ArithmeticOpTable.BinaryOp.UMin;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.LogicNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.LoweringProvider;
 
 @NodeInfo(shortName = "UnsignedMin")
 public class UnsignedMinNode extends MinMaxNode {
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/UnsignedRemNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/UnsignedRemNode.java
similarity index 86%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/UnsignedRemNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/UnsignedRemNode.java
index 8539e75f7c5d..eb8aff574c09 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/UnsignedRemNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/UnsignedRemNode.java
@@ -22,19 +22,19 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.calc;
+package jdk.graal.compiler.nodes.calc;
 
-import jdk.compiler.graal.core.common.type.IntegerStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.extended.GuardingNode;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodes.spi.LIRLowerable;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
+import jdk.graal.compiler.core.common.type.IntegerStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.extended.GuardingNode;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodes.spi.LIRLowerable;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
 
 import jdk.vm.ci.code.CodeUtil;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/UnsignedRightShiftNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/UnsignedRightShiftNode.java
similarity index 90%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/UnsignedRightShiftNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/UnsignedRightShiftNode.java
index 3ab469a9c867..9471f54faaf3 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/UnsignedRightShiftNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/UnsignedRightShiftNode.java
@@ -22,21 +22,21 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.calc;
-
-import jdk.compiler.graal.core.common.type.ArithmeticOpTable;
-import jdk.compiler.graal.core.common.type.ArithmeticOpTable.ShiftOp;
-import jdk.compiler.graal.core.common.type.ArithmeticOpTable.ShiftOp.UShr;
-import jdk.compiler.graal.core.common.type.IntegerStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.lir.gen.ArithmeticLIRGeneratorTool;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
+package jdk.graal.compiler.nodes.calc;
+
+import jdk.graal.compiler.core.common.type.ArithmeticOpTable;
+import jdk.graal.compiler.core.common.type.ArithmeticOpTable.ShiftOp;
+import jdk.graal.compiler.core.common.type.ArithmeticOpTable.ShiftOp.UShr;
+import jdk.graal.compiler.core.common.type.IntegerStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.lir.gen.ArithmeticLIRGeneratorTool;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
 
 import jdk.vm.ci.code.CodeUtil;
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/XorNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/XorNode.java
similarity index 85%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/XorNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/XorNode.java
index 8535d63a1447..f95987d7e094 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/XorNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/XorNode.java
@@ -22,23 +22,23 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.calc;
-
-import jdk.compiler.graal.core.common.type.ArithmeticOpTable;
-import jdk.compiler.graal.core.common.type.ArithmeticOpTable.BinaryOp;
-import jdk.compiler.graal.core.common.type.ArithmeticOpTable.BinaryOp.Xor;
-import jdk.compiler.graal.core.common.type.PrimitiveStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.lir.gen.ArithmeticLIRGeneratorTool;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.Canonicalizable;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
-import jdk.compiler.graal.nodes.util.GraphUtil;
+package jdk.graal.compiler.nodes.calc;
+
+import jdk.graal.compiler.core.common.type.ArithmeticOpTable;
+import jdk.graal.compiler.core.common.type.ArithmeticOpTable.BinaryOp;
+import jdk.graal.compiler.core.common.type.ArithmeticOpTable.BinaryOp.Xor;
+import jdk.graal.compiler.core.common.type.PrimitiveStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.lir.gen.ArithmeticLIRGeneratorTool;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.Canonicalizable;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.nodes.util.GraphUtil;
 
 import jdk.vm.ci.code.CodeUtil;
 import jdk.vm.ci.meta.Constant;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/ZeroExtendNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/ZeroExtendNode.java
similarity index 88%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/ZeroExtendNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/ZeroExtendNode.java
index ee044a2eacbc..5060a6974564 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/ZeroExtendNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/calc/ZeroExtendNode.java
@@ -22,25 +22,25 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.calc;
-
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_1;
-
-import jdk.compiler.graal.core.common.calc.CanonicalCondition;
-import jdk.compiler.graal.core.common.type.ArithmeticOpTable;
-import jdk.compiler.graal.core.common.type.ArithmeticOpTable.IntegerConvertOp;
-import jdk.compiler.graal.core.common.type.ArithmeticOpTable.IntegerConvertOp.Narrow;
-import jdk.compiler.graal.core.common.type.ArithmeticOpTable.IntegerConvertOp.ZeroExtend;
-import jdk.compiler.graal.core.common.type.IntegerStamp;
-import jdk.compiler.graal.core.common.type.PrimitiveStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.lir.gen.ArithmeticLIRGeneratorTool;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
+package jdk.graal.compiler.nodes.calc;
+
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_1;
+
+import jdk.graal.compiler.core.common.calc.CanonicalCondition;
+import jdk.graal.compiler.core.common.type.ArithmeticOpTable;
+import jdk.graal.compiler.core.common.type.ArithmeticOpTable.IntegerConvertOp;
+import jdk.graal.compiler.core.common.type.ArithmeticOpTable.IntegerConvertOp.Narrow;
+import jdk.graal.compiler.core.common.type.ArithmeticOpTable.IntegerConvertOp.ZeroExtend;
+import jdk.graal.compiler.core.common.type.IntegerStamp;
+import jdk.graal.compiler.core.common.type.PrimitiveStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.lir.gen.ArithmeticLIRGeneratorTool;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
 
 import jdk.vm.ci.code.CodeUtil;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/cfg/ControlFlowGraph.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/cfg/ControlFlowGraph.java
similarity index 97%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/cfg/ControlFlowGraph.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/cfg/ControlFlowGraph.java
index 4a016d128898..c96627aa0f53 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/cfg/ControlFlowGraph.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/cfg/ControlFlowGraph.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.cfg;
+package jdk.graal.compiler.nodes.cfg;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -30,39 +30,39 @@
 import java.util.function.Function;
 
 import org.graalvm.collections.EconomicMap;
-import jdk.compiler.graal.core.common.RetryableBailoutException;
-import jdk.compiler.graal.core.common.cfg.AbstractControlFlowGraph;
-import jdk.compiler.graal.core.common.cfg.BasicBlock;
-import jdk.compiler.graal.core.common.cfg.BasicBlockSet;
-import jdk.compiler.graal.core.common.cfg.CFGVerifier;
-import jdk.compiler.graal.core.common.cfg.Loop;
-import jdk.compiler.graal.core.common.util.CompilationAlarm;
-import jdk.compiler.graal.debug.Assertions;
-import jdk.compiler.graal.debug.DebugCloseable;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.debug.MemUseTrackerKey;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeMap;
-import jdk.compiler.graal.graph.iterators.NodeIterable;
-import jdk.compiler.graal.nodes.AbstractBeginNode;
-import jdk.compiler.graal.nodes.AbstractMergeNode;
-import jdk.compiler.graal.nodes.ControlSinkNode;
-import jdk.compiler.graal.nodes.ControlSplitNode;
-import jdk.compiler.graal.nodes.DeoptimizeNode;
-import jdk.compiler.graal.nodes.FixedNode;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.LoopBeginNode;
-import jdk.compiler.graal.nodes.LoopEndNode;
-import jdk.compiler.graal.nodes.LoopExitNode;
-import jdk.compiler.graal.nodes.ProfileData.LoopFrequencyData;
-import jdk.compiler.graal.nodes.ProfileData.ProfileSource;
-import jdk.compiler.graal.nodes.ReturnNode;
-import jdk.compiler.graal.nodes.StartNode;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.options.Option;
-import jdk.compiler.graal.options.OptionKey;
-import jdk.compiler.graal.options.OptionType;
+import jdk.graal.compiler.core.common.RetryableBailoutException;
+import jdk.graal.compiler.core.common.cfg.AbstractControlFlowGraph;
+import jdk.graal.compiler.core.common.cfg.BasicBlock;
+import jdk.graal.compiler.core.common.cfg.BasicBlockSet;
+import jdk.graal.compiler.core.common.cfg.CFGVerifier;
+import jdk.graal.compiler.core.common.cfg.Loop;
+import jdk.graal.compiler.core.common.util.CompilationAlarm;
+import jdk.graal.compiler.debug.Assertions;
+import jdk.graal.compiler.debug.DebugCloseable;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.debug.MemUseTrackerKey;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeMap;
+import jdk.graal.compiler.graph.iterators.NodeIterable;
+import jdk.graal.compiler.nodes.AbstractBeginNode;
+import jdk.graal.compiler.nodes.AbstractMergeNode;
+import jdk.graal.compiler.nodes.ControlSinkNode;
+import jdk.graal.compiler.nodes.ControlSplitNode;
+import jdk.graal.compiler.nodes.DeoptimizeNode;
+import jdk.graal.compiler.nodes.FixedNode;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.LoopBeginNode;
+import jdk.graal.compiler.nodes.LoopEndNode;
+import jdk.graal.compiler.nodes.LoopExitNode;
+import jdk.graal.compiler.nodes.ProfileData.LoopFrequencyData;
+import jdk.graal.compiler.nodes.ProfileData.ProfileSource;
+import jdk.graal.compiler.nodes.ReturnNode;
+import jdk.graal.compiler.nodes.StartNode;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.options.Option;
+import jdk.graal.compiler.options.OptionKey;
+import jdk.graal.compiler.options.OptionType;
 
 public final class ControlFlowGraph implements AbstractControlFlowGraph {
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/cfg/HIRBlock.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/cfg/HIRBlock.java
similarity index 96%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/cfg/HIRBlock.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/cfg/HIRBlock.java
index f5dc3c11e11a..a90b8500ef45 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/cfg/HIRBlock.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/cfg/HIRBlock.java
@@ -22,40 +22,40 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.cfg;
+package jdk.graal.compiler.nodes.cfg;
 
-import static jdk.compiler.graal.core.common.cfg.AbstractControlFlowGraph.INVALID_BLOCK_ID;
+import static jdk.graal.compiler.core.common.cfg.AbstractControlFlowGraph.INVALID_BLOCK_ID;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Iterator;
 
-import jdk.compiler.graal.core.common.cfg.BasicBlock;
-import jdk.compiler.graal.core.common.cfg.Loop;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeMap;
-import jdk.compiler.graal.nodeinfo.Verbosity;
-import jdk.compiler.graal.nodes.extended.SwitchNode;
-import jdk.compiler.graal.nodes.AbstractBeginNode;
-import jdk.compiler.graal.nodes.AbstractEndNode;
-import jdk.compiler.graal.nodes.AbstractMergeNode;
-import jdk.compiler.graal.nodes.ControlSinkNode;
-import jdk.compiler.graal.nodes.ControlSplitNode;
-import jdk.compiler.graal.nodes.EndNode;
-import jdk.compiler.graal.nodes.FixedNode;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.IfNode;
-import jdk.compiler.graal.nodes.LoopBeginNode;
-import jdk.compiler.graal.nodes.LoopEndNode;
-import jdk.compiler.graal.nodes.ProfileData.BranchProbabilityData;
-import jdk.compiler.graal.nodes.ProfileData.ProfileSource;
-import jdk.compiler.graal.nodes.StartNode;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.WithExceptionNode;
-import jdk.compiler.graal.nodes.memory.MemoryKill;
-import jdk.compiler.graal.nodes.memory.MultiMemoryKill;
-import jdk.compiler.graal.nodes.memory.SingleMemoryKill;
+import jdk.graal.compiler.core.common.cfg.BasicBlock;
+import jdk.graal.compiler.core.common.cfg.Loop;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeMap;
+import jdk.graal.compiler.nodeinfo.Verbosity;
+import jdk.graal.compiler.nodes.extended.SwitchNode;
+import jdk.graal.compiler.nodes.AbstractBeginNode;
+import jdk.graal.compiler.nodes.AbstractEndNode;
+import jdk.graal.compiler.nodes.AbstractMergeNode;
+import jdk.graal.compiler.nodes.ControlSinkNode;
+import jdk.graal.compiler.nodes.ControlSplitNode;
+import jdk.graal.compiler.nodes.EndNode;
+import jdk.graal.compiler.nodes.FixedNode;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.IfNode;
+import jdk.graal.compiler.nodes.LoopBeginNode;
+import jdk.graal.compiler.nodes.LoopEndNode;
+import jdk.graal.compiler.nodes.ProfileData.BranchProbabilityData;
+import jdk.graal.compiler.nodes.ProfileData.ProfileSource;
+import jdk.graal.compiler.nodes.StartNode;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.WithExceptionNode;
+import jdk.graal.compiler.nodes.memory.MemoryKill;
+import jdk.graal.compiler.nodes.memory.MultiMemoryKill;
+import jdk.graal.compiler.nodes.memory.SingleMemoryKill;
 import org.graalvm.word.LocationIdentity;
 
 /**
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/cfg/HIRLoop.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/cfg/HIRLoop.java
similarity index 95%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/cfg/HIRLoop.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/cfg/HIRLoop.java
index 3fc997601c7e..c36c94189b2d 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/cfg/HIRLoop.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/cfg/HIRLoop.java
@@ -22,10 +22,10 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.cfg;
+package jdk.graal.compiler.nodes.cfg;
 
-import jdk.compiler.graal.core.common.cfg.Loop;
-import jdk.compiler.graal.nodes.LoopBeginNode;
+import jdk.graal.compiler.core.common.cfg.Loop;
+import jdk.graal.compiler.nodes.LoopBeginNode;
 import org.graalvm.word.LocationIdentity;
 
 public final class HIRLoop extends Loop {
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/cfg/LocationSet.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/cfg/LocationSet.java
similarity index 99%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/cfg/LocationSet.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/cfg/LocationSet.java
index 8b51bce779d6..e3033526f334 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/cfg/LocationSet.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/cfg/LocationSet.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.cfg;
+package jdk.graal.compiler.nodes.cfg;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/cfg/ReversePostOrder.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/cfg/ReversePostOrder.java
similarity index 94%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/cfg/ReversePostOrder.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/cfg/ReversePostOrder.java
index 8c272dc96f9e..ee842bd73cbe 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/cfg/ReversePostOrder.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/cfg/ReversePostOrder.java
@@ -22,24 +22,24 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.cfg;
+package jdk.graal.compiler.nodes.cfg;
 
 import java.util.List;
 
-import jdk.compiler.graal.core.common.util.CompilationAlarm;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.LinkedStack;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeBitMap;
-import jdk.compiler.graal.nodes.AbstractEndNode;
-import jdk.compiler.graal.nodes.ControlSinkNode;
-import jdk.compiler.graal.nodes.ControlSplitNode;
-import jdk.compiler.graal.nodes.EndNode;
-import jdk.compiler.graal.nodes.FixedNode;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.LoopBeginNode;
-import jdk.compiler.graal.nodes.LoopEndNode;
-import jdk.compiler.graal.nodes.LoopExitNode;
+import jdk.graal.compiler.core.common.util.CompilationAlarm;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.LinkedStack;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeBitMap;
+import jdk.graal.compiler.nodes.AbstractEndNode;
+import jdk.graal.compiler.nodes.ControlSinkNode;
+import jdk.graal.compiler.nodes.ControlSplitNode;
+import jdk.graal.compiler.nodes.EndNode;
+import jdk.graal.compiler.nodes.FixedNode;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.LoopBeginNode;
+import jdk.graal.compiler.nodes.LoopEndNode;
+import jdk.graal.compiler.nodes.LoopExitNode;
 
 /**
  * Utility class computing a reverse post order of the {@link ControlFlowGraph}.
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/debug/BindToRegisterNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/debug/BindToRegisterNode.java
similarity index 77%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/debug/BindToRegisterNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/debug/BindToRegisterNode.java
index e19b29fb8b46..cb0aa8737f46 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/debug/BindToRegisterNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/debug/BindToRegisterNode.java
@@ -22,19 +22,19 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.debug;
+package jdk.graal.compiler.nodes.debug;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_0;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_0;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_0;
 
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.lir.StandardOp;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.LIRLowerable;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.lir.StandardOp;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.LIRLowerable;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
 
 @NodeInfo(cycles = CYCLES_0, size = SIZE_0)
 public final class BindToRegisterNode extends FixedWithNextNode implements LIRLowerable {
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/debug/BlackholeNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/debug/BlackholeNode.java
similarity index 80%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/debug/BlackholeNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/debug/BlackholeNode.java
index ea7469d2fe7f..d8f5e89efee7 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/debug/BlackholeNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/debug/BlackholeNode.java
@@ -22,20 +22,20 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.debug;
+package jdk.graal.compiler.nodes.debug;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_IGNORED;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_IGNORED;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_IGNORED;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_IGNORED;
 
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.graph.spi.NodeWithIdentity;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.java.ReachabilityFenceNode;
-import jdk.compiler.graal.nodes.spi.LIRLowerable;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.graph.spi.NodeWithIdentity;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.java.ReachabilityFenceNode;
+import jdk.graal.compiler.nodes.spi.LIRLowerable;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
 
 /**
  * Ensures that the provided values remains alive in the high-level IR and LIR until after register
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/debug/ControlFlowAnchorNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/debug/ControlFlowAnchorNode.java
similarity index 78%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/debug/ControlFlowAnchorNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/debug/ControlFlowAnchorNode.java
index 9eddbaf25a5c..39a33f3d0512 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/debug/ControlFlowAnchorNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/debug/ControlFlowAnchorNode.java
@@ -22,19 +22,19 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.debug;
+package jdk.graal.compiler.nodes.debug;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_0;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_0;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_0;
 
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.Invoke;
-import jdk.compiler.graal.nodes.spi.LIRLowerable;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.Invoke;
+import jdk.graal.compiler.nodes.spi.LIRLowerable;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
 
 @NodeInfo(cycles = CYCLES_0, size = SIZE_0)
 public final class ControlFlowAnchorNode extends FixedWithNextNode implements LIRLowerable, ControlFlowAnchored {
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/debug/ControlFlowAnchored.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/debug/ControlFlowAnchored.java
similarity index 93%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/debug/ControlFlowAnchored.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/debug/ControlFlowAnchored.java
index c4a37548c9f7..c7c89602a378 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/debug/ControlFlowAnchored.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/debug/ControlFlowAnchored.java
@@ -22,9 +22,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.debug;
+package jdk.graal.compiler.nodes.debug;
 
-import jdk.compiler.graal.graph.spi.NodeWithIdentity;
+import jdk.graal.compiler.graph.spi.NodeWithIdentity;
 
 /**
  * Marker interface for nodes that prevents control flow optimizations. The node should never be
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/debug/DynamicCounterNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/debug/DynamicCounterNode.java
similarity index 88%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/debug/DynamicCounterNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/debug/DynamicCounterNode.java
index bd6bce9b404a..b7fdb07c2f98 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/debug/DynamicCounterNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/debug/DynamicCounterNode.java
@@ -22,24 +22,24 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.debug;
-
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_IGNORED;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_IGNORED;
-
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.lir.LIRInstruction;
-import jdk.compiler.graal.lir.gen.LIRGeneratorTool;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.FixedNode;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.LIRLowerable;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
+package jdk.graal.compiler.nodes.debug;
+
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_IGNORED;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_IGNORED;
+
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.lir.LIRInstruction;
+import jdk.graal.compiler.lir.gen.LIRGeneratorTool;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.FixedNode;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.LIRLowerable;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
 
 /**
  * This node can be used to add a counter to the code that will estimate the dynamic number of calls
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/debug/NeverStripMineNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/debug/NeverStripMineNode.java
similarity index 80%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/debug/NeverStripMineNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/debug/NeverStripMineNode.java
index 4d14a2203b7b..cc0098c8c0e3 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/debug/NeverStripMineNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/debug/NeverStripMineNode.java
@@ -22,17 +22,17 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.debug;
+package jdk.graal.compiler.nodes.debug;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_IGNORED;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_IGNORED;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_IGNORED;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_IGNORED;
 
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.spi.LIRLowerable;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.spi.LIRLowerable;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
 
 /**
  * Compiler directives node that disabled strip mining of enclosing loops.
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/debug/NeverWriteSinkNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/debug/NeverWriteSinkNode.java
similarity index 80%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/debug/NeverWriteSinkNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/debug/NeverWriteSinkNode.java
index 0901db1188bb..53aab793a2ec 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/debug/NeverWriteSinkNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/debug/NeverWriteSinkNode.java
@@ -22,17 +22,17 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.debug;
+package jdk.graal.compiler.nodes.debug;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_IGNORED;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_IGNORED;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_IGNORED;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_IGNORED;
 
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.spi.LIRLowerable;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.spi.LIRLowerable;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
 
 /**
  * Compiler directives node that disables write sinking of all enclosing loops.
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/debug/SideEffectNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/debug/SideEffectNode.java
similarity index 78%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/debug/SideEffectNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/debug/SideEffectNode.java
index 569ccb37ad57..5becc87198b5 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/debug/SideEffectNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/debug/SideEffectNode.java
@@ -22,21 +22,21 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.debug;
+package jdk.graal.compiler.nodes.debug;
 
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.InputType;
-import jdk.compiler.graal.nodeinfo.NodeCycles;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodeinfo.NodeSize;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.memory.AbstractMemoryCheckpoint;
-import jdk.compiler.graal.nodes.memory.SingleMemoryKill;
-import jdk.compiler.graal.nodes.spi.LIRLowerable;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.InputType;
+import jdk.graal.compiler.nodeinfo.NodeCycles;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodeinfo.NodeSize;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.memory.AbstractMemoryCheckpoint;
+import jdk.graal.compiler.nodes.memory.SingleMemoryKill;
+import jdk.graal.compiler.nodes.spi.LIRLowerable;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
 import org.graalvm.word.LocationIdentity;
 
 /**
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/debug/SpillRegistersNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/debug/SpillRegistersNode.java
similarity index 78%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/debug/SpillRegistersNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/debug/SpillRegistersNode.java
index 56d1bb1331f2..1b5b1887897e 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/debug/SpillRegistersNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/debug/SpillRegistersNode.java
@@ -22,18 +22,18 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.debug;
+package jdk.graal.compiler.nodes.debug;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_0;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_2;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_0;
 
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.lir.StandardOp;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.spi.LIRLowerable;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.lir.StandardOp;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.spi.LIRLowerable;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
 
 @NodeInfo(cycles = CYCLES_2, size = SIZE_0)
 public final class SpillRegistersNode extends FixedWithNextNode implements LIRLowerable {
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/debug/StringToBytesNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/debug/StringToBytesNode.java
similarity index 78%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/debug/StringToBytesNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/debug/StringToBytesNode.java
index 42c829d7ad0b..af24540f89ce 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/debug/StringToBytesNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/debug/StringToBytesNode.java
@@ -22,19 +22,19 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.debug;
+package jdk.graal.compiler.nodes.debug;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_IGNORED;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_IGNORED;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_IGNORED;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_IGNORED;
 
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.InputType;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.NamedLocationIdentity;
-import jdk.compiler.graal.nodes.memory.SingleMemoryKill;
-import jdk.compiler.graal.nodes.spi.Lowerable;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.InputType;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.NamedLocationIdentity;
+import jdk.graal.compiler.nodes.memory.SingleMemoryKill;
+import jdk.graal.compiler.nodes.spi.Lowerable;
 import org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/debug/VerifyHeapNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/debug/VerifyHeapNode.java
similarity index 80%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/debug/VerifyHeapNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/debug/VerifyHeapNode.java
index 5499f8cde57f..3535b5ad73ed 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/debug/VerifyHeapNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/debug/VerifyHeapNode.java
@@ -22,18 +22,18 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.debug;
+package jdk.graal.compiler.nodes.debug;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_IGNORED;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_IGNORED;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_IGNORED;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_IGNORED;
 
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.FixedNode;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.spi.Lowerable;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.FixedNode;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.spi.Lowerable;
 
 /**
  * A node for platform dependent verification of the Java heap. Intended to be used for debugging
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/AbstractBoxingNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/AbstractBoxingNode.java
similarity index 80%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/AbstractBoxingNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/AbstractBoxingNode.java
index c40ce211c10c..efbb71f990cc 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/AbstractBoxingNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/AbstractBoxingNode.java
@@ -22,23 +22,23 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.extended;
+package jdk.graal.compiler.nodes.extended;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_2;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_2;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_2;
 
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.InputType;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.memory.MemoryAccess;
-import jdk.compiler.graal.nodes.memory.MemoryKill;
-import jdk.compiler.graal.nodes.spi.Canonicalizable;
-import jdk.compiler.graal.nodes.spi.Lowerable;
-import jdk.compiler.graal.nodes.spi.Virtualizable;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.InputType;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.memory.MemoryAccess;
+import jdk.graal.compiler.nodes.memory.MemoryKill;
+import jdk.graal.compiler.nodes.spi.Canonicalizable;
+import jdk.graal.compiler.nodes.spi.Lowerable;
+import jdk.graal.compiler.nodes.spi.Virtualizable;
 import org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/AnchoringNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/AnchoringNode.java
similarity index 93%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/AnchoringNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/AnchoringNode.java
index f2ffdf6e909a..a24352139703 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/AnchoringNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/AnchoringNode.java
@@ -22,9 +22,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.extended;
+package jdk.graal.compiler.nodes.extended;
 
-import jdk.compiler.graal.nodes.ValueNodeInterface;
+import jdk.graal.compiler.nodes.ValueNodeInterface;
 
 public interface AnchoringNode extends ValueNodeInterface {
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/ArrayRangeWrite.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/ArrayRangeWrite.java
similarity index 88%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/ArrayRangeWrite.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/ArrayRangeWrite.java
index e06424254676..2be59cf28997 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/ArrayRangeWrite.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/ArrayRangeWrite.java
@@ -22,13 +22,13 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.extended;
+package jdk.graal.compiler.nodes.extended;
 
-import jdk.compiler.graal.nodes.FixedNode;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.FixedWithNextNodeInterface;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.memory.address.AddressNode;
+import jdk.graal.compiler.nodes.FixedNode;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.FixedWithNextNodeInterface;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.memory.address.AddressNode;
 
 public interface ArrayRangeWrite extends FixedWithNextNodeInterface {
     AddressNode getAddress();
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/BoxNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/BoxNode.java
similarity index 83%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/BoxNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/BoxNode.java
index 183ad86a056c..b784d82540b3 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/BoxNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/BoxNode.java
@@ -22,40 +22,40 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.extended;
+package jdk.graal.compiler.nodes.extended;
 
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_16;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_8;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_16;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_8;
 
 import java.util.Collections;
 
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.core.common.type.TypeReference;
-import jdk.compiler.graal.graph.IterableNodeType;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.Node.IndirectCanonicalization;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.InputType;
-import jdk.compiler.graal.nodeinfo.NodeCycles;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodeinfo.NodeSize;
-import jdk.compiler.graal.nodes.java.MonitorIdNode;
-import jdk.compiler.graal.nodes.virtual.VirtualBoxingNode;
-import jdk.compiler.graal.nodes.virtual.VirtualObjectNode;
-import jdk.compiler.graal.nodes.FieldLocationIdentity;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.calc.FloatingNode;
-import jdk.compiler.graal.nodes.memory.SingleMemoryKill;
-import jdk.compiler.graal.nodes.spi.Canonicalizable;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodes.spi.Lowerable;
-import jdk.compiler.graal.nodes.spi.LoweringTool;
-import jdk.compiler.graal.nodes.spi.Virtualizable;
-import jdk.compiler.graal.nodes.spi.VirtualizableAllocation;
-import jdk.compiler.graal.nodes.spi.VirtualizerTool;
-import jdk.compiler.graal.nodes.type.StampTool;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.core.common.type.TypeReference;
+import jdk.graal.compiler.graph.IterableNodeType;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.Node.IndirectCanonicalization;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.InputType;
+import jdk.graal.compiler.nodeinfo.NodeCycles;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodeinfo.NodeSize;
+import jdk.graal.compiler.nodes.java.MonitorIdNode;
+import jdk.graal.compiler.nodes.virtual.VirtualBoxingNode;
+import jdk.graal.compiler.nodes.virtual.VirtualObjectNode;
+import jdk.graal.compiler.nodes.FieldLocationIdentity;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.calc.FloatingNode;
+import jdk.graal.compiler.nodes.memory.SingleMemoryKill;
+import jdk.graal.compiler.nodes.spi.Canonicalizable;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodes.spi.Lowerable;
+import jdk.graal.compiler.nodes.spi.LoweringTool;
+import jdk.graal.compiler.nodes.spi.Virtualizable;
+import jdk.graal.compiler.nodes.spi.VirtualizableAllocation;
+import jdk.graal.compiler.nodes.spi.VirtualizerTool;
+import jdk.graal.compiler.nodes.type.StampTool;
 import org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/BranchProbabilityNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/BranchProbabilityNode.java
similarity index 89%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/BranchProbabilityNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/BranchProbabilityNode.java
index 983fefdc686e..df8c6665c6c0 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/BranchProbabilityNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/BranchProbabilityNode.java
@@ -22,42 +22,42 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.extended;
+package jdk.graal.compiler.nodes.extended;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_0;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_0;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_0;
 
-import jdk.compiler.graal.core.common.calc.CanonicalCondition;
-import jdk.compiler.graal.core.common.type.IntegerStamp;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.graph.iterators.NodePredicates;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.FixedGuardNode;
-import jdk.compiler.graal.nodes.FrameState;
-import jdk.compiler.graal.nodes.IfNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ProfileData.BranchProbabilityData;
-import jdk.compiler.graal.nodes.ProfileData.ProfileSource;
-import jdk.compiler.graal.nodes.ReturnNode;
-import jdk.compiler.graal.nodes.ShortCircuitOrNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.ValuePhiNode;
-import jdk.compiler.graal.nodes.calc.ConditionalNode;
-import jdk.compiler.graal.nodes.calc.FloatingNode;
-import jdk.compiler.graal.nodes.calc.IntegerEqualsNode;
-import jdk.compiler.graal.nodes.calc.NarrowNode;
-import jdk.compiler.graal.nodes.calc.ZeroExtendNode;
-import jdk.compiler.graal.nodes.spi.Canonicalizable;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodes.spi.Lowerable;
-import jdk.compiler.graal.nodes.spi.LoweringTool;
-import jdk.compiler.graal.nodes.spi.Simplifiable;
-import jdk.compiler.graal.nodes.spi.SimplifierTool;
-import jdk.compiler.graal.nodes.util.GraphUtil;
+import jdk.graal.compiler.core.common.calc.CanonicalCondition;
+import jdk.graal.compiler.core.common.type.IntegerStamp;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.graph.iterators.NodePredicates;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.FixedGuardNode;
+import jdk.graal.compiler.nodes.FrameState;
+import jdk.graal.compiler.nodes.IfNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ProfileData.BranchProbabilityData;
+import jdk.graal.compiler.nodes.ProfileData.ProfileSource;
+import jdk.graal.compiler.nodes.ReturnNode;
+import jdk.graal.compiler.nodes.ShortCircuitOrNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.ValuePhiNode;
+import jdk.graal.compiler.nodes.calc.ConditionalNode;
+import jdk.graal.compiler.nodes.calc.FloatingNode;
+import jdk.graal.compiler.nodes.calc.IntegerEqualsNode;
+import jdk.graal.compiler.nodes.calc.NarrowNode;
+import jdk.graal.compiler.nodes.calc.ZeroExtendNode;
+import jdk.graal.compiler.nodes.spi.Canonicalizable;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodes.spi.Lowerable;
+import jdk.graal.compiler.nodes.spi.LoweringTool;
+import jdk.graal.compiler.nodes.spi.Simplifiable;
+import jdk.graal.compiler.nodes.spi.SimplifierTool;
+import jdk.graal.compiler.nodes.util.GraphUtil;
 
 import jdk.vm.ci.meta.JavaKind;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/BytecodeExceptionNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/BytecodeExceptionNode.java
similarity index 88%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/BytecodeExceptionNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/BytecodeExceptionNode.java
index 94246d862f34..dec74e158d95 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/BytecodeExceptionNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/BytecodeExceptionNode.java
@@ -22,29 +22,29 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.extended;
-
-import static jdk.compiler.graal.nodeinfo.InputType.Memory;
-import static jdk.compiler.graal.nodeinfo.InputType.Value;
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_8;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_8;
-
-import jdk.compiler.graal.core.common.spi.ForeignCallDescriptor;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.core.common.type.TypeReference;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.graph.NodeInputList;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodeinfo.Verbosity;
-import jdk.compiler.graal.nodes.FrameState;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.memory.AbstractMemoryCheckpoint;
-import jdk.compiler.graal.nodes.memory.SingleMemoryKill;
-import jdk.compiler.graal.nodes.spi.Canonicalizable;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodes.spi.Lowerable;
+package jdk.graal.compiler.nodes.extended;
+
+import static jdk.graal.compiler.nodeinfo.InputType.Memory;
+import static jdk.graal.compiler.nodeinfo.InputType.Value;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_8;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_8;
+
+import jdk.graal.compiler.core.common.spi.ForeignCallDescriptor;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.core.common.type.TypeReference;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.graph.NodeInputList;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodeinfo.Verbosity;
+import jdk.graal.compiler.nodes.FrameState;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.memory.AbstractMemoryCheckpoint;
+import jdk.graal.compiler.nodes.memory.SingleMemoryKill;
+import jdk.graal.compiler.nodes.spi.Canonicalizable;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodes.spi.Lowerable;
 import org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/CacheWritebackNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/CacheWritebackNode.java
similarity index 78%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/CacheWritebackNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/CacheWritebackNode.java
index 885abfbd2756..1a444b717be5 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/CacheWritebackNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/CacheWritebackNode.java
@@ -22,18 +22,18 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.extended;
+package jdk.graal.compiler.nodes.extended;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_1;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_1;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_1;
 
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.LIRLowerable;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.LIRLowerable;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
 
 import jdk.vm.ci.meta.Value;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/CacheWritebackSyncNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/CacheWritebackSyncNode.java
similarity index 80%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/CacheWritebackSyncNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/CacheWritebackSyncNode.java
index d45ba4e5d1a8..0363780fbebf 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/CacheWritebackSyncNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/CacheWritebackSyncNode.java
@@ -22,17 +22,17 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.extended;
+package jdk.graal.compiler.nodes.extended;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_1;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_1;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_1;
 
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.spi.LIRLowerable;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.spi.LIRLowerable;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
 
 /**
  * Implements {@code jdk.internal.misc.Unsafe.writebackPreSync0(long)} and
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/CaptureStateBeginNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/CaptureStateBeginNode.java
similarity index 77%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/CaptureStateBeginNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/CaptureStateBeginNode.java
index 7512bfc17f8e..e3f840b9e5d5 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/CaptureStateBeginNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/CaptureStateBeginNode.java
@@ -23,23 +23,23 @@
  * questions.
  */
 
-package jdk.compiler.graal.nodes.extended;
+package jdk.graal.compiler.nodes.extended;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_0;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_0;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_0;
 
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.graph.iterators.NodePredicates;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.AbstractBeginNode;
-import jdk.compiler.graal.nodes.BeginNode;
-import jdk.compiler.graal.nodes.BeginStateSplitNode;
-import jdk.compiler.graal.nodes.LoopExitNode;
-import jdk.compiler.graal.nodes.MemoryProxyNode;
-import jdk.compiler.graal.nodes.ValueProxyNode;
-import jdk.compiler.graal.nodes.spi.Canonicalizable;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.graph.iterators.NodePredicates;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.AbstractBeginNode;
+import jdk.graal.compiler.nodes.BeginNode;
+import jdk.graal.compiler.nodes.BeginStateSplitNode;
+import jdk.graal.compiler.nodes.LoopExitNode;
+import jdk.graal.compiler.nodes.MemoryProxyNode;
+import jdk.graal.compiler.nodes.ValueProxyNode;
+import jdk.graal.compiler.nodes.spi.Canonicalizable;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
 
 /**
  * An {@linkplain AbstractBeginNode begin node} that can capture the state at a certain program
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/ClassIsArrayNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/ClassIsArrayNode.java
similarity index 84%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/ClassIsArrayNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/ClassIsArrayNode.java
index e6e9e661c091..7f3b94fd9e7f 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/ClassIsArrayNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/ClassIsArrayNode.java
@@ -22,19 +22,19 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.extended;
+package jdk.graal.compiler.nodes.extended;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_4;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_4;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_4;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_4;
 
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodes.spi.Canonicalizable;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.LogicConstantNode;
-import jdk.compiler.graal.nodes.LogicNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.Lowerable;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodes.spi.Canonicalizable;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.LogicConstantNode;
+import jdk.graal.compiler.nodes.LogicNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.Lowerable;
 
 import jdk.vm.ci.meta.ConstantReflectionProvider;
 import jdk.vm.ci.meta.ResolvedJavaType;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/FixedValueAnchorNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/FixedValueAnchorNode.java
similarity index 78%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/FixedValueAnchorNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/FixedValueAnchorNode.java
index 8ba1940898d5..4852abe145f6 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/FixedValueAnchorNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/FixedValueAnchorNode.java
@@ -22,24 +22,24 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.extended;
+package jdk.graal.compiler.nodes.extended;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_0;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_0;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_0;
 
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.InputType;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.Canonicalizable;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodes.spi.LIRLowerable;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
-import jdk.compiler.graal.nodes.spi.ValueProxy;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.InputType;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.Canonicalizable;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodes.spi.LIRLowerable;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.nodes.spi.ValueProxy;
 
 @NodeInfo(cycles = CYCLES_0, size = SIZE_0, allowedUsageTypes = {InputType.Anchor})
 public class FixedValueAnchorNode extends FixedWithNextNode implements LIRLowerable, ValueProxy, GuardingNode, Canonicalizable, AnchoringNode {
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/ForeignCall.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/ForeignCall.java
similarity index 85%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/ForeignCall.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/ForeignCall.java
index ba518fd08390..d2730299ba8d 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/ForeignCall.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/ForeignCall.java
@@ -22,18 +22,18 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.extended;
+package jdk.graal.compiler.nodes.extended;
 
-import jdk.compiler.graal.core.common.spi.ForeignCallDescriptor;
-import jdk.compiler.graal.graph.NodeInputList;
-import jdk.compiler.graal.nodes.DeoptBciSupplier;
-import jdk.compiler.graal.nodes.DeoptimizingNode;
-import jdk.compiler.graal.nodes.FrameState;
-import jdk.compiler.graal.nodes.StateSplit;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.memory.MultiMemoryKill;
-import jdk.compiler.graal.nodes.spi.LIRLowerable;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.core.common.spi.ForeignCallDescriptor;
+import jdk.graal.compiler.graph.NodeInputList;
+import jdk.graal.compiler.nodes.DeoptBciSupplier;
+import jdk.graal.compiler.nodes.DeoptimizingNode;
+import jdk.graal.compiler.nodes.FrameState;
+import jdk.graal.compiler.nodes.StateSplit;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.memory.MultiMemoryKill;
+import jdk.graal.compiler.nodes.spi.LIRLowerable;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
 import org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.code.BytecodeFrame;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/ForeignCallNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/ForeignCallNode.java
similarity index 86%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/ForeignCallNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/ForeignCallNode.java
index b9dac80a3e47..437b2d912b1d 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/ForeignCallNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/ForeignCallNode.java
@@ -22,30 +22,30 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.extended;
+package jdk.graal.compiler.nodes.extended;
 
-import static jdk.compiler.graal.nodeinfo.InputType.Memory;
-import static jdk.compiler.graal.nodeinfo.InputType.State;
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_2;
+import static jdk.graal.compiler.nodeinfo.InputType.Memory;
+import static jdk.graal.compiler.nodeinfo.InputType.State;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_2;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_2;
 
 import java.util.List;
 import java.util.Map;
 
-import jdk.compiler.graal.core.common.spi.ForeignCallDescriptor;
-import jdk.compiler.graal.core.common.spi.ForeignCallSignature;
-import jdk.compiler.graal.core.common.spi.ForeignCallsProvider;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.Node.NodeIntrinsicFactory;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.graph.NodeInputList;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodeinfo.Verbosity;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext;
-import jdk.compiler.graal.nodes.FrameState;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.memory.AbstractMemoryCheckpoint;
+import jdk.graal.compiler.core.common.spi.ForeignCallDescriptor;
+import jdk.graal.compiler.core.common.spi.ForeignCallSignature;
+import jdk.graal.compiler.core.common.spi.ForeignCallsProvider;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.Node.NodeIntrinsicFactory;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.graph.NodeInputList;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodeinfo.Verbosity;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext;
+import jdk.graal.compiler.nodes.FrameState;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.memory.AbstractMemoryCheckpoint;
 
 import jdk.vm.ci.code.BytecodeFrame;
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/GetClassNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/GetClassNode.java
similarity index 79%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/GetClassNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/GetClassNode.java
index 877cdd863426..84b74d79fc00 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/GetClassNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/GetClassNode.java
@@ -22,26 +22,26 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.extended;
+package jdk.graal.compiler.nodes.extended;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_2;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_1;
 
-import jdk.compiler.graal.core.common.type.ObjectStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.core.common.type.TypeReference;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.virtual.VirtualObjectNode;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.calc.FloatingNode;
-import jdk.compiler.graal.nodes.spi.Canonicalizable;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodes.spi.Lowerable;
-import jdk.compiler.graal.nodes.spi.Virtualizable;
-import jdk.compiler.graal.nodes.spi.VirtualizerTool;
+import jdk.graal.compiler.core.common.type.ObjectStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.core.common.type.TypeReference;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.virtual.VirtualObjectNode;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.calc.FloatingNode;
+import jdk.graal.compiler.nodes.spi.Canonicalizable;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodes.spi.Lowerable;
+import jdk.graal.compiler.nodes.spi.Virtualizable;
+import jdk.graal.compiler.nodes.spi.VirtualizerTool;
 
 import jdk.vm.ci.meta.Assumptions;
 import jdk.vm.ci.meta.Constant;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/GuardedNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/GuardedNode.java
similarity index 93%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/GuardedNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/GuardedNode.java
index 421f0e88d07f..b17f23be88ab 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/GuardedNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/GuardedNode.java
@@ -22,9 +22,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.extended;
+package jdk.graal.compiler.nodes.extended;
 
-import jdk.compiler.graal.nodes.ValueNodeInterface;
+import jdk.graal.compiler.nodes.ValueNodeInterface;
 
 /**
  * A node that may be guarded by a {@linkplain GuardingNode guarding node}.
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/GuardedUnsafeLoadNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/GuardedUnsafeLoadNode.java
similarity index 91%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/GuardedUnsafeLoadNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/GuardedUnsafeLoadNode.java
index dc6dc62622c4..389ac5b683b9 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/GuardedUnsafeLoadNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/GuardedUnsafeLoadNode.java
@@ -22,14 +22,14 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.extended;
+package jdk.graal.compiler.nodes.extended;
 
-import static jdk.compiler.graal.nodeinfo.InputType.Guard;
+import static jdk.graal.compiler.nodeinfo.InputType.Guard;
 
-import jdk.compiler.graal.core.common.memory.MemoryOrderMode;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.ValueNode;
+import jdk.graal.compiler.core.common.memory.MemoryOrderMode;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.ValueNode;
 import org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/GuardingNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/GuardingNode.java
similarity index 93%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/GuardingNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/GuardingNode.java
index 6ac4dbad6dfb..995179af630b 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/GuardingNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/GuardingNode.java
@@ -22,9 +22,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.extended;
+package jdk.graal.compiler.nodes.extended;
 
-import jdk.compiler.graal.nodes.ValueNodeInterface;
+import jdk.graal.compiler.nodes.ValueNodeInterface;
 
 public interface GuardingNode extends ValueNodeInterface {
 }
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/HubGetClassNodeInterface.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/HubGetClassNodeInterface.java
similarity index 91%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/HubGetClassNodeInterface.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/HubGetClassNodeInterface.java
index 5376df833923..c64584910485 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/HubGetClassNodeInterface.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/HubGetClassNodeInterface.java
@@ -22,10 +22,10 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.extended;
+package jdk.graal.compiler.nodes.extended;
 
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.ValueNodeInterface;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.ValueNodeInterface;
 
 /**
  * In some systems, the hub and the class are different objects, and this is a base interface for
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/IntegerSwitchNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/IntegerSwitchNode.java
similarity index 94%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/IntegerSwitchNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/IntegerSwitchNode.java
index 42ee7ecd77b9..b328dd2e62ee 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/IntegerSwitchNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/IntegerSwitchNode.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.extended;
+package jdk.graal.compiler.nodes.extended;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -32,40 +32,40 @@
 import java.util.List;
 import java.util.Map;
 
-import jdk.compiler.graal.nodes.java.LoadIndexedNode;
+import jdk.graal.compiler.nodes.java.LoadIndexedNode;
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.EconomicSet;
 import org.graalvm.collections.MapCursor;
-import jdk.compiler.graal.core.common.spi.ConstantFieldProvider;
-import jdk.compiler.graal.core.common.type.IntegerStamp;
-import jdk.compiler.graal.core.common.type.PrimitiveStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodes.spi.Simplifiable;
-import jdk.compiler.graal.nodes.spi.SimplifierTool;
-import jdk.compiler.graal.nodeinfo.InputType;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.AbstractBeginNode;
-import jdk.compiler.graal.nodes.AbstractMergeNode;
-import jdk.compiler.graal.nodes.BeginNode;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.EndNode;
-import jdk.compiler.graal.nodes.FixedGuardNode;
-import jdk.compiler.graal.nodes.FixedNode;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.LogicNode;
-import jdk.compiler.graal.nodes.MergeNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ProfileData.ProfileSource;
-import jdk.compiler.graal.nodes.ProfileData.SwitchProbabilityData;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.calc.IntegerBelowNode;
-import jdk.compiler.graal.nodes.spi.LIRLowerable;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
-import jdk.compiler.graal.nodes.spi.SwitchFoldable;
-import jdk.compiler.graal.nodes.util.GraphUtil;
+import jdk.graal.compiler.core.common.spi.ConstantFieldProvider;
+import jdk.graal.compiler.core.common.type.IntegerStamp;
+import jdk.graal.compiler.core.common.type.PrimitiveStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodes.spi.Simplifiable;
+import jdk.graal.compiler.nodes.spi.SimplifierTool;
+import jdk.graal.compiler.nodeinfo.InputType;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.AbstractBeginNode;
+import jdk.graal.compiler.nodes.AbstractMergeNode;
+import jdk.graal.compiler.nodes.BeginNode;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.EndNode;
+import jdk.graal.compiler.nodes.FixedGuardNode;
+import jdk.graal.compiler.nodes.FixedNode;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.LogicNode;
+import jdk.graal.compiler.nodes.MergeNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ProfileData.ProfileSource;
+import jdk.graal.compiler.nodes.ProfileData.SwitchProbabilityData;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.calc.IntegerBelowNode;
+import jdk.graal.compiler.nodes.spi.LIRLowerable;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.nodes.spi.SwitchFoldable;
+import jdk.graal.compiler.nodes.util.GraphUtil;
 
 import jdk.vm.ci.meta.DeoptimizationAction;
 import jdk.vm.ci.meta.DeoptimizationReason;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/JavaReadNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/JavaReadNode.java
similarity index 77%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/JavaReadNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/JavaReadNode.java
index f879f9871610..f071395600e3 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/JavaReadNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/JavaReadNode.java
@@ -22,29 +22,29 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.extended;
+package jdk.graal.compiler.nodes.extended;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_2;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_1;
 
-import jdk.compiler.graal.core.common.memory.BarrierType;
-import jdk.compiler.graal.core.common.memory.MemoryOrderMode;
-import jdk.compiler.graal.core.common.type.AbstractObjectStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.memory.FixedAccessNode;
-import jdk.compiler.graal.nodes.memory.MemoryKill;
-import jdk.compiler.graal.nodes.memory.OrderedMemoryAccess;
-import jdk.compiler.graal.nodes.memory.ReadNode;
-import jdk.compiler.graal.nodes.memory.SingleMemoryKill;
-import jdk.compiler.graal.nodes.memory.address.AddressNode;
-import jdk.compiler.graal.nodes.memory.address.OffsetAddressNode;
-import jdk.compiler.graal.nodes.spi.Canonicalizable;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodes.spi.Lowerable;
+import jdk.graal.compiler.core.common.memory.BarrierType;
+import jdk.graal.compiler.core.common.memory.MemoryOrderMode;
+import jdk.graal.compiler.core.common.type.AbstractObjectStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.memory.FixedAccessNode;
+import jdk.graal.compiler.nodes.memory.MemoryKill;
+import jdk.graal.compiler.nodes.memory.OrderedMemoryAccess;
+import jdk.graal.compiler.nodes.memory.ReadNode;
+import jdk.graal.compiler.nodes.memory.SingleMemoryKill;
+import jdk.graal.compiler.nodes.memory.address.AddressNode;
+import jdk.graal.compiler.nodes.memory.address.OffsetAddressNode;
+import jdk.graal.compiler.nodes.spi.Canonicalizable;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodes.spi.Lowerable;
 import org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/JavaWriteNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/JavaWriteNode.java
similarity index 85%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/JavaWriteNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/JavaWriteNode.java
index 7ff7b78c2ccf..d6ba6098e6e3 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/JavaWriteNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/JavaWriteNode.java
@@ -22,19 +22,19 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.extended;
+package jdk.graal.compiler.nodes.extended;
 
-import jdk.compiler.graal.core.common.memory.BarrierType;
-import jdk.compiler.graal.core.common.memory.MemoryOrderMode;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.memory.AbstractWriteNode;
-import jdk.compiler.graal.nodes.memory.MemoryAccess;
-import jdk.compiler.graal.nodes.memory.address.AddressNode;
-import jdk.compiler.graal.nodes.spi.Lowerable;
+import jdk.graal.compiler.core.common.memory.BarrierType;
+import jdk.graal.compiler.core.common.memory.MemoryOrderMode;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.memory.AbstractWriteNode;
+import jdk.graal.compiler.nodes.memory.MemoryAccess;
+import jdk.graal.compiler.nodes.memory.address.AddressNode;
+import jdk.graal.compiler.nodes.spi.Lowerable;
 import org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/LoadArrayComponentHubNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/LoadArrayComponentHubNode.java
similarity index 83%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/LoadArrayComponentHubNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/LoadArrayComponentHubNode.java
index 169876ec2b04..870b4e6322e3 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/LoadArrayComponentHubNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/LoadArrayComponentHubNode.java
@@ -22,22 +22,22 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.extended;
+package jdk.graal.compiler.nodes.extended;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_2;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_1;
 
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodes.spi.Canonicalizable;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.Lowerable;
-import jdk.compiler.graal.nodes.spi.StampProvider;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodes.spi.Canonicalizable;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.Lowerable;
+import jdk.graal.compiler.nodes.spi.StampProvider;
 
 import jdk.vm.ci.meta.ConstantReflectionProvider;
 import jdk.vm.ci.meta.MetaAccessProvider;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/LoadHubNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/LoadHubNode.java
similarity index 80%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/LoadHubNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/LoadHubNode.java
index aa2402677daa..91cc03306ec1 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/LoadHubNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/LoadHubNode.java
@@ -22,28 +22,28 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.extended;
+package jdk.graal.compiler.nodes.extended;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_2;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_1;
 
-import jdk.compiler.graal.core.common.type.AbstractPointerStamp;
-import jdk.compiler.graal.core.common.type.ObjectStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.core.common.type.TypeReference;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodes.spi.Canonicalizable;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.calc.FloatingNode;
-import jdk.compiler.graal.nodes.spi.Lowerable;
-import jdk.compiler.graal.nodes.spi.StampProvider;
-import jdk.compiler.graal.nodes.spi.Virtualizable;
-import jdk.compiler.graal.nodes.spi.VirtualizerTool;
-import jdk.compiler.graal.nodes.type.StampTool;
+import jdk.graal.compiler.core.common.type.AbstractPointerStamp;
+import jdk.graal.compiler.core.common.type.ObjectStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.core.common.type.TypeReference;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodes.spi.Canonicalizable;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.calc.FloatingNode;
+import jdk.graal.compiler.nodes.spi.Lowerable;
+import jdk.graal.compiler.nodes.spi.StampProvider;
+import jdk.graal.compiler.nodes.spi.Virtualizable;
+import jdk.graal.compiler.nodes.spi.VirtualizerTool;
+import jdk.graal.compiler.nodes.type.StampTool;
 
 import jdk.vm.ci.meta.ConstantReflectionProvider;
 import jdk.vm.ci.meta.MetaAccessProvider;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/LoadHubOrNullNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/LoadHubOrNullNode.java
similarity index 77%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/LoadHubOrNullNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/LoadHubOrNullNode.java
index 3ecba8a0b116..c1b04ee6f8a1 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/LoadHubOrNullNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/LoadHubOrNullNode.java
@@ -22,28 +22,28 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.extended;
+package jdk.graal.compiler.nodes.extended;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_2;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_1;
 
-import jdk.compiler.graal.core.common.type.AbstractPointerStamp;
-import jdk.compiler.graal.core.common.type.ObjectStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.core.common.type.TypeReference;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.calc.FloatingNode;
-import jdk.compiler.graal.nodes.spi.Canonicalizable;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodes.spi.Lowerable;
-import jdk.compiler.graal.nodes.spi.StampProvider;
-import jdk.compiler.graal.nodes.spi.Virtualizable;
-import jdk.compiler.graal.nodes.spi.VirtualizerTool;
-import jdk.compiler.graal.nodes.type.StampTool;
+import jdk.graal.compiler.core.common.type.AbstractPointerStamp;
+import jdk.graal.compiler.core.common.type.ObjectStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.core.common.type.TypeReference;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.calc.FloatingNode;
+import jdk.graal.compiler.nodes.spi.Canonicalizable;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodes.spi.Lowerable;
+import jdk.graal.compiler.nodes.spi.StampProvider;
+import jdk.graal.compiler.nodes.spi.Virtualizable;
+import jdk.graal.compiler.nodes.spi.VirtualizerTool;
+import jdk.graal.compiler.nodes.type.StampTool;
 
 import jdk.vm.ci.meta.ConstantReflectionProvider;
 import jdk.vm.ci.meta.MetaAccessProvider;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/LoadMethodNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/LoadMethodNode.java
similarity index 85%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/LoadMethodNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/LoadMethodNode.java
index 1b0dc9fc395f..566d5fde0fcf 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/LoadMethodNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/LoadMethodNode.java
@@ -22,26 +22,26 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.extended;
+package jdk.graal.compiler.nodes.extended;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_2;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_1;
 
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.core.common.type.TypeReference;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodes.spi.Canonicalizable;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.memory.MemoryAccess;
-import jdk.compiler.graal.nodes.spi.Lowerable;
-import jdk.compiler.graal.nodes.type.StampTool;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.core.common.type.TypeReference;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodes.spi.Canonicalizable;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.memory.MemoryAccess;
+import jdk.graal.compiler.nodes.spi.Lowerable;
+import jdk.graal.compiler.nodes.type.StampTool;
 import org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.meta.Assumptions;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/MembarNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/MembarNode.java
similarity index 85%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/MembarNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/MembarNode.java
index fa593f23924d..1340c05d2d45 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/MembarNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/MembarNode.java
@@ -22,21 +22,21 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.extended;
+package jdk.graal.compiler.nodes.extended;
 
-import static jdk.compiler.graal.nodeinfo.InputType.Memory;
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_2;
+import static jdk.graal.compiler.nodeinfo.InputType.Memory;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_2;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_2;
 
 import java.util.Map;
 
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.memory.SingleMemoryKill;
-import jdk.compiler.graal.nodes.spi.LIRLowerable;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.memory.SingleMemoryKill;
+import jdk.graal.compiler.nodes.spi.LIRLowerable;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
 import org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.code.MemoryBarriers;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/MonitorEnter.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/MonitorEnter.java
similarity index 96%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/MonitorEnter.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/MonitorEnter.java
index ba90d5c42cc2..f3ed809e249d 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/MonitorEnter.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/MonitorEnter.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.extended;
+package jdk.graal.compiler.nodes.extended;
 
 /**
  * Denotes monitor locking transition.
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/MonitorExit.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/MonitorExit.java
similarity index 92%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/MonitorExit.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/MonitorExit.java
index bb2263d5d635..0127f20a307e 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/MonitorExit.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/MonitorExit.java
@@ -22,9 +22,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.extended;
+package jdk.graal.compiler.nodes.extended;
 
-import jdk.compiler.graal.nodes.memory.SingleMemoryKill;
+import jdk.graal.compiler.nodes.memory.SingleMemoryKill;
 
 /**
  * Denotes monitor unlocking transition.
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/MultiGuardNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/MultiGuardNode.java
similarity index 85%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/MultiGuardNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/MultiGuardNode.java
index d0f1e684e5a3..0b08285765e1 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/MultiGuardNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/MultiGuardNode.java
@@ -22,29 +22,29 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.extended;
+package jdk.graal.compiler.nodes.extended;
 
-import static jdk.compiler.graal.nodeinfo.InputType.Guard;
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_0;
+import static jdk.graal.compiler.nodeinfo.InputType.Guard;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_0;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_0;
 
 import org.graalvm.collections.EconomicSet;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeBitMap;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.graph.NodeInputList;
-import jdk.compiler.graal.nodes.spi.Canonicalizable;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodes.spi.Simplifiable;
-import jdk.compiler.graal.nodes.spi.SimplifierTool;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.calc.FloatingNode;
-import jdk.compiler.graal.nodes.spi.LIRLowerable;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
-import jdk.compiler.graal.nodes.util.GraphUtil;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeBitMap;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.graph.NodeInputList;
+import jdk.graal.compiler.nodes.spi.Canonicalizable;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodes.spi.Simplifiable;
+import jdk.graal.compiler.nodes.spi.SimplifierTool;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.calc.FloatingNode;
+import jdk.graal.compiler.nodes.spi.LIRLowerable;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.nodes.util.GraphUtil;
 
 import java.util.ArrayList;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/NullCheckNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/NullCheckNode.java
similarity index 82%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/NullCheckNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/NullCheckNode.java
index 931f4759b20d..003c06e3f9ef 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/NullCheckNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/NullCheckNode.java
@@ -22,26 +22,26 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.extended;
+package jdk.graal.compiler.nodes.extended;
 
-import static jdk.compiler.graal.nodeinfo.InputType.Guard;
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_2;
+import static jdk.graal.compiler.nodeinfo.InputType.Guard;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_2;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_2;
 
-import jdk.compiler.graal.core.common.type.AbstractPointerStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.Graph;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.CompressionNode;
-import jdk.compiler.graal.nodes.ImplicitNullCheckNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.memory.address.OffsetAddressNode;
-import jdk.compiler.graal.nodes.spi.LIRLowerable;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.core.common.type.AbstractPointerStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.Graph;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.CompressionNode;
+import jdk.graal.compiler.nodes.ImplicitNullCheckNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.memory.address.OffsetAddressNode;
+import jdk.graal.compiler.nodes.spi.LIRLowerable;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
 
 import jdk.vm.ci.meta.JavaConstant;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/OSRLocalNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/OSRLocalNode.java
similarity index 84%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/OSRLocalNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/OSRLocalNode.java
index 371810a4b129..eb02f3acae97 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/OSRLocalNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/OSRLocalNode.java
@@ -22,13 +22,13 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.extended;
+package jdk.graal.compiler.nodes.extended;
 
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.graph.IterableNodeType;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.AbstractLocalNode;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.graph.IterableNodeType;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.AbstractLocalNode;
 
 @NodeInfo(nameTemplate = "OSRLocal({p#index})")
 public final class OSRLocalNode extends AbstractLocalNode implements IterableNodeType {
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/OSRLockNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/OSRLockNode.java
similarity index 84%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/OSRLockNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/OSRLockNode.java
index f29a9b91c794..95e23400b736 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/OSRLockNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/OSRLockNode.java
@@ -22,13 +22,13 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.extended;
+package jdk.graal.compiler.nodes.extended;
 
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.graph.IterableNodeType;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.AbstractLocalNode;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.graph.IterableNodeType;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.AbstractLocalNode;
 
 @NodeInfo(nameTemplate = "OSRLock({p#index})")
 public class OSRLockNode extends AbstractLocalNode implements IterableNodeType {
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/OSRMonitorEnterNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/OSRMonitorEnterNode.java
similarity index 76%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/OSRMonitorEnterNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/OSRMonitorEnterNode.java
index 0eef8b73348e..de3970021859 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/OSRMonitorEnterNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/OSRMonitorEnterNode.java
@@ -22,20 +22,20 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.extended;
+package jdk.graal.compiler.nodes.extended;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_0;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_0;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_0;
 
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.java.MonitorEnterNode;
-import jdk.compiler.graal.nodes.java.MonitorIdNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.LIRLowerable;
-import jdk.compiler.graal.nodes.spi.LoweringTool;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
-import jdk.compiler.graal.nodes.spi.VirtualizerTool;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.java.MonitorEnterNode;
+import jdk.graal.compiler.nodes.java.MonitorIdNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.LIRLowerable;
+import jdk.graal.compiler.nodes.spi.LoweringTool;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.nodes.spi.VirtualizerTool;
 
 @NodeInfo(cycles = CYCLES_0, size = SIZE_0)
 public class OSRMonitorEnterNode extends MonitorEnterNode implements LIRLowerable {
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/OSRStartNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/OSRStartNode.java
similarity index 86%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/OSRStartNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/OSRStartNode.java
index ac3ca4d3cf7a..0cd0fbb83a6e 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/OSRStartNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/OSRStartNode.java
@@ -22,12 +22,12 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.extended;
+package jdk.graal.compiler.nodes.extended;
 
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.StartNode;
-import jdk.compiler.graal.nodes.spi.Lowerable;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.StartNode;
+import jdk.graal.compiler.nodes.spi.Lowerable;
 
 @NodeInfo
 public final class OSRStartNode extends StartNode implements Lowerable {
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/ObjectIsArrayNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/ObjectIsArrayNode.java
similarity index 83%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/ObjectIsArrayNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/ObjectIsArrayNode.java
index 4ac4e63a14f4..60e34d70b177 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/ObjectIsArrayNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/ObjectIsArrayNode.java
@@ -22,24 +22,24 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.extended;
+package jdk.graal.compiler.nodes.extended;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_4;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_4;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_4;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_4;
 
-import jdk.compiler.graal.core.common.type.AbstractObjectStamp;
-import jdk.compiler.graal.core.common.type.ObjectStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.LogicConstantNode;
-import jdk.compiler.graal.nodes.LogicNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.UnaryOpLogicNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.Lowerable;
-import jdk.compiler.graal.nodes.type.StampTool;
+import jdk.graal.compiler.core.common.type.AbstractObjectStamp;
+import jdk.graal.compiler.core.common.type.ObjectStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.LogicConstantNode;
+import jdk.graal.compiler.nodes.LogicNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.UnaryOpLogicNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.Lowerable;
+import jdk.graal.compiler.nodes.type.StampTool;
 
 import jdk.vm.ci.meta.ResolvedJavaType;
 import jdk.vm.ci.meta.TriState;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/OpaqueGuardNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/OpaqueGuardNode.java
similarity index 80%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/OpaqueGuardNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/OpaqueGuardNode.java
index 67c816711537..719a5fd8a511 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/OpaqueGuardNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/OpaqueGuardNode.java
@@ -22,17 +22,17 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.extended;
+package jdk.graal.compiler.nodes.extended;
 
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.graph.spi.NodeWithIdentity;
-import jdk.compiler.graal.nodeinfo.InputType;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.ValueNode;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.graph.spi.NodeWithIdentity;
+import jdk.graal.compiler.nodeinfo.InputType;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.ValueNode;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_0;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_0;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_0;
 
 @NodeInfo(cycles = CYCLES_0, size = SIZE_0)
 public final class OpaqueGuardNode extends OpaqueNode implements NodeWithIdentity, GuardingNode {
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/OpaqueLogicNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/OpaqueLogicNode.java
similarity index 79%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/OpaqueLogicNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/OpaqueLogicNode.java
index ed93f6b79951..61cb35e98ec8 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/OpaqueLogicNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/OpaqueLogicNode.java
@@ -22,17 +22,17 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.extended;
+package jdk.graal.compiler.nodes.extended;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_0;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_0;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_0;
 
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.graph.spi.NodeWithIdentity;
-import jdk.compiler.graal.nodeinfo.InputType;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.LIRLowerableLogicNode;
-import jdk.compiler.graal.nodes.LogicNode;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.graph.spi.NodeWithIdentity;
+import jdk.graal.compiler.nodeinfo.InputType;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.LIRLowerableLogicNode;
+import jdk.graal.compiler.nodes.LogicNode;
 
 @NodeInfo(cycles = CYCLES_0, size = SIZE_0, allowedUsageTypes = {InputType.Condition})
 public final class OpaqueLogicNode extends LIRLowerableLogicNode implements NodeWithIdentity {
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/OpaqueNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/OpaqueNode.java
similarity index 79%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/OpaqueNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/OpaqueNode.java
index 95b3b5904434..4936cdc250fb 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/OpaqueNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/OpaqueNode.java
@@ -22,18 +22,18 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.extended;
+package jdk.graal.compiler.nodes.extended;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_0;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_0;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_0;
 
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.graph.spi.NodeWithIdentity;
-import jdk.compiler.graal.nodeinfo.InputType;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.calc.FloatingNode;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.graph.spi.NodeWithIdentity;
+import jdk.graal.compiler.nodeinfo.InputType;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.calc.FloatingNode;
 
 @NodeInfo(cycles = CYCLES_0, size = SIZE_0)
 public abstract class OpaqueNode extends FloatingNode implements NodeWithIdentity {
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/OpaqueValueNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/OpaqueValueNode.java
similarity index 78%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/OpaqueValueNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/OpaqueValueNode.java
index 48de42a9b317..0ad9643b04e5 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/OpaqueValueNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/OpaqueValueNode.java
@@ -22,19 +22,19 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.extended;
+package jdk.graal.compiler.nodes.extended;
 
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.graph.spi.NodeWithIdentity;
-import jdk.compiler.graal.nodeinfo.InputType;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.LIRLowerable;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.graph.spi.NodeWithIdentity;
+import jdk.graal.compiler.nodeinfo.InputType;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.LIRLowerable;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_0;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_0;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_0;
 
 @NodeInfo(cycles = CYCLES_0, size = SIZE_0)
 public final class OpaqueValueNode extends OpaqueNode implements NodeWithIdentity, LIRLowerable, GuardingNode {
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/RawLoadNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/RawLoadNode.java
similarity index 87%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/RawLoadNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/RawLoadNode.java
index e3eb4389c2cd..088f1b274a68 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/RawLoadNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/RawLoadNode.java
@@ -22,35 +22,35 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.extended;
-
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1;
-
-import jdk.compiler.graal.core.common.memory.MemoryOrderMode;
-import jdk.compiler.graal.core.common.type.PrimitiveStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.core.common.type.TypeReference;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.java.LoadFieldNode;
-import jdk.compiler.graal.nodes.virtual.VirtualArrayNode;
-import jdk.compiler.graal.nodes.virtual.VirtualObjectNode;
-import jdk.compiler.graal.nodes.GraphState;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.calc.ReinterpretNode;
-import jdk.compiler.graal.nodes.memory.MemoryKill;
-import jdk.compiler.graal.nodes.memory.ReadNode;
-import jdk.compiler.graal.nodes.memory.SingleMemoryKill;
-import jdk.compiler.graal.nodes.spi.Canonicalizable;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodes.spi.Lowerable;
-import jdk.compiler.graal.nodes.spi.Virtualizable;
-import jdk.compiler.graal.nodes.spi.VirtualizerTool;
-import jdk.compiler.graal.nodes.type.StampTool;
+package jdk.graal.compiler.nodes.extended;
+
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_2;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_1;
+
+import jdk.graal.compiler.core.common.memory.MemoryOrderMode;
+import jdk.graal.compiler.core.common.type.PrimitiveStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.core.common.type.TypeReference;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.java.LoadFieldNode;
+import jdk.graal.compiler.nodes.virtual.VirtualArrayNode;
+import jdk.graal.compiler.nodes.virtual.VirtualObjectNode;
+import jdk.graal.compiler.nodes.GraphState;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.calc.ReinterpretNode;
+import jdk.graal.compiler.nodes.memory.MemoryKill;
+import jdk.graal.compiler.nodes.memory.ReadNode;
+import jdk.graal.compiler.nodes.memory.SingleMemoryKill;
+import jdk.graal.compiler.nodes.spi.Canonicalizable;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodes.spi.Lowerable;
+import jdk.graal.compiler.nodes.spi.Virtualizable;
+import jdk.graal.compiler.nodes.spi.VirtualizerTool;
+import jdk.graal.compiler.nodes.type.StampTool;
 import org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/RawStoreNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/RawStoreNode.java
similarity index 88%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/RawStoreNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/RawStoreNode.java
index d85b62cede20..ad4ba97dccba 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/RawStoreNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/RawStoreNode.java
@@ -22,26 +22,26 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.extended;
-
-import static jdk.compiler.graal.nodeinfo.InputType.State;
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1;
-
-import jdk.compiler.graal.core.common.memory.MemoryOrderMode;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.java.StoreFieldNode;
-import jdk.compiler.graal.nodes.virtual.VirtualObjectNode;
-import jdk.compiler.graal.nodes.FrameState;
-import jdk.compiler.graal.nodes.GraphState;
-import jdk.compiler.graal.nodes.StateSplit;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.memory.SingleMemoryKill;
-import jdk.compiler.graal.nodes.spi.Lowerable;
-import jdk.compiler.graal.nodes.spi.Virtualizable;
-import jdk.compiler.graal.nodes.spi.VirtualizerTool;
+package jdk.graal.compiler.nodes.extended;
+
+import static jdk.graal.compiler.nodeinfo.InputType.State;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_2;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_1;
+
+import jdk.graal.compiler.core.common.memory.MemoryOrderMode;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.java.StoreFieldNode;
+import jdk.graal.compiler.nodes.virtual.VirtualObjectNode;
+import jdk.graal.compiler.nodes.FrameState;
+import jdk.graal.compiler.nodes.GraphState;
+import jdk.graal.compiler.nodes.StateSplit;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.memory.SingleMemoryKill;
+import jdk.graal.compiler.nodes.spi.Lowerable;
+import jdk.graal.compiler.nodes.spi.Virtualizable;
+import jdk.graal.compiler.nodes.spi.VirtualizerTool;
 import org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/StateSplitProxyNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/StateSplitProxyNode.java
similarity index 83%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/StateSplitProxyNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/StateSplitProxyNode.java
index 7dc3b89d00bb..6d23704c85fa 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/StateSplitProxyNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/StateSplitProxyNode.java
@@ -22,20 +22,20 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.extended;
+package jdk.graal.compiler.nodes.extended;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_0;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_0;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_0;
 
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodes.spi.Canonicalizable;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodeinfo.InputType;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.FrameState;
-import jdk.compiler.graal.nodes.StateSplit;
-import jdk.compiler.graal.nodes.ValueNode;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodes.spi.Canonicalizable;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodeinfo.InputType;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.FrameState;
+import jdk.graal.compiler.nodes.StateSplit;
+import jdk.graal.compiler.nodes.ValueNode;
 
 /**
  * This node provides a state split along with the functionality of {@link FixedValueAnchorNode}.
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/StoreHubNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/StoreHubNode.java
similarity index 80%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/StoreHubNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/StoreHubNode.java
index 5b267ae1398e..ccd4377153e9 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/StoreHubNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/StoreHubNode.java
@@ -22,17 +22,17 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.extended;
+package jdk.graal.compiler.nodes.extended;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_2;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_1;
 
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.AbstractStateSplit;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.Lowerable;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.AbstractStateSplit;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.Lowerable;
 
 @NodeInfo(cycles = CYCLES_2, size = SIZE_1)
 public final class StoreHubNode extends AbstractStateSplit implements Lowerable {
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/SwitchCaseProbabilityNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/SwitchCaseProbabilityNode.java
similarity index 83%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/SwitchCaseProbabilityNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/SwitchCaseProbabilityNode.java
index 1c68b8ba2914..a8aa44461559 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/SwitchCaseProbabilityNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/SwitchCaseProbabilityNode.java
@@ -22,19 +22,19 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.extended;
+package jdk.graal.compiler.nodes.extended;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_0;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_0;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_0;
 
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.Lowerable;
-import jdk.compiler.graal.nodes.spi.LoweringTool;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.Lowerable;
+import jdk.graal.compiler.nodes.spi.LoweringTool;
 
 import jdk.vm.ci.meta.JavaKind;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/SwitchNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/SwitchNode.java
similarity index 90%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/SwitchNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/SwitchNode.java
index f2ceff9dc1a9..5d9b2482230d 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/SwitchNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/SwitchNode.java
@@ -22,37 +22,37 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.extended;
+package jdk.graal.compiler.nodes.extended;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2;
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_64;
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_8;
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_UNKNOWN;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_2;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_64;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_8;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_UNKNOWN;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_2;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_64;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_8;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_UNKNOWN;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_2;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_64;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_8;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_UNKNOWN;
 
 import java.util.Arrays;
 
-import jdk.compiler.graal.core.common.type.AbstractPointerStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.graph.NodeSuccessorList;
-import jdk.compiler.graal.nodeinfo.NodeCycles;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodeinfo.NodeSize;
-import jdk.compiler.graal.nodes.AbstractBeginNode;
-import jdk.compiler.graal.nodes.ControlSplitNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ProfileData;
-import jdk.compiler.graal.nodes.ProfileData.BranchProbabilityData;
-import jdk.compiler.graal.nodes.ProfileData.SwitchProbabilityData;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.SimplifierTool;
+import jdk.graal.compiler.core.common.type.AbstractPointerStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.graph.NodeSuccessorList;
+import jdk.graal.compiler.nodeinfo.NodeCycles;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodeinfo.NodeSize;
+import jdk.graal.compiler.nodes.AbstractBeginNode;
+import jdk.graal.compiler.nodes.ControlSplitNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ProfileData;
+import jdk.graal.compiler.nodes.ProfileData.BranchProbabilityData;
+import jdk.graal.compiler.nodes.ProfileData.SwitchProbabilityData;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.SimplifierTool;
 
 import jdk.vm.ci.meta.Constant;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/UnboxNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/UnboxNode.java
similarity index 84%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/UnboxNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/UnboxNode.java
index b7cad9196202..4c3d66238601 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/UnboxNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/UnboxNode.java
@@ -22,26 +22,26 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.extended;
+package jdk.graal.compiler.nodes.extended;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_16;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_2;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_16;
 
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.InputType;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.virtual.VirtualObjectNode;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.FieldLocationIdentity;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.Canonicalizable;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodes.spi.Lowerable;
-import jdk.compiler.graal.nodes.spi.Virtualizable;
-import jdk.compiler.graal.nodes.spi.VirtualizerTool;
-import jdk.compiler.graal.nodes.type.StampTool;
-import jdk.compiler.graal.nodes.util.GraphUtil;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.InputType;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.virtual.VirtualObjectNode;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.FieldLocationIdentity;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.Canonicalizable;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodes.spi.Lowerable;
+import jdk.graal.compiler.nodes.spi.Virtualizable;
+import jdk.graal.compiler.nodes.spi.VirtualizerTool;
+import jdk.graal.compiler.nodes.type.StampTool;
+import jdk.graal.compiler.nodes.util.GraphUtil;
 
 import jdk.vm.ci.meta.ConstantReflectionProvider;
 import jdk.vm.ci.meta.JavaConstant;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/UnsafeAccessNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/UnsafeAccessNode.java
similarity index 90%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/UnsafeAccessNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/UnsafeAccessNode.java
index 2c340db1396b..3e8049ca5bf9 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/UnsafeAccessNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/UnsafeAccessNode.java
@@ -22,27 +22,27 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.extended;
+package jdk.graal.compiler.nodes.extended;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_2;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_1;
 
 import java.nio.ByteOrder;
 
-import jdk.compiler.graal.core.common.memory.MemoryOrderMode;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.GraphState.StageFlag;
-import jdk.compiler.graal.nodes.NamedLocationIdentity;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.memory.MemoryAccess;
-import jdk.compiler.graal.nodes.memory.OrderedMemoryAccess;
-import jdk.compiler.graal.nodes.spi.Canonicalizable;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodes.type.StampTool;
+import jdk.graal.compiler.core.common.memory.MemoryOrderMode;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.GraphState.StageFlag;
+import jdk.graal.compiler.nodes.NamedLocationIdentity;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.memory.MemoryAccess;
+import jdk.graal.compiler.nodes.memory.OrderedMemoryAccess;
+import jdk.graal.compiler.nodes.spi.Canonicalizable;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodes.type.StampTool;
 import org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.meta.ConstantReflectionProvider;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/UnsafeCopyNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/UnsafeCopyNode.java
similarity index 87%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/UnsafeCopyNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/UnsafeCopyNode.java
index ad0d7a2093a5..8c93eeb23845 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/UnsafeCopyNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/UnsafeCopyNode.java
@@ -22,13 +22,13 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.extended;
+package jdk.graal.compiler.nodes.extended;
 
-import jdk.compiler.graal.graph.Node.ConstantNodeParameter;
-import jdk.compiler.graal.graph.Node.NodeIntrinsic;
-import jdk.compiler.graal.graph.Node.NodeIntrinsicFactory;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext;
+import jdk.graal.compiler.graph.Node.ConstantNodeParameter;
+import jdk.graal.compiler.graph.Node.NodeIntrinsic;
+import jdk.graal.compiler.graph.Node.NodeIntrinsicFactory;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext;
 import org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/UnsafeMemoryLoadNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/UnsafeMemoryLoadNode.java
similarity index 81%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/UnsafeMemoryLoadNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/UnsafeMemoryLoadNode.java
index d670689e2a96..706f1e9c29da 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/UnsafeMemoryLoadNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/UnsafeMemoryLoadNode.java
@@ -22,18 +22,18 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.extended;
+package jdk.graal.compiler.nodes.extended;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_2;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_1;
 
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.memory.MemoryAccess;
-import jdk.compiler.graal.nodes.spi.Lowerable;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.memory.MemoryAccess;
+import jdk.graal.compiler.nodes.spi.Lowerable;
 import org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/UnsafeMemoryStoreNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/UnsafeMemoryStoreNode.java
similarity index 82%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/UnsafeMemoryStoreNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/UnsafeMemoryStoreNode.java
index a723119d516b..69c1e09215cf 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/UnsafeMemoryStoreNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/UnsafeMemoryStoreNode.java
@@ -22,18 +22,18 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.extended;
+package jdk.graal.compiler.nodes.extended;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_2;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_1;
 
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.AbstractStateSplit;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.memory.SingleMemoryKill;
-import jdk.compiler.graal.nodes.spi.Lowerable;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.AbstractStateSplit;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.memory.SingleMemoryKill;
+import jdk.graal.compiler.nodes.spi.Lowerable;
 import org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/ValueAnchorNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/ValueAnchorNode.java
similarity index 79%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/ValueAnchorNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/ValueAnchorNode.java
index 9df47eebabe7..663cd738d228 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/ValueAnchorNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/extended/ValueAnchorNode.java
@@ -22,31 +22,31 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.extended;
+package jdk.graal.compiler.nodes.extended;
 
-import static jdk.compiler.graal.nodeinfo.InputType.Anchor;
-import static jdk.compiler.graal.nodeinfo.InputType.Guard;
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_0;
+import static jdk.graal.compiler.nodeinfo.InputType.Anchor;
+import static jdk.graal.compiler.nodeinfo.InputType.Guard;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_0;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_0;
 
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.graph.spi.NodeWithIdentity;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.virtual.VirtualObjectNode;
-import jdk.compiler.graal.nodes.AbstractBeginNode;
-import jdk.compiler.graal.nodes.FixedNode;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.debug.ControlFlowAnchored;
-import jdk.compiler.graal.nodes.memory.FixedAccessNode;
-import jdk.compiler.graal.nodes.spi.LIRLowerable;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
-import jdk.compiler.graal.nodes.spi.Simplifiable;
-import jdk.compiler.graal.nodes.spi.SimplifierTool;
-import jdk.compiler.graal.nodes.spi.Virtualizable;
-import jdk.compiler.graal.nodes.spi.VirtualizerTool;
-import jdk.compiler.graal.nodes.util.GraphUtil;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.graph.spi.NodeWithIdentity;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.virtual.VirtualObjectNode;
+import jdk.graal.compiler.nodes.AbstractBeginNode;
+import jdk.graal.compiler.nodes.FixedNode;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.debug.ControlFlowAnchored;
+import jdk.graal.compiler.nodes.memory.FixedAccessNode;
+import jdk.graal.compiler.nodes.spi.LIRLowerable;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.nodes.spi.Simplifiable;
+import jdk.graal.compiler.nodes.spi.SimplifierTool;
+import jdk.graal.compiler.nodes.spi.Virtualizable;
+import jdk.graal.compiler.nodes.spi.VirtualizerTool;
+import jdk.graal.compiler.nodes.util.GraphUtil;
 
 /**
  * This node can be used for two different kinds of anchoring for non-CFG (floating) nodes: It can
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/gc/ArrayRangeWriteBarrier.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/gc/ArrayRangeWriteBarrier.java
similarity index 83%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/gc/ArrayRangeWriteBarrier.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/gc/ArrayRangeWriteBarrier.java
index 0ef1c9a26c45..9c791c9ed1e1 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/gc/ArrayRangeWriteBarrier.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/gc/ArrayRangeWriteBarrier.java
@@ -22,16 +22,16 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.gc;
+package jdk.graal.compiler.nodes.gc;
 
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.spi.Lowerable;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.calc.IntegerConvertNode;
-import jdk.compiler.graal.nodes.memory.address.AddressNode;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.spi.Lowerable;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.calc.IntegerConvertNode;
+import jdk.graal.compiler.nodes.memory.address.AddressNode;
 
 import jdk.vm.ci.meta.JavaKind;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/gc/BarrierSet.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/gc/BarrierSet.java
similarity index 88%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/gc/BarrierSet.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/gc/BarrierSet.java
index 20c44217508f..bd88b7075d5c 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/gc/BarrierSet.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/gc/BarrierSet.java
@@ -23,14 +23,14 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.gc;
+package jdk.graal.compiler.nodes.gc;
 
-import jdk.compiler.graal.core.common.memory.BarrierType;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.nodes.extended.RawStoreNode;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.memory.FixedAccessNode;
+import jdk.graal.compiler.core.common.memory.BarrierType;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.nodes.extended.RawStoreNode;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.memory.FixedAccessNode;
 import org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/gc/CardTableBarrierSet.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/gc/CardTableBarrierSet.java
similarity index 90%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/gc/CardTableBarrierSet.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/gc/CardTableBarrierSet.java
index 0738b6352cad..042dd9253ddf 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/gc/CardTableBarrierSet.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/gc/CardTableBarrierSet.java
@@ -23,27 +23,27 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.gc;
+package jdk.graal.compiler.nodes.gc;
 
-import jdk.compiler.graal.core.common.memory.BarrierType;
-import jdk.compiler.graal.core.common.type.AbstractObjectStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.nodes.extended.ArrayRangeWrite;
-import jdk.compiler.graal.nodes.extended.RawStoreNode;
-import jdk.compiler.graal.nodes.java.AbstractCompareAndSwapNode;
-import jdk.compiler.graal.nodes.java.LoweredAtomicReadAndWriteNode;
-import jdk.compiler.graal.nodes.type.StampTool;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.memory.FixedAccessNode;
-import jdk.compiler.graal.nodes.memory.ReadNode;
-import jdk.compiler.graal.nodes.memory.WriteNode;
-import jdk.compiler.graal.nodes.memory.address.AddressNode;
-import jdk.compiler.graal.nodes.memory.address.OffsetAddressNode;
-import jdk.compiler.graal.nodes.util.GraphUtil;
+import jdk.graal.compiler.core.common.memory.BarrierType;
+import jdk.graal.compiler.core.common.type.AbstractObjectStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.nodes.extended.ArrayRangeWrite;
+import jdk.graal.compiler.nodes.extended.RawStoreNode;
+import jdk.graal.compiler.nodes.java.AbstractCompareAndSwapNode;
+import jdk.graal.compiler.nodes.java.LoweredAtomicReadAndWriteNode;
+import jdk.graal.compiler.nodes.type.StampTool;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.memory.FixedAccessNode;
+import jdk.graal.compiler.nodes.memory.ReadNode;
+import jdk.graal.compiler.nodes.memory.WriteNode;
+import jdk.graal.compiler.nodes.memory.address.AddressNode;
+import jdk.graal.compiler.nodes.memory.address.OffsetAddressNode;
+import jdk.graal.compiler.nodes.util.GraphUtil;
 import org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/gc/G1ArrayRangePostWriteBarrier.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/gc/G1ArrayRangePostWriteBarrier.java
similarity index 82%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/gc/G1ArrayRangePostWriteBarrier.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/gc/G1ArrayRangePostWriteBarrier.java
index db95e4698de3..17d880362585 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/gc/G1ArrayRangePostWriteBarrier.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/gc/G1ArrayRangePostWriteBarrier.java
@@ -23,15 +23,15 @@
  * questions.
  */
 
-package jdk.compiler.graal.nodes.gc;
+package jdk.graal.compiler.nodes.gc;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_64;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_64;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_64;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_64;
 
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.memory.address.AddressNode;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.memory.address.AddressNode;
 
 @NodeInfo(cycles = CYCLES_64, size = SIZE_64)
 public class G1ArrayRangePostWriteBarrier extends ArrayRangeWriteBarrier {
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/gc/G1ArrayRangePreWriteBarrier.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/gc/G1ArrayRangePreWriteBarrier.java
similarity index 82%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/gc/G1ArrayRangePreWriteBarrier.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/gc/G1ArrayRangePreWriteBarrier.java
index 073db7146e78..ce8c386940a0 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/gc/G1ArrayRangePreWriteBarrier.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/gc/G1ArrayRangePreWriteBarrier.java
@@ -23,15 +23,15 @@
  * questions.
  */
 
-package jdk.compiler.graal.nodes.gc;
+package jdk.graal.compiler.nodes.gc;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_64;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_64;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_64;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_64;
 
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.memory.address.AddressNode;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.memory.address.AddressNode;
 
 @NodeInfo(cycles = CYCLES_64, size = SIZE_64)
 public final class G1ArrayRangePreWriteBarrier extends ArrayRangeWriteBarrier {
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/gc/G1BarrierSet.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/gc/G1BarrierSet.java
similarity index 91%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/gc/G1BarrierSet.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/gc/G1BarrierSet.java
index 5d49baabef7e..b785c259dd02 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/gc/G1BarrierSet.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/gc/G1BarrierSet.java
@@ -23,24 +23,24 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.gc;
-
-import jdk.compiler.graal.core.common.memory.BarrierType;
-import jdk.compiler.graal.core.common.type.AbstractObjectStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.nodes.extended.ArrayRangeWrite;
-import jdk.compiler.graal.nodes.extended.RawStoreNode;
-import jdk.compiler.graal.nodes.java.AbstractCompareAndSwapNode;
-import jdk.compiler.graal.nodes.java.LoweredAtomicReadAndWriteNode;
-import jdk.compiler.graal.nodes.type.StampTool;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.memory.FixedAccessNode;
-import jdk.compiler.graal.nodes.memory.ReadNode;
-import jdk.compiler.graal.nodes.memory.WriteNode;
-import jdk.compiler.graal.nodes.memory.address.AddressNode;
+package jdk.graal.compiler.nodes.gc;
+
+import jdk.graal.compiler.core.common.memory.BarrierType;
+import jdk.graal.compiler.core.common.type.AbstractObjectStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.nodes.extended.ArrayRangeWrite;
+import jdk.graal.compiler.nodes.extended.RawStoreNode;
+import jdk.graal.compiler.nodes.java.AbstractCompareAndSwapNode;
+import jdk.graal.compiler.nodes.java.LoweredAtomicReadAndWriteNode;
+import jdk.graal.compiler.nodes.type.StampTool;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.memory.FixedAccessNode;
+import jdk.graal.compiler.nodes.memory.ReadNode;
+import jdk.graal.compiler.nodes.memory.WriteNode;
+import jdk.graal.compiler.nodes.memory.address.AddressNode;
 import org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/gc/G1PostWriteBarrier.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/gc/G1PostWriteBarrier.java
similarity index 85%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/gc/G1PostWriteBarrier.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/gc/G1PostWriteBarrier.java
index 89943d78c8f8..af685eefa3c2 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/gc/G1PostWriteBarrier.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/gc/G1PostWriteBarrier.java
@@ -22,15 +22,15 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.gc;
+package jdk.graal.compiler.nodes.gc;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_64;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_64;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_64;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_64;
 
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.memory.address.AddressNode;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.memory.address.AddressNode;
 
 @NodeInfo(cycles = CYCLES_64, size = SIZE_64)
 public class G1PostWriteBarrier extends ObjectWriteBarrier {
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/gc/G1PreWriteBarrier.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/gc/G1PreWriteBarrier.java
similarity index 83%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/gc/G1PreWriteBarrier.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/gc/G1PreWriteBarrier.java
index 63e7870334bf..862c81ff780c 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/gc/G1PreWriteBarrier.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/gc/G1PreWriteBarrier.java
@@ -23,18 +23,18 @@
  * questions.
  */
 
-package jdk.compiler.graal.nodes.gc;
+package jdk.graal.compiler.nodes.gc;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_64;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_64;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_64;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_64;
 
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.InputType;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.DeoptimizingNode;
-import jdk.compiler.graal.nodes.FrameState;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.memory.address.AddressNode;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.InputType;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.DeoptimizingNode;
+import jdk.graal.compiler.nodes.FrameState;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.memory.address.AddressNode;
 
 @NodeInfo(cycles = CYCLES_64, size = SIZE_64)
 public final class G1PreWriteBarrier extends ObjectWriteBarrier implements DeoptimizingNode.DeoptBefore {
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/gc/G1ReferentFieldReadBarrier.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/gc/G1ReferentFieldReadBarrier.java
similarity index 85%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/gc/G1ReferentFieldReadBarrier.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/gc/G1ReferentFieldReadBarrier.java
index b222aae9235b..3010878bf14c 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/gc/G1ReferentFieldReadBarrier.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/gc/G1ReferentFieldReadBarrier.java
@@ -22,15 +22,15 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.gc;
+package jdk.graal.compiler.nodes.gc;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_64;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_64;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_64;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_64;
 
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.memory.address.AddressNode;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.memory.address.AddressNode;
 
 /**
  * The {@code G1ReferentFieldReadBarrier} is added when a read access is performed to the referent
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/gc/ObjectWriteBarrier.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/gc/ObjectWriteBarrier.java
similarity index 88%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/gc/ObjectWriteBarrier.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/gc/ObjectWriteBarrier.java
index e1d99b56c712..e129f3182de3 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/gc/ObjectWriteBarrier.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/gc/ObjectWriteBarrier.java
@@ -22,12 +22,12 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.gc;
+package jdk.graal.compiler.nodes.gc;
 
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.memory.address.AddressNode;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.memory.address.AddressNode;
 
 @NodeInfo
 public abstract class ObjectWriteBarrier extends WriteBarrier {
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/gc/SerialArrayRangeWriteBarrier.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/gc/SerialArrayRangeWriteBarrier.java
similarity index 83%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/gc/SerialArrayRangeWriteBarrier.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/gc/SerialArrayRangeWriteBarrier.java
index c7581764baef..a7ad99884e8f 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/gc/SerialArrayRangeWriteBarrier.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/gc/SerialArrayRangeWriteBarrier.java
@@ -22,15 +22,15 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.gc;
+package jdk.graal.compiler.nodes.gc;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_8;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_8;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_8;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_8;
 
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.memory.address.AddressNode;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.memory.address.AddressNode;
 
 @NodeInfo(cycles = CYCLES_8, size = SIZE_8)
 public final class SerialArrayRangeWriteBarrier extends ArrayRangeWriteBarrier {
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/gc/SerialWriteBarrier.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/gc/SerialWriteBarrier.java
similarity index 86%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/gc/SerialWriteBarrier.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/gc/SerialWriteBarrier.java
index 2f7c8343a5d9..586e028cccd4 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/gc/SerialWriteBarrier.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/gc/SerialWriteBarrier.java
@@ -22,14 +22,14 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.gc;
+package jdk.graal.compiler.nodes.gc;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_8;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_4;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_8;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_4;
 
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.memory.address.AddressNode;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.memory.address.AddressNode;
 
 @NodeInfo(cycles = CYCLES_8, size = SIZE_4)
 public class SerialWriteBarrier extends ObjectWriteBarrier {
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/gc/WriteBarrier.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/gc/WriteBarrier.java
similarity index 81%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/gc/WriteBarrier.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/gc/WriteBarrier.java
index 4f38a7d12b2b..28319e38d03a 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/gc/WriteBarrier.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/gc/WriteBarrier.java
@@ -22,16 +22,16 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.gc;
-
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.InputType;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.spi.Lowerable;
-import jdk.compiler.graal.nodes.spi.LoweringTool;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.memory.address.AddressNode;
+package jdk.graal.compiler.nodes.gc;
+
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.InputType;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.spi.Lowerable;
+import jdk.graal.compiler.nodes.spi.LoweringTool;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.memory.address.AddressNode;
 
 @NodeInfo
 public abstract class WriteBarrier extends FixedWithNextNode implements Lowerable {
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/gc/ZBarrierSet.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/gc/ZBarrierSet.java
similarity index 87%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/gc/ZBarrierSet.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/gc/ZBarrierSet.java
index dabb6240cf41..8a2ab136b11a 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/gc/ZBarrierSet.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/gc/ZBarrierSet.java
@@ -22,29 +22,29 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.gc;
-
-import static jdk.compiler.graal.nodes.NamedLocationIdentity.OFF_HEAP_LOCATION;
-
-import jdk.compiler.graal.core.common.memory.BarrierType;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.nodes.extended.RawStoreNode;
-import jdk.compiler.graal.nodes.java.AbstractCompareAndSwapNode;
-import jdk.compiler.graal.nodes.java.LoweredAtomicReadAndWriteNode;
-import jdk.compiler.graal.nodes.FieldLocationIdentity;
-import jdk.compiler.graal.nodes.NamedLocationIdentity;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.memory.AddressableMemoryAccess;
-import jdk.compiler.graal.nodes.memory.FixedAccessNode;
-import jdk.compiler.graal.nodes.memory.FloatingReadNode;
-import jdk.compiler.graal.nodes.memory.LIRLowerableAccess;
-import jdk.compiler.graal.nodes.memory.ReadNode;
-import jdk.compiler.graal.nodes.memory.WriteNode;
-import jdk.compiler.graal.nodes.memory.address.AddressNode;
+package jdk.graal.compiler.nodes.gc;
+
+import static jdk.graal.compiler.nodes.NamedLocationIdentity.OFF_HEAP_LOCATION;
+
+import jdk.graal.compiler.core.common.memory.BarrierType;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.nodes.extended.RawStoreNode;
+import jdk.graal.compiler.nodes.java.AbstractCompareAndSwapNode;
+import jdk.graal.compiler.nodes.java.LoweredAtomicReadAndWriteNode;
+import jdk.graal.compiler.nodes.FieldLocationIdentity;
+import jdk.graal.compiler.nodes.NamedLocationIdentity;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.memory.AddressableMemoryAccess;
+import jdk.graal.compiler.nodes.memory.FixedAccessNode;
+import jdk.graal.compiler.nodes.memory.FloatingReadNode;
+import jdk.graal.compiler.nodes.memory.LIRLowerableAccess;
+import jdk.graal.compiler.nodes.memory.ReadNode;
+import jdk.graal.compiler.nodes.memory.WriteNode;
+import jdk.graal.compiler.nodes.memory.address.AddressNode;
 import org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/graphbuilderconf/ClassInitializationPlugin.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/graphbuilderconf/ClassInitializationPlugin.java
similarity index 96%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/graphbuilderconf/ClassInitializationPlugin.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/graphbuilderconf/ClassInitializationPlugin.java
index 38522a619fc6..07c766ebff38 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/graphbuilderconf/ClassInitializationPlugin.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/graphbuilderconf/ClassInitializationPlugin.java
@@ -22,11 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.graphbuilderconf;
+package jdk.graal.compiler.nodes.graphbuilderconf;
 
 import java.util.function.Supplier;
 
-import jdk.compiler.graal.nodes.FrameState;
+import jdk.graal.compiler.nodes.FrameState;
 
 import jdk.vm.ci.meta.ConstantPool;
 import jdk.vm.ci.meta.ResolvedJavaType;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/graphbuilderconf/ForeignCallPlugin.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/graphbuilderconf/ForeignCallPlugin.java
similarity index 90%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/graphbuilderconf/ForeignCallPlugin.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/graphbuilderconf/ForeignCallPlugin.java
index 699890bd79c8..5ac235cf71cc 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/graphbuilderconf/ForeignCallPlugin.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/graphbuilderconf/ForeignCallPlugin.java
@@ -22,11 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.graphbuilderconf;
+package jdk.graal.compiler.nodes.graphbuilderconf;
 
-import jdk.compiler.graal.core.common.spi.ForeignCallDescriptor;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.extended.ForeignCallNode;
+import jdk.graal.compiler.core.common.spi.ForeignCallDescriptor;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.extended.ForeignCallNode;
 
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/graphbuilderconf/GeneratedFoldInvocationPlugin.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/graphbuilderconf/GeneratedFoldInvocationPlugin.java
similarity index 96%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/graphbuilderconf/GeneratedFoldInvocationPlugin.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/graphbuilderconf/GeneratedFoldInvocationPlugin.java
index c57cf5591eb6..91a67e34a5d2 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/graphbuilderconf/GeneratedFoldInvocationPlugin.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/graphbuilderconf/GeneratedFoldInvocationPlugin.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.graphbuilderconf;
+package jdk.graal.compiler.nodes.graphbuilderconf;
 
 import java.lang.reflect.Type;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/graphbuilderconf/GeneratedInvocationPlugin.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/graphbuilderconf/GeneratedInvocationPlugin.java
similarity index 93%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/graphbuilderconf/GeneratedInvocationPlugin.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/graphbuilderconf/GeneratedInvocationPlugin.java
index 92ade245c47b..cb1f516111de 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/graphbuilderconf/GeneratedInvocationPlugin.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/graphbuilderconf/GeneratedInvocationPlugin.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.graphbuilderconf;
+package jdk.graal.compiler.nodes.graphbuilderconf;
 
 import static jdk.vm.ci.services.Services.IS_BUILDING_NATIVE_IMAGE;
 import static jdk.vm.ci.services.Services.IS_IN_NATIVE_IMAGE;
@@ -31,12 +31,12 @@
 import java.lang.reflect.Method;
 import java.lang.reflect.Type;
 
-import jdk.compiler.graal.api.replacements.Fold;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.Node.NodeIntrinsic;
-import jdk.compiler.graal.nodes.PluginReplacementNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin.RequiredInlineOnlyInvocationPlugin;
+import jdk.graal.compiler.api.replacements.Fold;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.Node.NodeIntrinsic;
+import jdk.graal.compiler.nodes.PluginReplacementNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin.RequiredInlineOnlyInvocationPlugin;
 
 import jdk.vm.ci.meta.MetaAccessProvider;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/graphbuilderconf/GeneratedNodeIntrinsicInvocationPlugin.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/graphbuilderconf/GeneratedNodeIntrinsicInvocationPlugin.java
similarity index 95%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/graphbuilderconf/GeneratedNodeIntrinsicInvocationPlugin.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/graphbuilderconf/GeneratedNodeIntrinsicInvocationPlugin.java
index c1434517c647..ab156e6b72a3 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/graphbuilderconf/GeneratedNodeIntrinsicInvocationPlugin.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/graphbuilderconf/GeneratedNodeIntrinsicInvocationPlugin.java
@@ -22,11 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.graphbuilderconf;
+package jdk.graal.compiler.nodes.graphbuilderconf;
 
 import java.lang.reflect.Type;
 
-import jdk.compiler.graal.core.common.spi.ForeignCallDescriptor;
+import jdk.graal.compiler.core.common.spi.ForeignCallDescriptor;
 
 import jdk.vm.ci.meta.MetaAccessProvider;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/graphbuilderconf/GeneratedPluginFactory.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/graphbuilderconf/GeneratedPluginFactory.java
similarity index 96%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/graphbuilderconf/GeneratedPluginFactory.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/graphbuilderconf/GeneratedPluginFactory.java
index 98fa4e3c3fcc..d89025f9a4bd 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/graphbuilderconf/GeneratedPluginFactory.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/graphbuilderconf/GeneratedPluginFactory.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.graphbuilderconf;
+package jdk.graal.compiler.nodes.graphbuilderconf;
 
 public interface GeneratedPluginFactory {
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/graphbuilderconf/GeneratedPluginInjectionProvider.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/graphbuilderconf/GeneratedPluginInjectionProvider.java
similarity index 94%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/graphbuilderconf/GeneratedPluginInjectionProvider.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/graphbuilderconf/GeneratedPluginInjectionProvider.java
index cb04a291abde..b5134e3bbb4d 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/graphbuilderconf/GeneratedPluginInjectionProvider.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/graphbuilderconf/GeneratedPluginInjectionProvider.java
@@ -22,9 +22,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.graphbuilderconf;
+package jdk.graal.compiler.nodes.graphbuilderconf;
 
-import jdk.compiler.graal.core.common.type.Stamp;
+import jdk.graal.compiler.core.common.type.Stamp;
 
 public interface GeneratedPluginInjectionProvider {
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/graphbuilderconf/GraphBuilderConfiguration.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/graphbuilderconf/GraphBuilderConfiguration.java
similarity index 99%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/graphbuilderconf/GraphBuilderConfiguration.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/graphbuilderconf/GraphBuilderConfiguration.java
index 62b6591018c0..5fe4a2879b41 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/graphbuilderconf/GraphBuilderConfiguration.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/graphbuilderconf/GraphBuilderConfiguration.java
@@ -22,13 +22,13 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.graphbuilderconf;
+package jdk.graal.compiler.nodes.graphbuilderconf;
 
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
-import jdk.compiler.graal.core.common.type.StampPair;
+import jdk.graal.compiler.core.common.type.StampPair;
 
 import jdk.vm.ci.meta.JavaType;
 import jdk.vm.ci.meta.ResolvedJavaType;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/graphbuilderconf/GraphBuilderContext.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/graphbuilderconf/GraphBuilderContext.java
similarity index 91%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/graphbuilderconf/GraphBuilderContext.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/graphbuilderconf/GraphBuilderContext.java
index 6ad0a7069493..cfcd97333241 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/graphbuilderconf/GraphBuilderContext.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/graphbuilderconf/GraphBuilderContext.java
@@ -22,55 +22,55 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.graphbuilderconf;
+package jdk.graal.compiler.nodes.graphbuilderconf;
 
 import static jdk.vm.ci.meta.DeoptimizationAction.InvalidateReprofile;
-import static jdk.compiler.graal.core.common.GraalOptions.StrictDeoptInsertionChecks;
-import static jdk.compiler.graal.core.common.type.StampFactory.objectNonNull;
-
-import jdk.compiler.graal.bytecode.Bytecode;
-import jdk.compiler.graal.core.common.type.AbstractPointerStamp;
-import jdk.compiler.graal.core.common.type.IntegerStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.core.common.type.StampPair;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.nodes.DeoptimizeNode;
-import jdk.compiler.graal.nodes.extended.BranchProbabilityNode;
-import jdk.compiler.graal.nodes.extended.BytecodeExceptionNode;
-import jdk.compiler.graal.nodes.extended.GuardingNode;
-import jdk.compiler.graal.nodes.java.InstanceOfDynamicNode;
-import jdk.compiler.graal.nodes.AbstractBeginNode;
-import jdk.compiler.graal.nodes.AbstractMergeNode;
-import jdk.compiler.graal.nodes.BeginNode;
-import jdk.compiler.graal.nodes.CallTargetNode;
-import jdk.compiler.graal.nodes.CallTargetNode.InvokeKind;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.DynamicPiNode;
-import jdk.compiler.graal.nodes.EndNode;
-import jdk.compiler.graal.nodes.FixedGuardNode;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.FrameState;
-import jdk.compiler.graal.nodes.IfNode;
-import jdk.compiler.graal.nodes.Invokable;
-import jdk.compiler.graal.nodes.Invoke;
-import jdk.compiler.graal.nodes.LogicNode;
-import jdk.compiler.graal.nodes.MergeNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.PiNode;
-import jdk.compiler.graal.nodes.PluginReplacementNode;
-import jdk.compiler.graal.nodes.PluginReplacementWithExceptionNode;
-import jdk.compiler.graal.nodes.ProfileData.BranchProbabilityData;
-import jdk.compiler.graal.nodes.StateSplit;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.calc.IntegerEqualsNode;
-import jdk.compiler.graal.nodes.calc.IntegerLessThanNode;
-import jdk.compiler.graal.nodes.calc.IsNullNode;
-import jdk.compiler.graal.nodes.calc.NarrowNode;
-import jdk.compiler.graal.nodes.calc.SignExtendNode;
-import jdk.compiler.graal.nodes.calc.ZeroExtendNode;
-import jdk.compiler.graal.nodes.type.StampTool;
+import static jdk.graal.compiler.core.common.GraalOptions.StrictDeoptInsertionChecks;
+import static jdk.graal.compiler.core.common.type.StampFactory.objectNonNull;
+
+import jdk.graal.compiler.bytecode.Bytecode;
+import jdk.graal.compiler.core.common.type.AbstractPointerStamp;
+import jdk.graal.compiler.core.common.type.IntegerStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.core.common.type.StampPair;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.nodes.DeoptimizeNode;
+import jdk.graal.compiler.nodes.extended.BranchProbabilityNode;
+import jdk.graal.compiler.nodes.extended.BytecodeExceptionNode;
+import jdk.graal.compiler.nodes.extended.GuardingNode;
+import jdk.graal.compiler.nodes.java.InstanceOfDynamicNode;
+import jdk.graal.compiler.nodes.AbstractBeginNode;
+import jdk.graal.compiler.nodes.AbstractMergeNode;
+import jdk.graal.compiler.nodes.BeginNode;
+import jdk.graal.compiler.nodes.CallTargetNode;
+import jdk.graal.compiler.nodes.CallTargetNode.InvokeKind;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.DynamicPiNode;
+import jdk.graal.compiler.nodes.EndNode;
+import jdk.graal.compiler.nodes.FixedGuardNode;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.FrameState;
+import jdk.graal.compiler.nodes.IfNode;
+import jdk.graal.compiler.nodes.Invokable;
+import jdk.graal.compiler.nodes.Invoke;
+import jdk.graal.compiler.nodes.LogicNode;
+import jdk.graal.compiler.nodes.MergeNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.PiNode;
+import jdk.graal.compiler.nodes.PluginReplacementNode;
+import jdk.graal.compiler.nodes.PluginReplacementWithExceptionNode;
+import jdk.graal.compiler.nodes.ProfileData.BranchProbabilityData;
+import jdk.graal.compiler.nodes.StateSplit;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.calc.IntegerEqualsNode;
+import jdk.graal.compiler.nodes.calc.IntegerLessThanNode;
+import jdk.graal.compiler.nodes.calc.IsNullNode;
+import jdk.graal.compiler.nodes.calc.NarrowNode;
+import jdk.graal.compiler.nodes.calc.SignExtendNode;
+import jdk.graal.compiler.nodes.calc.ZeroExtendNode;
+import jdk.graal.compiler.nodes.type.StampTool;
 
 import jdk.vm.ci.code.BailoutException;
 import jdk.vm.ci.meta.Assumptions;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/graphbuilderconf/GraphBuilderPlugin.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/graphbuilderconf/GraphBuilderPlugin.java
similarity index 96%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/graphbuilderconf/GraphBuilderPlugin.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/graphbuilderconf/GraphBuilderPlugin.java
index 5cc18d76f93d..ffb5dfd5c9c6 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/graphbuilderconf/GraphBuilderPlugin.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/graphbuilderconf/GraphBuilderPlugin.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.graphbuilderconf;
+package jdk.graal.compiler.nodes.graphbuilderconf;
 
 /**
  * Marker interface for graph builder plugins.
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/graphbuilderconf/GraphBuilderTool.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/graphbuilderconf/GraphBuilderTool.java
similarity index 90%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/graphbuilderconf/GraphBuilderTool.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/graphbuilderconf/GraphBuilderTool.java
index 6bea0d6d6e99..0d0660566815 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/graphbuilderconf/GraphBuilderTool.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/graphbuilderconf/GraphBuilderTool.java
@@ -22,13 +22,13 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.graphbuilderconf;
+package jdk.graal.compiler.nodes.graphbuilderconf;
 
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.spi.CoreProviders;
-import jdk.compiler.graal.options.OptionValues;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.spi.CoreProviders;
+import jdk.graal.compiler.options.OptionValues;
 
 import jdk.vm.ci.meta.Assumptions;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/graphbuilderconf/InlineInvokePlugin.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/graphbuilderconf/InlineInvokePlugin.java
similarity index 97%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/graphbuilderconf/InlineInvokePlugin.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/graphbuilderconf/InlineInvokePlugin.java
index 9b0b9fecb7f0..70d422b00dee 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/graphbuilderconf/InlineInvokePlugin.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/graphbuilderconf/InlineInvokePlugin.java
@@ -22,11 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.graphbuilderconf;
+package jdk.graal.compiler.nodes.graphbuilderconf;
 
-import jdk.compiler.graal.bytecode.BytecodeProvider;
-import jdk.compiler.graal.nodes.Invoke;
-import jdk.compiler.graal.nodes.ValueNode;
+import jdk.graal.compiler.bytecode.BytecodeProvider;
+import jdk.graal.compiler.nodes.Invoke;
+import jdk.graal.compiler.nodes.ValueNode;
 
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/graphbuilderconf/IntrinsicContext.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/graphbuilderconf/IntrinsicContext.java
similarity index 94%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/graphbuilderconf/IntrinsicContext.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/graphbuilderconf/IntrinsicContext.java
index 0a00be9d95df..9e4286359fa4 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/graphbuilderconf/IntrinsicContext.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/graphbuilderconf/IntrinsicContext.java
@@ -22,23 +22,23 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.graphbuilderconf;
+package jdk.graal.compiler.nodes.graphbuilderconf;
 
 import static jdk.vm.ci.code.BytecodeFrame.AFTER_BCI;
 import static jdk.vm.ci.code.BytecodeFrame.AFTER_EXCEPTION_BCI;
 import static jdk.vm.ci.code.BytecodeFrame.BEFORE_BCI;
 import static jdk.vm.ci.code.BytecodeFrame.INVALID_FRAMESTATE_BCI;
-import static jdk.compiler.graal.nodes.graphbuilderconf.IntrinsicContext.CompilationContext.INLINE_AFTER_PARSING;
-
-import jdk.compiler.graal.bytecode.BytecodeProvider;
-import jdk.compiler.graal.graph.NodeSourcePosition;
-import jdk.compiler.graal.nodes.java.ExceptionObjectNode;
-import jdk.compiler.graal.nodes.AbstractMergeNode;
-import jdk.compiler.graal.nodes.FrameState;
-import jdk.compiler.graal.nodes.Invoke;
-import jdk.compiler.graal.nodes.LoopExitNode;
-import jdk.compiler.graal.nodes.StateSplit;
-import jdk.compiler.graal.nodes.StructuredGraph;
+import static jdk.graal.compiler.nodes.graphbuilderconf.IntrinsicContext.CompilationContext.INLINE_AFTER_PARSING;
+
+import jdk.graal.compiler.bytecode.BytecodeProvider;
+import jdk.graal.compiler.graph.NodeSourcePosition;
+import jdk.graal.compiler.nodes.java.ExceptionObjectNode;
+import jdk.graal.compiler.nodes.AbstractMergeNode;
+import jdk.graal.compiler.nodes.FrameState;
+import jdk.graal.compiler.nodes.Invoke;
+import jdk.graal.compiler.nodes.LoopExitNode;
+import jdk.graal.compiler.nodes.StateSplit;
+import jdk.graal.compiler.nodes.StructuredGraph;
 
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/graphbuilderconf/InvocationPlugin.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/graphbuilderconf/InvocationPlugin.java
similarity index 98%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/graphbuilderconf/InvocationPlugin.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/graphbuilderconf/InvocationPlugin.java
index 6219b08dc1bb..9dd8996ae712 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/graphbuilderconf/InvocationPlugin.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/graphbuilderconf/InvocationPlugin.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.graphbuilderconf;
+package jdk.graal.compiler.nodes.graphbuilderconf;
 
 import static jdk.vm.ci.services.Services.IS_IN_NATIVE_IMAGE;
 
@@ -31,11 +31,11 @@
 import java.lang.reflect.Modifier;
 import java.lang.reflect.Type;
 
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.nodes.Invoke;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins.ClassPlugins;
-import jdk.compiler.graal.nodes.type.StampTool;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.nodes.Invoke;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins.ClassPlugins;
+import jdk.graal.compiler.nodes.type.StampTool;
 
 import jdk.vm.ci.meta.MetaUtil;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/graphbuilderconf/InvocationPluginContext.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/graphbuilderconf/InvocationPluginContext.java
similarity index 93%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/graphbuilderconf/InvocationPluginContext.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/graphbuilderconf/InvocationPluginContext.java
index b3bd77549b33..11fa779038fc 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/graphbuilderconf/InvocationPluginContext.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/graphbuilderconf/InvocationPluginContext.java
@@ -22,10 +22,10 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.graphbuilderconf;
+package jdk.graal.compiler.nodes.graphbuilderconf;
 
-import jdk.compiler.graal.nodes.CallTargetNode;
-import jdk.compiler.graal.nodes.ValueNode;
+import jdk.graal.compiler.nodes.CallTargetNode;
+import jdk.graal.compiler.nodes.ValueNode;
 
 import jdk.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/graphbuilderconf/InvocationPlugins.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/graphbuilderconf/InvocationPlugins.java
similarity index 98%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/graphbuilderconf/InvocationPlugins.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/graphbuilderconf/InvocationPlugins.java
index acdac8f2a85f..2d514638c362 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/graphbuilderconf/InvocationPlugins.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/graphbuilderconf/InvocationPlugins.java
@@ -22,12 +22,12 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.graphbuilderconf;
+package jdk.graal.compiler.nodes.graphbuilderconf;
 
 import static java.lang.String.format;
 import static jdk.vm.ci.services.Services.IS_BUILDING_NATIVE_IMAGE;
 import static jdk.vm.ci.services.Services.IS_IN_NATIVE_IMAGE;
-import static jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins.LateClassPlugins.CLOSED_LATE_CLASS_PLUGIN;
+import static jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins.LateClassPlugins.CLOSED_LATE_CLASS_PLUGIN;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
@@ -46,20 +46,20 @@
 import org.graalvm.collections.Pair;
 import org.graalvm.collections.UnmodifiableEconomicMap;
 import org.graalvm.collections.UnmodifiableMapCursor;
-import jdk.compiler.graal.core.common.SuppressFBWarnings;
-import jdk.compiler.graal.debug.Assertions;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.debug.MethodFilter;
-import jdk.compiler.graal.debug.TTY;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.iterators.NodeIterable;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.Replacements;
-import jdk.compiler.graal.nodes.type.StampTool;
-import jdk.compiler.graal.options.Option;
-import jdk.compiler.graal.options.OptionKey;
-import jdk.compiler.graal.options.OptionType;
-import jdk.compiler.graal.options.OptionValues;
+import jdk.graal.compiler.core.common.SuppressFBWarnings;
+import jdk.graal.compiler.debug.Assertions;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.debug.MethodFilter;
+import jdk.graal.compiler.debug.TTY;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.iterators.NodeIterable;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.Replacements;
+import jdk.graal.compiler.nodes.type.StampTool;
+import jdk.graal.compiler.options.Option;
+import jdk.graal.compiler.options.OptionKey;
+import jdk.graal.compiler.options.OptionType;
+import jdk.graal.compiler.options.OptionValues;
 
 import jdk.vm.ci.meta.MetaUtil;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/graphbuilderconf/LoopExplosionPlugin.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/graphbuilderconf/LoopExplosionPlugin.java
similarity index 98%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/graphbuilderconf/LoopExplosionPlugin.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/graphbuilderconf/LoopExplosionPlugin.java
index e96a75829709..ae5b30418673 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/graphbuilderconf/LoopExplosionPlugin.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/graphbuilderconf/LoopExplosionPlugin.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.graphbuilderconf;
+package jdk.graal.compiler.nodes.graphbuilderconf;
 
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/graphbuilderconf/NodePlugin.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/graphbuilderconf/NodePlugin.java
similarity index 96%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/graphbuilderconf/NodePlugin.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/graphbuilderconf/NodePlugin.java
index 99a02cc194b9..1b711b6f7bc0 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/graphbuilderconf/NodePlugin.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/graphbuilderconf/NodePlugin.java
@@ -22,18 +22,18 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.graphbuilderconf;
+package jdk.graal.compiler.nodes.graphbuilderconf;
 
 import java.util.function.Supplier;
 
 import org.graalvm.collections.Pair;
-import jdk.compiler.graal.core.common.BootstrapMethodIntrospection;
-import jdk.compiler.graal.graph.Node.ValueNumberable;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.FrameState;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.extended.GuardingNode;
+import jdk.graal.compiler.core.common.BootstrapMethodIntrospection;
+import jdk.graal.compiler.graph.Node.ValueNumberable;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.FrameState;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.extended.GuardingNode;
 
 import jdk.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.JavaTypeProfile;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/graphbuilderconf/ParameterPlugin.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/graphbuilderconf/ParameterPlugin.java
similarity index 89%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/graphbuilderconf/ParameterPlugin.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/graphbuilderconf/ParameterPlugin.java
index 9b41b1c81d16..18fd266cbb7a 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/graphbuilderconf/ParameterPlugin.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/graphbuilderconf/ParameterPlugin.java
@@ -22,10 +22,10 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.graphbuilderconf;
+package jdk.graal.compiler.nodes.graphbuilderconf;
 
-import jdk.compiler.graal.core.common.type.StampPair;
-import jdk.compiler.graal.nodes.calc.FloatingNode;
+import jdk.graal.compiler.core.common.type.StampPair;
+import jdk.graal.compiler.nodes.calc.FloatingNode;
 
 public interface ParameterPlugin extends GraphBuilderPlugin {
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/graphbuilderconf/TypePlugin.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/graphbuilderconf/TypePlugin.java
similarity index 94%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/graphbuilderconf/TypePlugin.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/graphbuilderconf/TypePlugin.java
index 3bcbf84af76d..db2c99bce274 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/graphbuilderconf/TypePlugin.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/graphbuilderconf/TypePlugin.java
@@ -22,9 +22,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.graphbuilderconf;
+package jdk.graal.compiler.nodes.graphbuilderconf;
 
-import jdk.compiler.graal.core.common.type.StampPair;
+import jdk.graal.compiler.core.common.type.StampPair;
 
 import jdk.vm.ci.meta.JavaType;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/AbstractCompareAndSwapNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/AbstractCompareAndSwapNode.java
similarity index 78%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/AbstractCompareAndSwapNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/AbstractCompareAndSwapNode.java
index c7806dafb39f..a249dfd68f05 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/AbstractCompareAndSwapNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/AbstractCompareAndSwapNode.java
@@ -22,26 +22,26 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.java;
+package jdk.graal.compiler.nodes.java;
 
-import static jdk.compiler.graal.nodeinfo.InputType.Memory;
-import static jdk.compiler.graal.nodeinfo.InputType.State;
+import static jdk.graal.compiler.nodeinfo.InputType.Memory;
+import static jdk.graal.compiler.nodeinfo.InputType.State;
 
-import jdk.compiler.graal.core.common.memory.BarrierType;
-import jdk.compiler.graal.core.common.memory.MemoryOrderMode;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.InputType;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.FrameState;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.StateSplit;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.memory.FixedAccessNode;
-import jdk.compiler.graal.nodes.memory.LIRLowerableAccess;
-import jdk.compiler.graal.nodes.memory.OrderedMemoryAccess;
-import jdk.compiler.graal.nodes.memory.SingleMemoryKill;
-import jdk.compiler.graal.nodes.memory.address.AddressNode;
+import jdk.graal.compiler.core.common.memory.BarrierType;
+import jdk.graal.compiler.core.common.memory.MemoryOrderMode;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.InputType;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.FrameState;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.StateSplit;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.memory.FixedAccessNode;
+import jdk.graal.compiler.nodes.memory.LIRLowerableAccess;
+import jdk.graal.compiler.nodes.memory.OrderedMemoryAccess;
+import jdk.graal.compiler.nodes.memory.SingleMemoryKill;
+import jdk.graal.compiler.nodes.memory.address.AddressNode;
 import org.graalvm.word.LocationIdentity;
 
 /**
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/AbstractNewArrayNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/AbstractNewArrayNode.java
similarity index 88%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/AbstractNewArrayNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/AbstractNewArrayNode.java
index 82ff60c066a3..764a077ef7b7 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/AbstractNewArrayNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/AbstractNewArrayNode.java
@@ -22,14 +22,14 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.java;
+package jdk.graal.compiler.nodes.java;
 
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.FrameState;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.ArrayLengthProvider;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.FrameState;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.ArrayLengthProvider;
 
 import jdk.vm.ci.meta.ConstantReflectionProvider;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/AbstractNewObjectNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/AbstractNewObjectNode.java
similarity index 82%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/AbstractNewObjectNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/AbstractNewObjectNode.java
index cc3781515373..73f0ccb856a3 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/AbstractNewObjectNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/AbstractNewObjectNode.java
@@ -22,19 +22,19 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.java;
+package jdk.graal.compiler.nodes.java;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_8;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_8;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_8;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_8;
 
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.DeoptimizingFixedWithNextNode;
-import jdk.compiler.graal.nodes.FrameState;
-import jdk.compiler.graal.nodes.extended.MembarNode;
-import jdk.compiler.graal.nodes.extended.MembarNode.FenceKind;
-import jdk.compiler.graal.nodes.spi.Lowerable;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.DeoptimizingFixedWithNextNode;
+import jdk.graal.compiler.nodes.FrameState;
+import jdk.graal.compiler.nodes.extended.MembarNode;
+import jdk.graal.compiler.nodes.extended.MembarNode.FenceKind;
+import jdk.graal.compiler.nodes.spi.Lowerable;
 
 /**
  * The {@code AbstractNewObjectNode} is the base class for the new instance and new array nodes.
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/AbstractUnsafeCompareAndSwapNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/AbstractUnsafeCompareAndSwapNode.java
similarity index 81%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/AbstractUnsafeCompareAndSwapNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/AbstractUnsafeCompareAndSwapNode.java
index 329b77781d0b..be0464b6aaf1 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/AbstractUnsafeCompareAndSwapNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/AbstractUnsafeCompareAndSwapNode.java
@@ -22,35 +22,35 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.java;
-
-import static jdk.compiler.graal.core.common.calc.CanonicalCondition.EQ;
-import static jdk.compiler.graal.debug.DebugContext.DETAILED_LEVEL;
-import static jdk.compiler.graal.nodeinfo.InputType.Memory;
-import static jdk.compiler.graal.nodeinfo.InputType.Value;
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_8;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_8;
-
-import jdk.compiler.graal.core.common.memory.MemoryOrderMode;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.virtual.VirtualArrayNode;
-import jdk.compiler.graal.nodes.virtual.VirtualInstanceNode;
-import jdk.compiler.graal.nodes.virtual.VirtualObjectNode;
-import jdk.compiler.graal.nodes.LogicConstantNode;
-import jdk.compiler.graal.nodes.LogicNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.calc.CompareNode;
-import jdk.compiler.graal.nodes.calc.ConditionalNode;
-import jdk.compiler.graal.nodes.calc.ObjectEqualsNode;
-import jdk.compiler.graal.nodes.memory.AbstractMemoryCheckpoint;
-import jdk.compiler.graal.nodes.memory.OrderedMemoryAccess;
-import jdk.compiler.graal.nodes.memory.SingleMemoryKill;
-import jdk.compiler.graal.nodes.spi.Lowerable;
-import jdk.compiler.graal.nodes.spi.Virtualizable;
-import jdk.compiler.graal.nodes.spi.VirtualizerTool;
+package jdk.graal.compiler.nodes.java;
+
+import static jdk.graal.compiler.core.common.calc.CanonicalCondition.EQ;
+import static jdk.graal.compiler.debug.DebugContext.DETAILED_LEVEL;
+import static jdk.graal.compiler.nodeinfo.InputType.Memory;
+import static jdk.graal.compiler.nodeinfo.InputType.Value;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_8;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_8;
+
+import jdk.graal.compiler.core.common.memory.MemoryOrderMode;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.virtual.VirtualArrayNode;
+import jdk.graal.compiler.nodes.virtual.VirtualInstanceNode;
+import jdk.graal.compiler.nodes.virtual.VirtualObjectNode;
+import jdk.graal.compiler.nodes.LogicConstantNode;
+import jdk.graal.compiler.nodes.LogicNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.calc.CompareNode;
+import jdk.graal.compiler.nodes.calc.ConditionalNode;
+import jdk.graal.compiler.nodes.calc.ObjectEqualsNode;
+import jdk.graal.compiler.nodes.memory.AbstractMemoryCheckpoint;
+import jdk.graal.compiler.nodes.memory.OrderedMemoryAccess;
+import jdk.graal.compiler.nodes.memory.SingleMemoryKill;
+import jdk.graal.compiler.nodes.spi.Lowerable;
+import jdk.graal.compiler.nodes.spi.Virtualizable;
+import jdk.graal.compiler.nodes.spi.VirtualizerTool;
 import org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/AccessArrayNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/AccessArrayNode.java
similarity index 87%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/AccessArrayNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/AccessArrayNode.java
index c0066fc670ed..28fa3d7277f9 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/AccessArrayNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/AccessArrayNode.java
@@ -22,13 +22,13 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.java;
+package jdk.graal.compiler.nodes.java;
 
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.ValueNode;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.ValueNode;
 
 /**
  * This the base class of all array operations.
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/AccessFieldNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/AccessFieldNode.java
similarity index 85%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/AccessFieldNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/AccessFieldNode.java
index 220dd1fef9ec..d4b5ea72f827 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/AccessFieldNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/AccessFieldNode.java
@@ -22,24 +22,24 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.java;
+package jdk.graal.compiler.nodes.java;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_2;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_2;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_1;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_2;
 
-import jdk.compiler.graal.core.common.memory.MemoryOrderMode;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodeinfo.NodeSize;
-import jdk.compiler.graal.nodeinfo.Verbosity;
-import jdk.compiler.graal.nodes.FieldLocationIdentity;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.memory.MemoryAccess;
-import jdk.compiler.graal.nodes.memory.OrderedMemoryAccess;
-import jdk.compiler.graal.nodes.spi.Lowerable;
+import jdk.graal.compiler.core.common.memory.MemoryOrderMode;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodeinfo.NodeSize;
+import jdk.graal.compiler.nodeinfo.Verbosity;
+import jdk.graal.compiler.nodes.FieldLocationIdentity;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.memory.MemoryAccess;
+import jdk.graal.compiler.nodes.memory.OrderedMemoryAccess;
+import jdk.graal.compiler.nodes.spi.Lowerable;
 
 import jdk.vm.ci.meta.ResolvedJavaField;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/AccessIndexedNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/AccessIndexedNode.java
similarity index 86%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/AccessIndexedNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/AccessIndexedNode.java
index 9ce58d641061..ea4528bd86aa 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/AccessIndexedNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/AccessIndexedNode.java
@@ -22,17 +22,17 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.java;
+package jdk.graal.compiler.nodes.java;
 
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.InputType;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.NamedLocationIdentity;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.extended.GuardingNode;
-import jdk.compiler.graal.nodes.memory.MemoryAccess;
-import jdk.compiler.graal.nodes.spi.Lowerable;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.InputType;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.NamedLocationIdentity;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.extended.GuardingNode;
+import jdk.graal.compiler.nodes.memory.MemoryAccess;
+import jdk.graal.compiler.nodes.spi.Lowerable;
 import org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/AccessMonitorNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/AccessMonitorNode.java
similarity index 85%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/AccessMonitorNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/AccessMonitorNode.java
index 183070b1f86f..cabb0dff76d1 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/AccessMonitorNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/AccessMonitorNode.java
@@ -22,20 +22,20 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.java;
-
-import static jdk.compiler.graal.nodeinfo.InputType.Association;
-import static jdk.compiler.graal.nodeinfo.InputType.Memory;
-
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.InputType;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.DeoptimizingNode;
-import jdk.compiler.graal.nodes.FrameState;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.memory.AbstractMemoryCheckpoint;
-import jdk.compiler.graal.nodes.memory.SingleMemoryKill;
+package jdk.graal.compiler.nodes.java;
+
+import static jdk.graal.compiler.nodeinfo.InputType.Association;
+import static jdk.graal.compiler.nodeinfo.InputType.Memory;
+
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.InputType;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.DeoptimizingNode;
+import jdk.graal.compiler.nodes.FrameState;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.memory.AbstractMemoryCheckpoint;
+import jdk.graal.compiler.nodes.memory.SingleMemoryKill;
 
 import jdk.vm.ci.code.BailoutException;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/ArrayLengthNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/ArrayLengthNode.java
similarity index 79%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/ArrayLengthNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/ArrayLengthNode.java
index 4c1b8a574263..58271225b723 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/ArrayLengthNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/ArrayLengthNode.java
@@ -22,34 +22,34 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.java;
-
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1;
-
-import jdk.compiler.graal.core.common.type.AbstractObjectStamp;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.Node.NodeIntrinsicFactory;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodes.virtual.VirtualArrayNode;
-import jdk.compiler.graal.nodes.spi.Canonicalizable;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.BeginNode;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.DeoptimizeNode;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.NamedLocationIdentity;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.PiNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext;
-import jdk.compiler.graal.nodes.memory.MemoryAccess;
-import jdk.compiler.graal.nodes.spi.ArrayLengthProvider;
-import jdk.compiler.graal.nodes.spi.Lowerable;
-import jdk.compiler.graal.nodes.spi.Virtualizable;
-import jdk.compiler.graal.nodes.spi.VirtualizerTool;
-import jdk.compiler.graal.nodes.util.GraphUtil;
+package jdk.graal.compiler.nodes.java;
+
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_2;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_1;
+
+import jdk.graal.compiler.core.common.type.AbstractObjectStamp;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.Node.NodeIntrinsicFactory;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodes.virtual.VirtualArrayNode;
+import jdk.graal.compiler.nodes.spi.Canonicalizable;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.BeginNode;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.DeoptimizeNode;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.NamedLocationIdentity;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.PiNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext;
+import jdk.graal.compiler.nodes.memory.MemoryAccess;
+import jdk.graal.compiler.nodes.spi.ArrayLengthProvider;
+import jdk.graal.compiler.nodes.spi.Lowerable;
+import jdk.graal.compiler.nodes.spi.Virtualizable;
+import jdk.graal.compiler.nodes.spi.VirtualizerTool;
+import jdk.graal.compiler.nodes.util.GraphUtil;
 import org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.meta.ConstantReflectionProvider;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/AtomicReadAndAddNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/AtomicReadAndAddNode.java
similarity index 83%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/AtomicReadAndAddNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/AtomicReadAndAddNode.java
index 72298d94207b..1254e7f71c99 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/AtomicReadAndAddNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/AtomicReadAndAddNode.java
@@ -22,19 +22,19 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.java;
+package jdk.graal.compiler.nodes.java;
 
-import static jdk.compiler.graal.nodeinfo.InputType.Memory;
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_8;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_2;
+import static jdk.graal.compiler.nodeinfo.InputType.Memory;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_8;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_2;
 
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.memory.AbstractMemoryCheckpoint;
-import jdk.compiler.graal.nodes.memory.SingleMemoryKill;
-import jdk.compiler.graal.nodes.spi.Lowerable;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.memory.AbstractMemoryCheckpoint;
+import jdk.graal.compiler.nodes.memory.SingleMemoryKill;
+import jdk.graal.compiler.nodes.spi.Lowerable;
 import org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/AtomicReadAndWriteNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/AtomicReadAndWriteNode.java
similarity index 83%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/AtomicReadAndWriteNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/AtomicReadAndWriteNode.java
index a8cf86206d4e..a7ffee5ac85a 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/AtomicReadAndWriteNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/AtomicReadAndWriteNode.java
@@ -22,18 +22,18 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.java;
+package jdk.graal.compiler.nodes.java;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_8;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_2;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_8;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_2;
 
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.memory.AbstractMemoryCheckpoint;
-import jdk.compiler.graal.nodes.memory.SingleMemoryKill;
-import jdk.compiler.graal.nodes.spi.Lowerable;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.memory.AbstractMemoryCheckpoint;
+import jdk.graal.compiler.nodes.memory.SingleMemoryKill;
+import jdk.graal.compiler.nodes.spi.Lowerable;
 import org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/ClassIsAssignableFromNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/ClassIsAssignableFromNode.java
similarity index 84%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/ClassIsAssignableFromNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/ClassIsAssignableFromNode.java
index 6502cbc340c1..b39a8e5d13db 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/ClassIsAssignableFromNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/ClassIsAssignableFromNode.java
@@ -22,23 +22,23 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.java;
+package jdk.graal.compiler.nodes.java;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_32;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_32;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_32;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_32;
 
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodes.extended.GetClassNode;
-import jdk.compiler.graal.nodes.spi.Canonicalizable;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.BinaryOpLogicNode;
-import jdk.compiler.graal.nodes.LogicConstantNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.Lowerable;
-import jdk.compiler.graal.nodes.type.StampTool;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodes.extended.GetClassNode;
+import jdk.graal.compiler.nodes.spi.Canonicalizable;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.BinaryOpLogicNode;
+import jdk.graal.compiler.nodes.LogicConstantNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.Lowerable;
+import jdk.graal.compiler.nodes.type.StampTool;
 
 import jdk.vm.ci.meta.ConstantReflectionProvider;
 import jdk.vm.ci.meta.ResolvedJavaType;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/DynamicNewArrayNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/DynamicNewArrayNode.java
similarity index 91%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/DynamicNewArrayNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/DynamicNewArrayNode.java
index 3b6633027cf4..aa38222ab1a6 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/DynamicNewArrayNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/DynamicNewArrayNode.java
@@ -23,18 +23,18 @@
  * questions.
  */
 //JaCoCo Exclude
-package jdk.compiler.graal.nodes.java;
-
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.core.common.type.TypeReference;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodes.spi.Canonicalizable;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.FrameState;
-import jdk.compiler.graal.nodes.ValueNode;
+package jdk.graal.compiler.nodes.java;
+
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.core.common.type.TypeReference;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodes.spi.Canonicalizable;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.FrameState;
+import jdk.graal.compiler.nodes.ValueNode;
 
 import jdk.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.MetaAccessProvider;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/DynamicNewInstanceNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/DynamicNewInstanceNode.java
similarity index 86%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/DynamicNewInstanceNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/DynamicNewInstanceNode.java
index 65a12bbcaf3d..d60d5a8eb985 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/DynamicNewInstanceNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/DynamicNewInstanceNode.java
@@ -22,23 +22,23 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.java;
+package jdk.graal.compiler.nodes.java;
 
-import static jdk.compiler.graal.nodes.extended.BranchProbabilityNode.probability;
+import static jdk.graal.compiler.nodes.extended.BranchProbabilityNode.probability;
 
 import java.lang.reflect.Modifier;
 
-import jdk.compiler.graal.core.common.type.ObjectStamp;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext;
-import jdk.compiler.graal.nodes.spi.Canonicalizable;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodes.spi.CoreProviders;
+import jdk.graal.compiler.core.common.type.ObjectStamp;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext;
+import jdk.graal.compiler.nodes.spi.Canonicalizable;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodes.spi.CoreProviders;
 
 import jdk.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.MetaAccessProvider;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/ExceptionObjectNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/ExceptionObjectNode.java
similarity index 82%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/ExceptionObjectNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/ExceptionObjectNode.java
index 3ca24223aa75..e227f2b0c58d 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/ExceptionObjectNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/ExceptionObjectNode.java
@@ -22,32 +22,32 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.java;
+package jdk.graal.compiler.nodes.java;
 
-import static jdk.compiler.graal.nodeinfo.InputType.Memory;
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_8;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_8;
+import static jdk.graal.compiler.nodeinfo.InputType.Memory;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_8;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_8;
 
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.core.common.type.TypeReference;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.InputType;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.BeginNode;
-import jdk.compiler.graal.nodes.BeginStateSplitNode;
-import jdk.compiler.graal.nodes.DeoptimizingNode;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.GraphState;
-import jdk.compiler.graal.nodes.MergeNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.StateSplit;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.WithExceptionNode;
-import jdk.compiler.graal.nodes.memory.MemoryAnchorNode;
-import jdk.compiler.graal.nodes.memory.SingleMemoryKill;
-import jdk.compiler.graal.nodes.spi.Lowerable;
-import jdk.compiler.graal.nodes.spi.LoweringTool;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.core.common.type.TypeReference;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.InputType;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.BeginNode;
+import jdk.graal.compiler.nodes.BeginStateSplitNode;
+import jdk.graal.compiler.nodes.DeoptimizingNode;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.GraphState;
+import jdk.graal.compiler.nodes.MergeNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.StateSplit;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.WithExceptionNode;
+import jdk.graal.compiler.nodes.memory.MemoryAnchorNode;
+import jdk.graal.compiler.nodes.memory.SingleMemoryKill;
+import jdk.graal.compiler.nodes.spi.Lowerable;
+import jdk.graal.compiler.nodes.spi.LoweringTool;
 import org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.meta.JavaKind;
@@ -114,7 +114,7 @@ public void lower(LoweringTool tool) {
     /**
      * Tests whether this is a placeholder node that can be removed.
      *
-     * @see jdk.compiler.graal.replacements.SnippetTemplate#replaceExceptionObjectNode
+     * @see jdk.graal.compiler.replacements.SnippetTemplate#replaceExceptionObjectNode
      */
     private boolean isMarkerAndCanBeRemoved() {
         if (predecessor() instanceof WithExceptionNode) {
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/FinalFieldBarrierNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/FinalFieldBarrierNode.java
similarity index 75%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/FinalFieldBarrierNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/FinalFieldBarrierNode.java
index a503f47759e4..2a4c118ade9a 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/FinalFieldBarrierNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/FinalFieldBarrierNode.java
@@ -22,23 +22,23 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.java;
+package jdk.graal.compiler.nodes.java;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_2;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_2;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_2;
 
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.virtual.VirtualObjectNode;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.extended.MembarNode;
-import jdk.compiler.graal.nodes.memory.SingleMemoryKill;
-import jdk.compiler.graal.nodes.spi.Lowerable;
-import jdk.compiler.graal.nodes.spi.LoweringTool;
-import jdk.compiler.graal.nodes.spi.Virtualizable;
-import jdk.compiler.graal.nodes.spi.VirtualizerTool;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.virtual.VirtualObjectNode;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.extended.MembarNode;
+import jdk.graal.compiler.nodes.memory.SingleMemoryKill;
+import jdk.graal.compiler.nodes.spi.Lowerable;
+import jdk.graal.compiler.nodes.spi.LoweringTool;
+import jdk.graal.compiler.nodes.spi.Virtualizable;
+import jdk.graal.compiler.nodes.spi.VirtualizerTool;
 import org.graalvm.word.LocationIdentity;
 
 @NodeInfo(cycles = CYCLES_2, size = SIZE_2)
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/ForeignCallDescriptors.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/ForeignCallDescriptors.java
similarity index 94%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/ForeignCallDescriptors.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/ForeignCallDescriptors.java
index a09ad24a6d47..5c606a5093cd 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/ForeignCallDescriptors.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/ForeignCallDescriptors.java
@@ -22,9 +22,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.java;
+package jdk.graal.compiler.nodes.java;
 
-import jdk.compiler.graal.core.common.spi.ForeignCallSignature;
+import jdk.graal.compiler.core.common.spi.ForeignCallSignature;
 
 /**
  * The foreign call descriptors used by nodes in this package.
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/InstanceOfDynamicNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/InstanceOfDynamicNode.java
similarity index 87%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/InstanceOfDynamicNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/InstanceOfDynamicNode.java
index 9c1e6597707c..836ab290ea73 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/InstanceOfDynamicNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/InstanceOfDynamicNode.java
@@ -22,23 +22,23 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.java;
-
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_32;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_32;
-
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.core.common.type.TypeReference;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodes.spi.Canonicalizable;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.BinaryOpLogicNode;
-import jdk.compiler.graal.nodes.LogicConstantNode;
-import jdk.compiler.graal.nodes.LogicNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.calc.IsNullNode;
-import jdk.compiler.graal.nodes.spi.Lowerable;
+package jdk.graal.compiler.nodes.java;
+
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_32;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_32;
+
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.core.common.type.TypeReference;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodes.spi.Canonicalizable;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.BinaryOpLogicNode;
+import jdk.graal.compiler.nodes.LogicConstantNode;
+import jdk.graal.compiler.nodes.LogicNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.calc.IsNullNode;
+import jdk.graal.compiler.nodes.spi.Lowerable;
 
 import jdk.vm.ci.meta.Assumptions;
 import jdk.vm.ci.meta.ConstantReflectionProvider;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/InstanceOfNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/InstanceOfNode.java
similarity index 88%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/InstanceOfNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/InstanceOfNode.java
index 9cfc65cd5867..395ba8fdb791 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/InstanceOfNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/InstanceOfNode.java
@@ -22,34 +22,34 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.java;
+package jdk.graal.compiler.nodes.java;
 
-import static jdk.compiler.graal.nodeinfo.InputType.Anchor;
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_8;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_8;
+import static jdk.graal.compiler.nodeinfo.InputType.Anchor;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_8;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_8;
 
 import java.util.Objects;
 
-import jdk.compiler.graal.core.common.type.ObjectStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.core.common.type.TypeReference;
-import jdk.compiler.graal.graph.Node.NodeIntrinsicFactory;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.LogicConstantNode;
-import jdk.compiler.graal.nodes.LogicNegationNode;
-import jdk.compiler.graal.nodes.LogicNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.UnaryOpLogicNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.calc.ConditionalNode;
-import jdk.compiler.graal.nodes.calc.IsNullNode;
-import jdk.compiler.graal.nodes.extended.AnchoringNode;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodes.spi.Lowerable;
-import jdk.compiler.graal.nodes.type.StampTool;
+import jdk.graal.compiler.core.common.type.ObjectStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.core.common.type.TypeReference;
+import jdk.graal.compiler.graph.Node.NodeIntrinsicFactory;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.LogicConstantNode;
+import jdk.graal.compiler.nodes.LogicNegationNode;
+import jdk.graal.compiler.nodes.LogicNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.UnaryOpLogicNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.calc.ConditionalNode;
+import jdk.graal.compiler.nodes.calc.IsNullNode;
+import jdk.graal.compiler.nodes.extended.AnchoringNode;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodes.spi.Lowerable;
+import jdk.graal.compiler.nodes.type.StampTool;
 
 import jdk.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.JavaTypeProfile;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/LoadExceptionObjectNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/LoadExceptionObjectNode.java
similarity index 78%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/LoadExceptionObjectNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/LoadExceptionObjectNode.java
index 32e80a6cd18c..b472172cb4da 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/LoadExceptionObjectNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/LoadExceptionObjectNode.java
@@ -22,17 +22,17 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.java;
+package jdk.graal.compiler.nodes.java;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_8;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_8;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_8;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_8;
 
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.AbstractStateSplit;
-import jdk.compiler.graal.nodes.DeoptimizingNode;
-import jdk.compiler.graal.nodes.spi.Lowerable;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.AbstractStateSplit;
+import jdk.graal.compiler.nodes.DeoptimizingNode;
+import jdk.graal.compiler.nodes.spi.Lowerable;
 
 @NodeInfo(cycles = CYCLES_8, size = SIZE_8)
 public final class LoadExceptionObjectNode extends AbstractStateSplit implements Lowerable, DeoptimizingNode.DeoptAfter {
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/LoadFieldNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/LoadFieldNode.java
similarity index 86%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/LoadFieldNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/LoadFieldNode.java
index 532134630763..0f40eb8538f2 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/LoadFieldNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/LoadFieldNode.java
@@ -22,40 +22,40 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.java;
-
-import static jdk.compiler.graal.graph.iterators.NodePredicates.isNotA;
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2;
-
-import jdk.compiler.graal.core.common.memory.MemoryOrderMode;
-import jdk.compiler.graal.core.common.spi.ConstantFieldProvider;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.core.common.type.StampPair;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.graph.NodeSourcePosition;
-import jdk.compiler.graal.nodeinfo.NodeCycles;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.virtual.VirtualInstanceNode;
-import jdk.compiler.graal.nodes.virtual.VirtualObjectNode;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.DeoptimizeNode;
-import jdk.compiler.graal.nodes.FixedGuardNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.PhiNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.ValuePhiNode;
-import jdk.compiler.graal.nodes.calc.IsNullNode;
-import jdk.compiler.graal.nodes.memory.MemoryKill;
-import jdk.compiler.graal.nodes.memory.SingleMemoryKill;
-import jdk.compiler.graal.nodes.spi.Canonicalizable;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodes.spi.UncheckedInterfaceProvider;
-import jdk.compiler.graal.nodes.spi.Virtualizable;
-import jdk.compiler.graal.nodes.spi.VirtualizerTool;
-import jdk.compiler.graal.nodes.type.StampTool;
-import jdk.compiler.graal.nodes.util.ConstantFoldUtil;
-import jdk.compiler.graal.options.OptionValues;
+package jdk.graal.compiler.nodes.java;
+
+import static jdk.graal.compiler.graph.iterators.NodePredicates.isNotA;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_2;
+
+import jdk.graal.compiler.core.common.memory.MemoryOrderMode;
+import jdk.graal.compiler.core.common.spi.ConstantFieldProvider;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.core.common.type.StampPair;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.graph.NodeSourcePosition;
+import jdk.graal.compiler.nodeinfo.NodeCycles;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.virtual.VirtualInstanceNode;
+import jdk.graal.compiler.nodes.virtual.VirtualObjectNode;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.DeoptimizeNode;
+import jdk.graal.compiler.nodes.FixedGuardNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.PhiNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.ValuePhiNode;
+import jdk.graal.compiler.nodes.calc.IsNullNode;
+import jdk.graal.compiler.nodes.memory.MemoryKill;
+import jdk.graal.compiler.nodes.memory.SingleMemoryKill;
+import jdk.graal.compiler.nodes.spi.Canonicalizable;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodes.spi.UncheckedInterfaceProvider;
+import jdk.graal.compiler.nodes.spi.Virtualizable;
+import jdk.graal.compiler.nodes.spi.VirtualizerTool;
+import jdk.graal.compiler.nodes.type.StampTool;
+import jdk.graal.compiler.nodes.util.ConstantFoldUtil;
+import jdk.graal.compiler.options.OptionValues;
 import org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.meta.Assumptions;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/LoadIndexedNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/LoadIndexedNode.java
similarity index 84%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/LoadIndexedNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/LoadIndexedNode.java
index 34972bbe7aba..6439781ab131 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/LoadIndexedNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/LoadIndexedNode.java
@@ -22,38 +22,38 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.java;
+package jdk.graal.compiler.nodes.java;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_8;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_8;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_8;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_8;
 
-import jdk.compiler.graal.core.common.calc.CanonicalCondition;
-import jdk.compiler.graal.core.common.type.ObjectStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.core.common.type.TypeReference;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.virtual.VirtualArrayNode;
-import jdk.compiler.graal.nodes.virtual.VirtualObjectNode;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.DeoptimizeNode;
-import jdk.compiler.graal.nodes.FixedGuardNode;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.LogicNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.calc.CompareNode;
-import jdk.compiler.graal.nodes.extended.GuardingNode;
-import jdk.compiler.graal.nodes.memory.MemoryAccess;
-import jdk.compiler.graal.nodes.spi.Canonicalizable;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodes.spi.Simplifiable;
-import jdk.compiler.graal.nodes.spi.SimplifierTool;
-import jdk.compiler.graal.nodes.spi.Virtualizable;
-import jdk.compiler.graal.nodes.spi.VirtualizerTool;
-import jdk.compiler.graal.nodes.type.StampTool;
+import jdk.graal.compiler.core.common.calc.CanonicalCondition;
+import jdk.graal.compiler.core.common.type.ObjectStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.core.common.type.TypeReference;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.virtual.VirtualArrayNode;
+import jdk.graal.compiler.nodes.virtual.VirtualObjectNode;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.DeoptimizeNode;
+import jdk.graal.compiler.nodes.FixedGuardNode;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.LogicNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.calc.CompareNode;
+import jdk.graal.compiler.nodes.extended.GuardingNode;
+import jdk.graal.compiler.nodes.memory.MemoryAccess;
+import jdk.graal.compiler.nodes.spi.Canonicalizable;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodes.spi.Simplifiable;
+import jdk.graal.compiler.nodes.spi.SimplifierTool;
+import jdk.graal.compiler.nodes.spi.Virtualizable;
+import jdk.graal.compiler.nodes.spi.VirtualizerTool;
+import jdk.graal.compiler.nodes.type.StampTool;
 
 import jdk.vm.ci.meta.Assumptions;
 import jdk.vm.ci.meta.ConstantReflectionProvider;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/LogicCompareAndSwapNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/LogicCompareAndSwapNode.java
similarity index 80%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/LogicCompareAndSwapNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/LogicCompareAndSwapNode.java
index faa7d12c1e1d..a084c90fe812 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/LogicCompareAndSwapNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/LogicCompareAndSwapNode.java
@@ -22,22 +22,22 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.java;
+package jdk.graal.compiler.nodes.java;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_8;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_8;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_8;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_8;
 
-import jdk.compiler.graal.core.common.LIRKind;
-import jdk.compiler.graal.core.common.memory.BarrierType;
-import jdk.compiler.graal.core.common.memory.MemoryOrderMode;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.lir.gen.LIRGeneratorTool;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.memory.address.AddressNode;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.core.common.LIRKind;
+import jdk.graal.compiler.core.common.memory.BarrierType;
+import jdk.graal.compiler.core.common.memory.MemoryOrderMode;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.lir.gen.LIRGeneratorTool;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.memory.address.AddressNode;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
 import org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.meta.JavaConstant;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/LoweredAtomicReadAndAddNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/LoweredAtomicReadAndAddNode.java
similarity index 76%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/LoweredAtomicReadAndAddNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/LoweredAtomicReadAndAddNode.java
index 21048229858c..edf24b563b2d 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/LoweredAtomicReadAndAddNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/LoweredAtomicReadAndAddNode.java
@@ -22,27 +22,27 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.java;
+package jdk.graal.compiler.nodes.java;
 
-import static jdk.compiler.graal.nodeinfo.InputType.Memory;
-import static jdk.compiler.graal.nodeinfo.InputType.State;
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_8;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_2;
+import static jdk.graal.compiler.nodeinfo.InputType.Memory;
+import static jdk.graal.compiler.nodeinfo.InputType.State;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_8;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_2;
 
-import jdk.compiler.graal.core.common.LIRKind;
-import jdk.compiler.graal.core.common.memory.BarrierType;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.FrameState;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.StateSplit;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.memory.FixedAccessNode;
-import jdk.compiler.graal.nodes.memory.LIRLowerableAccess;
-import jdk.compiler.graal.nodes.memory.SingleMemoryKill;
-import jdk.compiler.graal.nodes.memory.address.AddressNode;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.core.common.LIRKind;
+import jdk.graal.compiler.core.common.memory.BarrierType;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.FrameState;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.StateSplit;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.memory.FixedAccessNode;
+import jdk.graal.compiler.nodes.memory.LIRLowerableAccess;
+import jdk.graal.compiler.nodes.memory.SingleMemoryKill;
+import jdk.graal.compiler.nodes.memory.address.AddressNode;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
 import org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.meta.Value;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/LoweredAtomicReadAndWriteNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/LoweredAtomicReadAndWriteNode.java
similarity index 78%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/LoweredAtomicReadAndWriteNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/LoweredAtomicReadAndWriteNode.java
index b200b635857a..fc5508f139f4 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/LoweredAtomicReadAndWriteNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/LoweredAtomicReadAndWriteNode.java
@@ -22,27 +22,27 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.java;
-
-import static jdk.compiler.graal.nodeinfo.InputType.Memory;
-import static jdk.compiler.graal.nodeinfo.InputType.State;
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_8;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_2;
-
-import jdk.compiler.graal.core.common.LIRKind;
-import jdk.compiler.graal.core.common.memory.BarrierType;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.FrameState;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.StateSplit;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.memory.FixedAccessNode;
-import jdk.compiler.graal.nodes.memory.LIRLowerableAccess;
-import jdk.compiler.graal.nodes.memory.SingleMemoryKill;
-import jdk.compiler.graal.nodes.memory.address.AddressNode;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
+package jdk.graal.compiler.nodes.java;
+
+import static jdk.graal.compiler.nodeinfo.InputType.Memory;
+import static jdk.graal.compiler.nodeinfo.InputType.State;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_8;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_2;
+
+import jdk.graal.compiler.core.common.LIRKind;
+import jdk.graal.compiler.core.common.memory.BarrierType;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.FrameState;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.StateSplit;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.memory.FixedAccessNode;
+import jdk.graal.compiler.nodes.memory.LIRLowerableAccess;
+import jdk.graal.compiler.nodes.memory.SingleMemoryKill;
+import jdk.graal.compiler.nodes.memory.address.AddressNode;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
 import org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.meta.Value;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/LoweredRegisterFinalizerNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/LoweredRegisterFinalizerNode.java
similarity index 85%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/LoweredRegisterFinalizerNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/LoweredRegisterFinalizerNode.java
index 680f5e5db9c9..eb253b104da9 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/LoweredRegisterFinalizerNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/LoweredRegisterFinalizerNode.java
@@ -22,15 +22,15 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.java;
+package jdk.graal.compiler.nodes.java;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_UNKNOWN;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_8;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_UNKNOWN;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_8;
 
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.LoweringTool;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.LoweringTool;
 
 /**
  * This node is used to perform the finalizer registration at the end of the java.lang.Object
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/MethodCallTargetNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/MethodCallTargetNode.java
similarity index 93%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/MethodCallTargetNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/MethodCallTargetNode.java
index 00514a92c677..91b3c25502d9 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/MethodCallTargetNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/MethodCallTargetNode.java
@@ -22,32 +22,32 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.java;
+package jdk.graal.compiler.nodes.java;
 
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.core.common.type.StampPair;
-import jdk.compiler.graal.core.common.type.TypeReference;
-import jdk.compiler.graal.graph.IterableNodeType;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodeinfo.Verbosity;
-import jdk.compiler.graal.nodes.BeginNode;
-import jdk.compiler.graal.nodes.CallTargetNode;
-import jdk.compiler.graal.nodes.FixedGuardNode;
-import jdk.compiler.graal.nodes.FixedNode;
-import jdk.compiler.graal.nodes.Invoke;
-import jdk.compiler.graal.nodes.LogicNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.PiNode;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.extended.AnchoringNode;
-import jdk.compiler.graal.nodes.spi.Simplifiable;
-import jdk.compiler.graal.nodes.spi.SimplifierTool;
-import jdk.compiler.graal.nodes.spi.UncheckedInterfaceProvider;
-import jdk.compiler.graal.nodes.type.StampTool;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.core.common.type.StampPair;
+import jdk.graal.compiler.core.common.type.TypeReference;
+import jdk.graal.compiler.graph.IterableNodeType;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodeinfo.Verbosity;
+import jdk.graal.compiler.nodes.BeginNode;
+import jdk.graal.compiler.nodes.CallTargetNode;
+import jdk.graal.compiler.nodes.FixedGuardNode;
+import jdk.graal.compiler.nodes.FixedNode;
+import jdk.graal.compiler.nodes.Invoke;
+import jdk.graal.compiler.nodes.LogicNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.PiNode;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.extended.AnchoringNode;
+import jdk.graal.compiler.nodes.spi.Simplifiable;
+import jdk.graal.compiler.nodes.spi.SimplifierTool;
+import jdk.graal.compiler.nodes.spi.UncheckedInterfaceProvider;
+import jdk.graal.compiler.nodes.type.StampTool;
 
 import jdk.vm.ci.code.BytecodeFrame;
 import jdk.vm.ci.meta.Assumptions;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/MonitorEnterNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/MonitorEnterNode.java
similarity index 78%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/MonitorEnterNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/MonitorEnterNode.java
index a3ca5b2410bd..2d75b4c133c4 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/MonitorEnterNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/MonitorEnterNode.java
@@ -22,21 +22,21 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.java;
+package jdk.graal.compiler.nodes.java;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_64;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_64;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_64;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_64;
 
-import jdk.compiler.graal.graph.IterableNodeType;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.virtual.VirtualObjectNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.extended.MonitorEnter;
-import jdk.compiler.graal.nodes.memory.SingleMemoryKill;
-import jdk.compiler.graal.nodes.spi.Lowerable;
-import jdk.compiler.graal.nodes.spi.Virtualizable;
-import jdk.compiler.graal.nodes.spi.VirtualizerTool;
+import jdk.graal.compiler.graph.IterableNodeType;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.virtual.VirtualObjectNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.extended.MonitorEnter;
+import jdk.graal.compiler.nodes.memory.SingleMemoryKill;
+import jdk.graal.compiler.nodes.spi.Lowerable;
+import jdk.graal.compiler.nodes.spi.Virtualizable;
+import jdk.graal.compiler.nodes.spi.VirtualizerTool;
 import org.graalvm.word.LocationIdentity;
 
 /**
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/MonitorExitNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/MonitorExitNode.java
similarity index 81%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/MonitorExitNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/MonitorExitNode.java
index 76a60ada9ca1..1463d259166c 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/MonitorExitNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/MonitorExitNode.java
@@ -22,22 +22,22 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.java;
+package jdk.graal.compiler.nodes.java;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_64;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_64;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_64;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_64;
 
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.IterableNodeType;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.virtual.VirtualObjectNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.extended.MonitorExit;
-import jdk.compiler.graal.nodes.memory.SingleMemoryKill;
-import jdk.compiler.graal.nodes.spi.Lowerable;
-import jdk.compiler.graal.nodes.spi.Virtualizable;
-import jdk.compiler.graal.nodes.spi.VirtualizerTool;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.IterableNodeType;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.virtual.VirtualObjectNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.extended.MonitorExit;
+import jdk.graal.compiler.nodes.memory.SingleMemoryKill;
+import jdk.graal.compiler.nodes.spi.Lowerable;
+import jdk.graal.compiler.nodes.spi.Virtualizable;
+import jdk.graal.compiler.nodes.spi.VirtualizerTool;
 import org.graalvm.word.LocationIdentity;
 
 /**
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/MonitorIdNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/MonitorIdNode.java
similarity index 86%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/MonitorIdNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/MonitorIdNode.java
index 84b199c092b6..aa8d0304a8da 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/MonitorIdNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/MonitorIdNode.java
@@ -22,20 +22,20 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.java;
-
-import static jdk.compiler.graal.nodeinfo.InputType.Association;
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_0;
-
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.IterableNodeType;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.FrameState;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.LIRLowerable;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
+package jdk.graal.compiler.nodes.java;
+
+import static jdk.graal.compiler.nodeinfo.InputType.Association;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_0;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_0;
+
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.IterableNodeType;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.FrameState;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.LIRLowerable;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
 
 /**
  * This node describes one locking scope; it ties the monitor enter, monitor exit and the frame
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/NewArrayInterface.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/NewArrayInterface.java
similarity index 90%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/NewArrayInterface.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/NewArrayInterface.java
index eb4f45be62b1..ed761adebc3b 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/NewArrayInterface.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/NewArrayInterface.java
@@ -22,10 +22,10 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.java;
+package jdk.graal.compiler.nodes.java;
 
-import jdk.compiler.graal.nodes.FixedWithNextNodeInterface;
-import jdk.compiler.graal.nodes.ValueNodeInterface;
+import jdk.graal.compiler.nodes.FixedWithNextNodeInterface;
+import jdk.graal.compiler.nodes.ValueNodeInterface;
 
 /**
  * See {@link ValueNodeInterface} for details about these node interfaces.
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/NewArrayNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/NewArrayNode.java
similarity index 82%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/NewArrayNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/NewArrayNode.java
index 73197851bf6d..cc9e0e3a842f 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/NewArrayNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/NewArrayNode.java
@@ -22,32 +22,32 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.java;
+package jdk.graal.compiler.nodes.java;
 
 import java.util.Collections;
 
-import jdk.compiler.graal.core.common.calc.CanonicalCondition;
-import jdk.compiler.graal.core.common.type.IntegerStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.core.common.type.TypeReference;
-import jdk.compiler.graal.debug.DebugCloseable;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodes.virtual.VirtualArrayNode;
-import jdk.compiler.graal.nodes.virtual.VirtualObjectNode;
-import jdk.compiler.graal.nodes.spi.Simplifiable;
-import jdk.compiler.graal.nodes.spi.SimplifierTool;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.FixedGuardNode;
-import jdk.compiler.graal.nodes.FrameState;
-import jdk.compiler.graal.nodes.LogicNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.calc.CompareNode;
-import jdk.compiler.graal.nodes.spi.VirtualizableAllocation;
-import jdk.compiler.graal.nodes.spi.VirtualizerTool;
-import jdk.compiler.graal.nodes.util.GraphUtil;
+import jdk.graal.compiler.core.common.calc.CanonicalCondition;
+import jdk.graal.compiler.core.common.type.IntegerStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.core.common.type.TypeReference;
+import jdk.graal.compiler.debug.DebugCloseable;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodes.virtual.VirtualArrayNode;
+import jdk.graal.compiler.nodes.virtual.VirtualObjectNode;
+import jdk.graal.compiler.nodes.spi.Simplifiable;
+import jdk.graal.compiler.nodes.spi.SimplifierTool;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.FixedGuardNode;
+import jdk.graal.compiler.nodes.FrameState;
+import jdk.graal.compiler.nodes.LogicNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.calc.CompareNode;
+import jdk.graal.compiler.nodes.spi.VirtualizableAllocation;
+import jdk.graal.compiler.nodes.spi.VirtualizerTool;
+import jdk.graal.compiler.nodes.util.GraphUtil;
 
 import jdk.vm.ci.meta.DeoptimizationAction;
 import jdk.vm.ci.meta.DeoptimizationReason;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/NewInstanceNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/NewInstanceNode.java
similarity index 86%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/NewInstanceNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/NewInstanceNode.java
index 0504a475e13a..d1466593247c 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/NewInstanceNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/NewInstanceNode.java
@@ -22,22 +22,22 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.java;
+package jdk.graal.compiler.nodes.java;
 
 import java.lang.ref.Reference;
 import java.util.Collections;
 
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.core.common.type.TypeReference;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.virtual.VirtualInstanceNode;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.FrameState;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.VirtualizableAllocation;
-import jdk.compiler.graal.nodes.spi.VirtualizerTool;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.core.common.type.TypeReference;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.virtual.VirtualInstanceNode;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.FrameState;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.VirtualizableAllocation;
+import jdk.graal.compiler.nodes.spi.VirtualizerTool;
 
 import jdk.vm.ci.meta.ResolvedJavaField;
 import jdk.vm.ci.meta.ResolvedJavaType;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/NewMultiArrayNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/NewMultiArrayNode.java
similarity index 79%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/NewMultiArrayNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/NewMultiArrayNode.java
index 7e3e5a4a6f50..097f2e5224bd 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/NewMultiArrayNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/NewMultiArrayNode.java
@@ -22,22 +22,22 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.java;
+package jdk.graal.compiler.nodes.java;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_8;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_8;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_8;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_8;
 
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.core.common.type.TypeReference;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.graph.NodeInputList;
-import jdk.compiler.graal.graph.NodeList;
-import jdk.compiler.graal.graph.spi.NodeWithIdentity;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.DeoptimizingFixedWithNextNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.ArrayLengthProvider;
-import jdk.compiler.graal.nodes.spi.Lowerable;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.core.common.type.TypeReference;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.graph.NodeInputList;
+import jdk.graal.compiler.graph.NodeList;
+import jdk.graal.compiler.graph.spi.NodeWithIdentity;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.DeoptimizingFixedWithNextNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.ArrayLengthProvider;
+import jdk.graal.compiler.nodes.spi.Lowerable;
 
 import jdk.vm.ci.meta.ConstantReflectionProvider;
 import jdk.vm.ci.meta.ResolvedJavaType;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/ReachabilityFenceNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/ReachabilityFenceNode.java
similarity index 89%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/ReachabilityFenceNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/ReachabilityFenceNode.java
index 1b61f9fa2c12..d5540d15ea32 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/ReachabilityFenceNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/ReachabilityFenceNode.java
@@ -22,32 +22,32 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.java;
+package jdk.graal.compiler.nodes.java;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_IGNORED;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_IGNORED;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_IGNORED;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_IGNORED;
 
 import java.lang.ref.Reference;
 
-import jdk.compiler.graal.nodes.virtual.VirtualObjectNode;
+import jdk.graal.compiler.nodes.virtual.VirtualObjectNode;
 import org.graalvm.collections.EconomicSet;
 import org.graalvm.collections.Equivalence;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.graph.NodeInputList;
-import jdk.compiler.graal.graph.iterators.NodePredicates;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.CompressionNode;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.FrameState;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.Canonicalizable;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodes.spi.LIRLowerable;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
-import jdk.compiler.graal.nodes.spi.Virtualizable;
-import jdk.compiler.graal.nodes.spi.VirtualizerTool;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.graph.NodeInputList;
+import jdk.graal.compiler.graph.iterators.NodePredicates;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.CompressionNode;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.FrameState;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.Canonicalizable;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodes.spi.LIRLowerable;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.nodes.spi.Virtualizable;
+import jdk.graal.compiler.nodes.spi.VirtualizerTool;
 
 import jdk.vm.ci.meta.JavaKind;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/RegisterFinalizerNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/RegisterFinalizerNode.java
similarity index 80%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/RegisterFinalizerNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/RegisterFinalizerNode.java
index ee7429ccfe2d..9f6d7edc9c4e 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/RegisterFinalizerNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/RegisterFinalizerNode.java
@@ -22,30 +22,30 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.java;
+package jdk.graal.compiler.nodes.java;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_UNKNOWN;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_8;
-import static jdk.compiler.graal.nodes.java.ForeignCallDescriptors.REGISTER_FINALIZER;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_UNKNOWN;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_8;
+import static jdk.graal.compiler.nodes.java.ForeignCallDescriptors.REGISTER_FINALIZER;
 
-import jdk.compiler.graal.core.common.spi.ForeignCallLinkage;
-import jdk.compiler.graal.core.common.type.ObjectStamp;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.virtual.VirtualObjectNode;
-import jdk.compiler.graal.nodes.AbstractStateSplit;
-import jdk.compiler.graal.nodes.DeoptimizingNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.Canonicalizable;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodes.spi.LIRLowerable;
-import jdk.compiler.graal.nodes.spi.Lowerable;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
-import jdk.compiler.graal.nodes.spi.Virtualizable;
-import jdk.compiler.graal.nodes.spi.VirtualizerTool;
-import jdk.compiler.graal.nodes.type.StampTool;
+import jdk.graal.compiler.core.common.spi.ForeignCallLinkage;
+import jdk.graal.compiler.core.common.type.ObjectStamp;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.virtual.VirtualObjectNode;
+import jdk.graal.compiler.nodes.AbstractStateSplit;
+import jdk.graal.compiler.nodes.DeoptimizingNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.Canonicalizable;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodes.spi.LIRLowerable;
+import jdk.graal.compiler.nodes.spi.Lowerable;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.nodes.spi.Virtualizable;
+import jdk.graal.compiler.nodes.spi.VirtualizerTool;
+import jdk.graal.compiler.nodes.type.StampTool;
 
 import jdk.vm.ci.meta.Assumptions;
 import jdk.vm.ci.meta.Assumptions.AssumptionResult;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/StoreFieldNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/StoreFieldNode.java
similarity index 82%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/StoreFieldNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/StoreFieldNode.java
index c24933c07d04..af536ad6c25b 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/StoreFieldNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/StoreFieldNode.java
@@ -22,28 +22,28 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.java;
-
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_8;
-
-import jdk.compiler.graal.core.common.memory.MemoryOrderMode;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.InputType;
-import jdk.compiler.graal.nodeinfo.NodeCycles;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.virtual.VirtualInstanceNode;
-import jdk.compiler.graal.nodes.virtual.VirtualObjectNode;
-import jdk.compiler.graal.nodes.DeoptimizeNode;
-import jdk.compiler.graal.nodes.FrameState;
-import jdk.compiler.graal.nodes.StateSplit;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.memory.SingleMemoryKill;
-import jdk.compiler.graal.nodes.spi.Canonicalizable;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodes.spi.Virtualizable;
-import jdk.compiler.graal.nodes.spi.VirtualizerTool;
+package jdk.graal.compiler.nodes.java;
+
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_8;
+
+import jdk.graal.compiler.core.common.memory.MemoryOrderMode;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.InputType;
+import jdk.graal.compiler.nodeinfo.NodeCycles;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.virtual.VirtualInstanceNode;
+import jdk.graal.compiler.nodes.virtual.VirtualObjectNode;
+import jdk.graal.compiler.nodes.DeoptimizeNode;
+import jdk.graal.compiler.nodes.FrameState;
+import jdk.graal.compiler.nodes.StateSplit;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.memory.SingleMemoryKill;
+import jdk.graal.compiler.nodes.spi.Canonicalizable;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodes.spi.Virtualizable;
+import jdk.graal.compiler.nodes.spi.VirtualizerTool;
 import org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.meta.DeoptimizationAction;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/StoreIndexedNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/StoreIndexedNode.java
similarity index 78%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/StoreIndexedNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/StoreIndexedNode.java
index 449a2d53765a..09482f5a4a98 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/StoreIndexedNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/StoreIndexedNode.java
@@ -22,32 +22,32 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.java;
-
-import static jdk.compiler.graal.nodeinfo.InputType.State;
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_8;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_8;
-
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.InputType;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.virtual.VirtualArrayNode;
-import jdk.compiler.graal.nodes.virtual.VirtualObjectNode;
-import jdk.compiler.graal.nodes.DeoptimizeNode;
-import jdk.compiler.graal.nodes.FrameState;
-import jdk.compiler.graal.nodes.StateSplit;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.extended.GuardingNode;
-import jdk.compiler.graal.nodes.memory.SingleMemoryKill;
-import jdk.compiler.graal.nodes.spi.Canonicalizable;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodes.spi.Lowerable;
-import jdk.compiler.graal.nodes.spi.Virtualizable;
-import jdk.compiler.graal.nodes.spi.VirtualizerTool;
-import jdk.compiler.graal.nodes.type.StampTool;
+package jdk.graal.compiler.nodes.java;
+
+import static jdk.graal.compiler.nodeinfo.InputType.State;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_8;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_8;
+
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.InputType;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.virtual.VirtualArrayNode;
+import jdk.graal.compiler.nodes.virtual.VirtualObjectNode;
+import jdk.graal.compiler.nodes.DeoptimizeNode;
+import jdk.graal.compiler.nodes.FrameState;
+import jdk.graal.compiler.nodes.StateSplit;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.extended.GuardingNode;
+import jdk.graal.compiler.nodes.memory.SingleMemoryKill;
+import jdk.graal.compiler.nodes.spi.Canonicalizable;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodes.spi.Lowerable;
+import jdk.graal.compiler.nodes.spi.Virtualizable;
+import jdk.graal.compiler.nodes.spi.VirtualizerTool;
+import jdk.graal.compiler.nodes.type.StampTool;
 import org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.meta.DeoptimizationAction;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/TypeSwitchNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/TypeSwitchNode.java
similarity index 89%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/TypeSwitchNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/TypeSwitchNode.java
index ed966c7769c1..6830a8c22997 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/TypeSwitchNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/TypeSwitchNode.java
@@ -22,31 +22,31 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.java;
+package jdk.graal.compiler.nodes.java;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 
-import jdk.compiler.graal.core.common.type.AbstractPointerStamp;
-import jdk.compiler.graal.core.common.type.ObjectStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.core.common.type.TypeReference;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodes.spi.Simplifiable;
-import jdk.compiler.graal.nodes.spi.SimplifierTool;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.AbstractBeginNode;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ProfileData.SwitchProbabilityData;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.extended.LoadHubNode;
-import jdk.compiler.graal.nodes.extended.SwitchNode;
-import jdk.compiler.graal.nodes.spi.LIRLowerable;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
-import jdk.compiler.graal.nodes.util.GraphUtil;
+import jdk.graal.compiler.core.common.type.AbstractPointerStamp;
+import jdk.graal.compiler.core.common.type.ObjectStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.core.common.type.TypeReference;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodes.spi.Simplifiable;
+import jdk.graal.compiler.nodes.spi.SimplifierTool;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.AbstractBeginNode;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ProfileData.SwitchProbabilityData;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.extended.LoadHubNode;
+import jdk.graal.compiler.nodes.extended.SwitchNode;
+import jdk.graal.compiler.nodes.spi.LIRLowerable;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.nodes.util.GraphUtil;
 
 import jdk.vm.ci.meta.Constant;
 import jdk.vm.ci.meta.ConstantReflectionProvider;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/UnsafeCompareAndExchangeNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/UnsafeCompareAndExchangeNode.java
similarity index 85%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/UnsafeCompareAndExchangeNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/UnsafeCompareAndExchangeNode.java
index 5a264b5e39ca..5e21bac14cda 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/UnsafeCompareAndExchangeNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/UnsafeCompareAndExchangeNode.java
@@ -22,16 +22,16 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.java;
+package jdk.graal.compiler.nodes.java;
 
-import jdk.compiler.graal.core.common.memory.MemoryOrderMode;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.LogicNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.VirtualizerTool;
+import jdk.graal.compiler.core.common.memory.MemoryOrderMode;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.LogicNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.VirtualizerTool;
 import org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/UnsafeCompareAndSwapNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/UnsafeCompareAndSwapNode.java
similarity index 82%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/UnsafeCompareAndSwapNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/UnsafeCompareAndSwapNode.java
index 5e9ee5a1160c..192f6f09441d 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/UnsafeCompareAndSwapNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/UnsafeCompareAndSwapNode.java
@@ -22,18 +22,18 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.java;
+package jdk.graal.compiler.nodes.java;
 
-import jdk.compiler.graal.core.common.memory.MemoryOrderMode;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.LogicNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.calc.ConditionalNode;
-import jdk.compiler.graal.nodes.spi.VirtualizerTool;
+import jdk.graal.compiler.core.common.memory.MemoryOrderMode;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.LogicNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.calc.ConditionalNode;
+import jdk.graal.compiler.nodes.spi.VirtualizerTool;
 import org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/ValidateNewInstanceClassNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/ValidateNewInstanceClassNode.java
similarity index 83%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/ValidateNewInstanceClassNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/ValidateNewInstanceClassNode.java
index 773ff4344701..6daf0a4c505d 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/ValidateNewInstanceClassNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/ValidateNewInstanceClassNode.java
@@ -22,20 +22,20 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.java;
+package jdk.graal.compiler.nodes.java;
 
-import jdk.compiler.graal.core.common.type.AbstractPointerStamp;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeCycles;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodeinfo.NodeSize;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.WithExceptionNode;
-import jdk.compiler.graal.nodes.memory.SingleMemoryKill;
-import jdk.compiler.graal.nodes.spi.Lowerable;
-import jdk.compiler.graal.nodes.spi.Simplifiable;
-import jdk.compiler.graal.nodes.spi.SimplifierTool;
+import jdk.graal.compiler.core.common.type.AbstractPointerStamp;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeCycles;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodeinfo.NodeSize;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.WithExceptionNode;
+import jdk.graal.compiler.nodes.memory.SingleMemoryKill;
+import jdk.graal.compiler.nodes.spi.Lowerable;
+import jdk.graal.compiler.nodes.spi.Simplifiable;
+import jdk.graal.compiler.nodes.spi.SimplifierTool;
 import org.graalvm.word.LocationIdentity;
 
 /**
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/ValueCompareAndSwapNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/ValueCompareAndSwapNode.java
similarity index 81%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/ValueCompareAndSwapNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/ValueCompareAndSwapNode.java
index a4c1fc6d3485..f49b28da9c06 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/ValueCompareAndSwapNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/java/ValueCompareAndSwapNode.java
@@ -22,20 +22,20 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.java;
+package jdk.graal.compiler.nodes.java;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_8;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_8;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_8;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_8;
 
-import jdk.compiler.graal.core.common.memory.BarrierType;
-import jdk.compiler.graal.core.common.memory.MemoryOrderMode;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.lir.gen.LIRGeneratorTool;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.memory.address.AddressNode;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.core.common.memory.BarrierType;
+import jdk.graal.compiler.core.common.memory.MemoryOrderMode;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.lir.gen.LIRGeneratorTool;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.memory.address.AddressNode;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
 import org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.meta.Value;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/loop/BasicInductionVariable.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/loop/BasicInductionVariable.java
similarity index 90%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/loop/BasicInductionVariable.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/loop/BasicInductionVariable.java
index 0c5dcd84ed24..d27b7aa4fd4a 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/loop/BasicInductionVariable.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/loop/BasicInductionVariable.java
@@ -22,22 +22,22 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.loop;
-
-import jdk.compiler.graal.core.common.type.IntegerStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.core.common.util.UnsignedLong;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.ValuePhiNode;
-import jdk.compiler.graal.nodes.calc.AddNode;
-import jdk.compiler.graal.nodes.calc.BinaryArithmeticNode;
-import jdk.compiler.graal.nodes.calc.IntegerConvertNode;
-import jdk.compiler.graal.nodes.calc.NegateNode;
-import jdk.compiler.graal.nodes.calc.SubNode;
+package jdk.graal.compiler.nodes.loop;
+
+import jdk.graal.compiler.core.common.type.IntegerStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.core.common.util.UnsignedLong;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.ValuePhiNode;
+import jdk.graal.compiler.nodes.calc.AddNode;
+import jdk.graal.compiler.nodes.calc.BinaryArithmeticNode;
+import jdk.graal.compiler.nodes.calc.IntegerConvertNode;
+import jdk.graal.compiler.nodes.calc.NegateNode;
+import jdk.graal.compiler.nodes.calc.SubNode;
 
 public class BasicInductionVariable extends InductionVariable {
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/loop/CountedLoopInfo.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/loop/CountedLoopInfo.java
similarity index 94%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/loop/CountedLoopInfo.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/loop/CountedLoopInfo.java
index a1a90c8dbe00..a93c026423d4 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/loop/CountedLoopInfo.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/loop/CountedLoopInfo.java
@@ -22,38 +22,38 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.loop;
+package jdk.graal.compiler.nodes.loop;
 
 import static java.lang.Math.abs;
 
-import jdk.compiler.graal.core.common.type.IntegerStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.core.common.util.UnsignedLong;
-import jdk.compiler.graal.debug.DebugCloseable;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.nodes.AbstractBeginNode;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.GuardNode;
-import jdk.compiler.graal.nodes.IfNode;
-import jdk.compiler.graal.nodes.LogicConstantNode;
-import jdk.compiler.graal.nodes.LogicNode;
-import jdk.compiler.graal.nodes.LoopBeginNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.PiNode;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.calc.BinaryArithmeticNode;
-import jdk.compiler.graal.nodes.calc.CompareNode;
-import jdk.compiler.graal.nodes.calc.ConditionalNode;
-import jdk.compiler.graal.nodes.calc.NegateNode;
-import jdk.compiler.graal.nodes.cfg.ControlFlowGraph;
-import jdk.compiler.graal.nodes.cfg.HIRBlock;
-import jdk.compiler.graal.nodes.extended.GuardingNode;
-import jdk.compiler.graal.nodes.util.IntegerHelper;
-import jdk.compiler.graal.nodes.util.SignedIntegerHelper;
-import jdk.compiler.graal.nodes.util.UnsignedIntegerHelper;
+import jdk.graal.compiler.core.common.type.IntegerStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.core.common.util.UnsignedLong;
+import jdk.graal.compiler.debug.DebugCloseable;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.nodes.AbstractBeginNode;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.GuardNode;
+import jdk.graal.compiler.nodes.IfNode;
+import jdk.graal.compiler.nodes.LogicConstantNode;
+import jdk.graal.compiler.nodes.LogicNode;
+import jdk.graal.compiler.nodes.LoopBeginNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.PiNode;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.calc.BinaryArithmeticNode;
+import jdk.graal.compiler.nodes.calc.CompareNode;
+import jdk.graal.compiler.nodes.calc.ConditionalNode;
+import jdk.graal.compiler.nodes.calc.NegateNode;
+import jdk.graal.compiler.nodes.cfg.ControlFlowGraph;
+import jdk.graal.compiler.nodes.cfg.HIRBlock;
+import jdk.graal.compiler.nodes.extended.GuardingNode;
+import jdk.graal.compiler.nodes.util.IntegerHelper;
+import jdk.graal.compiler.nodes.util.SignedIntegerHelper;
+import jdk.graal.compiler.nodes.util.UnsignedIntegerHelper;
 
 import jdk.vm.ci.meta.DeoptimizationAction;
 import jdk.vm.ci.meta.DeoptimizationReason;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/loop/DefaultLoopPolicies.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/loop/DefaultLoopPolicies.java
similarity index 92%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/loop/DefaultLoopPolicies.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/loop/DefaultLoopPolicies.java
index 0ed4698c7291..76bbe4cad4b7 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/loop/DefaultLoopPolicies.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/loop/DefaultLoopPolicies.java
@@ -22,53 +22,53 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.loop;
-
-import static jdk.compiler.graal.core.common.GraalOptions.LoopMaxUnswitch;
-import static jdk.compiler.graal.core.common.GraalOptions.MaximumDesiredSize;
-import static jdk.compiler.graal.core.common.GraalOptions.MinimumPeelFrequency;
-import static jdk.compiler.graal.nodes.loop.DefaultLoopPolicies.Options.DefaultLoopFrequency;
-import static jdk.compiler.graal.nodes.loop.DefaultLoopPolicies.Options.DefaultUnswitchFactor;
-import static jdk.compiler.graal.nodes.loop.DefaultLoopPolicies.Options.ExactFullUnrollMaxNodes;
-import static jdk.compiler.graal.nodes.loop.DefaultLoopPolicies.Options.ExactPartialUnrollMaxNodes;
-import static jdk.compiler.graal.nodes.loop.DefaultLoopPolicies.Options.FullUnrollConstantCompareBoost;
-import static jdk.compiler.graal.nodes.loop.DefaultLoopPolicies.Options.FullUnrollMaxIterations;
-import static jdk.compiler.graal.nodes.loop.DefaultLoopPolicies.Options.FullUnrollMaxNodes;
-import static jdk.compiler.graal.nodes.loop.DefaultLoopPolicies.Options.LoopUnswitchFrequencyBoost;
-import static jdk.compiler.graal.nodes.loop.DefaultLoopPolicies.Options.LoopUnswitchFrequencyMaxFactor;
-import static jdk.compiler.graal.nodes.loop.DefaultLoopPolicies.Options.LoopUnswitchFrequencyMinFactor;
-import static jdk.compiler.graal.nodes.loop.DefaultLoopPolicies.Options.LoopUnswitchMaxIncrease;
-import static jdk.compiler.graal.nodes.loop.DefaultLoopPolicies.Options.LoopUnswitchMinSplitFrequency;
-import static jdk.compiler.graal.nodes.loop.DefaultLoopPolicies.Options.LoopUnswitchTrivial;
-import static jdk.compiler.graal.nodes.loop.DefaultLoopPolicies.Options.UnrollMaxIterations;
+package jdk.graal.compiler.nodes.loop;
+
+import static jdk.graal.compiler.core.common.GraalOptions.LoopMaxUnswitch;
+import static jdk.graal.compiler.core.common.GraalOptions.MaximumDesiredSize;
+import static jdk.graal.compiler.core.common.GraalOptions.MinimumPeelFrequency;
+import static jdk.graal.compiler.nodes.loop.DefaultLoopPolicies.Options.DefaultLoopFrequency;
+import static jdk.graal.compiler.nodes.loop.DefaultLoopPolicies.Options.DefaultUnswitchFactor;
+import static jdk.graal.compiler.nodes.loop.DefaultLoopPolicies.Options.ExactFullUnrollMaxNodes;
+import static jdk.graal.compiler.nodes.loop.DefaultLoopPolicies.Options.ExactPartialUnrollMaxNodes;
+import static jdk.graal.compiler.nodes.loop.DefaultLoopPolicies.Options.FullUnrollConstantCompareBoost;
+import static jdk.graal.compiler.nodes.loop.DefaultLoopPolicies.Options.FullUnrollMaxIterations;
+import static jdk.graal.compiler.nodes.loop.DefaultLoopPolicies.Options.FullUnrollMaxNodes;
+import static jdk.graal.compiler.nodes.loop.DefaultLoopPolicies.Options.LoopUnswitchFrequencyBoost;
+import static jdk.graal.compiler.nodes.loop.DefaultLoopPolicies.Options.LoopUnswitchFrequencyMaxFactor;
+import static jdk.graal.compiler.nodes.loop.DefaultLoopPolicies.Options.LoopUnswitchFrequencyMinFactor;
+import static jdk.graal.compiler.nodes.loop.DefaultLoopPolicies.Options.LoopUnswitchMaxIncrease;
+import static jdk.graal.compiler.nodes.loop.DefaultLoopPolicies.Options.LoopUnswitchMinSplitFrequency;
+import static jdk.graal.compiler.nodes.loop.DefaultLoopPolicies.Options.LoopUnswitchTrivial;
+import static jdk.graal.compiler.nodes.loop.DefaultLoopPolicies.Options.UnrollMaxIterations;
 
 import java.util.List;
 
-import jdk.compiler.graal.nodes.AbstractBeginNode;
-import jdk.compiler.graal.nodes.ControlSplitNode;
-import jdk.compiler.graal.nodes.Invoke;
-import jdk.compiler.graal.nodes.LoopBeginNode;
-import jdk.compiler.graal.nodes.ProfileData;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.calc.CompareNode;
-import jdk.compiler.graal.nodes.cfg.ControlFlowGraph;
-import jdk.compiler.graal.nodes.cfg.HIRBlock;
-import jdk.compiler.graal.nodes.extended.ForeignCall;
-import jdk.compiler.graal.nodes.spi.CoreProviders;
+import jdk.graal.compiler.nodes.AbstractBeginNode;
+import jdk.graal.compiler.nodes.ControlSplitNode;
+import jdk.graal.compiler.nodes.Invoke;
+import jdk.graal.compiler.nodes.LoopBeginNode;
+import jdk.graal.compiler.nodes.ProfileData;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.calc.CompareNode;
+import jdk.graal.compiler.nodes.cfg.ControlFlowGraph;
+import jdk.graal.compiler.nodes.cfg.HIRBlock;
+import jdk.graal.compiler.nodes.extended.ForeignCall;
+import jdk.graal.compiler.nodes.spi.CoreProviders;
 import org.graalvm.collections.EconomicMap;
-import jdk.compiler.graal.core.common.cfg.BasicBlock;
-import jdk.compiler.graal.core.common.cfg.Loop;
-import jdk.compiler.graal.core.common.util.UnsignedLong;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeBitMap;
-import jdk.compiler.graal.nodes.debug.ControlFlowAnchorNode;
-import jdk.compiler.graal.options.Option;
-import jdk.compiler.graal.options.OptionKey;
-import jdk.compiler.graal.options.OptionType;
-import jdk.compiler.graal.options.OptionValues;
+import jdk.graal.compiler.core.common.cfg.BasicBlock;
+import jdk.graal.compiler.core.common.cfg.Loop;
+import jdk.graal.compiler.core.common.util.UnsignedLong;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeBitMap;
+import jdk.graal.compiler.nodes.debug.ControlFlowAnchorNode;
+import jdk.graal.compiler.options.Option;
+import jdk.graal.compiler.options.OptionKey;
+import jdk.graal.compiler.options.OptionType;
+import jdk.graal.compiler.options.OptionValues;
 
 public class DefaultLoopPolicies implements LoopPolicies {
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/loop/DerivedConvertedInductionVariable.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/loop/DerivedConvertedInductionVariable.java
similarity index 94%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/loop/DerivedConvertedInductionVariable.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/loop/DerivedConvertedInductionVariable.java
index 3e93e5707ef3..e9b41992e27b 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/loop/DerivedConvertedInductionVariable.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/loop/DerivedConvertedInductionVariable.java
@@ -22,13 +22,13 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.loop;
+package jdk.graal.compiler.nodes.loop;
 
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.calc.IntegerConvertNode;
-import jdk.compiler.graal.nodes.calc.ZeroExtendNode;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.calc.IntegerConvertNode;
+import jdk.graal.compiler.nodes.calc.ZeroExtendNode;
 
 public class DerivedConvertedInductionVariable extends DerivedInductionVariable {
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/loop/DerivedInductionVariable.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/loop/DerivedInductionVariable.java
similarity index 92%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/loop/DerivedInductionVariable.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/loop/DerivedInductionVariable.java
index cbc91e8f04f8..2bd5d9638643 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/loop/DerivedInductionVariable.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/loop/DerivedInductionVariable.java
@@ -22,11 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.loop;
+package jdk.graal.compiler.nodes.loop;
 
-import jdk.compiler.graal.core.common.util.CompilationAlarm;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
+import jdk.graal.compiler.core.common.util.CompilationAlarm;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
 
 /**
  * Base class of the derived induction variables.
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/loop/DerivedOffsetInductionVariable.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/loop/DerivedOffsetInductionVariable.java
similarity index 93%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/loop/DerivedOffsetInductionVariable.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/loop/DerivedOffsetInductionVariable.java
index bee82ee718bd..e753994de90a 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/loop/DerivedOffsetInductionVariable.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/loop/DerivedOffsetInductionVariable.java
@@ -22,17 +22,17 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.loop;
-
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.calc.AddNode;
-import jdk.compiler.graal.nodes.calc.BinaryArithmeticNode;
-import jdk.compiler.graal.nodes.calc.IntegerConvertNode;
-import jdk.compiler.graal.nodes.calc.NegateNode;
-import jdk.compiler.graal.nodes.calc.SubNode;
+package jdk.graal.compiler.nodes.loop;
+
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.calc.AddNode;
+import jdk.graal.compiler.nodes.calc.BinaryArithmeticNode;
+import jdk.graal.compiler.nodes.calc.IntegerConvertNode;
+import jdk.graal.compiler.nodes.calc.NegateNode;
+import jdk.graal.compiler.nodes.calc.SubNode;
 
 public class DerivedOffsetInductionVariable extends DerivedInductionVariable {
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/loop/DerivedScaledInductionVariable.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/loop/DerivedScaledInductionVariable.java
similarity index 92%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/loop/DerivedScaledInductionVariable.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/loop/DerivedScaledInductionVariable.java
index cbbd853b0311..d6f903ebc493 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/loop/DerivedScaledInductionVariable.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/loop/DerivedScaledInductionVariable.java
@@ -22,18 +22,18 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.loop;
-
-import static jdk.compiler.graal.nodes.loop.MathUtil.mul;
-
-import jdk.compiler.graal.core.common.type.IntegerStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.calc.IntegerConvertNode;
-import jdk.compiler.graal.nodes.calc.NegateNode;
-import jdk.compiler.graal.nodes.util.GraphUtil;
+package jdk.graal.compiler.nodes.loop;
+
+import static jdk.graal.compiler.nodes.loop.MathUtil.mul;
+
+import jdk.graal.compiler.core.common.type.IntegerStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.calc.IntegerConvertNode;
+import jdk.graal.compiler.nodes.calc.NegateNode;
+import jdk.graal.compiler.nodes.util.GraphUtil;
 
 public class DerivedScaledInductionVariable extends DerivedInductionVariable {
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/loop/InductionVariable.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/loop/InductionVariable.java
similarity index 95%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/loop/InductionVariable.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/loop/InductionVariable.java
index 3168894256a2..9960f0d081dc 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/loop/InductionVariable.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/loop/InductionVariable.java
@@ -22,13 +22,13 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.loop;
+package jdk.graal.compiler.nodes.loop;
 
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
 
 /**
  * This class describes a value node that is an induction variable in a counted loop.
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/loop/InductionVariableHelper.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/loop/InductionVariableHelper.java
similarity index 95%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/loop/InductionVariableHelper.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/loop/InductionVariableHelper.java
index 651723a2c224..7d6c8c6d9e1a 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/loop/InductionVariableHelper.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/loop/InductionVariableHelper.java
@@ -22,13 +22,13 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.loop;
+package jdk.graal.compiler.nodes.loop;
 
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.calc.AddNode;
-import jdk.compiler.graal.nodes.calc.BinaryArithmeticNode;
-import jdk.compiler.graal.nodes.calc.SubNode;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.calc.AddNode;
+import jdk.graal.compiler.nodes.calc.BinaryArithmeticNode;
+import jdk.graal.compiler.nodes.calc.SubNode;
 
 public class InductionVariableHelper {
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/loop/LoopEx.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/loop/LoopEx.java
similarity index 92%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/loop/LoopEx.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/loop/LoopEx.java
index 61dff44269e2..745de9779eed 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/loop/LoopEx.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/loop/LoopEx.java
@@ -22,62 +22,62 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.loop;
+package jdk.graal.compiler.nodes.loop;
 
-import static jdk.compiler.graal.phases.common.util.LoopUtility.isNumericInteger;
+import static jdk.graal.compiler.phases.common.util.LoopUtility.isNumericInteger;
 
 import java.util.Collection;
 import java.util.LinkedList;
 import java.util.Queue;
 
-import jdk.compiler.graal.nodes.AbstractBeginNode;
-import jdk.compiler.graal.nodes.AbstractEndNode;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.FixedGuardNode;
-import jdk.compiler.graal.nodes.FixedNode;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.FrameState;
-import jdk.compiler.graal.nodes.FullInfopointNode;
-import jdk.compiler.graal.nodes.IfNode;
-import jdk.compiler.graal.nodes.LogicNode;
-import jdk.compiler.graal.nodes.LoopBeginNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.PhiNode;
-import jdk.compiler.graal.nodes.PiNode;
-import jdk.compiler.graal.nodes.ProfileData;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.ValuePhiNode;
-import jdk.compiler.graal.nodes.calc.AddNode;
-import jdk.compiler.graal.nodes.calc.BinaryArithmeticNode;
-import jdk.compiler.graal.nodes.calc.CompareNode;
-import jdk.compiler.graal.nodes.calc.LeftShiftNode;
-import jdk.compiler.graal.nodes.calc.MulNode;
-import jdk.compiler.graal.nodes.calc.NarrowNode;
-import jdk.compiler.graal.nodes.calc.NegateNode;
-import jdk.compiler.graal.nodes.calc.SignExtendNode;
-import jdk.compiler.graal.nodes.calc.SubNode;
-import jdk.compiler.graal.nodes.calc.ZeroExtendNode;
-import jdk.compiler.graal.nodes.cfg.ControlFlowGraph;
-import jdk.compiler.graal.nodes.cfg.HIRBlock;
-import jdk.compiler.graal.nodes.extended.ValueAnchorNode;
-import jdk.compiler.graal.nodes.util.GraphUtil;
+import jdk.graal.compiler.nodes.AbstractBeginNode;
+import jdk.graal.compiler.nodes.AbstractEndNode;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.FixedGuardNode;
+import jdk.graal.compiler.nodes.FixedNode;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.FrameState;
+import jdk.graal.compiler.nodes.FullInfopointNode;
+import jdk.graal.compiler.nodes.IfNode;
+import jdk.graal.compiler.nodes.LogicNode;
+import jdk.graal.compiler.nodes.LoopBeginNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.PhiNode;
+import jdk.graal.compiler.nodes.PiNode;
+import jdk.graal.compiler.nodes.ProfileData;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.ValuePhiNode;
+import jdk.graal.compiler.nodes.calc.AddNode;
+import jdk.graal.compiler.nodes.calc.BinaryArithmeticNode;
+import jdk.graal.compiler.nodes.calc.CompareNode;
+import jdk.graal.compiler.nodes.calc.LeftShiftNode;
+import jdk.graal.compiler.nodes.calc.MulNode;
+import jdk.graal.compiler.nodes.calc.NarrowNode;
+import jdk.graal.compiler.nodes.calc.NegateNode;
+import jdk.graal.compiler.nodes.calc.SignExtendNode;
+import jdk.graal.compiler.nodes.calc.SubNode;
+import jdk.graal.compiler.nodes.calc.ZeroExtendNode;
+import jdk.graal.compiler.nodes.cfg.ControlFlowGraph;
+import jdk.graal.compiler.nodes.cfg.HIRBlock;
+import jdk.graal.compiler.nodes.extended.ValueAnchorNode;
+import jdk.graal.compiler.nodes.util.GraphUtil;
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.EconomicSet;
 import org.graalvm.collections.Equivalence;
-import jdk.compiler.graal.core.common.calc.Condition;
-import jdk.compiler.graal.core.common.cfg.Loop;
-import jdk.compiler.graal.core.common.type.ArithmeticOpTable.BinaryOp;
-import jdk.compiler.graal.core.common.type.IntegerStamp;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.Graph;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeBitMap;
-import jdk.compiler.graal.graph.iterators.NodePredicate;
-import jdk.compiler.graal.nodes.debug.ControlFlowAnchored;
-import jdk.compiler.graal.nodes.debug.NeverStripMineNode;
-import jdk.compiler.graal.nodes.debug.NeverWriteSinkNode;
-import jdk.compiler.graal.phases.common.CanonicalizerPhase;
+import jdk.graal.compiler.core.common.calc.Condition;
+import jdk.graal.compiler.core.common.cfg.Loop;
+import jdk.graal.compiler.core.common.type.ArithmeticOpTable.BinaryOp;
+import jdk.graal.compiler.core.common.type.IntegerStamp;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.Graph;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeBitMap;
+import jdk.graal.compiler.graph.iterators.NodePredicate;
+import jdk.graal.compiler.nodes.debug.ControlFlowAnchored;
+import jdk.graal.compiler.nodes.debug.NeverStripMineNode;
+import jdk.graal.compiler.nodes.debug.NeverWriteSinkNode;
+import jdk.graal.compiler.phases.common.CanonicalizerPhase;
 
 public class LoopEx {
     protected final Loop loop;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/loop/LoopExpandableNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/loop/LoopExpandableNode.java
similarity index 95%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/loop/LoopExpandableNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/loop/LoopExpandableNode.java
index 6a99ab490cd3..73c42973d10d 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/loop/LoopExpandableNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/loop/LoopExpandableNode.java
@@ -22,9 +22,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.loop;
+package jdk.graal.compiler.nodes.loop;
 
-import jdk.compiler.graal.graph.Node;
+import jdk.graal.compiler.graph.Node;
 
 /**
  * Marker interface for {@link Node} that can expand to loops later in the compilation pipeline via
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/loop/LoopFragment.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/loop/LoopFragment.java
similarity index 93%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/loop/LoopFragment.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/loop/LoopFragment.java
index 4ebfcf011d60..5f9d9242e41b 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/loop/LoopFragment.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/loop/LoopFragment.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.loop;
+package jdk.graal.compiler.nodes.loop;
 
 import java.util.ArrayDeque;
 import java.util.ArrayList;
@@ -30,38 +30,38 @@
 import java.util.Iterator;
 import java.util.List;
 
-import jdk.compiler.graal.nodes.AbstractBeginNode;
-import jdk.compiler.graal.nodes.AbstractMergeNode;
-import jdk.compiler.graal.nodes.EndNode;
-import jdk.compiler.graal.nodes.FixedNode;
-import jdk.compiler.graal.nodes.FrameState;
-import jdk.compiler.graal.nodes.GuardNode;
-import jdk.compiler.graal.nodes.GuardProxyNode;
-import jdk.compiler.graal.nodes.Invoke;
-import jdk.compiler.graal.nodes.LoopBeginNode;
-import jdk.compiler.graal.nodes.LoopExitNode;
-import jdk.compiler.graal.nodes.MergeNode;
-import jdk.compiler.graal.nodes.PhiNode;
-import jdk.compiler.graal.nodes.ProxyNode;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.VirtualState;
-import jdk.compiler.graal.nodes.cfg.ControlFlowGraph;
-import jdk.compiler.graal.nodes.cfg.HIRBlock;
-import jdk.compiler.graal.nodes.java.MonitorEnterNode;
-import jdk.compiler.graal.nodes.spi.NodeWithState;
-import jdk.compiler.graal.nodes.virtual.CommitAllocationNode;
-import jdk.compiler.graal.nodes.virtual.VirtualObjectNode;
+import jdk.graal.compiler.nodes.AbstractBeginNode;
+import jdk.graal.compiler.nodes.AbstractMergeNode;
+import jdk.graal.compiler.nodes.EndNode;
+import jdk.graal.compiler.nodes.FixedNode;
+import jdk.graal.compiler.nodes.FrameState;
+import jdk.graal.compiler.nodes.GuardNode;
+import jdk.graal.compiler.nodes.GuardProxyNode;
+import jdk.graal.compiler.nodes.Invoke;
+import jdk.graal.compiler.nodes.LoopBeginNode;
+import jdk.graal.compiler.nodes.LoopExitNode;
+import jdk.graal.compiler.nodes.MergeNode;
+import jdk.graal.compiler.nodes.PhiNode;
+import jdk.graal.compiler.nodes.ProxyNode;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.VirtualState;
+import jdk.graal.compiler.nodes.cfg.ControlFlowGraph;
+import jdk.graal.compiler.nodes.cfg.HIRBlock;
+import jdk.graal.compiler.nodes.java.MonitorEnterNode;
+import jdk.graal.compiler.nodes.spi.NodeWithState;
+import jdk.graal.compiler.nodes.virtual.CommitAllocationNode;
+import jdk.graal.compiler.nodes.virtual.VirtualObjectNode;
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.MapCursor;
 import org.graalvm.collections.UnmodifiableEconomicMap;
-import jdk.compiler.graal.debug.DebugCloseable;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.Graph;
-import jdk.compiler.graal.graph.Graph.DuplicationReplacement;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeBitMap;
-import jdk.compiler.graal.graph.iterators.NodeIterable;
+import jdk.graal.compiler.debug.DebugCloseable;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.Graph;
+import jdk.graal.compiler.graph.Graph.DuplicationReplacement;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeBitMap;
+import jdk.graal.compiler.graph.iterators.NodeIterable;
 
 import jdk.vm.ci.meta.TriState;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/loop/LoopFragmentInside.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/loop/LoopFragmentInside.java
similarity index 92%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/loop/LoopFragmentInside.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/loop/LoopFragmentInside.java
index fd15aa818941..f4a261597a08 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/loop/LoopFragmentInside.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/loop/LoopFragmentInside.java
@@ -22,67 +22,67 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.loop;
+package jdk.graal.compiler.nodes.loop;
 
 import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
 
-import jdk.compiler.graal.nodes.AbstractBeginNode;
-import jdk.compiler.graal.nodes.AbstractEndNode;
-import jdk.compiler.graal.nodes.AbstractMergeNode;
-import jdk.compiler.graal.nodes.BeginNode;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.EndNode;
-import jdk.compiler.graal.nodes.FixedNode;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.FrameState;
-import jdk.compiler.graal.nodes.GraphState;
-import jdk.compiler.graal.nodes.GuardPhiNode;
-import jdk.compiler.graal.nodes.GuardProxyNode;
-import jdk.compiler.graal.nodes.IfNode;
-import jdk.compiler.graal.nodes.LogicNode;
-import jdk.compiler.graal.nodes.LoopBeginNode;
-import jdk.compiler.graal.nodes.LoopEndNode;
-import jdk.compiler.graal.nodes.LoopExitNode;
-import jdk.compiler.graal.nodes.MemoryProxyNode;
-import jdk.compiler.graal.nodes.MergeNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.PhiNode;
-import jdk.compiler.graal.nodes.ProxyNode;
-import jdk.compiler.graal.nodes.SafepointNode;
-import jdk.compiler.graal.nodes.StateSplit;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.ValuePhiNode;
-import jdk.compiler.graal.nodes.ValueProxyNode;
-import jdk.compiler.graal.nodes.VirtualState;
-import jdk.compiler.graal.nodes.calc.AddNode;
-import jdk.compiler.graal.nodes.calc.CompareNode;
-import jdk.compiler.graal.nodes.calc.ConditionalNode;
-import jdk.compiler.graal.nodes.calc.IntegerBelowNode;
-import jdk.compiler.graal.nodes.calc.SubNode;
-import jdk.compiler.graal.nodes.extended.AnchoringNode;
-import jdk.compiler.graal.nodes.extended.GuardingNode;
-import jdk.compiler.graal.nodes.extended.OpaqueNode;
-import jdk.compiler.graal.nodes.extended.OpaqueValueNode;
-import jdk.compiler.graal.nodes.extended.ValueAnchorNode;
-import jdk.compiler.graal.nodes.memory.MemoryKill;
-import jdk.compiler.graal.nodes.memory.MemoryPhiNode;
-import jdk.compiler.graal.nodes.util.GraphUtil;
-import jdk.compiler.graal.nodes.util.IntegerHelper;
+import jdk.graal.compiler.nodes.AbstractBeginNode;
+import jdk.graal.compiler.nodes.AbstractEndNode;
+import jdk.graal.compiler.nodes.AbstractMergeNode;
+import jdk.graal.compiler.nodes.BeginNode;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.EndNode;
+import jdk.graal.compiler.nodes.FixedNode;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.FrameState;
+import jdk.graal.compiler.nodes.GraphState;
+import jdk.graal.compiler.nodes.GuardPhiNode;
+import jdk.graal.compiler.nodes.GuardProxyNode;
+import jdk.graal.compiler.nodes.IfNode;
+import jdk.graal.compiler.nodes.LogicNode;
+import jdk.graal.compiler.nodes.LoopBeginNode;
+import jdk.graal.compiler.nodes.LoopEndNode;
+import jdk.graal.compiler.nodes.LoopExitNode;
+import jdk.graal.compiler.nodes.MemoryProxyNode;
+import jdk.graal.compiler.nodes.MergeNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.PhiNode;
+import jdk.graal.compiler.nodes.ProxyNode;
+import jdk.graal.compiler.nodes.SafepointNode;
+import jdk.graal.compiler.nodes.StateSplit;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.ValuePhiNode;
+import jdk.graal.compiler.nodes.ValueProxyNode;
+import jdk.graal.compiler.nodes.VirtualState;
+import jdk.graal.compiler.nodes.calc.AddNode;
+import jdk.graal.compiler.nodes.calc.CompareNode;
+import jdk.graal.compiler.nodes.calc.ConditionalNode;
+import jdk.graal.compiler.nodes.calc.IntegerBelowNode;
+import jdk.graal.compiler.nodes.calc.SubNode;
+import jdk.graal.compiler.nodes.extended.AnchoringNode;
+import jdk.graal.compiler.nodes.extended.GuardingNode;
+import jdk.graal.compiler.nodes.extended.OpaqueNode;
+import jdk.graal.compiler.nodes.extended.OpaqueValueNode;
+import jdk.graal.compiler.nodes.extended.ValueAnchorNode;
+import jdk.graal.compiler.nodes.memory.MemoryKill;
+import jdk.graal.compiler.nodes.memory.MemoryPhiNode;
+import jdk.graal.compiler.nodes.util.GraphUtil;
+import jdk.graal.compiler.nodes.util.IntegerHelper;
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.Equivalence;
-import jdk.compiler.graal.core.common.type.IntegerStamp;
-import jdk.compiler.graal.debug.DebugCloseable;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.Graph.DuplicationReplacement;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeBitMap;
-import jdk.compiler.graal.graph.Position;
-import jdk.compiler.graal.graph.iterators.NodeIterable;
-import jdk.compiler.graal.nodeinfo.InputType;
+import jdk.graal.compiler.core.common.type.IntegerStamp;
+import jdk.graal.compiler.debug.DebugCloseable;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.Graph.DuplicationReplacement;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeBitMap;
+import jdk.graal.compiler.graph.Position;
+import jdk.graal.compiler.graph.iterators.NodeIterable;
+import jdk.graal.compiler.nodeinfo.InputType;
 
 public class LoopFragmentInside extends LoopFragment {
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/loop/LoopFragmentInsideBefore.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/loop/LoopFragmentInsideBefore.java
similarity index 93%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/loop/LoopFragmentInsideBefore.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/loop/LoopFragmentInsideBefore.java
index 4953e9a9bfcc..3f71fefde677 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/loop/LoopFragmentInsideBefore.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/loop/LoopFragmentInsideBefore.java
@@ -22,10 +22,10 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.loop;
+package jdk.graal.compiler.nodes.loop;
 
-import jdk.compiler.graal.graph.NodeBitMap;
-import jdk.compiler.graal.nodes.FixedNode;
+import jdk.graal.compiler.graph.NodeBitMap;
+import jdk.graal.compiler.nodes.FixedNode;
 
 public class LoopFragmentInsideBefore extends LoopFragmentInside {
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/loop/LoopFragmentInsideFrom.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/loop/LoopFragmentInsideFrom.java
similarity index 93%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/loop/LoopFragmentInsideFrom.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/loop/LoopFragmentInsideFrom.java
index 6f08c21cc651..147f6f65bedb 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/loop/LoopFragmentInsideFrom.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/loop/LoopFragmentInsideFrom.java
@@ -22,10 +22,10 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.loop;
+package jdk.graal.compiler.nodes.loop;
 
-import jdk.compiler.graal.graph.NodeBitMap;
-import jdk.compiler.graal.nodes.FixedNode;
+import jdk.graal.compiler.graph.NodeBitMap;
+import jdk.graal.compiler.nodes.FixedNode;
 
 public class LoopFragmentInsideFrom extends LoopFragmentInside {
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/loop/LoopFragmentWhole.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/loop/LoopFragmentWhole.java
similarity index 87%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/loop/LoopFragmentWhole.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/loop/LoopFragmentWhole.java
index cc41106274a9..ea125b2dedcf 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/loop/LoopFragmentWhole.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/loop/LoopFragmentWhole.java
@@ -22,18 +22,18 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.loop;
-
-import jdk.compiler.graal.core.common.cfg.Loop;
-import jdk.compiler.graal.graph.Graph;
-import jdk.compiler.graal.graph.Graph.DuplicationReplacement;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeBitMap;
-import jdk.compiler.graal.nodes.EndNode;
-import jdk.compiler.graal.nodes.FixedNode;
-import jdk.compiler.graal.nodes.LoopBeginNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.cfg.HIRBlock;
+package jdk.graal.compiler.nodes.loop;
+
+import jdk.graal.compiler.core.common.cfg.Loop;
+import jdk.graal.compiler.graph.Graph;
+import jdk.graal.compiler.graph.Graph.DuplicationReplacement;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeBitMap;
+import jdk.graal.compiler.nodes.EndNode;
+import jdk.graal.compiler.nodes.FixedNode;
+import jdk.graal.compiler.nodes.LoopBeginNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.cfg.HIRBlock;
 
 public class LoopFragmentWhole extends LoopFragment {
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/loop/LoopPolicies.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/loop/LoopPolicies.java
similarity index 91%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/loop/LoopPolicies.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/loop/LoopPolicies.java
index bfdb90309d98..6baf33db48e0 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/loop/LoopPolicies.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/loop/LoopPolicies.java
@@ -22,18 +22,18 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.loop;
+package jdk.graal.compiler.nodes.loop;
 
 import java.util.List;
 
-import jdk.compiler.graal.nodes.ControlSplitNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.cfg.ControlFlowGraph;
-import jdk.compiler.graal.nodes.spi.CoreProviders;
+import jdk.graal.compiler.nodes.ControlSplitNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.cfg.ControlFlowGraph;
+import jdk.graal.compiler.nodes.spi.CoreProviders;
 import org.graalvm.collections.EconomicMap;
-import jdk.compiler.graal.options.Option;
-import jdk.compiler.graal.options.OptionKey;
-import jdk.compiler.graal.options.OptionType;
+import jdk.graal.compiler.options.Option;
+import jdk.graal.compiler.options.OptionKey;
+import jdk.graal.compiler.options.OptionType;
 
 public interface LoopPolicies {
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/loop/LoopsData.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/loop/LoopsData.java
similarity index 93%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/loop/LoopsData.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/loop/LoopsData.java
index 02f9e6d86d10..9015f067c998 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/loop/LoopsData.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/loop/LoopsData.java
@@ -22,22 +22,22 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.loop;
+package jdk.graal.compiler.nodes.loop;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import jdk.compiler.graal.nodes.LoopBeginNode;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.cfg.ControlFlowGraph;
-import jdk.compiler.graal.nodes.cfg.HIRBlock;
+import jdk.graal.compiler.nodes.LoopBeginNode;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.cfg.ControlFlowGraph;
+import jdk.graal.compiler.nodes.cfg.HIRBlock;
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.EconomicSet;
 import org.graalvm.collections.Equivalence;
-import jdk.compiler.graal.core.common.cfg.Loop;
-import jdk.compiler.graal.core.common.util.ReversedList;
-import jdk.compiler.graal.debug.DebugContext;
+import jdk.graal.compiler.core.common.cfg.Loop;
+import jdk.graal.compiler.core.common.util.ReversedList;
+import jdk.graal.compiler.debug.DebugContext;
 
 public class LoopsData {
     private final EconomicMap loopBeginToEx;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/loop/LoopsDataProviderImpl.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/loop/LoopsDataProviderImpl.java
similarity index 88%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/loop/LoopsDataProviderImpl.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/loop/LoopsDataProviderImpl.java
index 7d23a7c8393d..42a8d631de4b 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/loop/LoopsDataProviderImpl.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/loop/LoopsDataProviderImpl.java
@@ -22,11 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.loop;
+package jdk.graal.compiler.nodes.loop;
 
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.cfg.ControlFlowGraph;
-import jdk.compiler.graal.nodes.spi.LoopsDataProvider;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.cfg.ControlFlowGraph;
+import jdk.graal.compiler.nodes.spi.LoopsDataProvider;
 
 public class LoopsDataProviderImpl implements LoopsDataProvider {
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/loop/MathUtil.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/loop/MathUtil.java
similarity index 87%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/loop/MathUtil.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/loop/MathUtil.java
index 5770e3754a21..8cf8344ccd41 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/loop/MathUtil.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/loop/MathUtil.java
@@ -22,23 +22,23 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.loop;
+package jdk.graal.compiler.nodes.loop;
 
 import java.util.function.BiFunction;
 
-import jdk.compiler.graal.core.common.type.IntegerStamp;
-import jdk.compiler.graal.nodes.FixedNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.calc.AddNode;
-import jdk.compiler.graal.nodes.calc.BinaryArithmeticNode;
-import jdk.compiler.graal.nodes.calc.FixedBinaryNode;
-import jdk.compiler.graal.nodes.calc.IntegerDivRemNode;
-import jdk.compiler.graal.nodes.calc.MulNode;
-import jdk.compiler.graal.nodes.calc.SubNode;
-import jdk.compiler.graal.nodes.calc.UnsignedDivNode;
-import jdk.compiler.graal.nodes.extended.GuardingNode;
+import jdk.graal.compiler.core.common.type.IntegerStamp;
+import jdk.graal.compiler.nodes.FixedNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.calc.AddNode;
+import jdk.graal.compiler.nodes.calc.BinaryArithmeticNode;
+import jdk.graal.compiler.nodes.calc.FixedBinaryNode;
+import jdk.graal.compiler.nodes.calc.IntegerDivRemNode;
+import jdk.graal.compiler.nodes.calc.MulNode;
+import jdk.graal.compiler.nodes.calc.SubNode;
+import jdk.graal.compiler.nodes.calc.UnsignedDivNode;
+import jdk.graal.compiler.nodes.extended.GuardingNode;
 
 /**
  * Utility methods to perform integer math with some obvious constant folding first.
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/AbstractMemoryCheckpoint.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/memory/AbstractMemoryCheckpoint.java
similarity index 85%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/AbstractMemoryCheckpoint.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/memory/AbstractMemoryCheckpoint.java
index bbcf5a9b9b2a..79a29088786c 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/AbstractMemoryCheckpoint.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/memory/AbstractMemoryCheckpoint.java
@@ -22,14 +22,14 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.memory;
+package jdk.graal.compiler.nodes.memory;
 
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.FrameState;
-import jdk.compiler.graal.nodes.StateSplit;
-import jdk.compiler.graal.nodes.AbstractStateSplit;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.FrameState;
+import jdk.graal.compiler.nodes.StateSplit;
+import jdk.graal.compiler.nodes.AbstractStateSplit;
 
 /**
  * Provides an implementation of {@link StateSplit}.
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/AbstractWriteNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/memory/AbstractWriteNode.java
similarity index 78%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/AbstractWriteNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/memory/AbstractWriteNode.java
index 4ce2783efa69..2f5f8428fffb 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/AbstractWriteNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/memory/AbstractWriteNode.java
@@ -22,23 +22,23 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.memory;
+package jdk.graal.compiler.nodes.memory;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_2;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_1;
 
-import jdk.compiler.graal.core.common.memory.BarrierType;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.InputType;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.StateSplit;
-import jdk.compiler.graal.nodes.extended.GuardingNode;
-import jdk.compiler.graal.nodes.FrameState;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.memory.address.AddressNode;
+import jdk.graal.compiler.core.common.memory.BarrierType;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.InputType;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.StateSplit;
+import jdk.graal.compiler.nodes.extended.GuardingNode;
+import jdk.graal.compiler.nodes.FrameState;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.memory.address.AddressNode;
 import org.graalvm.word.LocationIdentity;
 
 @NodeInfo(allowedUsageTypes = {InputType.Memory, InputType.Guard}, cycles = CYCLES_2, size = SIZE_1)
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/AddressableMemoryAccess.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/memory/AddressableMemoryAccess.java
similarity index 92%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/AddressableMemoryAccess.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/memory/AddressableMemoryAccess.java
index 2b3841b48774..11b0e469e15a 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/AddressableMemoryAccess.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/memory/AddressableMemoryAccess.java
@@ -22,10 +22,10 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.memory;
+package jdk.graal.compiler.nodes.memory;
 
-import jdk.compiler.graal.core.common.memory.BarrierType;
-import jdk.compiler.graal.nodes.memory.address.AddressNode;
+import jdk.graal.compiler.core.common.memory.BarrierType;
+import jdk.graal.compiler.nodes.memory.address.AddressNode;
 import org.graalvm.word.LocationIdentity;
 
 /**
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/ExtendableMemoryAccess.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/memory/ExtendableMemoryAccess.java
similarity index 91%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/ExtendableMemoryAccess.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/memory/ExtendableMemoryAccess.java
index 18494261e130..af97639ed8bf 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/ExtendableMemoryAccess.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/memory/ExtendableMemoryAccess.java
@@ -22,12 +22,12 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.memory;
+package jdk.graal.compiler.nodes.memory;
 
-import jdk.compiler.graal.core.common.memory.MemoryExtendKind;
-import jdk.compiler.graal.nodes.spi.LoweringProvider;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.FixedWithNextNodeInterface;
+import jdk.graal.compiler.core.common.memory.MemoryExtendKind;
+import jdk.graal.compiler.nodes.spi.LoweringProvider;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.FixedWithNextNodeInterface;
 
 /**
  * Nodes implementing this interface may be able to directly implement sign and/or zero extends as
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/FixedAccessNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/memory/FixedAccessNode.java
similarity index 87%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/FixedAccessNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/memory/FixedAccessNode.java
index 2fd38a0b0d8c..e320719d913c 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/FixedAccessNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/memory/FixedAccessNode.java
@@ -22,20 +22,20 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.memory;
-
-import static jdk.compiler.graal.nodeinfo.InputType.Memory;
-
-import jdk.compiler.graal.core.common.memory.BarrierType;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.graph.IterableNodeType;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.InputType;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.FrameState;
-import jdk.compiler.graal.nodes.ImplicitNullCheckNode;
-import jdk.compiler.graal.nodes.extended.GuardingNode;
-import jdk.compiler.graal.nodes.memory.address.AddressNode;
+package jdk.graal.compiler.nodes.memory;
+
+import static jdk.graal.compiler.nodeinfo.InputType.Memory;
+
+import jdk.graal.compiler.core.common.memory.BarrierType;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.graph.IterableNodeType;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.InputType;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.FrameState;
+import jdk.graal.compiler.nodes.ImplicitNullCheckNode;
+import jdk.graal.compiler.nodes.extended.GuardingNode;
+import jdk.graal.compiler.nodes.memory.address.AddressNode;
 import org.graalvm.word.LocationIdentity;
 
 /**
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/FloatableAccessNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/memory/FloatableAccessNode.java
similarity index 88%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/FloatableAccessNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/memory/FloatableAccessNode.java
index c587d2337d87..baaf6d8c118e 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/FloatableAccessNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/memory/FloatableAccessNode.java
@@ -22,15 +22,15 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.memory;
+package jdk.graal.compiler.nodes.memory;
 
-import jdk.compiler.graal.core.common.memory.BarrierType;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.FrameState;
-import jdk.compiler.graal.nodes.extended.GuardingNode;
-import jdk.compiler.graal.nodes.memory.address.AddressNode;
+import jdk.graal.compiler.core.common.memory.BarrierType;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.FrameState;
+import jdk.graal.compiler.nodes.extended.GuardingNode;
+import jdk.graal.compiler.nodes.memory.address.AddressNode;
 import org.graalvm.word.LocationIdentity;
 
 /**
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/FloatableThreadLocalAccess.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/memory/FloatableThreadLocalAccess.java
similarity index 95%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/FloatableThreadLocalAccess.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/memory/FloatableThreadLocalAccess.java
index 20ec56906a9f..4970f0393759 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/FloatableThreadLocalAccess.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/memory/FloatableThreadLocalAccess.java
@@ -22,9 +22,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.memory;
+package jdk.graal.compiler.nodes.memory;
 
-import jdk.compiler.graal.nodes.FixedNodeInterface;
+import jdk.graal.compiler.nodes.FixedNodeInterface;
 
 /**
  * Marker interface for fixed high-tier nodes involved in access to thread local variables. Nodes
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/FloatingAccessNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/memory/FloatingAccessNode.java
similarity index 84%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/FloatingAccessNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/memory/FloatingAccessNode.java
index af4d03fe7cba..dce24ffc77df 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/FloatingAccessNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/memory/FloatingAccessNode.java
@@ -22,16 +22,16 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.memory;
+package jdk.graal.compiler.nodes.memory;
 
-import jdk.compiler.graal.core.common.memory.BarrierType;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.InputType;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.extended.GuardingNode;
-import jdk.compiler.graal.nodes.FloatingGuardedNode;
-import jdk.compiler.graal.nodes.memory.address.AddressNode;
+import jdk.graal.compiler.core.common.memory.BarrierType;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.InputType;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.extended.GuardingNode;
+import jdk.graal.compiler.nodes.FloatingGuardedNode;
+import jdk.graal.compiler.nodes.memory.address.AddressNode;
 import org.graalvm.word.LocationIdentity;
 
 @NodeInfo
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/FloatingReadNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/memory/FloatingReadNode.java
similarity index 83%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/FloatingReadNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/memory/FloatingReadNode.java
index 9c875e30ff93..7552c7233878 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/FloatingReadNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/memory/FloatingReadNode.java
@@ -22,29 +22,29 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.memory;
-
-import static jdk.compiler.graal.nodeinfo.InputType.Memory;
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1;
-
-import jdk.compiler.graal.core.common.LIRKind;
-import jdk.compiler.graal.core.common.memory.BarrierType;
-import jdk.compiler.graal.core.common.memory.MemoryExtendKind;
-import jdk.compiler.graal.core.common.memory.MemoryOrderMode;
-import jdk.compiler.graal.core.common.type.ObjectStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.debug.DebugCloseable;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.extended.GuardingNode;
-import jdk.compiler.graal.nodes.spi.Canonicalizable;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValuePhiNode;
-import jdk.compiler.graal.nodes.memory.address.AddressNode;
+package jdk.graal.compiler.nodes.memory;
+
+import static jdk.graal.compiler.nodeinfo.InputType.Memory;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_2;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_1;
+
+import jdk.graal.compiler.core.common.LIRKind;
+import jdk.graal.compiler.core.common.memory.BarrierType;
+import jdk.graal.compiler.core.common.memory.MemoryExtendKind;
+import jdk.graal.compiler.core.common.memory.MemoryOrderMode;
+import jdk.graal.compiler.core.common.type.ObjectStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.debug.DebugCloseable;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.extended.GuardingNode;
+import jdk.graal.compiler.nodes.spi.Canonicalizable;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValuePhiNode;
+import jdk.graal.compiler.nodes.memory.address.AddressNode;
 import org.graalvm.word.LocationIdentity;
 
 /**
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/GuardedMemoryAccess.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/memory/GuardedMemoryAccess.java
similarity index 90%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/GuardedMemoryAccess.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/memory/GuardedMemoryAccess.java
index e195270ddfdc..7c8ef0cddcc6 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/GuardedMemoryAccess.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/memory/GuardedMemoryAccess.java
@@ -22,10 +22,10 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.memory;
+package jdk.graal.compiler.nodes.memory;
 
-import jdk.compiler.graal.nodes.extended.GuardedNode;
-import jdk.compiler.graal.nodes.extended.GuardingNode;
+import jdk.graal.compiler.nodes.extended.GuardedNode;
+import jdk.graal.compiler.nodes.extended.GuardingNode;
 
 /**
  *
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/LIRLowerableAccess.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/memory/LIRLowerableAccess.java
similarity index 88%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/LIRLowerableAccess.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/memory/LIRLowerableAccess.java
index 2ba3eedfcf02..a2fd78b4c1e9 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/LIRLowerableAccess.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/memory/LIRLowerableAccess.java
@@ -22,11 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.memory;
+package jdk.graal.compiler.nodes.memory;
 
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.nodes.spi.LIRLowerable;
-import jdk.compiler.graal.nodes.NodeView;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.nodes.spi.LIRLowerable;
+import jdk.graal.compiler.nodes.NodeView;
 
 public interface LIRLowerableAccess extends LIRLowerable, AddressableMemoryAccess {
     Stamp getAccessStamp(NodeView view);
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/MemoryAccess.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/memory/MemoryAccess.java
similarity index 94%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/MemoryAccess.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/memory/MemoryAccess.java
index e4df00dd9a03..4857c1d57e5b 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/MemoryAccess.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/memory/MemoryAccess.java
@@ -22,10 +22,10 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.memory;
+package jdk.graal.compiler.nodes.memory;
 
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.nodes.ValueNodeInterface;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.nodes.ValueNodeInterface;
 import org.graalvm.word.LocationIdentity;
 
 /**
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/MemoryAnchorNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/memory/MemoryAnchorNode.java
similarity index 75%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/MemoryAnchorNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/memory/MemoryAnchorNode.java
index c3e7d000ee19..3d5d65a6f702 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/MemoryAnchorNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/memory/MemoryAnchorNode.java
@@ -22,23 +22,23 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.memory;
+package jdk.graal.compiler.nodes.memory;
 
-import static jdk.compiler.graal.nodeinfo.InputType.Memory;
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_0;
+import static jdk.graal.compiler.nodeinfo.InputType.Memory;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_0;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_0;
 
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodeinfo.StructuralInput.Memory;
-import jdk.compiler.graal.nodes.spi.Canonicalizable;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodes.spi.LIRLowerable;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.GraphState.StageFlag;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodeinfo.StructuralInput.Memory;
+import jdk.graal.compiler.nodes.spi.Canonicalizable;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodes.spi.LIRLowerable;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.GraphState.StageFlag;
 import org.graalvm.word.LocationIdentity;
 
 @NodeInfo(allowedUsageTypes = Memory, cycles = CYCLES_0, size = SIZE_0)
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/MemoryKill.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/memory/MemoryKill.java
similarity index 95%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/MemoryKill.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/memory/MemoryKill.java
index c00ca6c9c729..8716d1896842 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/MemoryKill.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/memory/MemoryKill.java
@@ -22,12 +22,12 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.memory;
+package jdk.graal.compiler.nodes.memory;
 
-import jdk.compiler.graal.graph.MemoryKillMarker;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.nodes.FixedNode;
-import jdk.compiler.graal.nodes.ValueNodeInterface;
+import jdk.graal.compiler.graph.MemoryKillMarker;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.nodes.FixedNode;
+import jdk.graal.compiler.nodes.ValueNodeInterface;
 import org.graalvm.word.LocationIdentity;
 
 /**
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/MemoryMap.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/memory/MemoryMap.java
similarity index 97%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/MemoryMap.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/memory/MemoryMap.java
index a552d83c82ab..10dcf290ceca 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/MemoryMap.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/memory/MemoryMap.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.memory;
+package jdk.graal.compiler.nodes.memory;
 
 import org.graalvm.word.LocationIdentity;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/MemoryMapNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/memory/MemoryMapNode.java
similarity index 85%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/MemoryMapNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/memory/MemoryMapNode.java
index b7e4f7b3cab3..eef35790fdbb 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/MemoryMapNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/memory/MemoryMapNode.java
@@ -22,30 +22,30 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.memory;
+package jdk.graal.compiler.nodes.memory;
 
-import static jdk.compiler.graal.nodeinfo.InputType.Extension;
-import static jdk.compiler.graal.nodeinfo.InputType.Memory;
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_0;
+import static jdk.graal.compiler.nodeinfo.InputType.Extension;
+import static jdk.graal.compiler.nodeinfo.InputType.Memory;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_0;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_0;
 import static org.graalvm.word.LocationIdentity.any;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
-import jdk.compiler.graal.nodes.spi.LIRLowerable;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.nodes.spi.LIRLowerable;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.Equivalence;
 import org.graalvm.collections.MapCursor;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.graph.NodeInputList;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.StartNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.calc.FloatingNode;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.graph.NodeInputList;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.StartNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.calc.FloatingNode;
 import org.graalvm.word.LocationIdentity;
 
 @NodeInfo(allowedUsageTypes = {Extension, Memory}, cycles = CYCLES_0, size = SIZE_0)
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/MemoryPhiNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/memory/MemoryPhiNode.java
similarity index 84%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/MemoryPhiNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/memory/MemoryPhiNode.java
index 3aae4b3257ab..2ca847a3c898 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/MemoryPhiNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/memory/MemoryPhiNode.java
@@ -22,21 +22,21 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.memory;
+package jdk.graal.compiler.nodes.memory;
 
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_0;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_0;
 
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.graph.NodeInputList;
-import jdk.compiler.graal.nodeinfo.InputType;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.MemoryProxyNode;
-import jdk.compiler.graal.nodes.PhiNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.AbstractMergeNode;
-import jdk.compiler.graal.nodes.LoopExitNode;
-import jdk.compiler.graal.nodes.ProxyNode;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.graph.NodeInputList;
+import jdk.graal.compiler.nodeinfo.InputType;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.MemoryProxyNode;
+import jdk.graal.compiler.nodes.PhiNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.AbstractMergeNode;
+import jdk.graal.compiler.nodes.LoopExitNode;
+import jdk.graal.compiler.nodes.ProxyNode;
 import org.graalvm.word.LocationIdentity;
 
 /**
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/MultiMemoryKill.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/memory/MultiMemoryKill.java
similarity index 97%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/MultiMemoryKill.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/memory/MultiMemoryKill.java
index 4e19ad2f8c22..3b8c1df0fc26 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/MultiMemoryKill.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/memory/MultiMemoryKill.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.memory;
+package jdk.graal.compiler.nodes.memory;
 
 import org.graalvm.word.LocationIdentity;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/OnHeapMemoryAccess.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/memory/OnHeapMemoryAccess.java
similarity index 93%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/OnHeapMemoryAccess.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/memory/OnHeapMemoryAccess.java
index 6d73c00da5c2..b7170b13a77b 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/OnHeapMemoryAccess.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/memory/OnHeapMemoryAccess.java
@@ -22,9 +22,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.memory;
+package jdk.graal.compiler.nodes.memory;
 
-import jdk.compiler.graal.core.common.memory.BarrierType;
+import jdk.graal.compiler.core.common.memory.BarrierType;
 
 /**
  *
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/OrderedMemoryAccess.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/memory/OrderedMemoryAccess.java
similarity index 93%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/OrderedMemoryAccess.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/memory/OrderedMemoryAccess.java
index 5895a09df2e5..56d67716ab73 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/OrderedMemoryAccess.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/memory/OrderedMemoryAccess.java
@@ -22,9 +22,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.memory;
+package jdk.graal.compiler.nodes.memory;
 
-import jdk.compiler.graal.core.common.memory.MemoryOrderMode;
+import jdk.graal.compiler.core.common.memory.MemoryOrderMode;
 
 /**
  * Nodes implementing this class have memory ordering requirements according to
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/ReadNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/memory/ReadNode.java
similarity index 86%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/ReadNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/memory/ReadNode.java
index 8e940c2d77a1..d4816db43551 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/ReadNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/memory/ReadNode.java
@@ -22,47 +22,47 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.memory;
-
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1;
-import static jdk.compiler.graal.nodes.NamedLocationIdentity.ARRAY_LENGTH_LOCATION;
-
-import jdk.compiler.graal.core.common.LIRKind;
-import jdk.compiler.graal.core.common.memory.BarrierType;
-import jdk.compiler.graal.core.common.memory.MemoryExtendKind;
-import jdk.compiler.graal.core.common.memory.MemoryOrderMode;
-import jdk.compiler.graal.core.common.type.IntegerStamp;
-import jdk.compiler.graal.core.common.type.PrimitiveStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.debug.DebugCloseable;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.InputType;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.extended.GuardingNode;
-import jdk.compiler.graal.nodes.spi.ArrayLengthProvider;
-import jdk.compiler.graal.nodes.spi.Canonicalizable;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodes.spi.CoreProviders;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
-import jdk.compiler.graal.nodes.spi.Virtualizable;
-import jdk.compiler.graal.nodes.spi.VirtualizerTool;
-import jdk.compiler.graal.nodes.CanonicalizableLocation;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.FieldLocationIdentity;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.FrameState;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.calc.NarrowNode;
-import jdk.compiler.graal.nodes.calc.ZeroExtendNode;
-import jdk.compiler.graal.nodes.memory.address.AddressNode;
-import jdk.compiler.graal.nodes.memory.address.OffsetAddressNode;
-import jdk.compiler.graal.nodes.util.ConstantFoldUtil;
-import jdk.compiler.graal.nodes.util.GraphUtil;
+package jdk.graal.compiler.nodes.memory;
+
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_2;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_1;
+import static jdk.graal.compiler.nodes.NamedLocationIdentity.ARRAY_LENGTH_LOCATION;
+
+import jdk.graal.compiler.core.common.LIRKind;
+import jdk.graal.compiler.core.common.memory.BarrierType;
+import jdk.graal.compiler.core.common.memory.MemoryExtendKind;
+import jdk.graal.compiler.core.common.memory.MemoryOrderMode;
+import jdk.graal.compiler.core.common.type.IntegerStamp;
+import jdk.graal.compiler.core.common.type.PrimitiveStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.debug.DebugCloseable;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.InputType;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.extended.GuardingNode;
+import jdk.graal.compiler.nodes.spi.ArrayLengthProvider;
+import jdk.graal.compiler.nodes.spi.Canonicalizable;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodes.spi.CoreProviders;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.nodes.spi.Virtualizable;
+import jdk.graal.compiler.nodes.spi.VirtualizerTool;
+import jdk.graal.compiler.nodes.CanonicalizableLocation;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.FieldLocationIdentity;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.FrameState;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.calc.NarrowNode;
+import jdk.graal.compiler.nodes.calc.ZeroExtendNode;
+import jdk.graal.compiler.nodes.memory.address.AddressNode;
+import jdk.graal.compiler.nodes.memory.address.OffsetAddressNode;
+import jdk.graal.compiler.nodes.util.ConstantFoldUtil;
+import jdk.graal.compiler.nodes.util.GraphUtil;
 import org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.meta.Constant;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/SideEffectFreeWriteNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/memory/SideEffectFreeWriteNode.java
similarity index 85%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/SideEffectFreeWriteNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/memory/SideEffectFreeWriteNode.java
index 6c5f1104c8ef..81f36af1d0bc 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/SideEffectFreeWriteNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/memory/SideEffectFreeWriteNode.java
@@ -22,15 +22,15 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.memory;
+package jdk.graal.compiler.nodes.memory;
 
-import jdk.compiler.graal.core.common.memory.BarrierType;
-import jdk.compiler.graal.core.common.memory.MemoryOrderMode;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.FrameState;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.memory.address.AddressNode;
+import jdk.graal.compiler.core.common.memory.BarrierType;
+import jdk.graal.compiler.core.common.memory.MemoryOrderMode;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.FrameState;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.memory.address.AddressNode;
 import org.graalvm.word.LocationIdentity;
 
 /**
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/SingleMemoryKill.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/memory/SingleMemoryKill.java
similarity index 97%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/SingleMemoryKill.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/memory/SingleMemoryKill.java
index 8ea5a9472945..f109c54fe870 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/SingleMemoryKill.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/memory/SingleMemoryKill.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.memory;
+package jdk.graal.compiler.nodes.memory;
 
 import org.graalvm.word.LocationIdentity;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/WriteNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/memory/WriteNode.java
similarity index 86%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/WriteNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/memory/WriteNode.java
index 4066d4b1e068..d4f300914461 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/WriteNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/memory/WriteNode.java
@@ -22,29 +22,29 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.memory;
-
-import static jdk.compiler.graal.core.common.memory.MemoryOrderMode.VOLATILE;
-
-import jdk.compiler.graal.core.common.LIRKind;
-import jdk.compiler.graal.core.common.memory.BarrierType;
-import jdk.compiler.graal.core.common.memory.MemoryOrderMode;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.core.common.util.CompilationAlarm;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.gc.WriteBarrier;
-import jdk.compiler.graal.nodes.java.AbstractCompareAndSwapNode;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
-import jdk.compiler.graal.nodes.spi.Simplifiable;
-import jdk.compiler.graal.nodes.spi.SimplifierTool;
-import jdk.compiler.graal.nodes.FixedNode;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.calc.ReinterpretNode;
-import jdk.compiler.graal.nodes.memory.address.AddressNode;
+package jdk.graal.compiler.nodes.memory;
+
+import static jdk.graal.compiler.core.common.memory.MemoryOrderMode.VOLATILE;
+
+import jdk.graal.compiler.core.common.LIRKind;
+import jdk.graal.compiler.core.common.memory.BarrierType;
+import jdk.graal.compiler.core.common.memory.MemoryOrderMode;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.core.common.util.CompilationAlarm;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.gc.WriteBarrier;
+import jdk.graal.compiler.nodes.java.AbstractCompareAndSwapNode;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.nodes.spi.Simplifiable;
+import jdk.graal.compiler.nodes.spi.SimplifierTool;
+import jdk.graal.compiler.nodes.FixedNode;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.calc.ReinterpretNode;
+import jdk.graal.compiler.nodes.memory.address.AddressNode;
 import org.graalvm.word.LocationIdentity;
 
 /**
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/address/AddressNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/memory/address/AddressNode.java
similarity index 78%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/address/AddressNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/memory/address/AddressNode.java
index 869ce19a252c..638dcbe11e5e 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/address/AddressNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/memory/address/AddressNode.java
@@ -22,19 +22,19 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.memory.address;
+package jdk.graal.compiler.nodes.memory.address;
 
-import static jdk.compiler.graal.nodeinfo.InputType.Association;
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_0;
+import static jdk.graal.compiler.nodeinfo.InputType.Association;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_0;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_0;
 
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.Node.IndirectCanonicalization;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodeinfo.StructuralInput;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.calc.FloatingNode;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.Node.IndirectCanonicalization;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodeinfo.StructuralInput;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.calc.FloatingNode;
 
 /**
  * Base class for nodes that deal with addressing calculation.
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/address/IndexAddressNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/memory/address/IndexAddressNode.java
similarity index 89%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/address/IndexAddressNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/memory/address/IndexAddressNode.java
index 1611ca409e44..f992f8e955c5 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/address/IndexAddressNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/memory/address/IndexAddressNode.java
@@ -22,14 +22,14 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.memory.address;
+package jdk.graal.compiler.nodes.memory.address;
 
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.InputType;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.Lowerable;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.InputType;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.Lowerable;
 
 import jdk.vm.ci.meta.JavaKind;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/address/OffsetAddressNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/memory/address/OffsetAddressNode.java
similarity index 85%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/address/OffsetAddressNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/memory/address/OffsetAddressNode.java
index a4ceabd15651..d863fc7efa31 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/address/OffsetAddressNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/memory/address/OffsetAddressNode.java
@@ -22,23 +22,23 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.memory.address;
+package jdk.graal.compiler.nodes.memory.address;
 
-import jdk.compiler.graal.core.common.type.AbstractPointerStamp;
-import jdk.compiler.graal.core.common.type.IntegerStamp;
-import jdk.compiler.graal.core.common.type.PrimitiveStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.calc.AddNode;
-import jdk.compiler.graal.nodes.calc.BinaryArithmeticNode;
-import jdk.compiler.graal.nodes.spi.Canonicalizable;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodeinfo.InputType;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
+import jdk.graal.compiler.core.common.type.AbstractPointerStamp;
+import jdk.graal.compiler.core.common.type.IntegerStamp;
+import jdk.graal.compiler.core.common.type.PrimitiveStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.calc.AddNode;
+import jdk.graal.compiler.nodes.calc.BinaryArithmeticNode;
+import jdk.graal.compiler.nodes.spi.Canonicalizable;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodeinfo.InputType;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
 
 import jdk.vm.ci.meta.JavaKind;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/ArithmeticLIRLowerable.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/spi/ArithmeticLIRLowerable.java
similarity index 93%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/ArithmeticLIRLowerable.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/spi/ArithmeticLIRLowerable.java
index 21897ee92884..9251c4c6f441 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/ArithmeticLIRLowerable.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/spi/ArithmeticLIRLowerable.java
@@ -22,9 +22,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.spi;
+package jdk.graal.compiler.nodes.spi;
 
-import jdk.compiler.graal.lir.gen.ArithmeticLIRGeneratorTool;
+import jdk.graal.compiler.lir.gen.ArithmeticLIRGeneratorTool;
 
 public interface ArithmeticLIRLowerable extends LIRLowerable {
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/ArrayLengthProvider.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/spi/ArrayLengthProvider.java
similarity index 93%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/ArrayLengthProvider.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/spi/ArrayLengthProvider.java
index 2c6b82bb8b3c..4ca21d440c4c 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/ArrayLengthProvider.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/spi/ArrayLengthProvider.java
@@ -22,13 +22,13 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.spi;
+package jdk.graal.compiler.nodes.spi;
 
 import jdk.vm.ci.meta.ConstantReflectionProvider;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.ValuePhiNode;
-import jdk.compiler.graal.nodes.ValueProxyNode;
-import jdk.compiler.graal.nodes.util.GraphUtil;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.ValuePhiNode;
+import jdk.graal.compiler.nodes.ValueProxyNode;
+import jdk.graal.compiler.nodes.util.GraphUtil;
 
 public interface ArrayLengthProvider {
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/Canonicalizable.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/spi/Canonicalizable.java
similarity index 97%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/Canonicalizable.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/spi/Canonicalizable.java
index a99a53c71056..aea0a3d7ee35 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/Canonicalizable.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/spi/Canonicalizable.java
@@ -22,12 +22,12 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.spi;
+package jdk.graal.compiler.nodes.spi;
 
-import jdk.compiler.graal.graph.Graph;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.spi.BinaryCommutativeMarker;
-import jdk.compiler.graal.graph.spi.CanonicalizableMarker;
+import jdk.graal.compiler.graph.Graph;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.spi.BinaryCommutativeMarker;
+import jdk.graal.compiler.graph.spi.CanonicalizableMarker;
 
 import jdk.vm.ci.meta.MetaAccessProvider;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/CanonicalizerTool.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/spi/CanonicalizerTool.java
similarity index 91%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/CanonicalizerTool.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/spi/CanonicalizerTool.java
index 2eaa42193a82..7f8060918422 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/CanonicalizerTool.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/spi/CanonicalizerTool.java
@@ -22,13 +22,13 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.spi;
+package jdk.graal.compiler.nodes.spi;
 
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.nodes.java.LoadFieldNode;
-import jdk.compiler.graal.nodes.java.LoadIndexedNode;
-import jdk.compiler.graal.nodes.memory.ReadNode;
-import jdk.compiler.graal.options.OptionValues;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.nodes.java.LoadFieldNode;
+import jdk.graal.compiler.nodes.java.LoadIndexedNode;
+import jdk.graal.compiler.nodes.memory.ReadNode;
+import jdk.graal.compiler.options.OptionValues;
 
 import jdk.vm.ci.meta.Assumptions;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/CoreProviders.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/spi/CoreProviders.java
similarity index 86%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/CoreProviders.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/spi/CoreProviders.java
index 83a1db5aab36..cd1e64562945 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/CoreProviders.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/spi/CoreProviders.java
@@ -22,12 +22,12 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.spi;
+package jdk.graal.compiler.nodes.spi;
 
-import jdk.compiler.graal.api.replacements.SnippetReflectionProvider;
-import jdk.compiler.graal.core.common.spi.ConstantFieldProvider;
-import jdk.compiler.graal.core.common.spi.ForeignCallsProvider;
-import jdk.compiler.graal.core.common.spi.MetaAccessExtensionProvider;
+import jdk.graal.compiler.api.replacements.SnippetReflectionProvider;
+import jdk.graal.compiler.core.common.spi.ConstantFieldProvider;
+import jdk.graal.compiler.core.common.spi.ForeignCallsProvider;
+import jdk.graal.compiler.core.common.spi.MetaAccessExtensionProvider;
 
 import jdk.vm.ci.meta.ConstantReflectionProvider;
 import jdk.vm.ci.meta.MetaAccessProvider;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/CoreProvidersDelegate.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/spi/CoreProvidersDelegate.java
similarity index 91%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/CoreProvidersDelegate.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/spi/CoreProvidersDelegate.java
index 161d9dfd09c2..ab444c29beac 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/CoreProvidersDelegate.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/spi/CoreProvidersDelegate.java
@@ -22,12 +22,12 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.spi;
+package jdk.graal.compiler.nodes.spi;
 
-import jdk.compiler.graal.api.replacements.SnippetReflectionProvider;
-import jdk.compiler.graal.core.common.spi.ConstantFieldProvider;
-import jdk.compiler.graal.core.common.spi.ForeignCallsProvider;
-import jdk.compiler.graal.core.common.spi.MetaAccessExtensionProvider;
+import jdk.graal.compiler.api.replacements.SnippetReflectionProvider;
+import jdk.graal.compiler.core.common.spi.ConstantFieldProvider;
+import jdk.graal.compiler.core.common.spi.ForeignCallsProvider;
+import jdk.graal.compiler.core.common.spi.MetaAccessExtensionProvider;
 
 import jdk.vm.ci.meta.ConstantReflectionProvider;
 import jdk.vm.ci.meta.MetaAccessProvider;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/DelegatingReplacements.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/spi/DelegatingReplacements.java
similarity index 87%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/DelegatingReplacements.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/spi/DelegatingReplacements.java
index a47766515470..f85e42370ebf 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/DelegatingReplacements.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/spi/DelegatingReplacements.java
@@ -22,22 +22,22 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.spi;
+package jdk.graal.compiler.nodes.spi;
 
 import java.util.BitSet;
 
-import jdk.compiler.graal.api.replacements.SnippetTemplateCache;
-import jdk.compiler.graal.bytecode.BytecodeProvider;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.graph.NodeSourcePosition;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderPlugin;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin;
-import jdk.compiler.graal.nodes.Invoke;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions;
-import jdk.compiler.graal.options.OptionValues;
+import jdk.graal.compiler.api.replacements.SnippetTemplateCache;
+import jdk.graal.compiler.bytecode.BytecodeProvider;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.graph.NodeSourcePosition;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderPlugin;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin;
+import jdk.graal.compiler.nodes.Invoke;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.StructuredGraph.AllowAssumptions;
+import jdk.graal.compiler.options.OptionValues;
 
 import jdk.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/LIRLowerable.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/spi/LIRLowerable.java
similarity index 97%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/LIRLowerable.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/spi/LIRLowerable.java
index b29909818b3b..622a531980e3 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/LIRLowerable.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/spi/LIRLowerable.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.spi;
+package jdk.graal.compiler.nodes.spi;
 
 public interface LIRLowerable {
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/LimitedValueProxy.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/spi/LimitedValueProxy.java
similarity index 95%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/LimitedValueProxy.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/spi/LimitedValueProxy.java
index 3118d90599e4..7908dcdcf603 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/LimitedValueProxy.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/spi/LimitedValueProxy.java
@@ -22,9 +22,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.spi;
+package jdk.graal.compiler.nodes.spi;
 
-import jdk.compiler.graal.nodes.ValueNode;
+import jdk.graal.compiler.nodes.ValueNode;
 
 /**
  * This interface is like the derived {@link ValueProxy}. The difference is that only the graph
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/LoopsDataProvider.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/spi/LoopsDataProvider.java
similarity index 90%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/LoopsDataProvider.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/spi/LoopsDataProvider.java
index d6b2e5d0d294..92354782d5ba 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/LoopsDataProvider.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/spi/LoopsDataProvider.java
@@ -22,11 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.spi;
+package jdk.graal.compiler.nodes.spi;
 
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.cfg.ControlFlowGraph;
-import jdk.compiler.graal.nodes.loop.LoopsData;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.cfg.ControlFlowGraph;
+import jdk.graal.compiler.nodes.loop.LoopsData;
 
 /**
  * Provides capabilities for loop detection in a {@linkplain StructuredGraph}.
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/Lowerable.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/spi/Lowerable.java
similarity index 95%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/Lowerable.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/spi/Lowerable.java
index 2535e75ef555..6b7dc7392742 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/Lowerable.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/spi/Lowerable.java
@@ -22,9 +22,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.spi;
+package jdk.graal.compiler.nodes.spi;
 
-import jdk.compiler.graal.nodes.ValueNodeInterface;
+import jdk.graal.compiler.nodes.ValueNodeInterface;
 
 /**
  * Interface implemented by nodes that can replace themselves with lower level nodes during a phase
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/LoweringProvider.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/spi/LoweringProvider.java
similarity index 88%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/LoweringProvider.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/spi/LoweringProvider.java
index 06f89bb43eac..33326b84de45 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/LoweringProvider.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/spi/LoweringProvider.java
@@ -22,17 +22,17 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.spi;
-
-import jdk.compiler.graal.core.common.memory.MemoryExtendKind;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.lir.CastValue;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.calc.RoundNode;
-import jdk.compiler.graal.nodes.gc.BarrierSet;
-import jdk.compiler.graal.nodes.memory.ExtendableMemoryAccess;
-import jdk.compiler.graal.nodes.memory.address.AddressNode;
-import jdk.compiler.graal.options.OptionValues;
+package jdk.graal.compiler.nodes.spi;
+
+import jdk.graal.compiler.core.common.memory.MemoryExtendKind;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.lir.CastValue;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.calc.RoundNode;
+import jdk.graal.compiler.nodes.gc.BarrierSet;
+import jdk.graal.compiler.nodes.memory.ExtendableMemoryAccess;
+import jdk.graal.compiler.nodes.memory.address.AddressNode;
+import jdk.graal.compiler.options.OptionValues;
 
 import jdk.vm.ci.code.TargetDescription;
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/LoweringTool.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/spi/LoweringTool.java
similarity index 85%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/LoweringTool.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/spi/LoweringTool.java
index 806fe9e787c1..66c79371df28 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/LoweringTool.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/spi/LoweringTool.java
@@ -22,16 +22,16 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.spi;
+package jdk.graal.compiler.nodes.spi;
 
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.debug.TimerKey;
-import jdk.compiler.graal.graph.NodeSourcePosition;
-import jdk.compiler.graal.nodes.extended.AnchoringNode;
-import jdk.compiler.graal.nodes.extended.GuardingNode;
-import jdk.compiler.graal.nodes.FixedNode;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.LogicNode;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.debug.TimerKey;
+import jdk.graal.compiler.graph.NodeSourcePosition;
+import jdk.graal.compiler.nodes.extended.AnchoringNode;
+import jdk.graal.compiler.nodes.extended.GuardingNode;
+import jdk.graal.compiler.nodes.FixedNode;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.LogicNode;
 
 import jdk.vm.ci.meta.DeoptimizationAction;
 import jdk.vm.ci.meta.DeoptimizationReason;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/MemoryEdgeProxy.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/spi/MemoryEdgeProxy.java
similarity index 93%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/MemoryEdgeProxy.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/spi/MemoryEdgeProxy.java
index 90aea3bafeda..5507d9f27b7c 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/MemoryEdgeProxy.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/spi/MemoryEdgeProxy.java
@@ -22,9 +22,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.spi;
+package jdk.graal.compiler.nodes.spi;
 
-import jdk.compiler.graal.nodes.memory.MemoryKill;
+import jdk.graal.compiler.nodes.memory.MemoryKill;
 import org.graalvm.word.LocationIdentity;
 
 public interface MemoryEdgeProxy extends Proxy, MemoryKill {
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/NodeLIRBuilderTool.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/spi/NodeLIRBuilderTool.java
similarity index 68%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/NodeLIRBuilderTool.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/spi/NodeLIRBuilderTool.java
index 0774b506cef3..838c5d190324 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/NodeLIRBuilderTool.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/spi/NodeLIRBuilderTool.java
@@ -22,33 +22,33 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.spi;
+package jdk.graal.compiler.nodes.spi;
 
 import java.util.List;
 
-import jdk.compiler.graal.core.common.cfg.BlockMap;
-import jdk.compiler.graal.core.common.spi.ForeignCallDescriptor;
-import jdk.compiler.graal.core.common.spi.ForeignCallLinkage;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.lir.LIRFrameState;
-import jdk.compiler.graal.lir.gen.LIRGeneratorTool;
-import jdk.compiler.graal.nodes.cfg.HIRBlock;
-import jdk.compiler.graal.nodes.extended.ForeignCall;
-import jdk.compiler.graal.nodes.extended.SwitchNode;
-import jdk.compiler.graal.nodes.AbstractBeginNode;
-import jdk.compiler.graal.nodes.AbstractEndNode;
-import jdk.compiler.graal.nodes.AbstractMergeNode;
-import jdk.compiler.graal.nodes.BreakpointNode;
-import jdk.compiler.graal.nodes.DeoptimizingNode;
-import jdk.compiler.graal.nodes.FullInfopointNode;
-import jdk.compiler.graal.nodes.IfNode;
-import jdk.compiler.graal.nodes.Invoke;
-import jdk.compiler.graal.nodes.LoopEndNode;
-import jdk.compiler.graal.nodes.SafepointNode;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.calc.ConditionalNode;
+import jdk.graal.compiler.core.common.cfg.BlockMap;
+import jdk.graal.compiler.core.common.spi.ForeignCallDescriptor;
+import jdk.graal.compiler.core.common.spi.ForeignCallLinkage;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.lir.LIRFrameState;
+import jdk.graal.compiler.lir.gen.LIRGeneratorTool;
+import jdk.graal.compiler.nodes.cfg.HIRBlock;
+import jdk.graal.compiler.nodes.extended.ForeignCall;
+import jdk.graal.compiler.nodes.extended.SwitchNode;
+import jdk.graal.compiler.nodes.AbstractBeginNode;
+import jdk.graal.compiler.nodes.AbstractEndNode;
+import jdk.graal.compiler.nodes.AbstractMergeNode;
+import jdk.graal.compiler.nodes.BreakpointNode;
+import jdk.graal.compiler.nodes.DeoptimizingNode;
+import jdk.graal.compiler.nodes.FullInfopointNode;
+import jdk.graal.compiler.nodes.IfNode;
+import jdk.graal.compiler.nodes.Invoke;
+import jdk.graal.compiler.nodes.LoopEndNode;
+import jdk.graal.compiler.nodes.SafepointNode;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.calc.ConditionalNode;
 
 public interface NodeLIRBuilderTool extends NodeValueMap {
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/NodeValueMap.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/spi/NodeValueMap.java
similarity index 95%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/NodeValueMap.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/spi/NodeValueMap.java
index 8babcf883f53..3a8d383e9dfc 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/NodeValueMap.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/spi/NodeValueMap.java
@@ -23,10 +23,10 @@
  * questions.
  */
 
-package jdk.compiler.graal.nodes.spi;
+package jdk.graal.compiler.nodes.spi;
 
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.nodes.ValueNode;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.nodes.ValueNode;
 
 import jdk.vm.ci.meta.Value;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/NodeWithState.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/spi/NodeWithState.java
similarity index 88%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/NodeWithState.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/spi/NodeWithState.java
index 61425f0f0521..59e729143331 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/NodeWithState.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/spi/NodeWithState.java
@@ -22,11 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.spi;
+package jdk.graal.compiler.nodes.spi;
 
-import jdk.compiler.graal.graph.iterators.NodeIterable;
-import jdk.compiler.graal.nodes.FixedNodeInterface;
-import jdk.compiler.graal.nodes.FrameState;
+import jdk.graal.compiler.graph.iterators.NodeIterable;
+import jdk.graal.compiler.nodes.FixedNodeInterface;
+import jdk.graal.compiler.nodes.FrameState;
 
 /**
  * Interface for nodes which have {@link FrameState} nodes as input.
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/PlatformConfigurationProvider.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/spi/PlatformConfigurationProvider.java
similarity index 94%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/PlatformConfigurationProvider.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/spi/PlatformConfigurationProvider.java
index dd991eedc866..2c75b652454d 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/PlatformConfigurationProvider.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/spi/PlatformConfigurationProvider.java
@@ -22,9 +22,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.spi;
+package jdk.graal.compiler.nodes.spi;
 
-import jdk.compiler.graal.nodes.gc.BarrierSet;
+import jdk.graal.compiler.nodes.gc.BarrierSet;
 
 public interface PlatformConfigurationProvider {
     /**
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/ProfileProvider.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/spi/ProfileProvider.java
similarity index 97%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/ProfileProvider.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/spi/ProfileProvider.java
index 656214b10eac..a5ef56df547b 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/ProfileProvider.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/spi/ProfileProvider.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.spi;
+package jdk.graal.compiler.nodes.spi;
 
 import jdk.vm.ci.meta.ProfilingInfo;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/Proxy.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/spi/Proxy.java
similarity index 92%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/Proxy.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/spi/Proxy.java
index c5436fd1a9ec..7fed33ce441e 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/Proxy.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/spi/Proxy.java
@@ -22,10 +22,10 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.spi;
+package jdk.graal.compiler.nodes.spi;
 
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.nodes.ValueNodeInterface;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.nodes.ValueNodeInterface;
 
 /**
  * This interface marks nodes whose result is the same as one of their inputs. Such nodes are used
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/Replacements.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/spi/Replacements.java
similarity index 88%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/Replacements.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/spi/Replacements.java
index 206a1e0381a1..6476d38537cd 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/Replacements.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/spi/Replacements.java
@@ -22,23 +22,23 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.spi;
+package jdk.graal.compiler.nodes.spi;
 
 import java.util.BitSet;
 
-import jdk.compiler.graal.api.replacements.Snippet;
-import jdk.compiler.graal.api.replacements.SnippetTemplateCache;
-import jdk.compiler.graal.bytecode.BytecodeProvider;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.graph.NodeSourcePosition;
-import jdk.compiler.graal.nodes.graphbuilderconf.GeneratedPluginInjectionProvider;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderPlugin;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin;
-import jdk.compiler.graal.nodes.Invoke;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions;
-import jdk.compiler.graal.options.OptionValues;
+import jdk.graal.compiler.api.replacements.Snippet;
+import jdk.graal.compiler.api.replacements.SnippetTemplateCache;
+import jdk.graal.compiler.bytecode.BytecodeProvider;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.graph.NodeSourcePosition;
+import jdk.graal.compiler.nodes.graphbuilderconf.GeneratedPluginInjectionProvider;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderPlugin;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin;
+import jdk.graal.compiler.nodes.Invoke;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.StructuredGraph.AllowAssumptions;
+import jdk.graal.compiler.options.OptionValues;
 
 import jdk.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/ResolvedJavaMethodProfileProvider.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/spi/ResolvedJavaMethodProfileProvider.java
similarity index 97%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/ResolvedJavaMethodProfileProvider.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/spi/ResolvedJavaMethodProfileProvider.java
index 084ab47498eb..3727be92856f 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/ResolvedJavaMethodProfileProvider.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/spi/ResolvedJavaMethodProfileProvider.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.spi;
+package jdk.graal.compiler.nodes.spi;
 
 import jdk.vm.ci.meta.ProfilingInfo;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/Simplifiable.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/spi/Simplifiable.java
similarity index 92%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/Simplifiable.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/spi/Simplifiable.java
index a67a166a1c82..880a172d6768 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/Simplifiable.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/spi/Simplifiable.java
@@ -22,10 +22,10 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.spi;
+package jdk.graal.compiler.nodes.spi;
 
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.spi.SimplifiableMarker;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.spi.SimplifiableMarker;
 
 /**
  * This interface allows nodes to perform more complicated simplifications, in contrast to
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/SimplifierTool.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/spi/SimplifierTool.java
similarity index 95%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/SimplifierTool.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/spi/SimplifierTool.java
index 2cef997a0f82..dd68df7cc64c 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/SimplifierTool.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/spi/SimplifierTool.java
@@ -22,9 +22,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.spi;
+package jdk.graal.compiler.nodes.spi;
 
-import jdk.compiler.graal.graph.Node;
+import jdk.graal.compiler.graph.Node;
 
 /**
  * @see Simplifiable
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/SnippetParameterInfo.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/spi/SnippetParameterInfo.java
similarity index 98%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/SnippetParameterInfo.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/spi/SnippetParameterInfo.java
index fe820c31629c..a91272e1d421 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/SnippetParameterInfo.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/spi/SnippetParameterInfo.java
@@ -22,11 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.spi;
+package jdk.graal.compiler.nodes.spi;
 
 import static jdk.vm.ci.services.Services.IS_BUILDING_NATIVE_IMAGE;
 
-import jdk.compiler.graal.api.replacements.Snippet;
+import jdk.graal.compiler.api.replacements.Snippet;
 
 import jdk.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.Local;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/StableProfileProvider.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/spi/StableProfileProvider.java
similarity index 99%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/StableProfileProvider.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/spi/StableProfileProvider.java
index 3592080e45b8..6e97a690a748 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/StableProfileProvider.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/spi/StableProfileProvider.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.spi;
+package jdk.graal.compiler.nodes.spi;
 
 import java.util.ArrayList;
 import java.util.Comparator;
@@ -30,9 +30,9 @@
 
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.MapCursor;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.debug.TTY;
-import jdk.compiler.graal.nodes.StructuredGraph;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.debug.TTY;
+import jdk.graal.compiler.nodes.StructuredGraph;
 
 import jdk.vm.ci.meta.DeoptimizationReason;
 import jdk.vm.ci.meta.JavaMethodProfile;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/StampInverter.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/spi/StampInverter.java
similarity index 91%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/StampInverter.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/spi/StampInverter.java
index 8af2cb545dd6..9b5038667e09 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/StampInverter.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/spi/StampInverter.java
@@ -22,10 +22,10 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.spi;
+package jdk.graal.compiler.nodes.spi;
 
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.nodes.ValueNode;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.nodes.ValueNode;
 
 public interface StampInverter {
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/StampProvider.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/spi/StampProvider.java
similarity index 88%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/StampProvider.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/spi/StampProvider.java
index 64a4422c78df..f1b7448eeada 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/StampProvider.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/spi/StampProvider.java
@@ -22,11 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.spi;
+package jdk.graal.compiler.nodes.spi;
 
-import jdk.compiler.graal.core.common.type.AbstractPointerStamp;
-import jdk.compiler.graal.core.common.type.ObjectStamp;
-import jdk.compiler.graal.nodes.extended.LoadHubNode;
+import jdk.graal.compiler.core.common.type.AbstractPointerStamp;
+import jdk.graal.compiler.core.common.type.ObjectStamp;
+import jdk.graal.compiler.nodes.extended.LoadHubNode;
 
 /**
  * Provides a capability for creating platform dependent stamps.
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/SwitchFoldable.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/spi/SwitchFoldable.java
similarity index 94%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/SwitchFoldable.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/spi/SwitchFoldable.java
index f178b335ffe0..72c33e2f701d 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/SwitchFoldable.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/spi/SwitchFoldable.java
@@ -23,33 +23,33 @@
  * questions.
  */
 
-package jdk.compiler.graal.nodes.spi;
+package jdk.graal.compiler.nodes.spi;
 
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
 
-import jdk.compiler.graal.nodes.extended.IntegerSwitchNode;
+import jdk.graal.compiler.nodes.extended.IntegerSwitchNode;
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.Equivalence;
-import jdk.compiler.graal.core.common.SuppressFBWarnings;
-import jdk.compiler.graal.core.common.type.IntegerStamp;
-import jdk.compiler.graal.core.common.type.PrimitiveStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.nodes.AbstractBeginNode;
-import jdk.compiler.graal.nodes.BeginNode;
-import jdk.compiler.graal.nodes.FixedNode;
-import jdk.compiler.graal.nodes.LogicNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ProfileData.ProfileSource;
-import jdk.compiler.graal.nodes.ProfileData.SwitchProbabilityData;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.ValueNodeInterface;
-import jdk.compiler.graal.nodes.calc.IntegerEqualsNode;
-import jdk.compiler.graal.nodes.calc.SignExtendNode;
-import jdk.compiler.graal.nodes.util.GraphUtil;
+import jdk.graal.compiler.core.common.SuppressFBWarnings;
+import jdk.graal.compiler.core.common.type.IntegerStamp;
+import jdk.graal.compiler.core.common.type.PrimitiveStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.nodes.AbstractBeginNode;
+import jdk.graal.compiler.nodes.BeginNode;
+import jdk.graal.compiler.nodes.FixedNode;
+import jdk.graal.compiler.nodes.LogicNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ProfileData.ProfileSource;
+import jdk.graal.compiler.nodes.ProfileData.SwitchProbabilityData;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.ValueNodeInterface;
+import jdk.graal.compiler.nodes.calc.IntegerEqualsNode;
+import jdk.graal.compiler.nodes.calc.SignExtendNode;
+import jdk.graal.compiler.nodes.util.GraphUtil;
 
 /**
  * Nodes that implement this interface can be collapsed to a single IntegerSwitch when they are seen
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/UncheckedInterfaceProvider.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/spi/UncheckedInterfaceProvider.java
similarity index 94%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/UncheckedInterfaceProvider.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/spi/UncheckedInterfaceProvider.java
index 1b7361dc2ab4..75ba1a25b715 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/UncheckedInterfaceProvider.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/spi/UncheckedInterfaceProvider.java
@@ -22,9 +22,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.spi;
+package jdk.graal.compiler.nodes.spi;
 
-import jdk.compiler.graal.core.common.type.Stamp;
+import jdk.graal.compiler.core.common.type.Stamp;
 
 public interface UncheckedInterfaceProvider {
     /**
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/ValueProxy.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/spi/ValueProxy.java
similarity index 94%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/ValueProxy.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/spi/ValueProxy.java
index 6cc21686d3d4..0e0f2f6504ca 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/ValueProxy.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/spi/ValueProxy.java
@@ -22,9 +22,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.spi;
+package jdk.graal.compiler.nodes.spi;
 
-import jdk.compiler.graal.nodes.extended.GuardingNode;
+import jdk.graal.compiler.nodes.extended.GuardingNode;
 
 /**
  * Special implementation of {@link LimitedValueProxy} that adds a guard to this value. Use in
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/Virtualizable.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/spi/Virtualizable.java
similarity index 98%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/Virtualizable.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/spi/Virtualizable.java
index b5dd422ae04d..4b7e1ef89cad 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/Virtualizable.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/spi/Virtualizable.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.spi;
+package jdk.graal.compiler.nodes.spi;
 
 /**
  * This interface allows a node to convey information about what its effect would be if some of its
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/VirtualizableAllocation.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/spi/VirtualizableAllocation.java
similarity index 97%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/VirtualizableAllocation.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/spi/VirtualizableAllocation.java
index 14f0dfb6ca19..9dfd165e988f 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/VirtualizableAllocation.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/spi/VirtualizableAllocation.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.spi;
+package jdk.graal.compiler.nodes.spi;
 
 /**
  * This interface allows a node to convey information about what its effect would be if some of its
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/VirtualizerTool.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/spi/VirtualizerTool.java
similarity index 93%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/VirtualizerTool.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/spi/VirtualizerTool.java
index 05e9f334769f..00a7ebfcd7e5 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/VirtualizerTool.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/spi/VirtualizerTool.java
@@ -22,19 +22,19 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.spi;
+package jdk.graal.compiler.nodes.spi;
 
 import java.util.List;
 
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeSourcePosition;
-import jdk.compiler.graal.nodes.java.MonitorIdNode;
-import jdk.compiler.graal.nodes.virtual.VirtualObjectNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.WithExceptionNode;
-import jdk.compiler.graal.options.OptionValues;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeSourcePosition;
+import jdk.graal.compiler.nodes.java.MonitorIdNode;
+import jdk.graal.compiler.nodes.virtual.VirtualObjectNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.WithExceptionNode;
+import jdk.graal.compiler.options.OptionValues;
 
 import jdk.vm.ci.meta.JavaKind;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/WordVerification.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/spi/WordVerification.java
similarity index 98%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/WordVerification.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/spi/WordVerification.java
index fabea39b3763..28323d08dad0 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/WordVerification.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/spi/WordVerification.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.spi;
+package jdk.graal.compiler.nodes.spi;
 
 import jdk.vm.ci.meta.JavaType;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/type/NarrowOopStamp.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/type/NarrowOopStamp.java
similarity index 91%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/type/NarrowOopStamp.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/type/NarrowOopStamp.java
index a325d3da92bb..9f5a6d730472 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/type/NarrowOopStamp.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/type/NarrowOopStamp.java
@@ -22,14 +22,14 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.type;
-
-import jdk.compiler.graal.core.common.CompressEncoding;
-import jdk.compiler.graal.core.common.LIRKind;
-import jdk.compiler.graal.core.common.spi.LIRKindTool;
-import jdk.compiler.graal.core.common.type.AbstractObjectStamp;
-import jdk.compiler.graal.core.common.type.ObjectStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
+package jdk.graal.compiler.nodes.type;
+
+import jdk.graal.compiler.core.common.CompressEncoding;
+import jdk.graal.compiler.core.common.LIRKind;
+import jdk.graal.compiler.core.common.spi.LIRKindTool;
+import jdk.graal.compiler.core.common.type.AbstractObjectStamp;
+import jdk.graal.compiler.core.common.type.ObjectStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
 
 import jdk.vm.ci.meta.Constant;
 import jdk.vm.ci.meta.MemoryAccessProvider;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/type/StampTool.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/type/StampTool.java
similarity index 95%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/type/StampTool.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/type/StampTool.java
index e6b28e8a6fd1..7155bf0bdaa9 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/type/StampTool.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/type/StampTool.java
@@ -22,18 +22,18 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.type;
+package jdk.graal.compiler.nodes.type;
 
 import java.util.Iterator;
 
-import jdk.compiler.graal.core.common.type.AbstractObjectStamp;
-import jdk.compiler.graal.core.common.type.AbstractPointerStamp;
-import jdk.compiler.graal.core.common.type.IntegerStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.core.common.type.TypeReference;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
+import jdk.graal.compiler.core.common.type.AbstractObjectStamp;
+import jdk.graal.compiler.core.common.type.AbstractPointerStamp;
+import jdk.graal.compiler.core.common.type.IntegerStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.core.common.type.TypeReference;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
 
 import jdk.vm.ci.code.CodeUtil;
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/util/ConstantFoldUtil.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/util/ConstantFoldUtil.java
similarity index 92%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/util/ConstantFoldUtil.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/util/ConstantFoldUtil.java
index 7c64450a34f8..16c2da98d471 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/util/ConstantFoldUtil.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/util/ConstantFoldUtil.java
@@ -22,15 +22,15 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.util;
-
-import jdk.compiler.graal.core.common.spi.ConstantFieldProvider;
-import jdk.compiler.graal.core.common.spi.ConstantFieldProvider.ConstantFieldTool;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.nodes.memory.ReadNode;
-import jdk.compiler.graal.nodes.spi.CoreProviders;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.options.OptionValues;
+package jdk.graal.compiler.nodes.util;
+
+import jdk.graal.compiler.core.common.spi.ConstantFieldProvider;
+import jdk.graal.compiler.core.common.spi.ConstantFieldProvider.ConstantFieldTool;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.nodes.memory.ReadNode;
+import jdk.graal.compiler.nodes.spi.CoreProviders;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.options.OptionValues;
 
 import jdk.vm.ci.meta.Constant;
 import jdk.vm.ci.meta.ConstantReflectionProvider;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/util/ConstantReflectionUtil.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/util/ConstantReflectionUtil.java
similarity index 96%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/util/ConstantReflectionUtil.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/util/ConstantReflectionUtil.java
index c7644c06c532..a5796327124b 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/util/ConstantReflectionUtil.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/util/ConstantReflectionUtil.java
@@ -22,15 +22,15 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.util;
+package jdk.graal.compiler.nodes.util;
 
 import java.nio.ByteOrder;
 
-import jdk.compiler.graal.core.common.Stride;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.NodeView;
+import jdk.graal.compiler.core.common.Stride;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.NodeView;
 
 import jdk.vm.ci.meta.ConstantReflectionProvider;
 import jdk.vm.ci.meta.JavaConstant;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/util/GraphUtil.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/util/GraphUtil.java
similarity index 95%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/util/GraphUtil.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/util/GraphUtil.java
index bfa6deea4366..19d5cb381f1e 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/util/GraphUtil.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/util/GraphUtil.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.util;
+package jdk.graal.compiler.nodes.util;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -33,69 +33,69 @@
 import java.util.Objects;
 import java.util.function.BiFunction;
 
-import jdk.compiler.graal.nodes.AbstractBeginNode;
-import jdk.compiler.graal.nodes.AbstractEndNode;
-import jdk.compiler.graal.nodes.GuardNode;
-import jdk.compiler.graal.nodes.IfNode;
-import jdk.compiler.graal.nodes.PhiNode;
-import jdk.compiler.graal.nodes.StateSplit;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.extended.MultiGuardNode;
-import jdk.compiler.graal.nodes.java.LoadIndexedNode;
-import jdk.compiler.graal.nodes.java.MethodCallTargetNode;
-import jdk.compiler.graal.nodes.java.MonitorIdNode;
-import jdk.compiler.graal.nodes.spi.ArrayLengthProvider;
-import jdk.compiler.graal.nodes.spi.CoreProviders;
-import jdk.compiler.graal.nodes.spi.CoreProvidersDelegate;
-import jdk.compiler.graal.nodes.spi.LimitedValueProxy;
-import jdk.compiler.graal.nodes.spi.SimplifierTool;
-import jdk.compiler.graal.nodes.spi.ValueProxy;
-import jdk.compiler.graal.nodes.spi.VirtualizerTool;
-import jdk.compiler.graal.nodes.type.StampTool;
-import jdk.compiler.graal.nodes.virtual.VirtualArrayNode;
-import jdk.compiler.graal.nodes.virtual.VirtualObjectNode;
+import jdk.graal.compiler.nodes.AbstractBeginNode;
+import jdk.graal.compiler.nodes.AbstractEndNode;
+import jdk.graal.compiler.nodes.GuardNode;
+import jdk.graal.compiler.nodes.IfNode;
+import jdk.graal.compiler.nodes.PhiNode;
+import jdk.graal.compiler.nodes.StateSplit;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.extended.MultiGuardNode;
+import jdk.graal.compiler.nodes.java.LoadIndexedNode;
+import jdk.graal.compiler.nodes.java.MethodCallTargetNode;
+import jdk.graal.compiler.nodes.java.MonitorIdNode;
+import jdk.graal.compiler.nodes.spi.ArrayLengthProvider;
+import jdk.graal.compiler.nodes.spi.CoreProviders;
+import jdk.graal.compiler.nodes.spi.CoreProvidersDelegate;
+import jdk.graal.compiler.nodes.spi.LimitedValueProxy;
+import jdk.graal.compiler.nodes.spi.SimplifierTool;
+import jdk.graal.compiler.nodes.spi.ValueProxy;
+import jdk.graal.compiler.nodes.spi.VirtualizerTool;
+import jdk.graal.compiler.nodes.type.StampTool;
+import jdk.graal.compiler.nodes.virtual.VirtualArrayNode;
+import jdk.graal.compiler.nodes.virtual.VirtualObjectNode;
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.EconomicSet;
 import org.graalvm.collections.Equivalence;
 import org.graalvm.collections.MapCursor;
-import jdk.compiler.graal.bytecode.Bytecode;
-import jdk.compiler.graal.code.SourceStackTraceBailoutException;
-import jdk.compiler.graal.core.common.type.ObjectStamp;
-import jdk.compiler.graal.core.common.util.CompilationAlarm;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.Graph;
-import jdk.compiler.graal.graph.LinkedStack;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeBitMap;
-import jdk.compiler.graal.graph.NodeSourcePosition;
-import jdk.compiler.graal.graph.NodeStack;
-import jdk.compiler.graal.graph.Position;
-import jdk.compiler.graal.graph.iterators.NodeIterable;
-import jdk.compiler.graal.nodes.AbstractMergeNode;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.ControlSinkNode;
-import jdk.compiler.graal.nodes.ControlSplitNode;
-import jdk.compiler.graal.nodes.EndNode;
-import jdk.compiler.graal.nodes.FixedNode;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.FrameState;
-import jdk.compiler.graal.nodes.LoopBeginNode;
-import jdk.compiler.graal.nodes.LoopEndNode;
-import jdk.compiler.graal.nodes.LoopExitNode;
-import jdk.compiler.graal.nodes.MergeNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.PiNode;
-import jdk.compiler.graal.nodes.ProxyNode;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValuePhiNode;
-import jdk.compiler.graal.nodes.ValueProxyNode;
-import jdk.compiler.graal.nodes.WithExceptionNode;
-import jdk.compiler.graal.nodes.memory.MemoryPhiNode;
-import jdk.compiler.graal.options.Option;
-import jdk.compiler.graal.options.OptionKey;
-import jdk.compiler.graal.options.OptionType;
-import jdk.compiler.graal.options.OptionValues;
+import jdk.graal.compiler.bytecode.Bytecode;
+import jdk.graal.compiler.code.SourceStackTraceBailoutException;
+import jdk.graal.compiler.core.common.type.ObjectStamp;
+import jdk.graal.compiler.core.common.util.CompilationAlarm;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.Graph;
+import jdk.graal.compiler.graph.LinkedStack;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeBitMap;
+import jdk.graal.compiler.graph.NodeSourcePosition;
+import jdk.graal.compiler.graph.NodeStack;
+import jdk.graal.compiler.graph.Position;
+import jdk.graal.compiler.graph.iterators.NodeIterable;
+import jdk.graal.compiler.nodes.AbstractMergeNode;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.ControlSinkNode;
+import jdk.graal.compiler.nodes.ControlSplitNode;
+import jdk.graal.compiler.nodes.EndNode;
+import jdk.graal.compiler.nodes.FixedNode;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.FrameState;
+import jdk.graal.compiler.nodes.LoopBeginNode;
+import jdk.graal.compiler.nodes.LoopEndNode;
+import jdk.graal.compiler.nodes.LoopExitNode;
+import jdk.graal.compiler.nodes.MergeNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.PiNode;
+import jdk.graal.compiler.nodes.ProxyNode;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValuePhiNode;
+import jdk.graal.compiler.nodes.ValueProxyNode;
+import jdk.graal.compiler.nodes.WithExceptionNode;
+import jdk.graal.compiler.nodes.memory.MemoryPhiNode;
+import jdk.graal.compiler.options.Option;
+import jdk.graal.compiler.options.OptionKey;
+import jdk.graal.compiler.options.OptionType;
+import jdk.graal.compiler.options.OptionValues;
 
 import jdk.vm.ci.code.BailoutException;
 import jdk.vm.ci.code.BytecodePosition;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/util/IntegerHelper.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/util/IntegerHelper.java
similarity index 91%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/util/IntegerHelper.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/util/IntegerHelper.java
index 726d4779e0a4..d5aead761dd1 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/util/IntegerHelper.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/util/IntegerHelper.java
@@ -22,12 +22,12 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.util;
+package jdk.graal.compiler.nodes.util;
 
-import jdk.compiler.graal.core.common.type.IntegerStamp;
-import jdk.compiler.graal.nodes.LogicNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.NodeView;
+import jdk.graal.compiler.core.common.type.IntegerStamp;
+import jdk.graal.compiler.nodes.LogicNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.NodeView;
 
 public abstract class IntegerHelper {
     protected final int bits;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/util/JavaConstantFormattable.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/util/JavaConstantFormattable.java
similarity index 97%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/util/JavaConstantFormattable.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/util/JavaConstantFormattable.java
index a4875255855e..e766ebf0fb09 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/util/JavaConstantFormattable.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/util/JavaConstantFormattable.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.util;
+package jdk.graal.compiler.nodes.util;
 
 /**
  * Performs special formatting of values involving {@link jdk.vm.ci.meta.JavaConstant JavaConstants}
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/util/JavaConstantFormatter.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/util/JavaConstantFormatter.java
similarity index 97%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/util/JavaConstantFormatter.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/util/JavaConstantFormatter.java
index 1acfd9669f4d..dd2968170fc3 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/util/JavaConstantFormatter.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/util/JavaConstantFormatter.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.util;
+package jdk.graal.compiler.nodes.util;
 
 import jdk.vm.ci.meta.JavaConstant;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/util/SignedIntegerHelper.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/util/SignedIntegerHelper.java
similarity index 88%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/util/SignedIntegerHelper.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/util/SignedIntegerHelper.java
index b4f5c6147f8d..a181aceec5a4 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/util/SignedIntegerHelper.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/util/SignedIntegerHelper.java
@@ -22,14 +22,14 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.util;
+package jdk.graal.compiler.nodes.util;
 
-import jdk.compiler.graal.core.common.NumUtil;
-import jdk.compiler.graal.core.common.type.IntegerStamp;
-import jdk.compiler.graal.nodes.LogicNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.calc.IntegerLessThanNode;
+import jdk.graal.compiler.core.common.NumUtil;
+import jdk.graal.compiler.core.common.type.IntegerStamp;
+import jdk.graal.compiler.nodes.LogicNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.calc.IntegerLessThanNode;
 
 import jdk.vm.ci.code.CodeUtil;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/util/UnsignedIntegerHelper.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/util/UnsignedIntegerHelper.java
similarity index 86%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/util/UnsignedIntegerHelper.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/util/UnsignedIntegerHelper.java
index e668520abcbc..e9dd60378cfc 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/util/UnsignedIntegerHelper.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/util/UnsignedIntegerHelper.java
@@ -22,15 +22,15 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.util;
+package jdk.graal.compiler.nodes.util;
 
-import jdk.compiler.graal.core.common.NumUtil;
-import jdk.compiler.graal.core.common.type.IntegerStamp;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.nodes.LogicNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.calc.IntegerBelowNode;
+import jdk.graal.compiler.core.common.NumUtil;
+import jdk.graal.compiler.core.common.type.IntegerStamp;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.nodes.LogicNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.calc.IntegerBelowNode;
 
 import jdk.vm.ci.code.CodeUtil;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/virtual/AllocatedObjectNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/virtual/AllocatedObjectNode.java
similarity index 77%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/virtual/AllocatedObjectNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/virtual/AllocatedObjectNode.java
index a9503f0641aa..fae82b6a1716 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/virtual/AllocatedObjectNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/virtual/AllocatedObjectNode.java
@@ -22,23 +22,23 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.virtual;
+package jdk.graal.compiler.nodes.virtual;
 
-import static jdk.compiler.graal.nodeinfo.InputType.Extension;
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_0;
+import static jdk.graal.compiler.nodeinfo.InputType.Extension;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_0;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_0;
 
 import jdk.vm.ci.meta.ConstantReflectionProvider;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.core.common.type.TypeReference;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.calc.FloatingNode;
-import jdk.compiler.graal.nodes.spi.ArrayLengthProvider;
-import jdk.compiler.graal.nodes.spi.VirtualizableAllocation;
-import jdk.compiler.graal.nodes.spi.VirtualizerTool;
-import jdk.compiler.graal.nodes.util.GraphUtil;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.core.common.type.TypeReference;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.calc.FloatingNode;
+import jdk.graal.compiler.nodes.spi.ArrayLengthProvider;
+import jdk.graal.compiler.nodes.spi.VirtualizableAllocation;
+import jdk.graal.compiler.nodes.spi.VirtualizerTool;
+import jdk.graal.compiler.nodes.util.GraphUtil;
 
 /**
  * Selects one object from a {@link CommitAllocationNode}. The object is identified by its
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/virtual/CommitAllocationNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/virtual/CommitAllocationNode.java
similarity index 88%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/virtual/CommitAllocationNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/virtual/CommitAllocationNode.java
index d78c203d1a6d..de7f57b83458 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/virtual/CommitAllocationNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/virtual/CommitAllocationNode.java
@@ -22,41 +22,41 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.virtual;
+package jdk.graal.compiler.nodes.virtual;
 
-import static jdk.compiler.graal.nodeinfo.InputType.Association;
-import static jdk.compiler.graal.nodeinfo.InputType.Extension;
-import static jdk.compiler.graal.nodeinfo.InputType.Memory;
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_UNKNOWN;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_UNKNOWN;
+import static jdk.graal.compiler.nodeinfo.InputType.Association;
+import static jdk.graal.compiler.nodeinfo.InputType.Extension;
+import static jdk.graal.compiler.nodeinfo.InputType.Memory;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_UNKNOWN;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_UNKNOWN;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.graph.NodeInputList;
-import jdk.compiler.graal.nodes.spi.Simplifiable;
-import jdk.compiler.graal.nodes.spi.SimplifierTool;
-import jdk.compiler.graal.nodeinfo.NodeCycles;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodeinfo.NodeSize;
-import jdk.compiler.graal.nodeinfo.Verbosity;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.java.AbstractNewObjectNode;
-import jdk.compiler.graal.nodes.java.MonitorIdNode;
-import jdk.compiler.graal.nodes.memory.MemoryAccess;
-import jdk.compiler.graal.nodes.memory.SingleMemoryKill;
-import jdk.compiler.graal.nodes.memory.WriteNode;
-import jdk.compiler.graal.nodes.spi.Lowerable;
-import jdk.compiler.graal.nodes.spi.LoweringTool;
-import jdk.compiler.graal.nodes.spi.VirtualizableAllocation;
-import jdk.compiler.graal.nodes.spi.VirtualizerTool;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.graph.NodeInputList;
+import jdk.graal.compiler.nodes.spi.Simplifiable;
+import jdk.graal.compiler.nodes.spi.SimplifierTool;
+import jdk.graal.compiler.nodeinfo.NodeCycles;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodeinfo.NodeSize;
+import jdk.graal.compiler.nodeinfo.Verbosity;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.java.AbstractNewObjectNode;
+import jdk.graal.compiler.nodes.java.MonitorIdNode;
+import jdk.graal.compiler.nodes.memory.MemoryAccess;
+import jdk.graal.compiler.nodes.memory.SingleMemoryKill;
+import jdk.graal.compiler.nodes.memory.WriteNode;
+import jdk.graal.compiler.nodes.spi.Lowerable;
+import jdk.graal.compiler.nodes.spi.LoweringTool;
+import jdk.graal.compiler.nodes.spi.VirtualizableAllocation;
+import jdk.graal.compiler.nodes.spi.VirtualizerTool;
 import org.graalvm.word.LocationIdentity;
 
 // @formatter:off
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/virtual/EnsureVirtualizedNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/virtual/EnsureVirtualizedNode.java
similarity index 78%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/virtual/EnsureVirtualizedNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/virtual/EnsureVirtualizedNode.java
index 00c4da25361f..7a165cd7e8c2 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/virtual/EnsureVirtualizedNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/virtual/EnsureVirtualizedNode.java
@@ -22,30 +22,30 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.virtual;
+package jdk.graal.compiler.nodes.virtual;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_0;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_0;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_0;
 
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.GraalGraphError;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.AbstractEndNode;
-import jdk.compiler.graal.nodes.FixedNode;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.Invoke;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.java.StoreFieldNode;
-import jdk.compiler.graal.nodes.spi.Lowerable;
-import jdk.compiler.graal.nodes.spi.LoweringTool;
-import jdk.compiler.graal.nodes.spi.Virtualizable;
-import jdk.compiler.graal.nodes.spi.VirtualizerTool;
-import jdk.compiler.graal.nodes.type.StampTool;
-import jdk.compiler.graal.nodes.util.GraphUtil;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.GraalGraphError;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.AbstractEndNode;
+import jdk.graal.compiler.nodes.FixedNode;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.Invoke;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.java.StoreFieldNode;
+import jdk.graal.compiler.nodes.spi.Lowerable;
+import jdk.graal.compiler.nodes.spi.LoweringTool;
+import jdk.graal.compiler.nodes.spi.Virtualizable;
+import jdk.graal.compiler.nodes.spi.VirtualizerTool;
+import jdk.graal.compiler.nodes.type.StampTool;
+import jdk.graal.compiler.nodes.util.GraphUtil;
 
 @NodeInfo(cycles = CYCLES_0, size = SIZE_0)
 public final class EnsureVirtualizedNode extends FixedWithNextNode implements Virtualizable, Lowerable {
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/virtual/EscapeObjectState.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/virtual/EscapeObjectState.java
similarity index 84%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/virtual/EscapeObjectState.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/virtual/EscapeObjectState.java
index d2b1c75581e0..93e9ab4a1f33 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/virtual/EscapeObjectState.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/virtual/EscapeObjectState.java
@@ -22,19 +22,19 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.virtual;
+package jdk.graal.compiler.nodes.virtual;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_0;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_0;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_0;
 
 import java.util.Iterator;
 
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.Node.ValueNumberable;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.graph.Position;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.VirtualState;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.Node.ValueNumberable;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.graph.Position;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.VirtualState;
 
 @NodeInfo(cycles = CYCLES_0, size = SIZE_0)
 public abstract class EscapeObjectState extends VirtualState implements ValueNumberable {
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/virtual/LockState.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/virtual/LockState.java
similarity index 95%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/virtual/LockState.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/virtual/LockState.java
index 41e57c36ce41..1bb7282b464d 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/virtual/LockState.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/virtual/LockState.java
@@ -22,13 +22,13 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.virtual;
+package jdk.graal.compiler.nodes.virtual;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import jdk.compiler.graal.nodes.java.MonitorIdNode;
+import jdk.graal.compiler.nodes.java.MonitorIdNode;
 
 /**
  * The class implements a simple linked list of MonitorIdNodes, which can be used to describe the
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/virtual/MaterializedObjectState.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/virtual/MaterializedObjectState.java
similarity index 90%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/virtual/MaterializedObjectState.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/virtual/MaterializedObjectState.java
index 1eb862e01937..86f684ab60f3 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/virtual/MaterializedObjectState.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/virtual/MaterializedObjectState.java
@@ -22,12 +22,12 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.virtual;
+package jdk.graal.compiler.nodes.virtual;
 
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.ValueNode;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.ValueNode;
 
 /**
  * This class encapsulated the materialized state of an escape analyzed object.
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/virtual/VirtualArrayNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/virtual/VirtualArrayNode.java
similarity index 90%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/virtual/VirtualArrayNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/virtual/VirtualArrayNode.java
index d10a7dbcae0d..2391fd00ec52 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/virtual/VirtualArrayNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/virtual/VirtualArrayNode.java
@@ -22,22 +22,22 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.virtual;
+package jdk.graal.compiler.nodes.virtual;
 
 import java.nio.ByteOrder;
 
-import jdk.compiler.graal.core.common.spi.MetaAccessExtensionProvider;
-import jdk.compiler.graal.core.common.type.PrimitiveStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodeinfo.Verbosity;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.FixedNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.ArrayLengthProvider;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
-import jdk.compiler.graal.nodes.spi.VirtualizerTool;
+import jdk.graal.compiler.core.common.spi.MetaAccessExtensionProvider;
+import jdk.graal.compiler.core.common.type.PrimitiveStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodeinfo.Verbosity;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.FixedNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.ArrayLengthProvider;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.nodes.spi.VirtualizerTool;
 
 import jdk.vm.ci.meta.ConstantReflectionProvider;
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/virtual/VirtualBoxingNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/virtual/VirtualBoxingNode.java
similarity index 88%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/virtual/VirtualBoxingNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/virtual/VirtualBoxingNode.java
index f69b80ae1c61..77d9fd4a7bd8 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/virtual/VirtualBoxingNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/virtual/VirtualBoxingNode.java
@@ -22,15 +22,15 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.virtual;
+package jdk.graal.compiler.nodes.virtual;
 
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.FixedNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.extended.BoxNode;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.FixedNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.extended.BoxNode;
 
-import jdk.compiler.graal.nodes.spi.VirtualizerTool;
+import jdk.graal.compiler.nodes.spi.VirtualizerTool;
 import jdk.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.ResolvedJavaType;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/virtual/VirtualInstanceNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/virtual/VirtualInstanceNode.java
similarity index 93%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/virtual/VirtualInstanceNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/virtual/VirtualInstanceNode.java
index 03d88d990b3e..32d968aa108b 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/virtual/VirtualInstanceNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/virtual/VirtualInstanceNode.java
@@ -22,14 +22,14 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.virtual;
-
-import jdk.compiler.graal.core.common.spi.MetaAccessExtensionProvider;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodeinfo.Verbosity;
-import jdk.compiler.graal.nodes.FixedNode;
-import jdk.compiler.graal.nodes.ValueNode;
+package jdk.graal.compiler.nodes.virtual;
+
+import jdk.graal.compiler.core.common.spi.MetaAccessExtensionProvider;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodeinfo.Verbosity;
+import jdk.graal.compiler.nodes.FixedNode;
+import jdk.graal.compiler.nodes.ValueNode;
 
 import jdk.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.MetaAccessProvider;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/virtual/VirtualObjectNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/virtual/VirtualObjectNode.java
similarity index 88%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/virtual/VirtualObjectNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/virtual/VirtualObjectNode.java
index 985045d1c9fa..a588dbb64757 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/virtual/VirtualObjectNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/virtual/VirtualObjectNode.java
@@ -22,23 +22,23 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.virtual;
-
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_0;
-
-import jdk.compiler.graal.core.common.spi.MetaAccessExtensionProvider;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.core.common.type.TypeReference;
-import jdk.compiler.graal.graph.IterableNodeType;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.FixedNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.LIRLowerable;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
-import jdk.compiler.graal.nodes.spi.VirtualizerTool;
+package jdk.graal.compiler.nodes.virtual;
+
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_0;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_0;
+
+import jdk.graal.compiler.core.common.spi.MetaAccessExtensionProvider;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.core.common.type.TypeReference;
+import jdk.graal.compiler.graph.IterableNodeType;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.FixedNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.LIRLowerable;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.nodes.spi.VirtualizerTool;
 
 import jdk.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.MetaAccessProvider;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/virtual/VirtualObjectState.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/virtual/VirtualObjectState.java
similarity index 89%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/virtual/VirtualObjectState.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/virtual/VirtualObjectState.java
index b8deafc56add..6b3b15f9aa9d 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/virtual/VirtualObjectState.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/virtual/VirtualObjectState.java
@@ -22,15 +22,15 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.nodes.virtual;
+package jdk.graal.compiler.nodes.virtual;
 
 import java.util.List;
 
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.graph.NodeInputList;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.ValueNode;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.graph.NodeInputList;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.ValueNode;
 
 /**
  * This class encapsulated the virtual state of an escape analyzed object.
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/options/EnumMultiOptionKey.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/options/EnumMultiOptionKey.java
similarity index 98%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/options/EnumMultiOptionKey.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/options/EnumMultiOptionKey.java
index 2a49eed8a329..bcb8c6a74d81 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/options/EnumMultiOptionKey.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/options/EnumMultiOptionKey.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.options;
+package jdk.graal.compiler.options;
 
 import java.util.EnumSet;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/options/EnumOptionKey.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/options/EnumOptionKey.java
similarity index 98%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/options/EnumOptionKey.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/options/EnumOptionKey.java
index 2555ce7c1e31..cf44d576286d 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/options/EnumOptionKey.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/options/EnumOptionKey.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.options;
+package jdk.graal.compiler.options;
 
 import java.util.EnumSet;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/options/ExcludeFromJacocoGeneratedReport.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/options/ExcludeFromJacocoGeneratedReport.java
similarity index 98%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/options/ExcludeFromJacocoGeneratedReport.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/options/ExcludeFromJacocoGeneratedReport.java
index 4922dcada05d..faa9d32bc227 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/options/ExcludeFromJacocoGeneratedReport.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/options/ExcludeFromJacocoGeneratedReport.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.options;
+package jdk.graal.compiler.options;
 
 import static java.lang.annotation.ElementType.METHOD;
 import static java.lang.annotation.ElementType.TYPE;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/options/ExcludeFromJacocoInstrumentation.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/options/ExcludeFromJacocoInstrumentation.java
similarity index 98%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/options/ExcludeFromJacocoInstrumentation.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/options/ExcludeFromJacocoInstrumentation.java
index d5d361bb0ce2..de290ba6a253 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/options/ExcludeFromJacocoInstrumentation.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/options/ExcludeFromJacocoInstrumentation.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.options;
+package jdk.graal.compiler.options;
 
 import static java.lang.annotation.ElementType.METHOD;
 import static java.lang.annotation.ElementType.PACKAGE;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/options/ModifiableOptionValues.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/options/ModifiableOptionValues.java
similarity index 99%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/options/ModifiableOptionValues.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/options/ModifiableOptionValues.java
index 773ac71994e9..673e76bbe5c2 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/options/ModifiableOptionValues.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/options/ModifiableOptionValues.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.options;
+package jdk.graal.compiler.options;
 
 import java.util.concurrent.atomic.AtomicReference;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/options/NestedBooleanOptionKey.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/options/NestedBooleanOptionKey.java
similarity index 98%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/options/NestedBooleanOptionKey.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/options/NestedBooleanOptionKey.java
index 71961f006113..3e8693f173b1 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/options/NestedBooleanOptionKey.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/options/NestedBooleanOptionKey.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.options;
+package jdk.graal.compiler.options;
 
 /**
  * A nested Boolean {@link OptionKey} that can be overridden by a {@link #parentOption parent
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/options/OWNERS.toml b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/options/OWNERS.toml
similarity index 100%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/options/OWNERS.toml
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/options/OWNERS.toml
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/options/Option.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/options/Option.java
similarity index 98%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/options/Option.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/options/Option.java
index 982b9b7f1b74..a1e4f50ffe6e 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/options/Option.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/options/Option.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.options;
+package jdk.graal.compiler.options;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/options/OptionDescriptor.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/options/OptionDescriptor.java
similarity index 99%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/options/OptionDescriptor.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/options/OptionDescriptor.java
index 666c5914adfd..029348fd8882 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/options/OptionDescriptor.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/options/OptionDescriptor.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.options;
+package jdk.graal.compiler.options;
 
 import java.util.Arrays;
 import java.util.Collections;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/options/OptionDescriptors.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/options/OptionDescriptors.java
similarity index 97%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/options/OptionDescriptors.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/options/OptionDescriptors.java
index 0e81e04b8109..e8348b2711c1 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/options/OptionDescriptors.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/options/OptionDescriptors.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.options;
+package jdk.graal.compiler.options;
 
 /**
  * An interface to a set of {@link OptionDescriptor}s.
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/options/OptionDescriptorsMap.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/options/OptionDescriptorsMap.java
similarity index 98%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/options/OptionDescriptorsMap.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/options/OptionDescriptorsMap.java
index b515d0cef178..f9bc3f2a2b5d 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/options/OptionDescriptorsMap.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/options/OptionDescriptorsMap.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.options;
+package jdk.graal.compiler.options;
 
 import java.util.Iterator;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/options/OptionGroup.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/options/OptionGroup.java
similarity index 98%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/options/OptionGroup.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/options/OptionGroup.java
index 3bcb45588bef..7c581bdb9ef3 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/options/OptionGroup.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/options/OptionGroup.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.options;
+package jdk.graal.compiler.options;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/options/OptionKey.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/options/OptionKey.java
similarity index 98%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/options/OptionKey.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/options/OptionKey.java
index 3cdc342b949b..12471587bdef 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/options/OptionKey.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/options/OptionKey.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.options;
+package jdk.graal.compiler.options;
 
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.UnmodifiableEconomicMap;
@@ -65,7 +65,7 @@ protected boolean checkDescriptorExists() {
             StringBuilder result = new StringBuilder();
             result.append("Could not find a descriptor for an option key. The most likely cause is a dependency on the ");
             result.append(Option.class.getName());
-            result.append(" annotation without a dependency on the jdk.compiler.graal.options.processor.OptionProcessor annotation processor.");
+            result.append(" annotation without a dependency on the jdk.graal.compiler.options.processor.OptionProcessor annotation processor.");
             StackTraceElement[] stackTrace = new Exception().getStackTrace();
             if (stackTrace.length > 2 &&
                             stackTrace[1].getClassName().equals(OptionKey.class.getName()) &&
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/options/OptionStability.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/options/OptionStability.java
similarity index 97%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/options/OptionStability.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/options/OptionStability.java
index 4d7efeb59748..ec17e56ab9e9 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/options/OptionStability.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/options/OptionStability.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.options;
+package jdk.graal.compiler.options;
 
 /**
  * Categorizes options according to their stability.
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/options/OptionType.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/options/OptionType.java
similarity index 97%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/options/OptionType.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/options/OptionType.java
index 7cfbc4f8eed5..d41da0979e44 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/options/OptionType.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/options/OptionType.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.options;
+package jdk.graal.compiler.options;
 
 /**
  * Classifies Graal options in several categories depending on who this option is relevant for.
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/options/OptionValues.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/options/OptionValues.java
similarity index 99%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/options/OptionValues.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/options/OptionValues.java
index a833b5148a9f..ad2b949938e0 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/options/OptionValues.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/options/OptionValues.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.options;
+package jdk.graal.compiler.options;
 
 import java.io.PrintStream;
 import java.util.ArrayList;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/options/OptionsParser.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/options/OptionsParser.java
similarity index 99%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/options/OptionsParser.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/options/OptionsParser.java
index df385af25949..41ccba6ae6cb 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/options/OptionsParser.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/options/OptionsParser.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.options;
+package jdk.graal.compiler.options;
 
 import static jdk.vm.ci.services.Services.IS_BUILDING_NATIVE_IMAGE;
 import static jdk.vm.ci.services.Services.IS_IN_NATIVE_IMAGE;
@@ -54,7 +54,7 @@ public static Iterable getOptionsLoader() {
             return cachedOptionDescriptors;
         }
         /*
-         * The Graal module (i.e., jdk.compiler.graal) is loaded by the platform class loader.
+         * The Graal module (i.e., jdk.graal.compiler) is loaded by the platform class loader.
          * Modules that depend on and extend Graal are loaded by the app class loader. As such, we
          * need to start the provider search at the app class loader instead of the platform class
          * loader.
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/BasePhase.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/BasePhase.java
similarity index 95%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/BasePhase.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/BasePhase.java
index e168f2782338..6450ad7488f9 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/BasePhase.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/BasePhase.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.phases;
+package jdk.graal.compiler.phases;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -32,34 +32,34 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.regex.Pattern;
 
-import jdk.compiler.graal.phases.contract.NodeCostUtil;
-import jdk.compiler.graal.phases.contract.PhaseSizeContract;
+import jdk.graal.compiler.phases.contract.NodeCostUtil;
+import jdk.graal.compiler.phases.contract.PhaseSizeContract;
 import org.graalvm.collections.EconomicMap;
-import jdk.compiler.graal.core.common.util.CompilationAlarm;
-import jdk.compiler.graal.debug.CounterKey;
-import jdk.compiler.graal.debug.DebugCloseable;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.debug.DebugContext.CompilerPhaseScope;
-import jdk.compiler.graal.debug.DebugOptions;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.debug.MemUseTrackerKey;
-import jdk.compiler.graal.debug.MethodFilter;
-import jdk.compiler.graal.debug.TTY;
-import jdk.compiler.graal.debug.TimerKey;
-import jdk.compiler.graal.graph.Graph;
-import jdk.compiler.graal.graph.Graph.Mark;
-import jdk.compiler.graal.graph.Graph.NodeEvent;
-import jdk.compiler.graal.graph.Graph.NodeEventListener;
-import jdk.compiler.graal.graph.Graph.NodeEventScope;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.GraphState;
-import jdk.compiler.graal.nodes.GraphState.StageFlag;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.options.Option;
-import jdk.compiler.graal.options.OptionKey;
-import jdk.compiler.graal.options.OptionType;
-import jdk.compiler.graal.options.OptionValues;
+import jdk.graal.compiler.core.common.util.CompilationAlarm;
+import jdk.graal.compiler.debug.CounterKey;
+import jdk.graal.compiler.debug.DebugCloseable;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.debug.DebugContext.CompilerPhaseScope;
+import jdk.graal.compiler.debug.DebugOptions;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.debug.MemUseTrackerKey;
+import jdk.graal.compiler.debug.MethodFilter;
+import jdk.graal.compiler.debug.TTY;
+import jdk.graal.compiler.debug.TimerKey;
+import jdk.graal.compiler.graph.Graph;
+import jdk.graal.compiler.graph.Graph.Mark;
+import jdk.graal.compiler.graph.Graph.NodeEvent;
+import jdk.graal.compiler.graph.Graph.NodeEventListener;
+import jdk.graal.compiler.graph.Graph.NodeEventScope;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.GraphState;
+import jdk.graal.compiler.nodes.GraphState.StageFlag;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.options.Option;
+import jdk.graal.compiler.options.OptionKey;
+import jdk.graal.compiler.options.OptionType;
+import jdk.graal.compiler.options.OptionValues;
 
 import jdk.vm.ci.meta.JavaMethod;
 import jdk.vm.ci.meta.SpeculationLog;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/ClassTypeSequence.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/ClassTypeSequence.java
similarity index 98%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/ClassTypeSequence.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/ClassTypeSequence.java
index d76bfffbec48..07162a76c502 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/ClassTypeSequence.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/ClassTypeSequence.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.compiler.graal.phases;
+package jdk.graal.compiler.phases;
 
 import jdk.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.JavaType;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/FloatingGuardPhase.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/FloatingGuardPhase.java
similarity index 97%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/FloatingGuardPhase.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/FloatingGuardPhase.java
index dbee058f05b4..8d1995c375d8 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/FloatingGuardPhase.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/FloatingGuardPhase.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.phases;
+package jdk.graal.compiler.phases;
 
 /**
  * Marker interface for phases that require floating guards.
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/LazyName.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/LazyName.java
similarity index 96%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/LazyName.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/LazyName.java
index d6e6b8d34f48..4acaeef9417a 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/LazyName.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/LazyName.java
@@ -22,9 +22,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.phases;
+package jdk.graal.compiler.phases;
 
-import jdk.compiler.graal.debug.DebugContext;
+import jdk.graal.compiler.debug.DebugContext;
 
 /**
  * A name whose {@link String} value is computed only when it is needed. This is useful in
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/OptimisticOptimizations.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/OptimisticOptimizations.java
similarity index 97%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/OptimisticOptimizations.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/OptimisticOptimizations.java
index 4c4ca77488b2..4a7eb48753d0 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/OptimisticOptimizations.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/OptimisticOptimizations.java
@@ -22,13 +22,13 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.phases;
+package jdk.graal.compiler.phases;
 
 import java.util.EnumSet;
 import java.util.Set;
 
-import jdk.compiler.graal.core.common.GraalOptions;
-import jdk.compiler.graal.options.OptionValues;
+import jdk.graal.compiler.core.common.GraalOptions;
+import jdk.graal.compiler.options.OptionValues;
 
 import jdk.vm.ci.meta.DeoptimizationReason;
 import jdk.vm.ci.meta.ProfilingInfo;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/Phase.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/Phase.java
similarity index 95%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/Phase.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/Phase.java
index 9c713dc61c97..4e1fa48e2417 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/Phase.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/Phase.java
@@ -22,9 +22,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.phases;
+package jdk.graal.compiler.phases;
 
-import jdk.compiler.graal.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.StructuredGraph;
 
 /**
  * Base class for compiler phases that don't need a context object.
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/PhaseSuite.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/PhaseSuite.java
similarity index 98%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/PhaseSuite.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/PhaseSuite.java
index e68133eceda4..a82edd16ef60 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/PhaseSuite.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/PhaseSuite.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.phases;
+package jdk.graal.compiler.phases;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -34,12 +34,12 @@
 import java.util.Optional;
 import java.util.function.Supplier;
 
-import jdk.compiler.graal.core.common.util.PhasePlan;
-import jdk.compiler.graal.debug.TTY;
-import jdk.compiler.graal.nodes.GraphState;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.options.Option;
-import jdk.compiler.graal.options.OptionKey;
+import jdk.graal.compiler.core.common.util.PhasePlan;
+import jdk.graal.compiler.debug.TTY;
+import jdk.graal.compiler.nodes.GraphState;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.options.Option;
+import jdk.graal.compiler.options.OptionKey;
 
 import jdk.vm.ci.services.Services;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/PlaceholderPhase.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/PlaceholderPhase.java
similarity index 93%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/PlaceholderPhase.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/PlaceholderPhase.java
index f2230316309e..cd5016506be4 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/PlaceholderPhase.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/PlaceholderPhase.java
@@ -22,13 +22,13 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.phases;
+package jdk.graal.compiler.phases;
 
 import java.util.Optional;
 
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.nodes.GraphState;
-import jdk.compiler.graal.nodes.StructuredGraph;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.nodes.GraphState;
+import jdk.graal.compiler.nodes.StructuredGraph;
 
 /**
  * Base class to hold a place in a {@link PhaseSuite}. This phase should then be replaced before the
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/SingleRunSubphase.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/SingleRunSubphase.java
similarity index 95%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/SingleRunSubphase.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/SingleRunSubphase.java
index 64e8a9627037..893be6ce84aa 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/SingleRunSubphase.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/SingleRunSubphase.java
@@ -22,10 +22,10 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.phases;
+package jdk.graal.compiler.phases;
 
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.nodes.StructuredGraph;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.nodes.StructuredGraph;
 
 /**
  * A subclass of {@link BasePhase} whose instances may only be
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/Speculative.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/Speculative.java
similarity index 94%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/Speculative.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/Speculative.java
index 71634e79b207..0b1dc75e9d36 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/Speculative.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/Speculative.java
@@ -22,9 +22,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.phases;
+package jdk.graal.compiler.phases;
 
-import jdk.compiler.graal.nodes.GraphState;
+import jdk.graal.compiler.nodes.GraphState;
 
 import jdk.vm.ci.meta.SpeculationLog;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/VerifyPhase.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/VerifyPhase.java
similarity index 93%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/VerifyPhase.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/VerifyPhase.java
index cca282043739..a268e4f92d2a 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/VerifyPhase.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/VerifyPhase.java
@@ -22,14 +22,14 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.phases;
+package jdk.graal.compiler.phases;
 
 import java.util.Optional;
 
-import jdk.compiler.graal.nodes.CallTargetNode;
-import jdk.compiler.graal.nodes.GraphState;
-import jdk.compiler.graal.nodes.Invoke;
-import jdk.compiler.graal.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.CallTargetNode;
+import jdk.graal.compiler.nodes.GraphState;
+import jdk.graal.compiler.nodes.Invoke;
+import jdk.graal.compiler.nodes.StructuredGraph;
 
 import jdk.vm.ci.meta.MetaAccessProvider;
 import jdk.vm.ci.meta.ResolvedJavaType;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/AbstractInliningPhase.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/AbstractInliningPhase.java
similarity index 87%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/AbstractInliningPhase.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/AbstractInliningPhase.java
index 39a7c6b0fcd5..8a9172d8febd 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/AbstractInliningPhase.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/AbstractInliningPhase.java
@@ -22,14 +22,14 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.phases.common;
+package jdk.graal.compiler.phases.common;
 
 import java.util.Optional;
 
-import jdk.compiler.graal.nodes.GraphState;
-import jdk.compiler.graal.nodes.GraphState.StageFlag;
-import jdk.compiler.graal.phases.BasePhase;
-import jdk.compiler.graal.phases.tiers.HighTierContext;
+import jdk.graal.compiler.nodes.GraphState;
+import jdk.graal.compiler.nodes.GraphState.StageFlag;
+import jdk.graal.compiler.phases.BasePhase;
+import jdk.graal.compiler.phases.tiers.HighTierContext;
 
 /**
  * Common superclass for phases that perform inlining.
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/AddressLoweringByNodePhase.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/AddressLoweringByNodePhase.java
similarity index 85%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/AddressLoweringByNodePhase.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/AddressLoweringByNodePhase.java
index 9ad6299fab23..6c8d27b48287 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/AddressLoweringByNodePhase.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/AddressLoweringByNodePhase.java
@@ -22,16 +22,16 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.phases.common;
+package jdk.graal.compiler.phases.common;
 
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.memory.address.AddressNode;
-import jdk.compiler.graal.nodes.memory.address.OffsetAddressNode;
-import jdk.compiler.graal.nodes.spi.CoreProviders;
-import jdk.compiler.graal.nodes.spi.LoopsDataProvider;
-import jdk.compiler.graal.nodes.util.GraphUtil;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.memory.address.AddressNode;
+import jdk.graal.compiler.nodes.memory.address.OffsetAddressNode;
+import jdk.graal.compiler.nodes.spi.CoreProviders;
+import jdk.graal.compiler.nodes.spi.LoopsDataProvider;
+import jdk.graal.compiler.nodes.util.GraphUtil;
 
 /**
  * A phase the visits each address node and lowers into a machine dependent form.
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/AddressLoweringByUsePhase.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/AddressLoweringByUsePhase.java
similarity index 85%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/AddressLoweringByUsePhase.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/AddressLoweringByUsePhase.java
index 92626be6403e..4ef39310914f 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/AddressLoweringByUsePhase.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/AddressLoweringByUsePhase.java
@@ -23,26 +23,26 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.phases.common;
+package jdk.graal.compiler.phases.common;
 
 import java.util.Optional;
 
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.nodes.GraphState;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.PrefetchAllocateNode;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.extended.JavaReadNode;
-import jdk.compiler.graal.nodes.memory.AbstractWriteNode;
-import jdk.compiler.graal.nodes.memory.FloatingReadNode;
-import jdk.compiler.graal.nodes.memory.ReadNode;
-import jdk.compiler.graal.nodes.memory.address.AddressNode;
-import jdk.compiler.graal.nodes.memory.address.OffsetAddressNode;
-import jdk.compiler.graal.nodes.spi.CoreProviders;
-import jdk.compiler.graal.nodes.util.GraphUtil;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.nodes.GraphState;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.PrefetchAllocateNode;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.extended.JavaReadNode;
+import jdk.graal.compiler.nodes.memory.AbstractWriteNode;
+import jdk.graal.compiler.nodes.memory.FloatingReadNode;
+import jdk.graal.compiler.nodes.memory.ReadNode;
+import jdk.graal.compiler.nodes.memory.address.AddressNode;
+import jdk.graal.compiler.nodes.memory.address.OffsetAddressNode;
+import jdk.graal.compiler.nodes.spi.CoreProviders;
+import jdk.graal.compiler.nodes.util.GraphUtil;
 
 import jdk.vm.ci.meta.JavaKind;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/AddressLoweringPhase.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/AddressLoweringPhase.java
similarity index 86%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/AddressLoweringPhase.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/AddressLoweringPhase.java
index 27cef77de486..7217542bed0c 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/AddressLoweringPhase.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/AddressLoweringPhase.java
@@ -22,15 +22,15 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.phases.common;
+package jdk.graal.compiler.phases.common;
 
 import java.util.Optional;
 
-import jdk.compiler.graal.nodes.GraphState;
-import jdk.compiler.graal.nodes.GraphState.StageFlag;
-import jdk.compiler.graal.nodes.memory.address.AddressNode;
-import jdk.compiler.graal.nodes.spi.CoreProviders;
-import jdk.compiler.graal.phases.BasePhase;
+import jdk.graal.compiler.nodes.GraphState;
+import jdk.graal.compiler.nodes.GraphState.StageFlag;
+import jdk.graal.compiler.nodes.memory.address.AddressNode;
+import jdk.graal.compiler.nodes.spi.CoreProviders;
+import jdk.graal.compiler.phases.BasePhase;
 
 /**
  * The base class of all phases that lower {@link AddressNode} into a machine dependent nodes.
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/BarrierSetVerificationPhase.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/BarrierSetVerificationPhase.java
similarity index 87%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/BarrierSetVerificationPhase.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/BarrierSetVerificationPhase.java
index 1574fcdb7e6b..7a2daef61284 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/BarrierSetVerificationPhase.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/BarrierSetVerificationPhase.java
@@ -22,15 +22,15 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.phases.common;
+package jdk.graal.compiler.phases.common;
 
 import java.util.Optional;
 
-import jdk.compiler.graal.nodes.GraphState;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.gc.BarrierSet;
-import jdk.compiler.graal.nodes.spi.CoreProviders;
-import jdk.compiler.graal.phases.BasePhase;
+import jdk.graal.compiler.nodes.GraphState;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.gc.BarrierSet;
+import jdk.graal.compiler.nodes.spi.CoreProviders;
+import jdk.graal.compiler.phases.BasePhase;
 
 public class BarrierSetVerificationPhase extends BasePhase {
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/BoxNodeIdentityPhase.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/BoxNodeIdentityPhase.java
similarity index 86%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/BoxNodeIdentityPhase.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/BoxNodeIdentityPhase.java
index adb435e5b572..4f3669167df5 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/BoxNodeIdentityPhase.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/BoxNodeIdentityPhase.java
@@ -22,20 +22,20 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.phases.common;
+package jdk.graal.compiler.phases.common;
 
 import java.util.Optional;
 
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.nodes.GraphState;
-import jdk.compiler.graal.nodes.GraphState.StageFlag;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.calc.ObjectEqualsNode;
-import jdk.compiler.graal.nodes.extended.BoxNode;
-import jdk.compiler.graal.nodes.extended.BoxNode.TrustedBoxedValue;
-import jdk.compiler.graal.nodes.spi.CoreProviders;
-import jdk.compiler.graal.phases.BasePhase;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.nodes.GraphState;
+import jdk.graal.compiler.nodes.GraphState.StageFlag;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.calc.ObjectEqualsNode;
+import jdk.graal.compiler.nodes.extended.BoxNode;
+import jdk.graal.compiler.nodes.extended.BoxNode.TrustedBoxedValue;
+import jdk.graal.compiler.nodes.spi.CoreProviders;
+import jdk.graal.compiler.phases.BasePhase;
 
 /**
  * Find code patterns that appear to assume identity of boxes. That is where two box values are
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/BoxNodeOptimizationPhase.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/BoxNodeOptimizationPhase.java
similarity index 91%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/BoxNodeOptimizationPhase.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/BoxNodeOptimizationPhase.java
index 3c436a88f831..f369bed2b6c8 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/BoxNodeOptimizationPhase.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/BoxNodeOptimizationPhase.java
@@ -22,18 +22,18 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.phases.common;
+package jdk.graal.compiler.phases.common;
 
-import jdk.compiler.graal.graph.Graph;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.nodes.FixedNode;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.cfg.ControlFlowGraph;
-import jdk.compiler.graal.nodes.cfg.HIRBlock;
-import jdk.compiler.graal.nodes.extended.BoxNode;
-import jdk.compiler.graal.nodes.spi.CoreProviders;
-import jdk.compiler.graal.nodes.util.GraphUtil;
+import jdk.graal.compiler.graph.Graph;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.nodes.FixedNode;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.cfg.ControlFlowGraph;
+import jdk.graal.compiler.nodes.cfg.HIRBlock;
+import jdk.graal.compiler.nodes.extended.BoxNode;
+import jdk.graal.compiler.nodes.spi.CoreProviders;
+import jdk.graal.compiler.nodes.util.GraphUtil;
 
 /**
  * Try to replace box operations with dominating box operations.
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/CanonicalizerPhase.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/CanonicalizerPhase.java
similarity index 92%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/CanonicalizerPhase.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/CanonicalizerPhase.java
index de4b9e85b75a..56495fecb527 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/CanonicalizerPhase.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/CanonicalizerPhase.java
@@ -22,68 +22,68 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.phases.common;
+package jdk.graal.compiler.phases.common;
 
-import static jdk.compiler.graal.phases.common.CanonicalizerPhase.CanonicalizerFeature.CFG_SIMPLIFICATION;
-import static jdk.compiler.graal.phases.common.CanonicalizerPhase.CanonicalizerFeature.DEAD_PHI_CYCLE_DETECTION;
-import static jdk.compiler.graal.phases.common.CanonicalizerPhase.CanonicalizerFeature.GVN;
-import static jdk.compiler.graal.phases.common.CanonicalizerPhase.CanonicalizerFeature.READ_CANONICALIZATION;
+import static jdk.graal.compiler.phases.common.CanonicalizerPhase.CanonicalizerFeature.CFG_SIMPLIFICATION;
+import static jdk.graal.compiler.phases.common.CanonicalizerPhase.CanonicalizerFeature.DEAD_PHI_CYCLE_DETECTION;
+import static jdk.graal.compiler.phases.common.CanonicalizerPhase.CanonicalizerFeature.GVN;
+import static jdk.graal.compiler.phases.common.CanonicalizerPhase.CanonicalizerFeature.READ_CANONICALIZATION;
 
 import java.util.EnumSet;
 import java.util.Objects;
 import java.util.Optional;
 
-import jdk.compiler.graal.phases.BasePhase;
+import jdk.graal.compiler.phases.BasePhase;
 import org.graalvm.collections.EconomicSet;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.debug.CounterKey;
-import jdk.compiler.graal.debug.DebugCloseable;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.GraalGraphError;
-import jdk.compiler.graal.graph.Graph;
-import jdk.compiler.graal.graph.Graph.Mark;
-import jdk.compiler.graal.graph.Graph.NodeEventListener;
-import jdk.compiler.graal.graph.Graph.NodeEventScope;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.Node.IndirectCanonicalization;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.graph.NodeFlood;
-import jdk.compiler.graal.graph.NodeWorkList;
-import jdk.compiler.graal.nodeinfo.InputType;
-import jdk.compiler.graal.nodes.AbstractBeginNode;
-import jdk.compiler.graal.nodes.AbstractMergeNode;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.ControlSinkNode;
-import jdk.compiler.graal.nodes.FixedNode;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.GraphState;
-import jdk.compiler.graal.nodes.GraphState.StageFlag;
-import jdk.compiler.graal.nodes.GuardNode;
-import jdk.compiler.graal.nodes.LoopBeginNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.PhiNode;
-import jdk.compiler.graal.nodes.ProxyNode;
-import jdk.compiler.graal.nodes.StartNode;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.VirtualState;
-import jdk.compiler.graal.nodes.WithExceptionNode;
-import jdk.compiler.graal.nodes.calc.FloatingNode;
-import jdk.compiler.graal.nodes.cfg.ControlFlowGraph;
-import jdk.compiler.graal.nodes.loop.InductionVariable;
-import jdk.compiler.graal.nodes.spi.Canonicalizable;
-import jdk.compiler.graal.nodes.spi.Canonicalizable.BinaryCommutative;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodes.spi.CoreProviders;
-import jdk.compiler.graal.nodes.spi.CoreProvidersDelegate;
-import jdk.compiler.graal.nodes.spi.Simplifiable;
-import jdk.compiler.graal.nodes.spi.SimplifierTool;
-import jdk.compiler.graal.nodes.util.GraphUtil;
-import jdk.compiler.graal.options.Option;
-import jdk.compiler.graal.options.OptionKey;
-import jdk.compiler.graal.options.OptionType;
-import jdk.compiler.graal.options.OptionValues;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.debug.CounterKey;
+import jdk.graal.compiler.debug.DebugCloseable;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.GraalGraphError;
+import jdk.graal.compiler.graph.Graph;
+import jdk.graal.compiler.graph.Graph.Mark;
+import jdk.graal.compiler.graph.Graph.NodeEventListener;
+import jdk.graal.compiler.graph.Graph.NodeEventScope;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.Node.IndirectCanonicalization;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.graph.NodeFlood;
+import jdk.graal.compiler.graph.NodeWorkList;
+import jdk.graal.compiler.nodeinfo.InputType;
+import jdk.graal.compiler.nodes.AbstractBeginNode;
+import jdk.graal.compiler.nodes.AbstractMergeNode;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.ControlSinkNode;
+import jdk.graal.compiler.nodes.FixedNode;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.GraphState;
+import jdk.graal.compiler.nodes.GraphState.StageFlag;
+import jdk.graal.compiler.nodes.GuardNode;
+import jdk.graal.compiler.nodes.LoopBeginNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.PhiNode;
+import jdk.graal.compiler.nodes.ProxyNode;
+import jdk.graal.compiler.nodes.StartNode;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.VirtualState;
+import jdk.graal.compiler.nodes.WithExceptionNode;
+import jdk.graal.compiler.nodes.calc.FloatingNode;
+import jdk.graal.compiler.nodes.cfg.ControlFlowGraph;
+import jdk.graal.compiler.nodes.loop.InductionVariable;
+import jdk.graal.compiler.nodes.spi.Canonicalizable;
+import jdk.graal.compiler.nodes.spi.Canonicalizable.BinaryCommutative;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodes.spi.CoreProviders;
+import jdk.graal.compiler.nodes.spi.CoreProvidersDelegate;
+import jdk.graal.compiler.nodes.spi.Simplifiable;
+import jdk.graal.compiler.nodes.spi.SimplifierTool;
+import jdk.graal.compiler.nodes.util.GraphUtil;
+import jdk.graal.compiler.options.Option;
+import jdk.graal.compiler.options.OptionKey;
+import jdk.graal.compiler.options.OptionType;
+import jdk.graal.compiler.options.OptionValues;
 
 import jdk.vm.ci.meta.Assumptions;
 import jdk.vm.ci.meta.Constant;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/ConditionalEliminationPhase.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/ConditionalEliminationPhase.java
similarity index 94%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/ConditionalEliminationPhase.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/ConditionalEliminationPhase.java
index b4ca87da6751..7a2daebd2a16 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/ConditionalEliminationPhase.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/ConditionalEliminationPhase.java
@@ -22,85 +22,85 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.phases.common;
+package jdk.graal.compiler.phases.common;
 
-import static jdk.compiler.graal.nodes.StaticDeoptimizingNode.mergeActions;
+import static jdk.graal.compiler.nodes.StaticDeoptimizingNode.mergeActions;
 
 import java.util.ArrayDeque;
 import java.util.Deque;
 import java.util.List;
 import java.util.Optional;
 
-import jdk.compiler.graal.phases.BasePhase;
-import jdk.compiler.graal.phases.schedule.SchedulePhase;
+import jdk.graal.compiler.phases.BasePhase;
+import jdk.graal.compiler.phases.schedule.SchedulePhase;
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.EconomicSet;
 import org.graalvm.collections.Equivalence;
 import org.graalvm.collections.MapCursor;
-import jdk.compiler.graal.core.common.cfg.BlockMap;
-import jdk.compiler.graal.core.common.type.ArithmeticOpTable;
-import jdk.compiler.graal.core.common.type.ArithmeticOpTable.BinaryOp;
-import jdk.compiler.graal.core.common.type.ArithmeticOpTable.BinaryOp.And;
-import jdk.compiler.graal.core.common.type.ArithmeticOpTable.BinaryOp.Or;
-import jdk.compiler.graal.core.common.type.IntegerStamp;
-import jdk.compiler.graal.core.common.type.ObjectStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.debug.CounterKey;
-import jdk.compiler.graal.debug.DebugCloseable;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeMap;
-import jdk.compiler.graal.graph.NodeStack;
-import jdk.compiler.graal.nodeinfo.InputType;
-import jdk.compiler.graal.nodes.AbstractBeginNode;
-import jdk.compiler.graal.nodes.AbstractMergeNode;
-import jdk.compiler.graal.nodes.BinaryOpLogicNode;
-import jdk.compiler.graal.nodes.ConditionAnchorNode;
-import jdk.compiler.graal.nodes.DeoptimizeNode;
-import jdk.compiler.graal.nodes.DeoptimizingGuard;
-import jdk.compiler.graal.nodes.EndNode;
-import jdk.compiler.graal.nodes.FixedGuardNode;
-import jdk.compiler.graal.nodes.FixedNode;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.GraphState;
-import jdk.compiler.graal.nodes.GraphState.StageFlag;
-import jdk.compiler.graal.nodes.GuardNode;
-import jdk.compiler.graal.nodes.GuardProxyNode;
-import jdk.compiler.graal.nodes.IfNode;
-import jdk.compiler.graal.nodes.LogicConstantNode;
-import jdk.compiler.graal.nodes.LogicNode;
-import jdk.compiler.graal.nodes.LoopExitNode;
-import jdk.compiler.graal.nodes.MergeNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.PiNode;
-import jdk.compiler.graal.nodes.ProxyNode;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.StructuredGraph.ScheduleResult;
-import jdk.compiler.graal.nodes.UnaryOpLogicNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.ValuePhiNode;
-import jdk.compiler.graal.nodes.calc.AndNode;
-import jdk.compiler.graal.nodes.calc.IntegerEqualsNode;
-import jdk.compiler.graal.nodes.cfg.ControlFlowGraph;
-import jdk.compiler.graal.nodes.cfg.HIRBlock;
-import jdk.compiler.graal.nodes.extended.CaptureStateBeginNode;
-import jdk.compiler.graal.nodes.extended.GuardingNode;
-import jdk.compiler.graal.nodes.extended.IntegerSwitchNode;
-import jdk.compiler.graal.nodes.extended.LoadHubNode;
-import jdk.compiler.graal.nodes.extended.OpaqueLogicNode;
-import jdk.compiler.graal.nodes.extended.SwitchNode;
-import jdk.compiler.graal.nodes.extended.ValueAnchorNode;
-import jdk.compiler.graal.nodes.java.InstanceOfNode;
-import jdk.compiler.graal.nodes.java.TypeSwitchNode;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodes.spi.CoreProviders;
-import jdk.compiler.graal.nodes.spi.NodeWithState;
-import jdk.compiler.graal.nodes.spi.StampInverter;
-import jdk.compiler.graal.nodes.util.GraphUtil;
-import jdk.compiler.graal.options.Option;
-import jdk.compiler.graal.options.OptionKey;
-import jdk.compiler.graal.options.OptionType;
+import jdk.graal.compiler.core.common.cfg.BlockMap;
+import jdk.graal.compiler.core.common.type.ArithmeticOpTable;
+import jdk.graal.compiler.core.common.type.ArithmeticOpTable.BinaryOp;
+import jdk.graal.compiler.core.common.type.ArithmeticOpTable.BinaryOp.And;
+import jdk.graal.compiler.core.common.type.ArithmeticOpTable.BinaryOp.Or;
+import jdk.graal.compiler.core.common.type.IntegerStamp;
+import jdk.graal.compiler.core.common.type.ObjectStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.debug.CounterKey;
+import jdk.graal.compiler.debug.DebugCloseable;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeMap;
+import jdk.graal.compiler.graph.NodeStack;
+import jdk.graal.compiler.nodeinfo.InputType;
+import jdk.graal.compiler.nodes.AbstractBeginNode;
+import jdk.graal.compiler.nodes.AbstractMergeNode;
+import jdk.graal.compiler.nodes.BinaryOpLogicNode;
+import jdk.graal.compiler.nodes.ConditionAnchorNode;
+import jdk.graal.compiler.nodes.DeoptimizeNode;
+import jdk.graal.compiler.nodes.DeoptimizingGuard;
+import jdk.graal.compiler.nodes.EndNode;
+import jdk.graal.compiler.nodes.FixedGuardNode;
+import jdk.graal.compiler.nodes.FixedNode;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.GraphState;
+import jdk.graal.compiler.nodes.GraphState.StageFlag;
+import jdk.graal.compiler.nodes.GuardNode;
+import jdk.graal.compiler.nodes.GuardProxyNode;
+import jdk.graal.compiler.nodes.IfNode;
+import jdk.graal.compiler.nodes.LogicConstantNode;
+import jdk.graal.compiler.nodes.LogicNode;
+import jdk.graal.compiler.nodes.LoopExitNode;
+import jdk.graal.compiler.nodes.MergeNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.PiNode;
+import jdk.graal.compiler.nodes.ProxyNode;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.StructuredGraph.ScheduleResult;
+import jdk.graal.compiler.nodes.UnaryOpLogicNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.ValuePhiNode;
+import jdk.graal.compiler.nodes.calc.AndNode;
+import jdk.graal.compiler.nodes.calc.IntegerEqualsNode;
+import jdk.graal.compiler.nodes.cfg.ControlFlowGraph;
+import jdk.graal.compiler.nodes.cfg.HIRBlock;
+import jdk.graal.compiler.nodes.extended.CaptureStateBeginNode;
+import jdk.graal.compiler.nodes.extended.GuardingNode;
+import jdk.graal.compiler.nodes.extended.IntegerSwitchNode;
+import jdk.graal.compiler.nodes.extended.LoadHubNode;
+import jdk.graal.compiler.nodes.extended.OpaqueLogicNode;
+import jdk.graal.compiler.nodes.extended.SwitchNode;
+import jdk.graal.compiler.nodes.extended.ValueAnchorNode;
+import jdk.graal.compiler.nodes.java.InstanceOfNode;
+import jdk.graal.compiler.nodes.java.TypeSwitchNode;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodes.spi.CoreProviders;
+import jdk.graal.compiler.nodes.spi.NodeWithState;
+import jdk.graal.compiler.nodes.spi.StampInverter;
+import jdk.graal.compiler.nodes.util.GraphUtil;
+import jdk.graal.compiler.options.Option;
+import jdk.graal.compiler.options.OptionKey;
+import jdk.graal.compiler.options.OptionType;
 
 import jdk.vm.ci.meta.DeoptimizationAction;
 import jdk.vm.ci.meta.SpeculationLog.Speculation;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/ConditionalEliminationUtil.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/ConditionalEliminationUtil.java
similarity index 94%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/ConditionalEliminationUtil.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/ConditionalEliminationUtil.java
index 7b3d0cf308a9..6c449e478744 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/ConditionalEliminationUtil.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/ConditionalEliminationUtil.java
@@ -22,33 +22,33 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.phases.common;
+package jdk.graal.compiler.phases.common;
 
 import java.util.ArrayDeque;
 
 import org.graalvm.collections.Pair;
-import jdk.compiler.graal.core.common.type.ArithmeticOpTable;
-import jdk.compiler.graal.core.common.type.ArithmeticOpTable.BinaryOp;
-import jdk.compiler.graal.core.common.type.ArithmeticOpTable.BinaryOp.Or;
-import jdk.compiler.graal.core.common.type.IntegerStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.nodes.BinaryOpLogicNode;
-import jdk.compiler.graal.nodes.DeoptimizingGuard;
-import jdk.compiler.graal.nodes.GraphState.StageFlag;
-import jdk.compiler.graal.nodes.LogicNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ParameterNode;
-import jdk.compiler.graal.nodes.PiNode;
-import jdk.compiler.graal.nodes.ShortCircuitOrNode;
-import jdk.compiler.graal.nodes.UnaryOpLogicNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.calc.AndNode;
-import jdk.compiler.graal.nodes.calc.BinaryArithmeticNode;
-import jdk.compiler.graal.nodes.calc.BinaryNode;
-import jdk.compiler.graal.nodes.calc.IntegerEqualsNode;
-import jdk.compiler.graal.nodes.calc.UnaryNode;
-import jdk.compiler.graal.nodes.extended.GuardingNode;
+import jdk.graal.compiler.core.common.type.ArithmeticOpTable;
+import jdk.graal.compiler.core.common.type.ArithmeticOpTable.BinaryOp;
+import jdk.graal.compiler.core.common.type.ArithmeticOpTable.BinaryOp.Or;
+import jdk.graal.compiler.core.common.type.IntegerStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.nodes.BinaryOpLogicNode;
+import jdk.graal.compiler.nodes.DeoptimizingGuard;
+import jdk.graal.compiler.nodes.GraphState.StageFlag;
+import jdk.graal.compiler.nodes.LogicNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ParameterNode;
+import jdk.graal.compiler.nodes.PiNode;
+import jdk.graal.compiler.nodes.ShortCircuitOrNode;
+import jdk.graal.compiler.nodes.UnaryOpLogicNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.calc.AndNode;
+import jdk.graal.compiler.nodes.calc.BinaryArithmeticNode;
+import jdk.graal.compiler.nodes.calc.BinaryNode;
+import jdk.graal.compiler.nodes.calc.IntegerEqualsNode;
+import jdk.graal.compiler.nodes.calc.UnaryNode;
+import jdk.graal.compiler.nodes.extended.GuardingNode;
 
 import jdk.vm.ci.meta.JavaConstant;
 import jdk.vm.ci.meta.TriState;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/DeadCodeEliminationPhase.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/DeadCodeEliminationPhase.java
similarity index 90%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/DeadCodeEliminationPhase.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/DeadCodeEliminationPhase.java
index d093d61e7b2a..21e09f3d87c9 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/DeadCodeEliminationPhase.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/DeadCodeEliminationPhase.java
@@ -22,21 +22,21 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.phases.common;
+package jdk.graal.compiler.phases.common;
 
 import java.util.Optional;
 
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeFlood;
-import jdk.compiler.graal.nodes.AbstractEndNode;
-import jdk.compiler.graal.nodes.GraphState;
-import jdk.compiler.graal.nodes.GuardNode;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.options.Option;
-import jdk.compiler.graal.options.OptionKey;
-import jdk.compiler.graal.options.OptionType;
-import jdk.compiler.graal.phases.Phase;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeFlood;
+import jdk.graal.compiler.nodes.AbstractEndNode;
+import jdk.graal.compiler.nodes.GraphState;
+import jdk.graal.compiler.nodes.GuardNode;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.options.Option;
+import jdk.graal.compiler.options.OptionKey;
+import jdk.graal.compiler.options.OptionType;
+import jdk.graal.compiler.phases.Phase;
 
 public class DeadCodeEliminationPhase extends Phase {
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/DeoptimizationGroupingPhase.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/DeoptimizationGroupingPhase.java
similarity index 83%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/DeoptimizationGroupingPhase.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/DeoptimizationGroupingPhase.java
index eaf2fb7ba866..b34261f56050 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/DeoptimizationGroupingPhase.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/DeoptimizationGroupingPhase.java
@@ -22,33 +22,33 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.phases.common;
+package jdk.graal.compiler.phases.common;
 
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Optional;
 
-import jdk.compiler.graal.core.common.cfg.Loop;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.debug.DebugCloseable;
-import jdk.compiler.graal.nodes.AbstractDeoptimizeNode;
-import jdk.compiler.graal.nodes.AbstractMergeNode;
-import jdk.compiler.graal.nodes.DynamicDeoptimizeNode;
-import jdk.compiler.graal.nodes.EndNode;
-import jdk.compiler.graal.nodes.FrameState;
-import jdk.compiler.graal.nodes.GraphState;
-import jdk.compiler.graal.nodes.LoopBeginNode;
-import jdk.compiler.graal.nodes.LoopExitNode;
-import jdk.compiler.graal.nodes.MergeNode;
-import jdk.compiler.graal.nodes.PhiNode;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.ValuePhiNode;
-import jdk.compiler.graal.nodes.cfg.HIRBlock;
-import jdk.compiler.graal.nodes.cfg.ControlFlowGraph;
-import jdk.compiler.graal.phases.BasePhase;
-import jdk.compiler.graal.phases.tiers.MidTierContext;
+import jdk.graal.compiler.core.common.cfg.Loop;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.debug.DebugCloseable;
+import jdk.graal.compiler.nodes.AbstractDeoptimizeNode;
+import jdk.graal.compiler.nodes.AbstractMergeNode;
+import jdk.graal.compiler.nodes.DynamicDeoptimizeNode;
+import jdk.graal.compiler.nodes.EndNode;
+import jdk.graal.compiler.nodes.FrameState;
+import jdk.graal.compiler.nodes.GraphState;
+import jdk.graal.compiler.nodes.LoopBeginNode;
+import jdk.graal.compiler.nodes.LoopExitNode;
+import jdk.graal.compiler.nodes.MergeNode;
+import jdk.graal.compiler.nodes.PhiNode;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.ValuePhiNode;
+import jdk.graal.compiler.nodes.cfg.HIRBlock;
+import jdk.graal.compiler.nodes.cfg.ControlFlowGraph;
+import jdk.graal.compiler.phases.BasePhase;
+import jdk.graal.compiler.phases.tiers.MidTierContext;
 
 /**
  * This phase tries to find {@link AbstractDeoptimizeNode DeoptimizeNodes} which use the same
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/DisableOverflownCountedLoopsPhase.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/DisableOverflownCountedLoopsPhase.java
similarity index 89%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/DisableOverflownCountedLoopsPhase.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/DisableOverflownCountedLoopsPhase.java
index 2f6fe0919f2d..3f416ee40d09 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/DisableOverflownCountedLoopsPhase.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/DisableOverflownCountedLoopsPhase.java
@@ -22,14 +22,14 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.phases.common;
+package jdk.graal.compiler.phases.common;
 
 import java.util.Optional;
 
-import jdk.compiler.graal.nodes.GraphState;
-import jdk.compiler.graal.nodes.LoopBeginNode;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.phases.Phase;
+import jdk.graal.compiler.nodes.GraphState;
+import jdk.graal.compiler.nodes.LoopBeginNode;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.phases.Phase;
 
 /*
  * Phase that disables counted loop detection for loops that have deopted in previous compiled versions
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/DominatorBasedGlobalValueNumberingPhase.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/DominatorBasedGlobalValueNumberingPhase.java
similarity index 93%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/DominatorBasedGlobalValueNumberingPhase.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/DominatorBasedGlobalValueNumberingPhase.java
index 39cb34c48848..858fd1c8fdba 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/DominatorBasedGlobalValueNumberingPhase.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/DominatorBasedGlobalValueNumberingPhase.java
@@ -22,52 +22,52 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.phases.common;
+package jdk.graal.compiler.phases.common;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Optional;
 
-import jdk.compiler.graal.phases.util.GraphOrder;
+import jdk.graal.compiler.phases.util.GraphOrder;
 import org.graalvm.collections.EconomicMap;
-import jdk.compiler.graal.core.common.GraalOptions;
-import jdk.compiler.graal.core.common.cfg.BlockMap;
-import jdk.compiler.graal.core.common.cfg.Loop;
-import jdk.compiler.graal.debug.CounterKey;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeBitMap;
-import jdk.compiler.graal.graph.spi.NodeWithIdentity;
-import jdk.compiler.graal.nodes.ControlSinkNode;
-import jdk.compiler.graal.nodes.FixedGuardNode;
-import jdk.compiler.graal.nodes.FixedNode;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.GraphState;
-import jdk.compiler.graal.nodes.LogicNode;
-import jdk.compiler.graal.nodes.LoopBeginNode;
-import jdk.compiler.graal.nodes.LoopExitNode;
-import jdk.compiler.graal.nodes.MergeNode;
-import jdk.compiler.graal.nodes.PiNode;
-import jdk.compiler.graal.nodes.ProxyNode;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.calc.FixedBinaryNode;
-import jdk.compiler.graal.nodes.calc.FloatingNode;
-import jdk.compiler.graal.nodes.cfg.ControlFlowGraph;
-import jdk.compiler.graal.nodes.cfg.HIRBlock;
-import jdk.compiler.graal.nodes.cfg.HIRLoop;
-import jdk.compiler.graal.nodes.cfg.LocationSet;
-import jdk.compiler.graal.nodes.debug.ControlFlowAnchored;
-import jdk.compiler.graal.nodes.extended.AnchoringNode;
-import jdk.compiler.graal.nodes.loop.LoopEx;
-import jdk.compiler.graal.nodes.loop.LoopsData;
-import jdk.compiler.graal.nodes.memory.MemoryAccess;
-import jdk.compiler.graal.nodes.memory.MemoryKill;
-import jdk.compiler.graal.nodes.memory.MultiMemoryKill;
-import jdk.compiler.graal.nodes.memory.SingleMemoryKill;
-import jdk.compiler.graal.nodes.spi.CoreProviders;
-import jdk.compiler.graal.nodes.spi.VirtualizableAllocation;
-import jdk.compiler.graal.nodes.util.GraphUtil;
+import jdk.graal.compiler.core.common.GraalOptions;
+import jdk.graal.compiler.core.common.cfg.BlockMap;
+import jdk.graal.compiler.core.common.cfg.Loop;
+import jdk.graal.compiler.debug.CounterKey;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeBitMap;
+import jdk.graal.compiler.graph.spi.NodeWithIdentity;
+import jdk.graal.compiler.nodes.ControlSinkNode;
+import jdk.graal.compiler.nodes.FixedGuardNode;
+import jdk.graal.compiler.nodes.FixedNode;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.GraphState;
+import jdk.graal.compiler.nodes.LogicNode;
+import jdk.graal.compiler.nodes.LoopBeginNode;
+import jdk.graal.compiler.nodes.LoopExitNode;
+import jdk.graal.compiler.nodes.MergeNode;
+import jdk.graal.compiler.nodes.PiNode;
+import jdk.graal.compiler.nodes.ProxyNode;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.calc.FixedBinaryNode;
+import jdk.graal.compiler.nodes.calc.FloatingNode;
+import jdk.graal.compiler.nodes.cfg.ControlFlowGraph;
+import jdk.graal.compiler.nodes.cfg.HIRBlock;
+import jdk.graal.compiler.nodes.cfg.HIRLoop;
+import jdk.graal.compiler.nodes.cfg.LocationSet;
+import jdk.graal.compiler.nodes.debug.ControlFlowAnchored;
+import jdk.graal.compiler.nodes.extended.AnchoringNode;
+import jdk.graal.compiler.nodes.loop.LoopEx;
+import jdk.graal.compiler.nodes.loop.LoopsData;
+import jdk.graal.compiler.nodes.memory.MemoryAccess;
+import jdk.graal.compiler.nodes.memory.MemoryKill;
+import jdk.graal.compiler.nodes.memory.MultiMemoryKill;
+import jdk.graal.compiler.nodes.memory.SingleMemoryKill;
+import jdk.graal.compiler.nodes.spi.CoreProviders;
+import jdk.graal.compiler.nodes.spi.VirtualizableAllocation;
+import jdk.graal.compiler.nodes.util.GraphUtil;
 import org.graalvm.word.LocationIdentity;
 
 /**
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/ExpandLogicPhase.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/ExpandLogicPhase.java
similarity index 90%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/ExpandLogicPhase.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/ExpandLogicPhase.java
index 073f10ca6a6d..3e5f4f336d2f 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/ExpandLogicPhase.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/ExpandLogicPhase.java
@@ -22,35 +22,35 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.phases.common;
+package jdk.graal.compiler.phases.common;
 
 import java.util.Optional;
 
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.debug.DebugCloseable;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.Graph;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.nodes.AbstractBeginNode;
-import jdk.compiler.graal.nodes.AbstractMergeNode;
-import jdk.compiler.graal.nodes.BeginNode;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.EndNode;
-import jdk.compiler.graal.nodes.GraphState;
-import jdk.compiler.graal.nodes.GraphState.StageFlag;
-import jdk.compiler.graal.nodes.GuardPhiNode;
-import jdk.compiler.graal.nodes.IfNode;
-import jdk.compiler.graal.nodes.LogicNode;
-import jdk.compiler.graal.nodes.MergeNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ShortCircuitOrNode;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.calc.AbstractNormalizeCompareNode;
-import jdk.compiler.graal.nodes.calc.ConditionalNode;
-import jdk.compiler.graal.nodes.spi.CoreProviders;
-import jdk.compiler.graal.phases.BasePhase;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.debug.DebugCloseable;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.Graph;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.nodes.AbstractBeginNode;
+import jdk.graal.compiler.nodes.AbstractMergeNode;
+import jdk.graal.compiler.nodes.BeginNode;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.EndNode;
+import jdk.graal.compiler.nodes.GraphState;
+import jdk.graal.compiler.nodes.GraphState.StageFlag;
+import jdk.graal.compiler.nodes.GuardPhiNode;
+import jdk.graal.compiler.nodes.IfNode;
+import jdk.graal.compiler.nodes.LogicNode;
+import jdk.graal.compiler.nodes.MergeNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ShortCircuitOrNode;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.calc.AbstractNormalizeCompareNode;
+import jdk.graal.compiler.nodes.calc.ConditionalNode;
+import jdk.graal.compiler.nodes.spi.CoreProviders;
+import jdk.graal.compiler.phases.BasePhase;
 
 public class ExpandLogicPhase extends PostRunCanonicalizationPhase {
     private static final double EPSILON = 1E-6;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/FinalCanonicalizerPhase.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/FinalCanonicalizerPhase.java
similarity index 93%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/FinalCanonicalizerPhase.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/FinalCanonicalizerPhase.java
index bbbbc182a674..a0a4fcf02f43 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/FinalCanonicalizerPhase.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/FinalCanonicalizerPhase.java
@@ -22,15 +22,15 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.phases.common;
+package jdk.graal.compiler.phases.common;
 
 import java.util.EnumSet;
 import java.util.Optional;
 
-import jdk.compiler.graal.nodes.GraphState;
-import jdk.compiler.graal.nodes.GraphState.StageFlag;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodes.GraphState;
+import jdk.graal.compiler.nodes.GraphState.StageFlag;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
 
 /**
  * Final application of {@link CanonicalizerPhase}. After the application of this phase, no further
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/FixReadsPhase.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/FixReadsPhase.java
similarity index 91%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/FixReadsPhase.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/FixReadsPhase.java
index 04c1c82bbc8f..c15b66359e3f 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/FixReadsPhase.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/FixReadsPhase.java
@@ -22,68 +22,68 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.phases.common;
+package jdk.graal.compiler.phases.common;
 
 import java.util.Optional;
 
-import jdk.compiler.graal.phases.BasePhase;
-import jdk.compiler.graal.phases.graph.ScheduledNodeIterator;
-import jdk.compiler.graal.phases.util.Providers;
+import jdk.graal.compiler.phases.BasePhase;
+import jdk.graal.compiler.phases.graph.ScheduledNodeIterator;
+import jdk.graal.compiler.phases.util.Providers;
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.Equivalence;
 import org.graalvm.collections.MapCursor;
-import jdk.compiler.graal.core.common.GraalOptions;
-import jdk.compiler.graal.core.common.cfg.BlockMap;
-import jdk.compiler.graal.core.common.type.FloatStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.debug.CounterKey;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.graph.Graph;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeBitMap;
-import jdk.compiler.graal.graph.NodeMap;
-import jdk.compiler.graal.graph.NodeStack;
-import jdk.compiler.graal.graph.Position;
-import jdk.compiler.graal.graph.iterators.NodePredicate;
-import jdk.compiler.graal.nodeinfo.InputType;
-import jdk.compiler.graal.nodes.AbstractBeginNode;
-import jdk.compiler.graal.nodes.AbstractMergeNode;
-import jdk.compiler.graal.nodes.BinaryOpLogicNode;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.EndNode;
-import jdk.compiler.graal.nodes.GraphState;
-import jdk.compiler.graal.nodes.GraphState.StageFlag;
-import jdk.compiler.graal.nodes.IfNode;
-import jdk.compiler.graal.nodes.LogicConstantNode;
-import jdk.compiler.graal.nodes.LogicNode;
-import jdk.compiler.graal.nodes.MergeNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.PhiNode;
-import jdk.compiler.graal.nodes.PiNode;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.StructuredGraph.ScheduleResult;
-import jdk.compiler.graal.nodes.UnaryOpLogicNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.ValuePhiNode;
-import jdk.compiler.graal.nodes.calc.BinaryNode;
-import jdk.compiler.graal.nodes.calc.ConditionalNode;
-import jdk.compiler.graal.nodes.calc.UnaryNode;
-import jdk.compiler.graal.nodes.cfg.HIRBlock;
-import jdk.compiler.graal.nodes.cfg.ControlFlowGraph;
-import jdk.compiler.graal.nodes.cfg.ControlFlowGraph.RecursiveVisitor;
-import jdk.compiler.graal.nodes.extended.GuardingNode;
-import jdk.compiler.graal.nodes.extended.IntegerSwitchNode;
-import jdk.compiler.graal.nodes.memory.FixedAccessNode;
-import jdk.compiler.graal.nodes.memory.FloatingAccessNode;
-import jdk.compiler.graal.nodes.memory.FloatingReadNode;
-import jdk.compiler.graal.nodes.memory.MemoryAccess;
-import jdk.compiler.graal.nodes.memory.MemoryPhiNode;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodes.spi.CoreProviders;
-import jdk.compiler.graal.nodes.spi.CoreProvidersDelegate;
-import jdk.compiler.graal.nodes.util.GraphUtil;
-import jdk.compiler.graal.options.OptionValues;
+import jdk.graal.compiler.core.common.GraalOptions;
+import jdk.graal.compiler.core.common.cfg.BlockMap;
+import jdk.graal.compiler.core.common.type.FloatStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.debug.CounterKey;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.graph.Graph;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeBitMap;
+import jdk.graal.compiler.graph.NodeMap;
+import jdk.graal.compiler.graph.NodeStack;
+import jdk.graal.compiler.graph.Position;
+import jdk.graal.compiler.graph.iterators.NodePredicate;
+import jdk.graal.compiler.nodeinfo.InputType;
+import jdk.graal.compiler.nodes.AbstractBeginNode;
+import jdk.graal.compiler.nodes.AbstractMergeNode;
+import jdk.graal.compiler.nodes.BinaryOpLogicNode;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.EndNode;
+import jdk.graal.compiler.nodes.GraphState;
+import jdk.graal.compiler.nodes.GraphState.StageFlag;
+import jdk.graal.compiler.nodes.IfNode;
+import jdk.graal.compiler.nodes.LogicConstantNode;
+import jdk.graal.compiler.nodes.LogicNode;
+import jdk.graal.compiler.nodes.MergeNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.PhiNode;
+import jdk.graal.compiler.nodes.PiNode;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.StructuredGraph.ScheduleResult;
+import jdk.graal.compiler.nodes.UnaryOpLogicNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.ValuePhiNode;
+import jdk.graal.compiler.nodes.calc.BinaryNode;
+import jdk.graal.compiler.nodes.calc.ConditionalNode;
+import jdk.graal.compiler.nodes.calc.UnaryNode;
+import jdk.graal.compiler.nodes.cfg.HIRBlock;
+import jdk.graal.compiler.nodes.cfg.ControlFlowGraph;
+import jdk.graal.compiler.nodes.cfg.ControlFlowGraph.RecursiveVisitor;
+import jdk.graal.compiler.nodes.extended.GuardingNode;
+import jdk.graal.compiler.nodes.extended.IntegerSwitchNode;
+import jdk.graal.compiler.nodes.memory.FixedAccessNode;
+import jdk.graal.compiler.nodes.memory.FloatingAccessNode;
+import jdk.graal.compiler.nodes.memory.FloatingReadNode;
+import jdk.graal.compiler.nodes.memory.MemoryAccess;
+import jdk.graal.compiler.nodes.memory.MemoryPhiNode;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodes.spi.CoreProviders;
+import jdk.graal.compiler.nodes.spi.CoreProvidersDelegate;
+import jdk.graal.compiler.nodes.util.GraphUtil;
+import jdk.graal.compiler.options.OptionValues;
 
 import jdk.vm.ci.meta.Assumptions;
 import jdk.vm.ci.meta.Constant;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/FloatingReadPhase.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/FloatingReadPhase.java
similarity index 89%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/FloatingReadPhase.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/FloatingReadPhase.java
index 3c3288bff168..994bd4a377cd 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/FloatingReadPhase.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/FloatingReadPhase.java
@@ -22,10 +22,10 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.phases.common;
+package jdk.graal.compiler.phases.common;
 
-import static jdk.compiler.graal.graph.Graph.NodeEvent.NODE_ADDED;
-import static jdk.compiler.graal.graph.Graph.NodeEvent.ZERO_USAGES;
+import static jdk.graal.compiler.graph.Graph.NodeEvent.NODE_ADDED;
+import static jdk.graal.compiler.graph.Graph.NodeEvent.ZERO_USAGES;
 import static org.graalvm.word.LocationIdentity.any;
 import static org.graalvm.word.LocationIdentity.init;
 
@@ -34,50 +34,50 @@
 import java.util.List;
 import java.util.Optional;
 
-import jdk.compiler.graal.phases.graph.ReentrantNodeIterator;
+import jdk.graal.compiler.phases.graph.ReentrantNodeIterator;
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.EconomicSet;
 import org.graalvm.collections.Equivalence;
 import org.graalvm.collections.UnmodifiableMapCursor;
-import jdk.compiler.graal.core.common.cfg.Loop;
-import jdk.compiler.graal.debug.DebugCloseable;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.Graph.NodeEventScope;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.nodes.AbstractBeginNode;
-import jdk.compiler.graal.nodes.AbstractMergeNode;
-import jdk.compiler.graal.nodes.FixedNode;
-import jdk.compiler.graal.nodes.GraphState;
-import jdk.compiler.graal.nodes.GraphState.StageFlag;
-import jdk.compiler.graal.nodes.LoopBeginNode;
-import jdk.compiler.graal.nodes.LoopEndNode;
-import jdk.compiler.graal.nodes.LoopExitNode;
-import jdk.compiler.graal.nodes.MemoryMapControlSinkNode;
-import jdk.compiler.graal.nodes.PhiNode;
-import jdk.compiler.graal.nodes.ProxyNode;
-import jdk.compiler.graal.nodes.StartNode;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.ValueNodeInterface;
-import jdk.compiler.graal.nodes.calc.FloatingNode;
-import jdk.compiler.graal.nodes.cfg.ControlFlowGraph;
-import jdk.compiler.graal.nodes.cfg.HIRBlock;
-import jdk.compiler.graal.nodes.cfg.HIRLoop;
-import jdk.compiler.graal.nodes.memory.AddressableMemoryAccess;
-import jdk.compiler.graal.nodes.memory.FloatableAccessNode;
-import jdk.compiler.graal.nodes.memory.FloatingAccessNode;
-import jdk.compiler.graal.nodes.memory.MemoryAccess;
-import jdk.compiler.graal.nodes.memory.MemoryAnchorNode;
-import jdk.compiler.graal.nodes.memory.MemoryKill;
-import jdk.compiler.graal.nodes.memory.MemoryMap;
-import jdk.compiler.graal.nodes.memory.MemoryMapNode;
-import jdk.compiler.graal.nodes.memory.MemoryPhiNode;
-import jdk.compiler.graal.nodes.memory.MultiMemoryKill;
-import jdk.compiler.graal.nodes.memory.SingleMemoryKill;
-import jdk.compiler.graal.nodes.memory.address.AddressNode;
-import jdk.compiler.graal.nodes.spi.CoreProviders;
-import jdk.compiler.graal.nodes.util.GraphUtil;
-import jdk.compiler.graal.phases.common.util.EconomicSetNodeEventListener;
+import jdk.graal.compiler.core.common.cfg.Loop;
+import jdk.graal.compiler.debug.DebugCloseable;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.Graph.NodeEventScope;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.nodes.AbstractBeginNode;
+import jdk.graal.compiler.nodes.AbstractMergeNode;
+import jdk.graal.compiler.nodes.FixedNode;
+import jdk.graal.compiler.nodes.GraphState;
+import jdk.graal.compiler.nodes.GraphState.StageFlag;
+import jdk.graal.compiler.nodes.LoopBeginNode;
+import jdk.graal.compiler.nodes.LoopEndNode;
+import jdk.graal.compiler.nodes.LoopExitNode;
+import jdk.graal.compiler.nodes.MemoryMapControlSinkNode;
+import jdk.graal.compiler.nodes.PhiNode;
+import jdk.graal.compiler.nodes.ProxyNode;
+import jdk.graal.compiler.nodes.StartNode;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.ValueNodeInterface;
+import jdk.graal.compiler.nodes.calc.FloatingNode;
+import jdk.graal.compiler.nodes.cfg.ControlFlowGraph;
+import jdk.graal.compiler.nodes.cfg.HIRBlock;
+import jdk.graal.compiler.nodes.cfg.HIRLoop;
+import jdk.graal.compiler.nodes.memory.AddressableMemoryAccess;
+import jdk.graal.compiler.nodes.memory.FloatableAccessNode;
+import jdk.graal.compiler.nodes.memory.FloatingAccessNode;
+import jdk.graal.compiler.nodes.memory.MemoryAccess;
+import jdk.graal.compiler.nodes.memory.MemoryAnchorNode;
+import jdk.graal.compiler.nodes.memory.MemoryKill;
+import jdk.graal.compiler.nodes.memory.MemoryMap;
+import jdk.graal.compiler.nodes.memory.MemoryMapNode;
+import jdk.graal.compiler.nodes.memory.MemoryPhiNode;
+import jdk.graal.compiler.nodes.memory.MultiMemoryKill;
+import jdk.graal.compiler.nodes.memory.SingleMemoryKill;
+import jdk.graal.compiler.nodes.memory.address.AddressNode;
+import jdk.graal.compiler.nodes.spi.CoreProviders;
+import jdk.graal.compiler.nodes.util.GraphUtil;
+import jdk.graal.compiler.phases.common.util.EconomicSetNodeEventListener;
 import org.graalvm.word.LocationIdentity;
 
 public class FloatingReadPhase extends PostRunCanonicalizationPhase {
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/FrameStateAssignmentPhase.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/FrameStateAssignmentPhase.java
similarity index 89%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/FrameStateAssignmentPhase.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/FrameStateAssignmentPhase.java
index 1cec8ed59fde..06542a324e4e 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/FrameStateAssignmentPhase.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/FrameStateAssignmentPhase.java
@@ -22,30 +22,30 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.phases.common;
+package jdk.graal.compiler.phases.common;
 
 import java.util.List;
 import java.util.Optional;
 
-import jdk.compiler.graal.phases.Phase;
-import jdk.compiler.graal.phases.graph.ReentrantNodeIterator;
+import jdk.graal.compiler.phases.Phase;
+import jdk.graal.compiler.phases.graph.ReentrantNodeIterator;
 import org.graalvm.collections.EconomicMap;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.nodes.AbstractBeginNode;
-import jdk.compiler.graal.nodes.AbstractMergeNode;
-import jdk.compiler.graal.nodes.DeoptimizingNode;
-import jdk.compiler.graal.nodes.FixedNode;
-import jdk.compiler.graal.nodes.FrameState;
-import jdk.compiler.graal.nodes.GraphState;
-import jdk.compiler.graal.nodes.GraphState.FrameStateVerification;
-import jdk.compiler.graal.nodes.GraphState.GuardsStage;
-import jdk.compiler.graal.nodes.GraphState.StageFlag;
-import jdk.compiler.graal.nodes.LoopBeginNode;
-import jdk.compiler.graal.nodes.LoopExitNode;
-import jdk.compiler.graal.nodes.StateSplit;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.util.GraphUtil;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.nodes.AbstractBeginNode;
+import jdk.graal.compiler.nodes.AbstractMergeNode;
+import jdk.graal.compiler.nodes.DeoptimizingNode;
+import jdk.graal.compiler.nodes.FixedNode;
+import jdk.graal.compiler.nodes.FrameState;
+import jdk.graal.compiler.nodes.GraphState;
+import jdk.graal.compiler.nodes.GraphState.FrameStateVerification;
+import jdk.graal.compiler.nodes.GraphState.GuardsStage;
+import jdk.graal.compiler.nodes.GraphState.StageFlag;
+import jdk.graal.compiler.nodes.LoopBeginNode;
+import jdk.graal.compiler.nodes.LoopExitNode;
+import jdk.graal.compiler.nodes.StateSplit;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.util.GraphUtil;
 
 import jdk.vm.ci.code.BytecodeFrame;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/GuardLoweringPhase.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/GuardLoweringPhase.java
similarity index 84%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/GuardLoweringPhase.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/GuardLoweringPhase.java
index f6b8ecfde01c..c8baca84803f 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/GuardLoweringPhase.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/GuardLoweringPhase.java
@@ -22,31 +22,31 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.phases.common;
+package jdk.graal.compiler.phases.common;
 
 import java.util.Optional;
 
-import jdk.compiler.graal.debug.DebugCloseable;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.nodes.AbstractBeginNode;
-import jdk.compiler.graal.nodes.BeginNode;
-import jdk.compiler.graal.nodes.DeoptimizeNode;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.GraphState;
-import jdk.compiler.graal.nodes.GraphState.GuardsStage;
-import jdk.compiler.graal.nodes.GraphState.StageFlag;
-import jdk.compiler.graal.nodes.GuardNode;
-import jdk.compiler.graal.nodes.IfNode;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.StructuredGraph.ScheduleResult;
-import jdk.compiler.graal.nodes.cfg.HIRBlock;
-import jdk.compiler.graal.nodes.extended.BranchProbabilityNode;
-import jdk.compiler.graal.nodes.spi.CoreProviders;
-import jdk.compiler.graal.phases.BasePhase;
-import jdk.compiler.graal.phases.FloatingGuardPhase;
-import jdk.compiler.graal.phases.schedule.SchedulePhase;
-import jdk.compiler.graal.phases.graph.ScheduledNodeIterator;
+import jdk.graal.compiler.debug.DebugCloseable;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.nodes.AbstractBeginNode;
+import jdk.graal.compiler.nodes.BeginNode;
+import jdk.graal.compiler.nodes.DeoptimizeNode;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.GraphState;
+import jdk.graal.compiler.nodes.GraphState.GuardsStage;
+import jdk.graal.compiler.nodes.GraphState.StageFlag;
+import jdk.graal.compiler.nodes.GuardNode;
+import jdk.graal.compiler.nodes.IfNode;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.StructuredGraph.ScheduleResult;
+import jdk.graal.compiler.nodes.cfg.HIRBlock;
+import jdk.graal.compiler.nodes.extended.BranchProbabilityNode;
+import jdk.graal.compiler.nodes.spi.CoreProviders;
+import jdk.graal.compiler.phases.BasePhase;
+import jdk.graal.compiler.phases.FloatingGuardPhase;
+import jdk.graal.compiler.phases.schedule.SchedulePhase;
+import jdk.graal.compiler.phases.graph.ScheduledNodeIterator;
 
 import java.util.ListIterator;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/HighTierLoweringPhase.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/HighTierLoweringPhase.java
similarity index 91%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/HighTierLoweringPhase.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/HighTierLoweringPhase.java
index d8dbb3496e19..825641b1d1c1 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/HighTierLoweringPhase.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/HighTierLoweringPhase.java
@@ -22,14 +22,14 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.phases.common;
+package jdk.graal.compiler.phases.common;
 
 import java.util.Optional;
 
-import jdk.compiler.graal.nodes.GraphState;
-import jdk.compiler.graal.nodes.GraphState.StageFlag;
-import jdk.compiler.graal.nodes.spi.Lowerable;
-import jdk.compiler.graal.nodes.spi.LoweringTool;
+import jdk.graal.compiler.nodes.GraphState;
+import jdk.graal.compiler.nodes.GraphState.StageFlag;
+import jdk.graal.compiler.nodes.spi.Lowerable;
+import jdk.graal.compiler.nodes.spi.LoweringTool;
 
 /**
  * A {@link LoweringPhase} used to lower {@link Lowerable} nodes when the graph is in
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/IncrementalCanonicalizerPhase.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/IncrementalCanonicalizerPhase.java
similarity index 90%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/IncrementalCanonicalizerPhase.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/IncrementalCanonicalizerPhase.java
index faa5666af019..541537c3354f 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/IncrementalCanonicalizerPhase.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/IncrementalCanonicalizerPhase.java
@@ -22,21 +22,21 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.phases.common;
+package jdk.graal.compiler.phases.common;
 
 import java.util.EnumSet;
 import java.util.Optional;
 
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.Graph;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeWorkList;
-import jdk.compiler.graal.nodes.GraphState;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.spi.CoreProviders;
-import jdk.compiler.graal.phases.BasePhase;
-import jdk.compiler.graal.phases.common.util.EconomicSetNodeEventListener;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.Graph;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeWorkList;
+import jdk.graal.compiler.nodes.GraphState;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.spi.CoreProviders;
+import jdk.graal.compiler.phases.BasePhase;
+import jdk.graal.compiler.phases.common.util.EconomicSetNodeEventListener;
 
 /**
  * The phase that does the work of {@link CanonicalizerPhase#applyIncremental}. This phase contains
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/InsertGuardFencesPhase.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/InsertGuardFencesPhase.java
similarity index 87%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/InsertGuardFencesPhase.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/InsertGuardFencesPhase.java
index 75810364a75c..0bf27e2ecedc 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/InsertGuardFencesPhase.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/InsertGuardFencesPhase.java
@@ -22,35 +22,35 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.phases.common;
+package jdk.graal.compiler.phases.common;
 
-import static jdk.compiler.graal.core.common.SpectrePHTMitigations.NonDeoptGuardTargets;
-import static jdk.compiler.graal.core.common.SpectrePHTMitigations.Options.SpectrePHTBarriers;
-import static jdk.compiler.graal.core.common.SpectrePHTMitigations.Options.SpectrePHTIndexMasking;
+import static jdk.graal.compiler.core.common.SpectrePHTMitigations.NonDeoptGuardTargets;
+import static jdk.graal.compiler.core.common.SpectrePHTMitigations.Options.SpectrePHTBarriers;
+import static jdk.graal.compiler.core.common.SpectrePHTMitigations.Options.SpectrePHTIndexMasking;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 
-import jdk.compiler.graal.core.common.type.IntegerStamp;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.Position;
-import jdk.compiler.graal.nodeinfo.InputType;
-import jdk.compiler.graal.nodes.AbstractBeginNode;
-import jdk.compiler.graal.nodes.DeoptimizeNode;
-import jdk.compiler.graal.nodes.FixedNode;
-import jdk.compiler.graal.nodes.GraphState;
-import jdk.compiler.graal.nodes.IfNode;
-import jdk.compiler.graal.nodes.LoopExitNode;
-import jdk.compiler.graal.nodes.NamedLocationIdentity;
-import jdk.compiler.graal.nodes.PiNode;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.cfg.ControlFlowGraph;
-import jdk.compiler.graal.nodes.extended.MultiGuardNode;
-import jdk.compiler.graal.nodes.memory.FixedAccessNode;
-import jdk.compiler.graal.nodes.memory.MemoryAccess;
-import jdk.compiler.graal.phases.Phase;
+import jdk.graal.compiler.core.common.type.IntegerStamp;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.Position;
+import jdk.graal.compiler.nodeinfo.InputType;
+import jdk.graal.compiler.nodes.AbstractBeginNode;
+import jdk.graal.compiler.nodes.DeoptimizeNode;
+import jdk.graal.compiler.nodes.FixedNode;
+import jdk.graal.compiler.nodes.GraphState;
+import jdk.graal.compiler.nodes.IfNode;
+import jdk.graal.compiler.nodes.LoopExitNode;
+import jdk.graal.compiler.nodes.NamedLocationIdentity;
+import jdk.graal.compiler.nodes.PiNode;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.cfg.ControlFlowGraph;
+import jdk.graal.compiler.nodes.extended.MultiGuardNode;
+import jdk.graal.compiler.nodes.memory.FixedAccessNode;
+import jdk.graal.compiler.nodes.memory.MemoryAccess;
+import jdk.graal.compiler.phases.Phase;
 
 import jdk.vm.ci.meta.DeoptimizationReason;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/IterativeConditionalEliminationPhase.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/IterativeConditionalEliminationPhase.java
similarity index 90%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/IterativeConditionalEliminationPhase.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/IterativeConditionalEliminationPhase.java
index 7349e3271d91..7f735d337ab9 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/IterativeConditionalEliminationPhase.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/IterativeConditionalEliminationPhase.java
@@ -22,18 +22,18 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.phases.common;
+package jdk.graal.compiler.phases.common;
 
 import java.util.Objects;
 import java.util.Optional;
 
-import jdk.compiler.graal.core.common.GraalOptions;
-import jdk.compiler.graal.graph.Graph.NodeEventScope;
-import jdk.compiler.graal.nodes.GraphState;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.spi.CoreProviders;
-import jdk.compiler.graal.phases.BasePhase;
-import jdk.compiler.graal.phases.common.util.EconomicSetNodeEventListener;
+import jdk.graal.compiler.core.common.GraalOptions;
+import jdk.graal.compiler.graph.Graph.NodeEventScope;
+import jdk.graal.compiler.nodes.GraphState;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.spi.CoreProviders;
+import jdk.graal.compiler.phases.BasePhase;
+import jdk.graal.compiler.phases.common.util.EconomicSetNodeEventListener;
 
 public class IterativeConditionalEliminationPhase extends BasePhase {
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/LazyValue.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/LazyValue.java
similarity index 97%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/LazyValue.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/LazyValue.java
index a4a050040d11..16cdd64d16c0 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/LazyValue.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/LazyValue.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.phases.common;
+package jdk.graal.compiler.phases.common;
 
 import java.util.function.Supplier;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/LockEliminationPhase.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/LockEliminationPhase.java
similarity index 88%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/LockEliminationPhase.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/LockEliminationPhase.java
index 59207d4a86b6..9f29edcaf1a9 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/LockEliminationPhase.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/LockEliminationPhase.java
@@ -22,31 +22,31 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.phases.common;
+package jdk.graal.compiler.phases.common;
 
 import java.util.Optional;
 
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.nodes.FixedNode;
-import jdk.compiler.graal.nodes.GraphState;
-import jdk.compiler.graal.nodes.GraphState.StageFlag;
-import jdk.compiler.graal.nodes.GuardNode;
-import jdk.compiler.graal.nodes.PiNode;
-import jdk.compiler.graal.nodes.ProxyNode;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.cfg.HIRBlock;
-import jdk.compiler.graal.nodes.cfg.ControlFlowGraph;
-import jdk.compiler.graal.nodes.extended.AnchoringNode;
-import jdk.compiler.graal.nodes.extended.GuardingNode;
-import jdk.compiler.graal.nodes.extended.OSRMonitorEnterNode;
-import jdk.compiler.graal.nodes.java.AccessMonitorNode;
-import jdk.compiler.graal.nodes.java.MonitorEnterNode;
-import jdk.compiler.graal.nodes.java.MonitorExitNode;
-import jdk.compiler.graal.nodes.java.MonitorIdNode;
-import jdk.compiler.graal.nodes.spi.ValueProxy;
-import jdk.compiler.graal.nodes.util.GraphUtil;
-import jdk.compiler.graal.phases.Phase;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.nodes.FixedNode;
+import jdk.graal.compiler.nodes.GraphState;
+import jdk.graal.compiler.nodes.GraphState.StageFlag;
+import jdk.graal.compiler.nodes.GuardNode;
+import jdk.graal.compiler.nodes.PiNode;
+import jdk.graal.compiler.nodes.ProxyNode;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.cfg.HIRBlock;
+import jdk.graal.compiler.nodes.cfg.ControlFlowGraph;
+import jdk.graal.compiler.nodes.extended.AnchoringNode;
+import jdk.graal.compiler.nodes.extended.GuardingNode;
+import jdk.graal.compiler.nodes.extended.OSRMonitorEnterNode;
+import jdk.graal.compiler.nodes.java.AccessMonitorNode;
+import jdk.graal.compiler.nodes.java.MonitorEnterNode;
+import jdk.graal.compiler.nodes.java.MonitorExitNode;
+import jdk.graal.compiler.nodes.java.MonitorIdNode;
+import jdk.graal.compiler.nodes.spi.ValueProxy;
+import jdk.graal.compiler.nodes.util.GraphUtil;
+import jdk.graal.compiler.phases.Phase;
 
 public class LockEliminationPhase extends Phase {
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/LoopSafepointInsertionPhase.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/LoopSafepointInsertionPhase.java
similarity index 84%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/LoopSafepointInsertionPhase.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/LoopSafepointInsertionPhase.java
index eace7cd0a7c2..b63d454c8bfc 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/LoopSafepointInsertionPhase.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/LoopSafepointInsertionPhase.java
@@ -22,21 +22,21 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.phases.common;
+package jdk.graal.compiler.phases.common;
 
-import static jdk.compiler.graal.core.common.GraalOptions.GenLoopSafepoints;
+import static jdk.graal.compiler.core.common.GraalOptions.GenLoopSafepoints;
 
 import java.util.Optional;
 
-import jdk.compiler.graal.debug.DebugCloseable;
-import jdk.compiler.graal.nodes.GraphState;
-import jdk.compiler.graal.nodes.GraphState.StageFlag;
-import jdk.compiler.graal.nodes.LoopBeginNode;
-import jdk.compiler.graal.nodes.LoopEndNode;
-import jdk.compiler.graal.nodes.SafepointNode;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.phases.BasePhase;
-import jdk.compiler.graal.phases.tiers.MidTierContext;
+import jdk.graal.compiler.debug.DebugCloseable;
+import jdk.graal.compiler.nodes.GraphState;
+import jdk.graal.compiler.nodes.GraphState.StageFlag;
+import jdk.graal.compiler.nodes.LoopBeginNode;
+import jdk.graal.compiler.nodes.LoopEndNode;
+import jdk.graal.compiler.nodes.SafepointNode;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.phases.BasePhase;
+import jdk.graal.compiler.phases.tiers.MidTierContext;
 
 /**
  * Adds safepoints to loops.
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/LowTierLoweringPhase.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/LowTierLoweringPhase.java
similarity index 89%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/LowTierLoweringPhase.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/LowTierLoweringPhase.java
index fa1e2d770756..9ea8b257713f 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/LowTierLoweringPhase.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/LowTierLoweringPhase.java
@@ -22,14 +22,14 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.phases.common;
+package jdk.graal.compiler.phases.common;
 
 import java.util.Optional;
 
-import jdk.compiler.graal.nodes.GraphState;
-import jdk.compiler.graal.nodes.GraphState.StageFlag;
-import jdk.compiler.graal.nodes.spi.Lowerable;
-import jdk.compiler.graal.nodes.spi.LoweringTool;
+import jdk.graal.compiler.nodes.GraphState;
+import jdk.graal.compiler.nodes.GraphState.StageFlag;
+import jdk.graal.compiler.nodes.spi.Lowerable;
+import jdk.graal.compiler.nodes.spi.LoweringTool;
 
 /**
  * A {@link LoweringPhase} used to lower {@link Lowerable} nodes when the graph is in
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/LoweringPhase.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/LoweringPhase.java
similarity index 91%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/LoweringPhase.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/LoweringPhase.java
index 50867d8d024b..7080cca77fea 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/LoweringPhase.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/LoweringPhase.java
@@ -22,17 +22,17 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.phases.common;
-
-import static jdk.compiler.graal.core.common.GraalOptions.OptEliminateGuards;
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_IGNORED;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_IGNORED;
-import static jdk.compiler.graal.nodes.memory.MemoryKill.NO_LOCATION;
-import static jdk.compiler.graal.phases.common.LoweringPhase.ProcessBlockState.ST_ENTER;
-import static jdk.compiler.graal.phases.common.LoweringPhase.ProcessBlockState.ST_ENTER_ALWAYS_REACHED;
-import static jdk.compiler.graal.phases.common.LoweringPhase.ProcessBlockState.ST_LEAVE;
-import static jdk.compiler.graal.phases.common.LoweringPhase.ProcessBlockState.ST_PROCESS;
-import static jdk.compiler.graal.phases.common.LoweringPhase.ProcessBlockState.ST_PROCESS_ALWAYS_REACHED;
+package jdk.graal.compiler.phases.common;
+
+import static jdk.graal.compiler.core.common.GraalOptions.OptEliminateGuards;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_IGNORED;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_IGNORED;
+import static jdk.graal.compiler.nodes.memory.MemoryKill.NO_LOCATION;
+import static jdk.graal.compiler.phases.common.LoweringPhase.ProcessBlockState.ST_ENTER;
+import static jdk.graal.compiler.phases.common.LoweringPhase.ProcessBlockState.ST_ENTER_ALWAYS_REACHED;
+import static jdk.graal.compiler.phases.common.LoweringPhase.ProcessBlockState.ST_LEAVE;
+import static jdk.graal.compiler.phases.common.LoweringPhase.ProcessBlockState.ST_PROCESS;
+import static jdk.graal.compiler.phases.common.LoweringPhase.ProcessBlockState.ST_PROCESS_ALWAYS_REACHED;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -40,66 +40,66 @@
 import java.util.List;
 import java.util.Optional;
 
-import jdk.compiler.graal.phases.BasePhase;
-import jdk.compiler.graal.phases.schedule.SchedulePhase;
+import jdk.graal.compiler.phases.BasePhase;
+import jdk.graal.compiler.phases.schedule.SchedulePhase;
 import org.graalvm.collections.EconomicSet;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.debug.CounterKey;
-import jdk.compiler.graal.debug.DebugCloseable;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.debug.TTY;
-import jdk.compiler.graal.debug.TimerKey;
-import jdk.compiler.graal.graph.Graph;
-import jdk.compiler.graal.graph.Graph.Mark;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeBitMap;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.graph.NodeMap;
-import jdk.compiler.graal.graph.NodeSourcePosition;
-import jdk.compiler.graal.graph.iterators.NodeIterable;
-import jdk.compiler.graal.nodeinfo.InputType;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.AbstractBeginNode;
-import jdk.compiler.graal.nodes.BeginNode;
-import jdk.compiler.graal.nodes.ControlSinkNode;
-import jdk.compiler.graal.nodes.FixedGuardNode;
-import jdk.compiler.graal.nodes.FixedNode;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.GraphState;
-import jdk.compiler.graal.nodes.GraphState.StageFlag;
-import jdk.compiler.graal.nodes.GuardNode;
-import jdk.compiler.graal.nodes.LogicNode;
-import jdk.compiler.graal.nodes.LoopExitNode;
-import jdk.compiler.graal.nodes.PhiNode;
-import jdk.compiler.graal.nodes.ProxyNode;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.StructuredGraph.ScheduleResult;
-import jdk.compiler.graal.nodes.UnreachableBeginNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.WithExceptionNode;
-import jdk.compiler.graal.nodes.calc.FloatingNode;
-import jdk.compiler.graal.nodes.cfg.HIRBlock;
-import jdk.compiler.graal.nodes.extended.AnchoringNode;
-import jdk.compiler.graal.nodes.extended.ForeignCall;
-import jdk.compiler.graal.nodes.extended.GuardedNode;
-import jdk.compiler.graal.nodes.extended.GuardingNode;
-import jdk.compiler.graal.nodes.memory.MemoryAccess;
-import jdk.compiler.graal.nodes.memory.MemoryKill;
-import jdk.compiler.graal.nodes.memory.MemoryMapNode;
-import jdk.compiler.graal.nodes.memory.MultiMemoryKill;
-import jdk.compiler.graal.nodes.memory.SideEffectFreeWriteNode;
-import jdk.compiler.graal.nodes.memory.SingleMemoryKill;
-import jdk.compiler.graal.nodes.spi.CoreProviders;
-import jdk.compiler.graal.nodes.spi.CoreProvidersDelegate;
-import jdk.compiler.graal.nodes.spi.Lowerable;
-import jdk.compiler.graal.nodes.spi.LoweringTool;
-import jdk.compiler.graal.nodes.virtual.CommitAllocationNode;
-import jdk.compiler.graal.options.Option;
-import jdk.compiler.graal.options.OptionKey;
-import jdk.compiler.graal.options.OptionType;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.common.util.EconomicSetNodeEventListener;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.debug.CounterKey;
+import jdk.graal.compiler.debug.DebugCloseable;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.debug.TTY;
+import jdk.graal.compiler.debug.TimerKey;
+import jdk.graal.compiler.graph.Graph;
+import jdk.graal.compiler.graph.Graph.Mark;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeBitMap;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.graph.NodeMap;
+import jdk.graal.compiler.graph.NodeSourcePosition;
+import jdk.graal.compiler.graph.iterators.NodeIterable;
+import jdk.graal.compiler.nodeinfo.InputType;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.AbstractBeginNode;
+import jdk.graal.compiler.nodes.BeginNode;
+import jdk.graal.compiler.nodes.ControlSinkNode;
+import jdk.graal.compiler.nodes.FixedGuardNode;
+import jdk.graal.compiler.nodes.FixedNode;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.GraphState;
+import jdk.graal.compiler.nodes.GraphState.StageFlag;
+import jdk.graal.compiler.nodes.GuardNode;
+import jdk.graal.compiler.nodes.LogicNode;
+import jdk.graal.compiler.nodes.LoopExitNode;
+import jdk.graal.compiler.nodes.PhiNode;
+import jdk.graal.compiler.nodes.ProxyNode;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.StructuredGraph.ScheduleResult;
+import jdk.graal.compiler.nodes.UnreachableBeginNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.WithExceptionNode;
+import jdk.graal.compiler.nodes.calc.FloatingNode;
+import jdk.graal.compiler.nodes.cfg.HIRBlock;
+import jdk.graal.compiler.nodes.extended.AnchoringNode;
+import jdk.graal.compiler.nodes.extended.ForeignCall;
+import jdk.graal.compiler.nodes.extended.GuardedNode;
+import jdk.graal.compiler.nodes.extended.GuardingNode;
+import jdk.graal.compiler.nodes.memory.MemoryAccess;
+import jdk.graal.compiler.nodes.memory.MemoryKill;
+import jdk.graal.compiler.nodes.memory.MemoryMapNode;
+import jdk.graal.compiler.nodes.memory.MultiMemoryKill;
+import jdk.graal.compiler.nodes.memory.SideEffectFreeWriteNode;
+import jdk.graal.compiler.nodes.memory.SingleMemoryKill;
+import jdk.graal.compiler.nodes.spi.CoreProviders;
+import jdk.graal.compiler.nodes.spi.CoreProvidersDelegate;
+import jdk.graal.compiler.nodes.spi.Lowerable;
+import jdk.graal.compiler.nodes.spi.LoweringTool;
+import jdk.graal.compiler.nodes.virtual.CommitAllocationNode;
+import jdk.graal.compiler.options.Option;
+import jdk.graal.compiler.options.OptionKey;
+import jdk.graal.compiler.options.OptionType;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.common.util.EconomicSetNodeEventListener;
 import org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.meta.DeoptimizationAction;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/MidTierLoweringPhase.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/MidTierLoweringPhase.java
similarity index 90%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/MidTierLoweringPhase.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/MidTierLoweringPhase.java
index 8aa5dc58ea48..9994bf2624cf 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/MidTierLoweringPhase.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/MidTierLoweringPhase.java
@@ -22,14 +22,14 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.phases.common;
+package jdk.graal.compiler.phases.common;
 
 import java.util.Optional;
 
-import jdk.compiler.graal.nodes.GraphState;
-import jdk.compiler.graal.nodes.GraphState.StageFlag;
-import jdk.compiler.graal.nodes.spi.Lowerable;
-import jdk.compiler.graal.nodes.spi.LoweringTool;
+import jdk.graal.compiler.nodes.GraphState;
+import jdk.graal.compiler.nodes.GraphState.StageFlag;
+import jdk.graal.compiler.nodes.spi.Lowerable;
+import jdk.graal.compiler.nodes.spi.LoweringTool;
 
 /**
  * A {@link LoweringPhase} used to lower {@link Lowerable} nodes when the graph is in
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/OptimizeDivPhase.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/OptimizeDivPhase.java
similarity index 88%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/OptimizeDivPhase.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/OptimizeDivPhase.java
index 485f1c73625d..52d57c43c585 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/OptimizeDivPhase.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/OptimizeDivPhase.java
@@ -22,41 +22,41 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.phases.common;
+package jdk.graal.compiler.phases.common;
 
 import java.util.Optional;
 
-import jdk.compiler.graal.phases.BasePhase;
+import jdk.graal.compiler.phases.BasePhase;
 import org.graalvm.collections.Pair;
-import jdk.compiler.graal.core.common.type.IntegerStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.debug.DebugCloseable;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.Graph.NodeEventScope;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.FixedNode;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.GraphState;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.PiNode;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.calc.BinaryArithmeticNode;
-import jdk.compiler.graal.nodes.calc.BinaryNode;
-import jdk.compiler.graal.nodes.calc.IntegerDivRemNode;
-import jdk.compiler.graal.nodes.calc.IntegerMulHighNode;
-import jdk.compiler.graal.nodes.calc.MulNode;
-import jdk.compiler.graal.nodes.calc.NarrowNode;
-import jdk.compiler.graal.nodes.calc.RightShiftNode;
-import jdk.compiler.graal.nodes.calc.SignExtendNode;
-import jdk.compiler.graal.nodes.calc.SignedDivNode;
-import jdk.compiler.graal.nodes.calc.SignedFloatingIntegerDivNode;
-import jdk.compiler.graal.nodes.calc.SignedFloatingIntegerRemNode;
-import jdk.compiler.graal.nodes.calc.SignedRemNode;
-import jdk.compiler.graal.nodes.calc.UnsignedRightShiftNode;
-import jdk.compiler.graal.nodes.spi.Canonicalizable;
-import jdk.compiler.graal.nodes.spi.CoreProviders;
-import jdk.compiler.graal.phases.common.util.EconomicSetNodeEventListener;
+import jdk.graal.compiler.core.common.type.IntegerStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.debug.DebugCloseable;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.Graph.NodeEventScope;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.FixedNode;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.GraphState;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.PiNode;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.calc.BinaryArithmeticNode;
+import jdk.graal.compiler.nodes.calc.BinaryNode;
+import jdk.graal.compiler.nodes.calc.IntegerDivRemNode;
+import jdk.graal.compiler.nodes.calc.IntegerMulHighNode;
+import jdk.graal.compiler.nodes.calc.MulNode;
+import jdk.graal.compiler.nodes.calc.NarrowNode;
+import jdk.graal.compiler.nodes.calc.RightShiftNode;
+import jdk.graal.compiler.nodes.calc.SignExtendNode;
+import jdk.graal.compiler.nodes.calc.SignedDivNode;
+import jdk.graal.compiler.nodes.calc.SignedFloatingIntegerDivNode;
+import jdk.graal.compiler.nodes.calc.SignedFloatingIntegerRemNode;
+import jdk.graal.compiler.nodes.calc.SignedRemNode;
+import jdk.graal.compiler.nodes.calc.UnsignedRightShiftNode;
+import jdk.graal.compiler.nodes.spi.Canonicalizable;
+import jdk.graal.compiler.nodes.spi.CoreProviders;
+import jdk.graal.compiler.phases.common.util.EconomicSetNodeEventListener;
 
 import jdk.vm.ci.code.CodeUtil;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/OptimizeExtendsPhase.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/OptimizeExtendsPhase.java
similarity index 92%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/OptimizeExtendsPhase.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/OptimizeExtendsPhase.java
index 6ade5edc8c48..b14f0a27730e 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/OptimizeExtendsPhase.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/OptimizeExtendsPhase.java
@@ -23,34 +23,34 @@
  * questions.
  */
 
-package jdk.compiler.graal.phases.common;
+package jdk.graal.compiler.phases.common;
 
 import java.util.List;
 import java.util.Optional;
 
-import jdk.compiler.graal.lir.CastValue;
-import jdk.compiler.graal.phases.BasePhase;
-import jdk.compiler.graal.phases.tiers.LowTierContext;
+import jdk.graal.compiler.lir.CastValue;
+import jdk.graal.compiler.phases.BasePhase;
+import jdk.graal.compiler.phases.tiers.LowTierContext;
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.EconomicSet;
 import org.graalvm.collections.Equivalence;
-import jdk.compiler.graal.core.common.memory.MemoryExtendKind;
-import jdk.compiler.graal.core.common.type.IntegerStamp;
-import jdk.compiler.graal.debug.Assertions;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.nodeinfo.InputType;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.GraphState;
-import jdk.compiler.graal.nodes.GraphState.StageFlag;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.calc.IntegerConvertNode;
-import jdk.compiler.graal.nodes.calc.NarrowNode;
-import jdk.compiler.graal.nodes.calc.SignExtendNode;
-import jdk.compiler.graal.nodes.calc.ZeroExtendNode;
-import jdk.compiler.graal.nodes.memory.ExtendableMemoryAccess;
+import jdk.graal.compiler.core.common.memory.MemoryExtendKind;
+import jdk.graal.compiler.core.common.type.IntegerStamp;
+import jdk.graal.compiler.debug.Assertions;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.nodeinfo.InputType;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.GraphState;
+import jdk.graal.compiler.nodes.GraphState.StageFlag;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.calc.IntegerConvertNode;
+import jdk.graal.compiler.nodes.calc.NarrowNode;
+import jdk.graal.compiler.nodes.calc.SignExtendNode;
+import jdk.graal.compiler.nodes.calc.ZeroExtendNode;
+import jdk.graal.compiler.nodes.memory.ExtendableMemoryAccess;
 
 /**
  * Goal: minimize the number of {@link ZeroExtendNode}s and {@link SignExtendNode}s needed. This is
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/PostRunCanonicalizationPhase.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/PostRunCanonicalizationPhase.java
similarity index 91%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/PostRunCanonicalizationPhase.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/PostRunCanonicalizationPhase.java
index 1581719ddb98..840cf24272c4 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/PostRunCanonicalizationPhase.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/PostRunCanonicalizationPhase.java
@@ -22,14 +22,14 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.phases.common;
+package jdk.graal.compiler.phases.common;
 
 import java.util.Optional;
 
-import jdk.compiler.graal.nodes.GraphState;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.spi.CoreProviders;
-import jdk.compiler.graal.phases.BasePhase;
+import jdk.graal.compiler.nodes.GraphState;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.spi.CoreProviders;
+import jdk.graal.compiler.phases.BasePhase;
 
 /**
  * The base classes for phases that always want to apply {@link CanonicalizerPhase#applyIncremental}
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/ProfileCompiledMethodsPhase.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/ProfileCompiledMethodsPhase.java
similarity index 79%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/ProfileCompiledMethodsPhase.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/ProfileCompiledMethodsPhase.java
index 0c6a7c22cd77..304cce2a3bf5 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/ProfileCompiledMethodsPhase.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/ProfileCompiledMethodsPhase.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.phases.common;
+package jdk.graal.compiler.phases.common;
 
 import static jdk.vm.ci.services.Services.getSavedProperty;
 
@@ -31,47 +31,47 @@
 import java.util.HashSet;
 import java.util.Optional;
 
-import jdk.compiler.graal.core.common.cfg.Loop;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.nodes.AbstractBeginNode;
-import jdk.compiler.graal.nodes.AbstractEndNode;
-import jdk.compiler.graal.nodes.AbstractMergeNode;
-import jdk.compiler.graal.nodes.CallTargetNode;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.DeoptimizeNode;
-import jdk.compiler.graal.nodes.FixedNode;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.GraphState;
-import jdk.compiler.graal.nodes.IfNode;
-import jdk.compiler.graal.nodes.Invoke;
-import jdk.compiler.graal.nodes.LogicNode;
-import jdk.compiler.graal.nodes.ParameterNode;
-import jdk.compiler.graal.nodes.ReturnNode;
-import jdk.compiler.graal.nodes.SafepointNode;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.StructuredGraph.ScheduleResult;
-import jdk.compiler.graal.nodes.UnwindNode;
-import jdk.compiler.graal.nodes.VirtualState;
-import jdk.compiler.graal.nodes.calc.BinaryNode;
-import jdk.compiler.graal.nodes.calc.ConvertNode;
-import jdk.compiler.graal.nodes.calc.FloatDivNode;
-import jdk.compiler.graal.nodes.calc.IntegerDivRemNode;
-import jdk.compiler.graal.nodes.calc.MulNode;
-import jdk.compiler.graal.nodes.calc.NotNode;
-import jdk.compiler.graal.nodes.calc.ReinterpretNode;
-import jdk.compiler.graal.nodes.calc.RemNode;
-import jdk.compiler.graal.nodes.cfg.ControlFlowGraph;
-import jdk.compiler.graal.nodes.cfg.HIRBlock;
-import jdk.compiler.graal.nodes.debug.DynamicCounterNode;
-import jdk.compiler.graal.nodes.extended.SwitchNode;
-import jdk.compiler.graal.nodes.java.AbstractNewObjectNode;
-import jdk.compiler.graal.nodes.java.AccessMonitorNode;
-import jdk.compiler.graal.nodes.java.MonitorIdNode;
-import jdk.compiler.graal.nodes.memory.FloatingReadNode;
-import jdk.compiler.graal.nodes.spi.ValueProxy;
-import jdk.compiler.graal.nodes.virtual.VirtualObjectNode;
-import jdk.compiler.graal.phases.Phase;
-import jdk.compiler.graal.phases.schedule.SchedulePhase;
+import jdk.graal.compiler.core.common.cfg.Loop;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.nodes.AbstractBeginNode;
+import jdk.graal.compiler.nodes.AbstractEndNode;
+import jdk.graal.compiler.nodes.AbstractMergeNode;
+import jdk.graal.compiler.nodes.CallTargetNode;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.DeoptimizeNode;
+import jdk.graal.compiler.nodes.FixedNode;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.GraphState;
+import jdk.graal.compiler.nodes.IfNode;
+import jdk.graal.compiler.nodes.Invoke;
+import jdk.graal.compiler.nodes.LogicNode;
+import jdk.graal.compiler.nodes.ParameterNode;
+import jdk.graal.compiler.nodes.ReturnNode;
+import jdk.graal.compiler.nodes.SafepointNode;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.StructuredGraph.ScheduleResult;
+import jdk.graal.compiler.nodes.UnwindNode;
+import jdk.graal.compiler.nodes.VirtualState;
+import jdk.graal.compiler.nodes.calc.BinaryNode;
+import jdk.graal.compiler.nodes.calc.ConvertNode;
+import jdk.graal.compiler.nodes.calc.FloatDivNode;
+import jdk.graal.compiler.nodes.calc.IntegerDivRemNode;
+import jdk.graal.compiler.nodes.calc.MulNode;
+import jdk.graal.compiler.nodes.calc.NotNode;
+import jdk.graal.compiler.nodes.calc.ReinterpretNode;
+import jdk.graal.compiler.nodes.calc.RemNode;
+import jdk.graal.compiler.nodes.cfg.ControlFlowGraph;
+import jdk.graal.compiler.nodes.cfg.HIRBlock;
+import jdk.graal.compiler.nodes.debug.DynamicCounterNode;
+import jdk.graal.compiler.nodes.extended.SwitchNode;
+import jdk.graal.compiler.nodes.java.AbstractNewObjectNode;
+import jdk.graal.compiler.nodes.java.AccessMonitorNode;
+import jdk.graal.compiler.nodes.java.MonitorIdNode;
+import jdk.graal.compiler.nodes.memory.FloatingReadNode;
+import jdk.graal.compiler.nodes.spi.ValueProxy;
+import jdk.graal.compiler.nodes.virtual.VirtualObjectNode;
+import jdk.graal.compiler.phases.Phase;
+import jdk.graal.compiler.phases.schedule.SchedulePhase;
 
 /**
  * This phase add counters for the dynamically executed number of nodes. Incrementing the counter
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/PropagateDeoptimizeProbabilityPhase.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/PropagateDeoptimizeProbabilityPhase.java
similarity index 88%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/PropagateDeoptimizeProbabilityPhase.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/PropagateDeoptimizeProbabilityPhase.java
index 761845ff4457..834ae86a9e9e 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/PropagateDeoptimizeProbabilityPhase.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/PropagateDeoptimizeProbabilityPhase.java
@@ -22,26 +22,26 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.phases.common;
+package jdk.graal.compiler.phases.common;
 
 import java.util.Optional;
 
-import jdk.compiler.graal.phases.BasePhase;
+import jdk.graal.compiler.phases.BasePhase;
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.EconomicSet;
 import org.graalvm.collections.Equivalence;
 import org.graalvm.collections.MapCursor;
-import jdk.compiler.graal.graph.NodeStack;
-import jdk.compiler.graal.nodes.AbstractBeginNode;
-import jdk.compiler.graal.nodes.AbstractDeoptimizeNode;
-import jdk.compiler.graal.nodes.AbstractEndNode;
-import jdk.compiler.graal.nodes.AbstractMergeNode;
-import jdk.compiler.graal.nodes.ControlSplitNode;
-import jdk.compiler.graal.nodes.FixedNode;
-import jdk.compiler.graal.nodes.GraphState;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.extended.BranchProbabilityNode;
-import jdk.compiler.graal.nodes.spi.CoreProviders;
+import jdk.graal.compiler.graph.NodeStack;
+import jdk.graal.compiler.nodes.AbstractBeginNode;
+import jdk.graal.compiler.nodes.AbstractDeoptimizeNode;
+import jdk.graal.compiler.nodes.AbstractEndNode;
+import jdk.graal.compiler.nodes.AbstractMergeNode;
+import jdk.graal.compiler.nodes.ControlSplitNode;
+import jdk.graal.compiler.nodes.FixedNode;
+import jdk.graal.compiler.nodes.GraphState;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.extended.BranchProbabilityNode;
+import jdk.graal.compiler.nodes.spi.CoreProviders;
 
 /**
  * This phase will make sure that the branch leading towards this deopt has 0.0 probability.
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/RawConditionalEliminationPhase.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/RawConditionalEliminationPhase.java
similarity index 87%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/RawConditionalEliminationPhase.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/RawConditionalEliminationPhase.java
index 95f7fbe243d7..20fcb1f6ddf6 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/RawConditionalEliminationPhase.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/RawConditionalEliminationPhase.java
@@ -22,13 +22,13 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.phases.common;
+package jdk.graal.compiler.phases.common;
 
-import jdk.compiler.graal.core.common.GraalOptions;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.phases.BasePhase;
-import jdk.compiler.graal.phases.schedule.SchedulePhase;
-import jdk.compiler.graal.phases.tiers.LowTierContext;
+import jdk.graal.compiler.core.common.GraalOptions;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.phases.BasePhase;
+import jdk.graal.compiler.phases.schedule.SchedulePhase;
+import jdk.graal.compiler.phases.tiers.LowTierContext;
 
 public class RawConditionalEliminationPhase extends BasePhase {
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/ReassociationPhase.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/ReassociationPhase.java
similarity index 89%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/ReassociationPhase.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/ReassociationPhase.java
index c4946e626a53..4ae1cfc710d5 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/ReassociationPhase.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/ReassociationPhase.java
@@ -22,32 +22,32 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.phases.common;
+package jdk.graal.compiler.phases.common;
 
 import java.util.EnumSet;
 import java.util.Optional;
 
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.graph.Graph.NodeEvent;
-import jdk.compiler.graal.graph.Graph.NodeEventScope;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeBitMap;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.GraphState;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.calc.AddNode;
-import jdk.compiler.graal.nodes.calc.BinaryArithmeticNode;
-import jdk.compiler.graal.nodes.calc.LeftShiftNode;
-import jdk.compiler.graal.nodes.calc.MulNode;
-import jdk.compiler.graal.nodes.calc.SubNode;
-import jdk.compiler.graal.nodes.loop.LoopEx;
-import jdk.compiler.graal.nodes.loop.LoopsData;
-import jdk.compiler.graal.nodes.spi.CoreProviders;
-import jdk.compiler.graal.nodes.util.GraphUtil;
-import jdk.compiler.graal.phases.BasePhase;
-import jdk.compiler.graal.phases.common.util.EconomicSetNodeEventListener;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.graph.Graph.NodeEvent;
+import jdk.graal.compiler.graph.Graph.NodeEventScope;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeBitMap;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.GraphState;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.calc.AddNode;
+import jdk.graal.compiler.nodes.calc.BinaryArithmeticNode;
+import jdk.graal.compiler.nodes.calc.LeftShiftNode;
+import jdk.graal.compiler.nodes.calc.MulNode;
+import jdk.graal.compiler.nodes.calc.SubNode;
+import jdk.graal.compiler.nodes.loop.LoopEx;
+import jdk.graal.compiler.nodes.loop.LoopsData;
+import jdk.graal.compiler.nodes.spi.CoreProviders;
+import jdk.graal.compiler.nodes.util.GraphUtil;
+import jdk.graal.compiler.phases.BasePhase;
+import jdk.graal.compiler.phases.common.util.EconomicSetNodeEventListener;
 
 import jdk.vm.ci.meta.PrimitiveConstant;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/RemoveValueProxyPhase.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/RemoveValueProxyPhase.java
similarity index 85%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/RemoveValueProxyPhase.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/RemoveValueProxyPhase.java
index 2dbf7d9ffe53..1178882f9d2c 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/RemoveValueProxyPhase.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/RemoveValueProxyPhase.java
@@ -22,21 +22,21 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.phases.common;
+package jdk.graal.compiler.phases.common;
 
-import static jdk.compiler.graal.nodes.GraphState.FrameStateVerification.ALL_EXCEPT_LOOP_EXIT;
+import static jdk.graal.compiler.nodes.GraphState.FrameStateVerification.ALL_EXCEPT_LOOP_EXIT;
 
 import java.util.Optional;
 
-import jdk.compiler.graal.nodes.FrameState;
-import jdk.compiler.graal.nodes.GraphState;
-import jdk.compiler.graal.nodes.GraphState.FrameStateVerification;
-import jdk.compiler.graal.nodes.GraphState.StageFlag;
-import jdk.compiler.graal.nodes.LoopExitNode;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.spi.CoreProviders;
-import jdk.compiler.graal.nodes.util.GraphUtil;
-import jdk.compiler.graal.phases.BasePhase;
+import jdk.graal.compiler.nodes.FrameState;
+import jdk.graal.compiler.nodes.GraphState;
+import jdk.graal.compiler.nodes.GraphState.FrameStateVerification;
+import jdk.graal.compiler.nodes.GraphState.StageFlag;
+import jdk.graal.compiler.nodes.LoopExitNode;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.spi.CoreProviders;
+import jdk.graal.compiler.nodes.util.GraphUtil;
+import jdk.graal.compiler.phases.BasePhase;
 
 public class RemoveValueProxyPhase extends PostRunCanonicalizationPhase {
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/SnippetFrameStateAssignment.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/SnippetFrameStateAssignment.java
similarity index 93%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/SnippetFrameStateAssignment.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/SnippetFrameStateAssignment.java
index c8e0cc151b8b..771b2b4b5551 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/SnippetFrameStateAssignment.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/SnippetFrameStateAssignment.java
@@ -22,30 +22,30 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.phases.common;
+package jdk.graal.compiler.phases.common;
 
 import java.util.List;
 
-import jdk.compiler.graal.phases.graph.ReentrantNodeIterator;
+import jdk.graal.compiler.phases.graph.ReentrantNodeIterator;
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.MapCursor;
-import jdk.compiler.graal.api.replacements.Snippet;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeMap;
-import jdk.compiler.graal.nodes.AbstractBeginNode;
-import jdk.compiler.graal.nodes.AbstractMergeNode;
-import jdk.compiler.graal.nodes.FixedNode;
-import jdk.compiler.graal.nodes.LoopBeginNode;
-import jdk.compiler.graal.nodes.LoopEndNode;
-import jdk.compiler.graal.nodes.LoopExitNode;
-import jdk.compiler.graal.nodes.StartNode;
-import jdk.compiler.graal.nodes.StateSplit;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueProxyNode;
-import jdk.compiler.graal.nodes.java.ExceptionObjectNode;
-import jdk.compiler.graal.nodes.util.GraphUtil;
+import jdk.graal.compiler.api.replacements.Snippet;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeMap;
+import jdk.graal.compiler.nodes.AbstractBeginNode;
+import jdk.graal.compiler.nodes.AbstractMergeNode;
+import jdk.graal.compiler.nodes.FixedNode;
+import jdk.graal.compiler.nodes.LoopBeginNode;
+import jdk.graal.compiler.nodes.LoopEndNode;
+import jdk.graal.compiler.nodes.LoopExitNode;
+import jdk.graal.compiler.nodes.StartNode;
+import jdk.graal.compiler.nodes.StateSplit;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueProxyNode;
+import jdk.graal.compiler.nodes.java.ExceptionObjectNode;
+import jdk.graal.compiler.nodes.util.GraphUtil;
 
 /**
  * Utility class for snippet lowering.
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/UseTrappingNullChecksPhase.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/UseTrappingNullChecksPhase.java
similarity index 85%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/UseTrappingNullChecksPhase.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/UseTrappingNullChecksPhase.java
index 29a7f8d9e3f6..68812160e20c 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/UseTrappingNullChecksPhase.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/UseTrappingNullChecksPhase.java
@@ -22,34 +22,34 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.phases.common;
+package jdk.graal.compiler.phases.common;
 
-import static jdk.compiler.graal.core.common.GraalOptions.OptImplicitNullChecks;
+import static jdk.graal.compiler.core.common.GraalOptions.OptImplicitNullChecks;
 
 import java.util.Optional;
 
-import jdk.compiler.graal.nodes.AbstractBeginNode;
-import jdk.compiler.graal.nodes.AbstractDeoptimizeNode;
-import jdk.compiler.graal.nodes.CompressionNode;
-import jdk.compiler.graal.nodes.DeoptimizeNode;
-import jdk.compiler.graal.nodes.DeoptimizingFixedWithNextNode;
-import jdk.compiler.graal.nodes.DynamicDeoptimizeNode;
-import jdk.compiler.graal.nodes.FixedNode;
-import jdk.compiler.graal.nodes.GraphState;
-import jdk.compiler.graal.nodes.GraphState.StageFlag;
-import jdk.compiler.graal.nodes.IfNode;
-import jdk.compiler.graal.nodes.LogicNode;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.calc.IsNullNode;
-import jdk.compiler.graal.nodes.extended.NullCheckNode;
-import jdk.compiler.graal.nodes.memory.FixedAccessNode;
-import jdk.compiler.graal.nodes.memory.address.AddressNode;
-import jdk.compiler.graal.options.Option;
-import jdk.compiler.graal.options.OptionKey;
-import jdk.compiler.graal.options.OptionType;
-import jdk.compiler.graal.phases.BasePhase;
-import jdk.compiler.graal.phases.tiers.LowTierContext;
+import jdk.graal.compiler.nodes.AbstractBeginNode;
+import jdk.graal.compiler.nodes.AbstractDeoptimizeNode;
+import jdk.graal.compiler.nodes.CompressionNode;
+import jdk.graal.compiler.nodes.DeoptimizeNode;
+import jdk.graal.compiler.nodes.DeoptimizingFixedWithNextNode;
+import jdk.graal.compiler.nodes.DynamicDeoptimizeNode;
+import jdk.graal.compiler.nodes.FixedNode;
+import jdk.graal.compiler.nodes.GraphState;
+import jdk.graal.compiler.nodes.GraphState.StageFlag;
+import jdk.graal.compiler.nodes.IfNode;
+import jdk.graal.compiler.nodes.LogicNode;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.calc.IsNullNode;
+import jdk.graal.compiler.nodes.extended.NullCheckNode;
+import jdk.graal.compiler.nodes.memory.FixedAccessNode;
+import jdk.graal.compiler.nodes.memory.address.AddressNode;
+import jdk.graal.compiler.options.Option;
+import jdk.graal.compiler.options.OptionKey;
+import jdk.graal.compiler.options.OptionType;
+import jdk.graal.compiler.phases.BasePhase;
+import jdk.graal.compiler.phases.tiers.LowTierContext;
 
 import jdk.vm.ci.meta.DeoptimizationReason;
 import jdk.vm.ci.meta.JavaConstant;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/UseTrappingOperationPhase.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/UseTrappingOperationPhase.java
similarity index 90%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/UseTrappingOperationPhase.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/UseTrappingOperationPhase.java
index ff3c68d26934..6cae8692d744 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/UseTrappingOperationPhase.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/UseTrappingOperationPhase.java
@@ -22,33 +22,33 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.phases.common;
+package jdk.graal.compiler.phases.common;
 
 import java.util.List;
 import java.util.Optional;
 
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.nodeinfo.InputType;
-import jdk.compiler.graal.nodes.AbstractBeginNode;
-import jdk.compiler.graal.nodes.AbstractDeoptimizeNode;
-import jdk.compiler.graal.nodes.AbstractEndNode;
-import jdk.compiler.graal.nodes.AbstractMergeNode;
-import jdk.compiler.graal.nodes.BeginNode;
-import jdk.compiler.graal.nodes.DeoptimizingFixedWithNextNode;
-import jdk.compiler.graal.nodes.DynamicDeoptimizeNode;
-import jdk.compiler.graal.nodes.EndNode;
-import jdk.compiler.graal.nodes.GraphState;
-import jdk.compiler.graal.nodes.IfNode;
-import jdk.compiler.graal.nodes.LogicNode;
-import jdk.compiler.graal.nodes.LoopExitNode;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.ValuePhiNode;
-import jdk.compiler.graal.nodes.memory.address.AddressNode;
-import jdk.compiler.graal.nodes.util.GraphUtil;
-import jdk.compiler.graal.phases.BasePhase;
-import jdk.compiler.graal.phases.tiers.LowTierContext;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.nodeinfo.InputType;
+import jdk.graal.compiler.nodes.AbstractBeginNode;
+import jdk.graal.compiler.nodes.AbstractDeoptimizeNode;
+import jdk.graal.compiler.nodes.AbstractEndNode;
+import jdk.graal.compiler.nodes.AbstractMergeNode;
+import jdk.graal.compiler.nodes.BeginNode;
+import jdk.graal.compiler.nodes.DeoptimizingFixedWithNextNode;
+import jdk.graal.compiler.nodes.DynamicDeoptimizeNode;
+import jdk.graal.compiler.nodes.EndNode;
+import jdk.graal.compiler.nodes.GraphState;
+import jdk.graal.compiler.nodes.IfNode;
+import jdk.graal.compiler.nodes.LogicNode;
+import jdk.graal.compiler.nodes.LoopExitNode;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.ValuePhiNode;
+import jdk.graal.compiler.nodes.memory.address.AddressNode;
+import jdk.graal.compiler.nodes.util.GraphUtil;
+import jdk.graal.compiler.phases.BasePhase;
+import jdk.graal.compiler.phases.tiers.LowTierContext;
 
 import jdk.vm.ci.meta.DeoptimizationReason;
 import jdk.vm.ci.meta.JavaConstant;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/VerifyHeapAtReturnPhase.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/VerifyHeapAtReturnPhase.java
similarity index 85%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/VerifyHeapAtReturnPhase.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/VerifyHeapAtReturnPhase.java
index e05253005319..d83e73eebb08 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/VerifyHeapAtReturnPhase.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/VerifyHeapAtReturnPhase.java
@@ -22,15 +22,15 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.phases.common;
+package jdk.graal.compiler.phases.common;
 
 import java.util.Optional;
 
-import jdk.compiler.graal.nodes.GraphState;
-import jdk.compiler.graal.nodes.ReturnNode;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.debug.VerifyHeapNode;
-import jdk.compiler.graal.phases.Phase;
+import jdk.graal.compiler.nodes.GraphState;
+import jdk.graal.compiler.nodes.ReturnNode;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.debug.VerifyHeapNode;
+import jdk.graal.compiler.phases.Phase;
 
 public class VerifyHeapAtReturnPhase extends Phase {
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/WriteBarrierAdditionPhase.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/WriteBarrierAdditionPhase.java
similarity index 85%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/WriteBarrierAdditionPhase.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/WriteBarrierAdditionPhase.java
index 49df7e5f688e..5c19c1262d25 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/WriteBarrierAdditionPhase.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/WriteBarrierAdditionPhase.java
@@ -22,18 +22,18 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.phases.common;
+package jdk.graal.compiler.phases.common;
 
 import java.util.Optional;
 
-import jdk.compiler.graal.debug.DebugCloseable;
-import jdk.compiler.graal.nodes.GraphState;
-import jdk.compiler.graal.nodes.GraphState.StageFlag;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.gc.BarrierSet;
-import jdk.compiler.graal.nodes.memory.FixedAccessNode;
-import jdk.compiler.graal.nodes.spi.CoreProviders;
-import jdk.compiler.graal.phases.BasePhase;
+import jdk.graal.compiler.debug.DebugCloseable;
+import jdk.graal.compiler.nodes.GraphState;
+import jdk.graal.compiler.nodes.GraphState.StageFlag;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.gc.BarrierSet;
+import jdk.graal.compiler.nodes.memory.FixedAccessNode;
+import jdk.graal.compiler.nodes.spi.CoreProviders;
+import jdk.graal.compiler.phases.BasePhase;
 
 public class WriteBarrierAdditionPhase extends BasePhase {
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/inlining/InliningPhase.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/inlining/InliningPhase.java
similarity index 86%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/inlining/InliningPhase.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/inlining/InliningPhase.java
index 5c02377af19e..7544ebfa5bf8 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/inlining/InliningPhase.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/inlining/InliningPhase.java
@@ -22,20 +22,20 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.phases.common.inlining;
+package jdk.graal.compiler.phases.common.inlining;
 
 import java.util.LinkedList;
 
-import jdk.compiler.graal.nodes.Invoke;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.options.Option;
-import jdk.compiler.graal.options.OptionKey;
-import jdk.compiler.graal.options.OptionType;
-import jdk.compiler.graal.phases.common.AbstractInliningPhase;
-import jdk.compiler.graal.phases.common.CanonicalizerPhase;
-import jdk.compiler.graal.phases.common.inlining.policy.InliningPolicy;
-import jdk.compiler.graal.phases.common.inlining.walker.InliningData;
-import jdk.compiler.graal.phases.tiers.HighTierContext;
+import jdk.graal.compiler.nodes.Invoke;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.options.Option;
+import jdk.graal.compiler.options.OptionKey;
+import jdk.graal.compiler.options.OptionType;
+import jdk.graal.compiler.phases.common.AbstractInliningPhase;
+import jdk.graal.compiler.phases.common.CanonicalizerPhase;
+import jdk.graal.compiler.phases.common.inlining.policy.InliningPolicy;
+import jdk.graal.compiler.phases.common.inlining.walker.InliningData;
+import jdk.graal.compiler.phases.tiers.HighTierContext;
 
 public class InliningPhase extends AbstractInliningPhase {
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/inlining/InliningUtil.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/inlining/InliningUtil.java
similarity index 94%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/inlining/InliningUtil.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/inlining/InliningUtil.java
index c252fcad6946..87bc4a69f398 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/inlining/InliningUtil.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/inlining/InliningUtil.java
@@ -22,11 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.phases.common.inlining;
+package jdk.graal.compiler.phases.common.inlining;
 
 import static jdk.vm.ci.meta.DeoptimizationAction.InvalidateReprofile;
 import static jdk.vm.ci.meta.DeoptimizationReason.NullCheckException;
-import static jdk.compiler.graal.core.common.GraalOptions.HotSpotPrintInlining;
+import static jdk.graal.compiler.core.common.GraalOptions.HotSpotPrintInlining;
 
 import java.util.ArrayDeque;
 import java.util.ArrayList;
@@ -34,83 +34,83 @@
 import java.util.Objects;
 import java.util.function.Consumer;
 
-import jdk.compiler.graal.phases.common.inlining.info.InlineInfo;
-import jdk.compiler.graal.phases.common.util.EconomicSetNodeEventListener;
-import jdk.compiler.graal.phases.util.ValueMergeUtil;
+import jdk.graal.compiler.phases.common.inlining.info.InlineInfo;
+import jdk.graal.compiler.phases.common.util.EconomicSetNodeEventListener;
+import jdk.graal.compiler.phases.util.ValueMergeUtil;
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.EconomicSet;
 import org.graalvm.collections.Equivalence;
 import org.graalvm.collections.Pair;
 import org.graalvm.collections.UnmodifiableEconomicMap;
 import org.graalvm.collections.UnmodifiableMapCursor;
-import jdk.compiler.graal.core.common.calc.CanonicalCondition;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.core.common.type.TypeReference;
-import jdk.compiler.graal.core.common.util.Util;
-import jdk.compiler.graal.debug.DebugCloseable;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.Graph;
-import jdk.compiler.graal.graph.Graph.DuplicationReplacement;
-import jdk.compiler.graal.graph.Graph.Mark;
-import jdk.compiler.graal.graph.Graph.NodeEventScope;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeInputList;
-import jdk.compiler.graal.graph.NodeMap;
-import jdk.compiler.graal.graph.NodeSourcePosition;
-import jdk.compiler.graal.graph.NodeWorkList;
-import jdk.compiler.graal.graph.Position;
-import jdk.compiler.graal.nodeinfo.InputType;
-import jdk.compiler.graal.nodeinfo.Verbosity;
-import jdk.compiler.graal.nodes.AbstractBeginNode;
-import jdk.compiler.graal.nodes.AbstractEndNode;
-import jdk.compiler.graal.nodes.AbstractMergeNode;
-import jdk.compiler.graal.nodes.BeginNode;
-import jdk.compiler.graal.nodes.CallTargetNode.InvokeKind;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.DeoptimizeNode;
-import jdk.compiler.graal.nodes.DeoptimizingGuard;
-import jdk.compiler.graal.nodes.EndNode;
-import jdk.compiler.graal.nodes.FixedGuardNode;
-import jdk.compiler.graal.nodes.FixedNode;
-import jdk.compiler.graal.nodes.FrameState;
-import jdk.compiler.graal.nodes.GraphState.GuardsStage;
-import jdk.compiler.graal.nodes.GraphState.StageFlag;
-import jdk.compiler.graal.nodes.InliningLog;
-import jdk.compiler.graal.nodes.Invoke;
-import jdk.compiler.graal.nodes.InvokeWithExceptionNode;
-import jdk.compiler.graal.nodes.LogicNode;
-import jdk.compiler.graal.nodes.MergeNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ParameterNode;
-import jdk.compiler.graal.nodes.PhiNode;
-import jdk.compiler.graal.nodes.PiNode;
-import jdk.compiler.graal.nodes.ReturnNode;
-import jdk.compiler.graal.nodes.StartNode;
-import jdk.compiler.graal.nodes.StateSplit;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.UnwindNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.VirtualState;
-import jdk.compiler.graal.nodes.WithExceptionNode;
-import jdk.compiler.graal.nodes.calc.CompareNode;
-import jdk.compiler.graal.nodes.calc.IsNullNode;
-import jdk.compiler.graal.nodes.extended.ForeignCall;
-import jdk.compiler.graal.nodes.extended.GuardedNode;
-import jdk.compiler.graal.nodes.extended.GuardingNode;
-import jdk.compiler.graal.nodes.extended.LoadHubNode;
-import jdk.compiler.graal.nodes.extended.ValueAnchorNode;
-import jdk.compiler.graal.nodes.java.ExceptionObjectNode;
-import jdk.compiler.graal.nodes.java.MethodCallTargetNode;
-import jdk.compiler.graal.nodes.java.MonitorExitNode;
-import jdk.compiler.graal.nodes.java.MonitorIdNode;
-import jdk.compiler.graal.nodes.spi.CoreProviders;
-import jdk.compiler.graal.nodes.type.StampTool;
-import jdk.compiler.graal.nodes.util.GraphUtil;
-import jdk.compiler.graal.replacements.nodes.MacroInvokable;
-import jdk.compiler.graal.replacements.nodes.ResolvedMethodHandleCallTargetNode;
-import jdk.compiler.graal.serviceprovider.SpeculationReasonGroup;
+import jdk.graal.compiler.core.common.calc.CanonicalCondition;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.core.common.type.TypeReference;
+import jdk.graal.compiler.core.common.util.Util;
+import jdk.graal.compiler.debug.DebugCloseable;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.Graph;
+import jdk.graal.compiler.graph.Graph.DuplicationReplacement;
+import jdk.graal.compiler.graph.Graph.Mark;
+import jdk.graal.compiler.graph.Graph.NodeEventScope;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeInputList;
+import jdk.graal.compiler.graph.NodeMap;
+import jdk.graal.compiler.graph.NodeSourcePosition;
+import jdk.graal.compiler.graph.NodeWorkList;
+import jdk.graal.compiler.graph.Position;
+import jdk.graal.compiler.nodeinfo.InputType;
+import jdk.graal.compiler.nodeinfo.Verbosity;
+import jdk.graal.compiler.nodes.AbstractBeginNode;
+import jdk.graal.compiler.nodes.AbstractEndNode;
+import jdk.graal.compiler.nodes.AbstractMergeNode;
+import jdk.graal.compiler.nodes.BeginNode;
+import jdk.graal.compiler.nodes.CallTargetNode.InvokeKind;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.DeoptimizeNode;
+import jdk.graal.compiler.nodes.DeoptimizingGuard;
+import jdk.graal.compiler.nodes.EndNode;
+import jdk.graal.compiler.nodes.FixedGuardNode;
+import jdk.graal.compiler.nodes.FixedNode;
+import jdk.graal.compiler.nodes.FrameState;
+import jdk.graal.compiler.nodes.GraphState.GuardsStage;
+import jdk.graal.compiler.nodes.GraphState.StageFlag;
+import jdk.graal.compiler.nodes.InliningLog;
+import jdk.graal.compiler.nodes.Invoke;
+import jdk.graal.compiler.nodes.InvokeWithExceptionNode;
+import jdk.graal.compiler.nodes.LogicNode;
+import jdk.graal.compiler.nodes.MergeNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ParameterNode;
+import jdk.graal.compiler.nodes.PhiNode;
+import jdk.graal.compiler.nodes.PiNode;
+import jdk.graal.compiler.nodes.ReturnNode;
+import jdk.graal.compiler.nodes.StartNode;
+import jdk.graal.compiler.nodes.StateSplit;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.UnwindNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.VirtualState;
+import jdk.graal.compiler.nodes.WithExceptionNode;
+import jdk.graal.compiler.nodes.calc.CompareNode;
+import jdk.graal.compiler.nodes.calc.IsNullNode;
+import jdk.graal.compiler.nodes.extended.ForeignCall;
+import jdk.graal.compiler.nodes.extended.GuardedNode;
+import jdk.graal.compiler.nodes.extended.GuardingNode;
+import jdk.graal.compiler.nodes.extended.LoadHubNode;
+import jdk.graal.compiler.nodes.extended.ValueAnchorNode;
+import jdk.graal.compiler.nodes.java.ExceptionObjectNode;
+import jdk.graal.compiler.nodes.java.MethodCallTargetNode;
+import jdk.graal.compiler.nodes.java.MonitorExitNode;
+import jdk.graal.compiler.nodes.java.MonitorIdNode;
+import jdk.graal.compiler.nodes.spi.CoreProviders;
+import jdk.graal.compiler.nodes.type.StampTool;
+import jdk.graal.compiler.nodes.util.GraphUtil;
+import jdk.graal.compiler.replacements.nodes.MacroInvokable;
+import jdk.graal.compiler.replacements.nodes.ResolvedMethodHandleCallTargetNode;
+import jdk.graal.compiler.serviceprovider.SpeculationReasonGroup;
 
 import jdk.vm.ci.code.BytecodeFrame;
 import jdk.vm.ci.meta.DeoptimizationAction;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/inlining/info/AbstractInlineInfo.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/inlining/info/AbstractInlineInfo.java
similarity index 84%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/inlining/info/AbstractInlineInfo.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/inlining/info/AbstractInlineInfo.java
index ff91555822c9..a6624b7d8b4b 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/inlining/info/AbstractInlineInfo.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/inlining/info/AbstractInlineInfo.java
@@ -22,18 +22,18 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.phases.common.inlining.info;
+package jdk.graal.compiler.phases.common.inlining.info;
 
-import jdk.compiler.graal.phases.common.inlining.info.elem.Inlineable;
+import jdk.graal.compiler.phases.common.inlining.info.elem.Inlineable;
 import org.graalvm.collections.EconomicSet;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.nodes.Invoke;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.common.CanonicalizerPhase;
-import jdk.compiler.graal.phases.common.inlining.InliningUtil;
-import jdk.compiler.graal.phases.common.inlining.info.elem.InlineableGraph;
-import jdk.compiler.graal.phases.tiers.HighTierContext;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.nodes.Invoke;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.common.CanonicalizerPhase;
+import jdk.graal.compiler.phases.common.inlining.InliningUtil;
+import jdk.graal.compiler.phases.common.inlining.info.elem.InlineableGraph;
+import jdk.graal.compiler.phases.tiers.HighTierContext;
 
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/inlining/info/AssumptionInlineInfo.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/inlining/info/AssumptionInlineInfo.java
similarity index 87%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/inlining/info/AssumptionInlineInfo.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/inlining/info/AssumptionInlineInfo.java
index 6f8e247195e3..da1d4e71aba4 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/inlining/info/AssumptionInlineInfo.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/inlining/info/AssumptionInlineInfo.java
@@ -22,15 +22,15 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.phases.common.inlining.info;
+package jdk.graal.compiler.phases.common.inlining.info;
 
 import org.graalvm.collections.EconomicSet;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.nodes.CallTargetNode.InvokeKind;
-import jdk.compiler.graal.nodes.Invoke;
-import jdk.compiler.graal.nodes.spi.CoreProviders;
-import jdk.compiler.graal.phases.common.inlining.InliningUtil;
-import jdk.compiler.graal.phases.util.Providers;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.nodes.CallTargetNode.InvokeKind;
+import jdk.graal.compiler.nodes.Invoke;
+import jdk.graal.compiler.nodes.spi.CoreProviders;
+import jdk.graal.compiler.phases.common.inlining.InliningUtil;
+import jdk.graal.compiler.phases.util.Providers;
 
 import jdk.vm.ci.meta.Assumptions.AssumptionResult;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/inlining/info/ExactInlineInfo.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/inlining/info/ExactInlineInfo.java
similarity index 91%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/inlining/info/ExactInlineInfo.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/inlining/info/ExactInlineInfo.java
index 3e51b460eeeb..6051242c7259 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/inlining/info/ExactInlineInfo.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/inlining/info/ExactInlineInfo.java
@@ -22,14 +22,14 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.phases.common.inlining.info;
+package jdk.graal.compiler.phases.common.inlining.info;
 
-import jdk.compiler.graal.phases.common.inlining.info.elem.Inlineable;
+import jdk.graal.compiler.phases.common.inlining.info.elem.Inlineable;
 import org.graalvm.collections.EconomicSet;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.nodes.Invoke;
-import jdk.compiler.graal.nodes.spi.CoreProviders;
-import jdk.compiler.graal.phases.util.Providers;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.nodes.Invoke;
+import jdk.graal.compiler.nodes.spi.CoreProviders;
+import jdk.graal.compiler.phases.util.Providers;
 
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/inlining/info/InlineInfo.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/inlining/info/InlineInfo.java
similarity index 85%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/inlining/info/InlineInfo.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/inlining/info/InlineInfo.java
index d4ca64f517ac..e04a05d5b40f 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/inlining/info/InlineInfo.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/inlining/info/InlineInfo.java
@@ -22,18 +22,18 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.phases.common.inlining.info;
+package jdk.graal.compiler.phases.common.inlining.info;
 
-import jdk.compiler.graal.phases.common.inlining.info.elem.Inlineable;
+import jdk.graal.compiler.phases.common.inlining.info.elem.Inlineable;
 import org.graalvm.collections.EconomicSet;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.nodes.Invoke;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.spi.CoreProviders;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.common.CanonicalizerPhase;
-import jdk.compiler.graal.phases.tiers.HighTierContext;
-import jdk.compiler.graal.phases.util.Providers;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.nodes.Invoke;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.spi.CoreProviders;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.common.CanonicalizerPhase;
+import jdk.graal.compiler.phases.tiers.HighTierContext;
+import jdk.graal.compiler.phases.util.Providers;
 
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/inlining/info/MultiTypeGuardInlineInfo.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/inlining/info/MultiTypeGuardInlineInfo.java
similarity index 93%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/inlining/info/MultiTypeGuardInlineInfo.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/inlining/info/MultiTypeGuardInlineInfo.java
index 5a46f7e6b414..c7469fb481e5 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/inlining/info/MultiTypeGuardInlineInfo.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/inlining/info/MultiTypeGuardInlineInfo.java
@@ -22,45 +22,45 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.phases.common.inlining.info;
+package jdk.graal.compiler.phases.common.inlining.info;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import jdk.compiler.graal.phases.common.inlining.info.elem.Inlineable;
+import jdk.graal.compiler.phases.common.inlining.info.elem.Inlineable;
 import org.graalvm.collections.EconomicSet;
 import org.graalvm.collections.Equivalence;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.nodes.AbstractBeginNode;
-import jdk.compiler.graal.nodes.AbstractMergeNode;
-import jdk.compiler.graal.nodes.BeginNode;
-import jdk.compiler.graal.nodes.CallTargetNode.InvokeKind;
-import jdk.compiler.graal.nodes.DeoptimizeNode;
-import jdk.compiler.graal.nodes.EndNode;
-import jdk.compiler.graal.nodes.FixedNode;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.FrameState;
-import jdk.compiler.graal.nodes.InliningLog;
-import jdk.compiler.graal.nodes.Invoke;
-import jdk.compiler.graal.nodes.InvokeWithExceptionNode;
-import jdk.compiler.graal.nodes.MergeNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.PhiNode;
-import jdk.compiler.graal.nodes.PiNode;
-import jdk.compiler.graal.nodes.ProfileData.SwitchProbabilityData;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.ValuePhiNode;
-import jdk.compiler.graal.nodes.extended.LoadHubNode;
-import jdk.compiler.graal.nodes.java.ExceptionObjectNode;
-import jdk.compiler.graal.nodes.java.MethodCallTargetNode;
-import jdk.compiler.graal.nodes.java.TypeSwitchNode;
-import jdk.compiler.graal.nodes.spi.CoreProviders;
-import jdk.compiler.graal.nodes.spi.StampProvider;
-import jdk.compiler.graal.nodes.util.GraphUtil;
-import jdk.compiler.graal.phases.common.inlining.InliningUtil;
-import jdk.compiler.graal.phases.util.Providers;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.nodes.AbstractBeginNode;
+import jdk.graal.compiler.nodes.AbstractMergeNode;
+import jdk.graal.compiler.nodes.BeginNode;
+import jdk.graal.compiler.nodes.CallTargetNode.InvokeKind;
+import jdk.graal.compiler.nodes.DeoptimizeNode;
+import jdk.graal.compiler.nodes.EndNode;
+import jdk.graal.compiler.nodes.FixedNode;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.FrameState;
+import jdk.graal.compiler.nodes.InliningLog;
+import jdk.graal.compiler.nodes.Invoke;
+import jdk.graal.compiler.nodes.InvokeWithExceptionNode;
+import jdk.graal.compiler.nodes.MergeNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.PhiNode;
+import jdk.graal.compiler.nodes.PiNode;
+import jdk.graal.compiler.nodes.ProfileData.SwitchProbabilityData;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.ValuePhiNode;
+import jdk.graal.compiler.nodes.extended.LoadHubNode;
+import jdk.graal.compiler.nodes.java.ExceptionObjectNode;
+import jdk.graal.compiler.nodes.java.MethodCallTargetNode;
+import jdk.graal.compiler.nodes.java.TypeSwitchNode;
+import jdk.graal.compiler.nodes.spi.CoreProviders;
+import jdk.graal.compiler.nodes.spi.StampProvider;
+import jdk.graal.compiler.nodes.util.GraphUtil;
+import jdk.graal.compiler.phases.common.inlining.InliningUtil;
+import jdk.graal.compiler.phases.util.Providers;
 
 import jdk.vm.ci.meta.ConstantReflectionProvider;
 import jdk.vm.ci.meta.DeoptimizationAction;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/inlining/info/TypeGuardInlineInfo.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/inlining/info/TypeGuardInlineInfo.java
similarity index 89%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/inlining/info/TypeGuardInlineInfo.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/inlining/info/TypeGuardInlineInfo.java
index f53a5da06894..a466b38daee6 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/inlining/info/TypeGuardInlineInfo.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/inlining/info/TypeGuardInlineInfo.java
@@ -22,16 +22,16 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.phases.common.inlining.info;
+package jdk.graal.compiler.phases.common.inlining.info;
 
-import jdk.compiler.graal.phases.common.inlining.info.elem.Inlineable;
+import jdk.graal.compiler.phases.common.inlining.info.elem.Inlineable;
 import org.graalvm.collections.EconomicSet;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.nodes.CallTargetNode.InvokeKind;
-import jdk.compiler.graal.nodes.Invoke;
-import jdk.compiler.graal.nodes.spi.CoreProviders;
-import jdk.compiler.graal.phases.common.inlining.InliningUtil;
-import jdk.compiler.graal.phases.util.Providers;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.nodes.CallTargetNode.InvokeKind;
+import jdk.graal.compiler.nodes.Invoke;
+import jdk.graal.compiler.nodes.spi.CoreProviders;
+import jdk.graal.compiler.phases.common.inlining.InliningUtil;
+import jdk.graal.compiler.phases.util.Providers;
 
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 import jdk.vm.ci.meta.ResolvedJavaType;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/inlining/info/elem/Inlineable.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/inlining/info/elem/Inlineable.java
similarity index 88%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/inlining/info/elem/Inlineable.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/inlining/info/elem/Inlineable.java
index 046cc634b2d2..8da20c3e86ca 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/inlining/info/elem/Inlineable.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/inlining/info/elem/Inlineable.java
@@ -22,11 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.phases.common.inlining.info.elem;
+package jdk.graal.compiler.phases.common.inlining.info.elem;
 
-import jdk.compiler.graal.nodes.Invoke;
-import jdk.compiler.graal.phases.common.CanonicalizerPhase;
-import jdk.compiler.graal.phases.tiers.HighTierContext;
+import jdk.graal.compiler.nodes.Invoke;
+import jdk.graal.compiler.phases.common.CanonicalizerPhase;
+import jdk.graal.compiler.phases.tiers.HighTierContext;
 
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/inlining/info/elem/InlineableGraph.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/inlining/info/elem/InlineableGraph.java
similarity index 89%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/inlining/info/elem/InlineableGraph.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/inlining/info/elem/InlineableGraph.java
index 12ed998584a8..d3b5ca3b2901 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/inlining/info/elem/InlineableGraph.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/inlining/info/elem/InlineableGraph.java
@@ -22,31 +22,31 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.phases.common.inlining.info.elem;
+package jdk.graal.compiler.phases.common.inlining.info.elem;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import jdk.compiler.graal.core.common.GraalOptions;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeInputList;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.Invoke;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ParameterNode;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.phases.common.CanonicalizerPhase;
-import jdk.compiler.graal.phases.common.DeadCodeEliminationPhase;
-import jdk.compiler.graal.phases.common.DominatorBasedGlobalValueNumberingPhase;
-import jdk.compiler.graal.phases.common.inlining.InliningUtil;
-import jdk.compiler.graal.phases.common.inlining.info.InlineInfo;
-import jdk.compiler.graal.phases.common.inlining.walker.CallsiteHolderExplorable;
-import jdk.compiler.graal.phases.common.inlining.walker.InliningData;
-import jdk.compiler.graal.phases.graph.FixedNodeRelativeFrequencyCache;
-import jdk.compiler.graal.phases.tiers.HighTierContext;
+import jdk.graal.compiler.core.common.GraalOptions;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeInputList;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.Invoke;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ParameterNode;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.phases.common.CanonicalizerPhase;
+import jdk.graal.compiler.phases.common.DeadCodeEliminationPhase;
+import jdk.graal.compiler.phases.common.DominatorBasedGlobalValueNumberingPhase;
+import jdk.graal.compiler.phases.common.inlining.InliningUtil;
+import jdk.graal.compiler.phases.common.inlining.info.InlineInfo;
+import jdk.graal.compiler.phases.common.inlining.walker.CallsiteHolderExplorable;
+import jdk.graal.compiler.phases.common.inlining.walker.InliningData;
+import jdk.graal.compiler.phases.graph.FixedNodeRelativeFrequencyCache;
+import jdk.graal.compiler.phases.tiers.HighTierContext;
 
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/inlining/policy/AbstractInliningPolicy.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/inlining/policy/AbstractInliningPolicy.java
similarity index 91%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/inlining/policy/AbstractInliningPolicy.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/inlining/policy/AbstractInliningPolicy.java
index e641b8290210..aba7256b8d26 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/inlining/policy/AbstractInliningPolicy.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/inlining/policy/AbstractInliningPolicy.java
@@ -22,17 +22,17 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.phases.common.inlining.policy;
+package jdk.graal.compiler.phases.common.inlining.policy;
 
-import static jdk.compiler.graal.phases.common.inlining.InliningPhase.Options.AlwaysInlineIntrinsics;
+import static jdk.graal.compiler.phases.common.inlining.InliningPhase.Options.AlwaysInlineIntrinsics;
 
 import java.util.Map;
 
-import jdk.compiler.graal.nodes.Invoke;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.spi.Replacements;
-import jdk.compiler.graal.phases.common.inlining.info.elem.Inlineable;
-import jdk.compiler.graal.phases.common.inlining.info.InlineInfo;
+import jdk.graal.compiler.nodes.Invoke;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.spi.Replacements;
+import jdk.graal.compiler.phases.common.inlining.info.elem.Inlineable;
+import jdk.graal.compiler.phases.common.inlining.info.InlineInfo;
 
 import jdk.vm.ci.meta.ProfilingInfo;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/inlining/policy/GreedyInliningPolicy.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/inlining/policy/GreedyInliningPolicy.java
similarity index 88%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/inlining/policy/GreedyInliningPolicy.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/inlining/policy/GreedyInliningPolicy.java
index c0621a989a2b..141927383510 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/inlining/policy/GreedyInliningPolicy.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/inlining/policy/GreedyInliningPolicy.java
@@ -22,27 +22,27 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.phases.common.inlining.policy;
+package jdk.graal.compiler.phases.common.inlining.policy;
 
-import static jdk.compiler.graal.core.common.GraalOptions.InlineEverything;
-import static jdk.compiler.graal.core.common.GraalOptions.LimitInlinedInvokes;
-import static jdk.compiler.graal.core.common.GraalOptions.MaximumDesiredSize;
-import static jdk.compiler.graal.core.common.GraalOptions.MaximumInliningSize;
-import static jdk.compiler.graal.core.common.GraalOptions.SmallCompiledLowLevelGraphSize;
-import static jdk.compiler.graal.core.common.GraalOptions.TraceInlining;
-import static jdk.compiler.graal.core.common.GraalOptions.TrivialInliningSize;
+import static jdk.graal.compiler.core.common.GraalOptions.InlineEverything;
+import static jdk.graal.compiler.core.common.GraalOptions.LimitInlinedInvokes;
+import static jdk.graal.compiler.core.common.GraalOptions.MaximumDesiredSize;
+import static jdk.graal.compiler.core.common.GraalOptions.MaximumInliningSize;
+import static jdk.graal.compiler.core.common.GraalOptions.SmallCompiledLowLevelGraphSize;
+import static jdk.graal.compiler.core.common.GraalOptions.TraceInlining;
+import static jdk.graal.compiler.core.common.GraalOptions.TrivialInliningSize;
 
 import java.util.Map;
 
-import jdk.compiler.graal.debug.CounterKey;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.nodes.Invoke;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.spi.Replacements;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.common.inlining.InliningUtil;
-import jdk.compiler.graal.phases.common.inlining.info.InlineInfo;
-import jdk.compiler.graal.phases.common.inlining.walker.MethodInvocation;
+import jdk.graal.compiler.debug.CounterKey;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.nodes.Invoke;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.spi.Replacements;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.common.inlining.InliningUtil;
+import jdk.graal.compiler.phases.common.inlining.info.InlineInfo;
+import jdk.graal.compiler.phases.common.inlining.walker.MethodInvocation;
 
 public class GreedyInliningPolicy extends AbstractInliningPolicy {
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/inlining/policy/InlineEverythingPolicy.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/inlining/policy/InlineEverythingPolicy.java
similarity index 79%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/inlining/policy/InlineEverythingPolicy.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/inlining/policy/InlineEverythingPolicy.java
index 545697eeeaef..ce52beb4fb9f 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/inlining/policy/InlineEverythingPolicy.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/inlining/policy/InlineEverythingPolicy.java
@@ -22,17 +22,17 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.phases.common.inlining.policy;
+package jdk.graal.compiler.phases.common.inlining.policy;
 
-import static jdk.compiler.graal.core.common.GraalOptions.MaximumDesiredSize;
+import static jdk.graal.compiler.core.common.GraalOptions.MaximumDesiredSize;
 
-import jdk.compiler.graal.core.common.GraalOptions;
-import jdk.compiler.graal.core.common.PermanentBailoutException;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.spi.Replacements;
-import jdk.compiler.graal.phases.common.inlining.InliningUtil;
-import jdk.compiler.graal.phases.common.inlining.info.InlineInfo;
-import jdk.compiler.graal.phases.common.inlining.walker.MethodInvocation;
+import jdk.graal.compiler.core.common.GraalOptions;
+import jdk.graal.compiler.core.common.PermanentBailoutException;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.spi.Replacements;
+import jdk.graal.compiler.phases.common.inlining.InliningUtil;
+import jdk.graal.compiler.phases.common.inlining.info.InlineInfo;
+import jdk.graal.compiler.phases.common.inlining.walker.MethodInvocation;
 
 public class InlineEverythingPolicy implements InliningPolicy {
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/inlining/policy/InlineMethodSubstitutionsPolicy.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/inlining/policy/InlineMethodSubstitutionsPolicy.java
similarity index 83%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/inlining/policy/InlineMethodSubstitutionsPolicy.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/inlining/policy/InlineMethodSubstitutionsPolicy.java
index 2829c0d6b30f..3ce979537ca5 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/inlining/policy/InlineMethodSubstitutionsPolicy.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/inlining/policy/InlineMethodSubstitutionsPolicy.java
@@ -22,15 +22,15 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.phases.common.inlining.policy;
+package jdk.graal.compiler.phases.common.inlining.policy;
 
-import jdk.compiler.graal.core.common.GraalOptions;
-import jdk.compiler.graal.nodes.CallTargetNode;
-import jdk.compiler.graal.nodes.java.MethodCallTargetNode;
-import jdk.compiler.graal.nodes.spi.Replacements;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.common.inlining.info.InlineInfo;
-import jdk.compiler.graal.phases.common.inlining.walker.MethodInvocation;
+import jdk.graal.compiler.core.common.GraalOptions;
+import jdk.graal.compiler.nodes.CallTargetNode;
+import jdk.graal.compiler.nodes.java.MethodCallTargetNode;
+import jdk.graal.compiler.nodes.spi.Replacements;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.common.inlining.info.InlineInfo;
+import jdk.graal.compiler.phases.common.inlining.walker.MethodInvocation;
 
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/inlining/policy/InliningPolicy.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/inlining/policy/InliningPolicy.java
similarity index 90%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/inlining/policy/InliningPolicy.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/inlining/policy/InliningPolicy.java
index aa56adf9e73d..1b7a9ea7604b 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/inlining/policy/InliningPolicy.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/inlining/policy/InliningPolicy.java
@@ -22,12 +22,12 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.phases.common.inlining.policy;
+package jdk.graal.compiler.phases.common.inlining.policy;
 
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.spi.Replacements;
-import jdk.compiler.graal.phases.common.inlining.info.InlineInfo;
-import jdk.compiler.graal.phases.common.inlining.walker.MethodInvocation;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.spi.Replacements;
+import jdk.graal.compiler.phases.common.inlining.info.InlineInfo;
+import jdk.graal.compiler.phases.common.inlining.walker.MethodInvocation;
 
 public interface InliningPolicy {
     final class Decision {
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/inlining/walker/CallsiteHolder.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/inlining/walker/CallsiteHolder.java
similarity index 95%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/inlining/walker/CallsiteHolder.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/inlining/walker/CallsiteHolder.java
index 3ffb5a984dd8..dd91135e4284 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/inlining/walker/CallsiteHolder.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/inlining/walker/CallsiteHolder.java
@@ -22,9 +22,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.phases.common.inlining.walker;
+package jdk.graal.compiler.phases.common.inlining.walker;
 
-import jdk.compiler.graal.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.StructuredGraph;
 
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/inlining/walker/CallsiteHolderExplorable.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/inlining/walker/CallsiteHolderExplorable.java
similarity index 93%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/inlining/walker/CallsiteHolderExplorable.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/inlining/walker/CallsiteHolderExplorable.java
index ea1c8a169b39..729e3836d538 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/inlining/walker/CallsiteHolderExplorable.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/inlining/walker/CallsiteHolderExplorable.java
@@ -22,22 +22,22 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.phases.common.inlining.walker;
+package jdk.graal.compiler.phases.common.inlining.walker;
 
 import java.util.BitSet;
 import java.util.LinkedList;
 import java.util.function.ToDoubleFunction;
 
-import jdk.compiler.graal.phases.common.inlining.info.elem.InlineableGraph;
-import jdk.compiler.graal.phases.common.inlining.policy.AbstractInliningPolicy;
+import jdk.graal.compiler.phases.common.inlining.info.elem.InlineableGraph;
+import jdk.graal.compiler.phases.common.inlining.policy.AbstractInliningPolicy;
 import org.graalvm.collections.EconomicSet;
 import org.graalvm.collections.Equivalence;
-import jdk.compiler.graal.nodes.FixedNode;
-import jdk.compiler.graal.nodes.Invoke;
-import jdk.compiler.graal.nodes.ParameterNode;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.phases.graph.FixedNodeRelativeFrequencyCache;
+import jdk.graal.compiler.nodes.FixedNode;
+import jdk.graal.compiler.nodes.Invoke;
+import jdk.graal.compiler.nodes.ParameterNode;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.phases.graph.FixedNodeRelativeFrequencyCache;
 
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/inlining/walker/ComputeInliningRelevance.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/inlining/walker/ComputeInliningRelevance.java
similarity index 93%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/inlining/walker/ComputeInliningRelevance.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/inlining/walker/ComputeInliningRelevance.java
index 200e62b128b6..3f206dc2d480 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/inlining/walker/ComputeInliningRelevance.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/inlining/walker/ComputeInliningRelevance.java
@@ -22,32 +22,32 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.phases.common.inlining.walker;
+package jdk.graal.compiler.phases.common.inlining.walker;
 
 import java.util.ArrayList;
 import java.util.function.ToDoubleFunction;
 
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.Equivalence;
-import jdk.compiler.graal.core.common.SuppressFBWarnings;
-import jdk.compiler.graal.core.common.util.CompilationAlarm;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeWorkList;
-import jdk.compiler.graal.nodes.AbstractBeginNode;
-import jdk.compiler.graal.nodes.AbstractMergeNode;
-import jdk.compiler.graal.nodes.ControlSinkNode;
-import jdk.compiler.graal.nodes.ControlSplitNode;
-import jdk.compiler.graal.nodes.EndNode;
-import jdk.compiler.graal.nodes.FixedNode;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.Invoke;
-import jdk.compiler.graal.nodes.LoopBeginNode;
-import jdk.compiler.graal.nodes.LoopEndNode;
-import jdk.compiler.graal.nodes.LoopExitNode;
-import jdk.compiler.graal.nodes.MergeNode;
-import jdk.compiler.graal.nodes.StartNode;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.phases.common.inlining.InliningUtil;
+import jdk.graal.compiler.core.common.SuppressFBWarnings;
+import jdk.graal.compiler.core.common.util.CompilationAlarm;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeWorkList;
+import jdk.graal.compiler.nodes.AbstractBeginNode;
+import jdk.graal.compiler.nodes.AbstractMergeNode;
+import jdk.graal.compiler.nodes.ControlSinkNode;
+import jdk.graal.compiler.nodes.ControlSplitNode;
+import jdk.graal.compiler.nodes.EndNode;
+import jdk.graal.compiler.nodes.FixedNode;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.Invoke;
+import jdk.graal.compiler.nodes.LoopBeginNode;
+import jdk.graal.compiler.nodes.LoopEndNode;
+import jdk.graal.compiler.nodes.LoopExitNode;
+import jdk.graal.compiler.nodes.MergeNode;
+import jdk.graal.compiler.nodes.StartNode;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.phases.common.inlining.InliningUtil;
 
 public class ComputeInliningRelevance {
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/inlining/walker/InliningData.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/inlining/walker/InliningData.java
similarity index 94%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/inlining/walker/InliningData.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/inlining/walker/InliningData.java
index 32bbb8609f14..d07b76a4a1cc 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/inlining/walker/InliningData.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/inlining/walker/InliningData.java
@@ -22,11 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.phases.common.inlining.walker;
+package jdk.graal.compiler.phases.common.inlining.walker;
 
-import static jdk.compiler.graal.core.common.GraalOptions.Intrinsify;
-import static jdk.compiler.graal.core.common.GraalOptions.MaximumRecursiveInlining;
-import static jdk.compiler.graal.core.common.GraalOptions.MegamorphicInliningMinMethodProbability;
+import static jdk.graal.compiler.core.common.GraalOptions.Intrinsify;
+import static jdk.graal.compiler.core.common.GraalOptions.MaximumRecursiveInlining;
+import static jdk.graal.compiler.core.common.GraalOptions.MegamorphicInliningMinMethodProbability;
 
 import java.util.ArrayDeque;
 import java.util.ArrayList;
@@ -34,39 +34,39 @@
 import java.util.Iterator;
 import java.util.LinkedList;
 
-import jdk.compiler.graal.nodes.spi.CoreProviders;
-import jdk.compiler.graal.phases.common.inlining.info.AssumptionInlineInfo;
-import jdk.compiler.graal.phases.common.inlining.info.ExactInlineInfo;
-import jdk.compiler.graal.phases.common.inlining.info.InlineInfo;
-import jdk.compiler.graal.phases.common.inlining.info.MultiTypeGuardInlineInfo;
-import jdk.compiler.graal.phases.common.inlining.info.TypeGuardInlineInfo;
-import jdk.compiler.graal.phases.common.inlining.info.elem.Inlineable;
-import jdk.compiler.graal.phases.common.inlining.policy.InliningPolicy;
+import jdk.graal.compiler.nodes.spi.CoreProviders;
+import jdk.graal.compiler.phases.common.inlining.info.AssumptionInlineInfo;
+import jdk.graal.compiler.phases.common.inlining.info.ExactInlineInfo;
+import jdk.graal.compiler.phases.common.inlining.info.InlineInfo;
+import jdk.graal.compiler.phases.common.inlining.info.MultiTypeGuardInlineInfo;
+import jdk.graal.compiler.phases.common.inlining.info.TypeGuardInlineInfo;
+import jdk.graal.compiler.phases.common.inlining.info.elem.Inlineable;
+import jdk.graal.compiler.phases.common.inlining.policy.InliningPolicy;
 import org.graalvm.collections.EconomicSet;
 import org.graalvm.collections.Equivalence;
-import jdk.compiler.graal.core.common.type.ObjectStamp;
-import jdk.compiler.graal.debug.CounterKey;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.Graph;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.nodes.CallTargetNode;
-import jdk.compiler.graal.nodes.CallTargetNode.InvokeKind;
-import jdk.compiler.graal.nodes.Invoke;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ParameterNode;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.java.AbstractNewObjectNode;
-import jdk.compiler.graal.nodes.java.MethodCallTargetNode;
-import jdk.compiler.graal.nodes.virtual.AllocatedObjectNode;
-import jdk.compiler.graal.nodes.virtual.VirtualObjectNode;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.OptimisticOptimizations;
-import jdk.compiler.graal.phases.common.CanonicalizerPhase;
-import jdk.compiler.graal.phases.common.inlining.InliningUtil;
-import jdk.compiler.graal.phases.common.inlining.info.elem.InlineableGraph;
-import jdk.compiler.graal.phases.tiers.HighTierContext;
+import jdk.graal.compiler.core.common.type.ObjectStamp;
+import jdk.graal.compiler.debug.CounterKey;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.Graph;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.nodes.CallTargetNode;
+import jdk.graal.compiler.nodes.CallTargetNode.InvokeKind;
+import jdk.graal.compiler.nodes.Invoke;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ParameterNode;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.java.AbstractNewObjectNode;
+import jdk.graal.compiler.nodes.java.MethodCallTargetNode;
+import jdk.graal.compiler.nodes.virtual.AllocatedObjectNode;
+import jdk.graal.compiler.nodes.virtual.VirtualObjectNode;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.OptimisticOptimizations;
+import jdk.graal.compiler.phases.common.CanonicalizerPhase;
+import jdk.graal.compiler.phases.common.inlining.InliningUtil;
+import jdk.graal.compiler.phases.common.inlining.info.elem.InlineableGraph;
+import jdk.graal.compiler.phases.tiers.HighTierContext;
 
 import jdk.vm.ci.code.BailoutException;
 import jdk.vm.ci.meta.Assumptions.AssumptionResult;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/inlining/walker/InliningIterator.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/inlining/walker/InliningIterator.java
similarity index 86%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/inlining/walker/InliningIterator.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/inlining/walker/InliningIterator.java
index eac0be6238a4..8d5f048b4f65 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/inlining/walker/InliningIterator.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/inlining/walker/InliningIterator.java
@@ -22,28 +22,28 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.phases.common.inlining.walker;
+package jdk.graal.compiler.phases.common.inlining.walker;
 
 import java.util.ArrayDeque;
 import java.util.Deque;
 import java.util.Iterator;
 import java.util.LinkedList;
 
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeBitMap;
-import jdk.compiler.graal.nodes.AbstractEndNode;
-import jdk.compiler.graal.nodes.AbstractMergeNode;
-import jdk.compiler.graal.nodes.ControlSinkNode;
-import jdk.compiler.graal.nodes.ControlSplitNode;
-import jdk.compiler.graal.nodes.EndNode;
-import jdk.compiler.graal.nodes.FixedNode;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.Invoke;
-import jdk.compiler.graal.nodes.LoopBeginNode;
-import jdk.compiler.graal.nodes.LoopEndNode;
-import jdk.compiler.graal.nodes.StartNode;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.java.MethodCallTargetNode;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeBitMap;
+import jdk.graal.compiler.nodes.AbstractEndNode;
+import jdk.graal.compiler.nodes.AbstractMergeNode;
+import jdk.graal.compiler.nodes.ControlSinkNode;
+import jdk.graal.compiler.nodes.ControlSplitNode;
+import jdk.graal.compiler.nodes.EndNode;
+import jdk.graal.compiler.nodes.FixedNode;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.Invoke;
+import jdk.graal.compiler.nodes.LoopBeginNode;
+import jdk.graal.compiler.nodes.LoopEndNode;
+import jdk.graal.compiler.nodes.StartNode;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.java.MethodCallTargetNode;
 
 /**
  * Given a graph, visit all fixed nodes in dominator-based order, collecting in the process the
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/inlining/walker/MethodInvocation.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/inlining/walker/MethodInvocation.java
similarity index 91%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/inlining/walker/MethodInvocation.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/inlining/walker/MethodInvocation.java
index 996ba3177e75..0c0562f32361 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/inlining/walker/MethodInvocation.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/inlining/walker/MethodInvocation.java
@@ -22,16 +22,16 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.phases.common.inlining.walker;
+package jdk.graal.compiler.phases.common.inlining.walker;
 
 import java.util.BitSet;
 
-import jdk.compiler.graal.nodes.CallTargetNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.java.MethodCallTargetNode;
-import jdk.compiler.graal.phases.common.inlining.info.InlineInfo;
-import jdk.compiler.graal.phases.common.inlining.info.elem.Inlineable;
-import jdk.compiler.graal.phases.common.inlining.info.elem.InlineableGraph;
+import jdk.graal.compiler.nodes.CallTargetNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.java.MethodCallTargetNode;
+import jdk.graal.compiler.phases.common.inlining.info.InlineInfo;
+import jdk.graal.compiler.phases.common.inlining.info.elem.Inlineable;
+import jdk.graal.compiler.phases.common.inlining.info.elem.InlineableGraph;
 
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/util/EconomicSetNodeEventListener.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/util/EconomicSetNodeEventListener.java
similarity index 91%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/util/EconomicSetNodeEventListener.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/util/EconomicSetNodeEventListener.java
index 793e7f79dcc2..766f87bcf896 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/util/EconomicSetNodeEventListener.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/util/EconomicSetNodeEventListener.java
@@ -22,18 +22,18 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.phases.common.util;
+package jdk.graal.compiler.phases.common.util;
 
 import java.util.EnumSet;
 import java.util.Set;
 
 import org.graalvm.collections.EconomicSet;
 import org.graalvm.collections.Equivalence;
-import jdk.compiler.graal.graph.Graph.NodeEvent;
-import jdk.compiler.graal.graph.Graph.NodeEventListener;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.Node.IndirectCanonicalization;
-import jdk.compiler.graal.nodes.AbstractBeginNode;
+import jdk.graal.compiler.graph.Graph.NodeEvent;
+import jdk.graal.compiler.graph.Graph.NodeEventListener;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.Node.IndirectCanonicalization;
+import jdk.graal.compiler.nodes.AbstractBeginNode;
 
 /**
  * A simple {@link NodeEventListener} implementation that accumulates event nodes in a
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/util/LoopUtility.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/util/LoopUtility.java
similarity index 81%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/util/LoopUtility.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/util/LoopUtility.java
index b5810a3916fd..0d44d1e19a33 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/util/LoopUtility.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/util/LoopUtility.java
@@ -22,29 +22,29 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.phases.common.util;
+package jdk.graal.compiler.phases.common.util;
 
 import java.util.EnumSet;
 
-import jdk.compiler.graal.core.common.type.IntegerStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.graph.Graph.NodeEvent;
-import jdk.compiler.graal.graph.Graph.NodeEventScope;
-import jdk.compiler.graal.nodes.LoopExitNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ProxyNode;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.ValuePhiNode;
-import jdk.compiler.graal.nodes.calc.AddNode;
-import jdk.compiler.graal.nodes.calc.IntegerConvertNode;
-import jdk.compiler.graal.nodes.calc.MulNode;
-import jdk.compiler.graal.nodes.loop.BasicInductionVariable;
-import jdk.compiler.graal.nodes.loop.InductionVariable;
-import jdk.compiler.graal.nodes.loop.LoopEx;
-import jdk.compiler.graal.nodes.loop.LoopsData;
-import jdk.compiler.graal.nodes.spi.CoreProviders;
-import jdk.compiler.graal.phases.common.CanonicalizerPhase;
+import jdk.graal.compiler.core.common.type.IntegerStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.graph.Graph.NodeEvent;
+import jdk.graal.compiler.graph.Graph.NodeEventScope;
+import jdk.graal.compiler.nodes.LoopExitNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ProxyNode;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.ValuePhiNode;
+import jdk.graal.compiler.nodes.calc.AddNode;
+import jdk.graal.compiler.nodes.calc.IntegerConvertNode;
+import jdk.graal.compiler.nodes.calc.MulNode;
+import jdk.graal.compiler.nodes.loop.BasicInductionVariable;
+import jdk.graal.compiler.nodes.loop.InductionVariable;
+import jdk.graal.compiler.nodes.loop.LoopEx;
+import jdk.graal.compiler.nodes.loop.LoopsData;
+import jdk.graal.compiler.nodes.spi.CoreProviders;
+import jdk.graal.compiler.phases.common.CanonicalizerPhase;
 
 public class LoopUtility {
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/util/OptimizationUtility.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/util/OptimizationUtility.java
similarity index 93%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/util/OptimizationUtility.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/util/OptimizationUtility.java
index a355cdff2ed5..81f1997535cf 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/util/OptimizationUtility.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/util/OptimizationUtility.java
@@ -22,11 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.phases.common.util;
+package jdk.graal.compiler.phases.common.util;
 
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.options.Option;
-import jdk.compiler.graal.options.OptionKey;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.options.Option;
+import jdk.graal.compiler.options.OptionKey;
 
 public class OptimizationUtility {
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/contract/NodeCostUtil.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/contract/NodeCostUtil.java
similarity index 91%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/contract/NodeCostUtil.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/contract/NodeCostUtil.java
index 22b1c84c41b3..d6630b02c982 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/contract/NodeCostUtil.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/contract/NodeCostUtil.java
@@ -22,23 +22,23 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.phases.contract;
+package jdk.graal.compiler.phases.contract;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.function.Function;
 
-import jdk.compiler.graal.core.common.cfg.BlockMap;
-import jdk.compiler.graal.debug.CounterKey;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.graph.GraalGraphError;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.nodes.FixedNode;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.cfg.HIRBlock;
-import jdk.compiler.graal.nodes.cfg.ControlFlowGraph;
-import jdk.compiler.graal.phases.BasePhase;
-import jdk.compiler.graal.phases.schedule.SchedulePhase;
+import jdk.graal.compiler.core.common.cfg.BlockMap;
+import jdk.graal.compiler.debug.CounterKey;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.graph.GraalGraphError;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.nodes.FixedNode;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.cfg.HIRBlock;
+import jdk.graal.compiler.nodes.cfg.ControlFlowGraph;
+import jdk.graal.compiler.phases.BasePhase;
+import jdk.graal.compiler.phases.schedule.SchedulePhase;
 
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/contract/PhaseSizeContract.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/contract/PhaseSizeContract.java
similarity index 94%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/contract/PhaseSizeContract.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/contract/PhaseSizeContract.java
index 1029e93e732c..7ec99e5cba25 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/contract/PhaseSizeContract.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/contract/PhaseSizeContract.java
@@ -22,9 +22,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.phases.contract;
+package jdk.graal.compiler.phases.contract;
 
-import jdk.compiler.graal.nodeinfo.NodeSize;
+import jdk.graal.compiler.nodeinfo.NodeSize;
 
 public interface PhaseSizeContract {
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/contract/VerifyNodeCosts.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/contract/VerifyNodeCosts.java
similarity index 92%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/contract/VerifyNodeCosts.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/contract/VerifyNodeCosts.java
index 2470aea23f31..04159f321b5a 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/contract/VerifyNodeCosts.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/contract/VerifyNodeCosts.java
@@ -22,19 +22,19 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.phases.contract;
+package jdk.graal.compiler.phases.contract;
 
 import java.lang.reflect.Modifier;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.function.Predicate;
 
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeCycles;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodeinfo.NodeSize;
-import jdk.compiler.graal.phases.VerifyPhase;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeCycles;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodeinfo.NodeSize;
+import jdk.graal.compiler.phases.VerifyPhase;
 
 /**
  * Utility class that verifies that every {@link Class} extending {@link Node} specifies non default
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/graph/FixedNodeRelativeFrequencyCache.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/graph/FixedNodeRelativeFrequencyCache.java
similarity index 88%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/graph/FixedNodeRelativeFrequencyCache.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/graph/FixedNodeRelativeFrequencyCache.java
index 23de6e9c72ff..a8ca3b7bb8ea 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/graph/FixedNodeRelativeFrequencyCache.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/graph/FixedNodeRelativeFrequencyCache.java
@@ -22,29 +22,29 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.phases.graph;
+package jdk.graal.compiler.phases.graph;
 
-import static jdk.compiler.graal.nodes.cfg.ControlFlowGraph.multiplyRelativeFrequencies;
+import static jdk.graal.compiler.nodes.cfg.ControlFlowGraph.multiplyRelativeFrequencies;
 
 import java.util.function.ToDoubleFunction;
 
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.Equivalence;
-import jdk.compiler.graal.core.common.util.CompilationAlarm;
-import jdk.compiler.graal.debug.CounterKey;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.graph.Graph;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeInputList;
-import jdk.compiler.graal.nodes.AbstractBeginNode;
-import jdk.compiler.graal.nodes.AbstractEndNode;
-import jdk.compiler.graal.nodes.AbstractMergeNode;
-import jdk.compiler.graal.nodes.ControlSplitNode;
-import jdk.compiler.graal.nodes.EndNode;
-import jdk.compiler.graal.nodes.FixedNode;
-import jdk.compiler.graal.nodes.LoopBeginNode;
-import jdk.compiler.graal.nodes.StartNode;
-import jdk.compiler.graal.nodes.cfg.ControlFlowGraph;
+import jdk.graal.compiler.core.common.util.CompilationAlarm;
+import jdk.graal.compiler.debug.CounterKey;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.graph.Graph;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeInputList;
+import jdk.graal.compiler.nodes.AbstractBeginNode;
+import jdk.graal.compiler.nodes.AbstractEndNode;
+import jdk.graal.compiler.nodes.AbstractMergeNode;
+import jdk.graal.compiler.nodes.ControlSplitNode;
+import jdk.graal.compiler.nodes.EndNode;
+import jdk.graal.compiler.nodes.FixedNode;
+import jdk.graal.compiler.nodes.LoopBeginNode;
+import jdk.graal.compiler.nodes.StartNode;
+import jdk.graal.compiler.nodes.cfg.ControlFlowGraph;
 
 /**
  * Compute relative frequencies for fixed nodes on the fly and cache them at
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/graph/MergeableState.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/graph/MergeableState.java
similarity index 90%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/graph/MergeableState.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/graph/MergeableState.java
index e69c291d7543..e72edacfeaab 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/graph/MergeableState.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/graph/MergeableState.java
@@ -22,15 +22,15 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.phases.graph;
+package jdk.graal.compiler.phases.graph;
 
 import java.util.List;
 
-import jdk.compiler.graal.nodes.AbstractBeginNode;
-import jdk.compiler.graal.nodes.AbstractMergeNode;
-import jdk.compiler.graal.nodes.ControlSplitNode;
-import jdk.compiler.graal.nodes.LoopBeginNode;
-import jdk.compiler.graal.nodes.LoopEndNode;
+import jdk.graal.compiler.nodes.AbstractBeginNode;
+import jdk.graal.compiler.nodes.AbstractMergeNode;
+import jdk.graal.compiler.nodes.ControlSplitNode;
+import jdk.graal.compiler.nodes.LoopBeginNode;
+import jdk.graal.compiler.nodes.LoopEndNode;
 
 public abstract class MergeableState {
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/graph/PostOrderNodeIterator.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/graph/PostOrderNodeIterator.java
similarity index 92%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/graph/PostOrderNodeIterator.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/graph/PostOrderNodeIterator.java
index 34c3afc21a96..1e3b1ec63e9c 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/graph/PostOrderNodeIterator.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/graph/PostOrderNodeIterator.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.phases.graph;
+package jdk.graal.compiler.phases.graph;
 
 import java.util.ArrayDeque;
 import java.util.ArrayList;
@@ -31,19 +31,19 @@
 
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.Equivalence;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeBitMap;
-import jdk.compiler.graal.nodes.AbstractBeginNode;
-import jdk.compiler.graal.nodes.AbstractMergeNode;
-import jdk.compiler.graal.nodes.ControlSinkNode;
-import jdk.compiler.graal.nodes.ControlSplitNode;
-import jdk.compiler.graal.nodes.EndNode;
-import jdk.compiler.graal.nodes.FixedNode;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.InvokeWithExceptionNode;
-import jdk.compiler.graal.nodes.LoopBeginNode;
-import jdk.compiler.graal.nodes.LoopEndNode;
-import jdk.compiler.graal.nodes.StructuredGraph;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeBitMap;
+import jdk.graal.compiler.nodes.AbstractBeginNode;
+import jdk.graal.compiler.nodes.AbstractMergeNode;
+import jdk.graal.compiler.nodes.ControlSinkNode;
+import jdk.graal.compiler.nodes.ControlSplitNode;
+import jdk.graal.compiler.nodes.EndNode;
+import jdk.graal.compiler.nodes.FixedNode;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.InvokeWithExceptionNode;
+import jdk.graal.compiler.nodes.LoopBeginNode;
+import jdk.graal.compiler.nodes.LoopEndNode;
+import jdk.graal.compiler.nodes.StructuredGraph;
 
 /**
  * A PostOrderNodeIterator iterates the fixed nodes of the graph in post order starting from a
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/graph/ReentrantBlockIterator.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/graph/ReentrantBlockIterator.java
similarity index 95%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/graph/ReentrantBlockIterator.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/graph/ReentrantBlockIterator.java
index 82ab542a89b1..51ef2397bd02 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/graph/ReentrantBlockIterator.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/graph/ReentrantBlockIterator.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.phases.graph;
+package jdk.graal.compiler.phases.graph;
 
 import java.util.ArrayDeque;
 import java.util.ArrayList;
@@ -32,16 +32,16 @@
 
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.Equivalence;
-import jdk.compiler.graal.core.common.PermanentBailoutException;
-import jdk.compiler.graal.core.common.cfg.Loop;
-import jdk.compiler.graal.core.common.util.CompilationAlarm;
-import jdk.compiler.graal.nodes.AbstractEndNode;
-import jdk.compiler.graal.nodes.AbstractMergeNode;
-import jdk.compiler.graal.nodes.FixedNode;
-import jdk.compiler.graal.nodes.LoopBeginNode;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.cfg.ControlFlowGraph;
-import jdk.compiler.graal.nodes.cfg.HIRBlock;
+import jdk.graal.compiler.core.common.PermanentBailoutException;
+import jdk.graal.compiler.core.common.cfg.Loop;
+import jdk.graal.compiler.core.common.util.CompilationAlarm;
+import jdk.graal.compiler.nodes.AbstractEndNode;
+import jdk.graal.compiler.nodes.AbstractMergeNode;
+import jdk.graal.compiler.nodes.FixedNode;
+import jdk.graal.compiler.nodes.LoopBeginNode;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.cfg.ControlFlowGraph;
+import jdk.graal.compiler.nodes.cfg.HIRBlock;
 
 public final class ReentrantBlockIterator {
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/graph/ReentrantNodeIterator.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/graph/ReentrantNodeIterator.java
similarity index 94%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/graph/ReentrantNodeIterator.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/graph/ReentrantNodeIterator.java
index e6f1709ac3af..e98e2aaf0331 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/graph/ReentrantNodeIterator.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/graph/ReentrantNodeIterator.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.phases.graph;
+package jdk.graal.compiler.phases.graph;
 
 import java.util.ArrayDeque;
 import java.util.ArrayList;
@@ -33,17 +33,17 @@
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.Equivalence;
 import org.graalvm.collections.MapCursor;
-import jdk.compiler.graal.core.common.util.CompilationAlarm;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.nodes.AbstractBeginNode;
-import jdk.compiler.graal.nodes.AbstractEndNode;
-import jdk.compiler.graal.nodes.AbstractMergeNode;
-import jdk.compiler.graal.nodes.EndNode;
-import jdk.compiler.graal.nodes.FixedNode;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.LoopBeginNode;
-import jdk.compiler.graal.nodes.LoopEndNode;
-import jdk.compiler.graal.nodes.LoopExitNode;
+import jdk.graal.compiler.core.common.util.CompilationAlarm;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.nodes.AbstractBeginNode;
+import jdk.graal.compiler.nodes.AbstractEndNode;
+import jdk.graal.compiler.nodes.AbstractMergeNode;
+import jdk.graal.compiler.nodes.EndNode;
+import jdk.graal.compiler.nodes.FixedNode;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.LoopBeginNode;
+import jdk.graal.compiler.nodes.LoopEndNode;
+import jdk.graal.compiler.nodes.LoopExitNode;
 
 public final class ReentrantNodeIterator {
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/graph/ScheduledNodeIterator.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/graph/ScheduledNodeIterator.java
similarity index 91%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/graph/ScheduledNodeIterator.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/graph/ScheduledNodeIterator.java
index 1166e9d900f5..bf66d2bc7637 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/graph/ScheduledNodeIterator.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/graph/ScheduledNodeIterator.java
@@ -22,15 +22,15 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.phases.graph;
+package jdk.graal.compiler.phases.graph;
 
 import java.util.ListIterator;
 
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.nodes.FixedNode;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.StructuredGraph.ScheduleResult;
-import jdk.compiler.graal.nodes.cfg.HIRBlock;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.nodes.FixedNode;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.StructuredGraph.ScheduleResult;
+import jdk.graal.compiler.nodes.cfg.HIRBlock;
 
 /**
  * Iterates over a list of nodes, which usually comes from
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/graph/StatelessPostOrderNodeIterator.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/graph/StatelessPostOrderNodeIterator.java
similarity index 89%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/graph/StatelessPostOrderNodeIterator.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/graph/StatelessPostOrderNodeIterator.java
index 6b2354050685..0c9bba37314c 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/graph/StatelessPostOrderNodeIterator.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/graph/StatelessPostOrderNodeIterator.java
@@ -22,22 +22,22 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.phases.graph;
+package jdk.graal.compiler.phases.graph;
 
 import java.util.ArrayDeque;
 import java.util.Deque;
 
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeBitMap;
-import jdk.compiler.graal.nodes.AbstractBeginNode;
-import jdk.compiler.graal.nodes.AbstractMergeNode;
-import jdk.compiler.graal.nodes.ControlSinkNode;
-import jdk.compiler.graal.nodes.ControlSplitNode;
-import jdk.compiler.graal.nodes.EndNode;
-import jdk.compiler.graal.nodes.FixedNode;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.LoopBeginNode;
-import jdk.compiler.graal.nodes.LoopEndNode;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeBitMap;
+import jdk.graal.compiler.nodes.AbstractBeginNode;
+import jdk.graal.compiler.nodes.AbstractMergeNode;
+import jdk.graal.compiler.nodes.ControlSinkNode;
+import jdk.graal.compiler.nodes.ControlSplitNode;
+import jdk.graal.compiler.nodes.EndNode;
+import jdk.graal.compiler.nodes.FixedNode;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.LoopBeginNode;
+import jdk.graal.compiler.nodes.LoopEndNode;
 
 /**
  * This iterator implements a reverse post order iteration over the fixed nodes in the graph,
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/graph/package-info.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/graph/package-info.java
similarity index 96%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/graph/package-info.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/graph/package-info.java
index 30984bebabd4..c77d3d4c5aa0 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/graph/package-info.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/graph/package-info.java
@@ -26,4 +26,4 @@
 /**
  *
  */
-package jdk.compiler.graal.phases.graph;
+package jdk.graal.compiler.phases.graph;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/package-info.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/package-info.java
similarity index 97%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/package-info.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/package-info.java
index 572c279deba0..48a64322a316 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/package-info.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/package-info.java
@@ -29,4 +29,4 @@
  * Graal is intended to be used with multiple JVM's so makes no use of or reference to classes for a
  * specific JVM.
  */
-package jdk.compiler.graal.phases;
+package jdk.graal.compiler.phases;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/schedule/BlockClosure.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/schedule/BlockClosure.java
similarity index 93%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/schedule/BlockClosure.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/schedule/BlockClosure.java
index 77136ac4e7b1..5f7303d4eacf 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/schedule/BlockClosure.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/schedule/BlockClosure.java
@@ -22,9 +22,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.phases.schedule;
+package jdk.graal.compiler.phases.schedule;
 
-import jdk.compiler.graal.nodes.cfg.HIRBlock;
+import jdk.graal.compiler.nodes.cfg.HIRBlock;
 
 /**
  * The {@code BlockClosure} interface represents a closure for iterating over blocks.
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/schedule/SchedulePhase.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/schedule/SchedulePhase.java
similarity index 95%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/schedule/SchedulePhase.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/schedule/SchedulePhase.java
index 3a1545e228a6..6cb4d16815a5 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/schedule/SchedulePhase.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/schedule/SchedulePhase.java
@@ -22,11 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.phases.schedule;
+package jdk.graal.compiler.phases.schedule;
 
 import static org.graalvm.collections.Equivalence.IDENTITY;
-import static jdk.compiler.graal.core.common.GraalOptions.GuardPriorities;
-import static jdk.compiler.graal.core.common.GraalOptions.OptScheduleOutOfLoops;
+import static jdk.graal.compiler.core.common.GraalOptions.GuardPriorities;
+import static jdk.graal.compiler.core.common.GraalOptions.OptScheduleOutOfLoops;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -40,59 +40,59 @@
 import java.util.TreeSet;
 import java.util.function.Function;
 
-import jdk.compiler.graal.phases.BasePhase;
+import jdk.graal.compiler.phases.BasePhase;
 import org.graalvm.collections.EconomicSet;
-import jdk.compiler.graal.core.common.SuppressFBWarnings;
-import jdk.compiler.graal.core.common.cfg.AbstractControlFlowGraph;
-import jdk.compiler.graal.core.common.cfg.BlockMap;
-import jdk.compiler.graal.core.common.util.CompilationAlarm;
-import jdk.compiler.graal.debug.Assertions;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.Graph.NodeEvent;
-import jdk.compiler.graal.graph.Graph.NodeEventListener;
-import jdk.compiler.graal.graph.Graph.NodeEventScope;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeBitMap;
-import jdk.compiler.graal.graph.NodeMap;
-import jdk.compiler.graal.graph.NodeStack;
-import jdk.compiler.graal.nodes.AbstractBeginNode;
-import jdk.compiler.graal.nodes.AbstractEndNode;
-import jdk.compiler.graal.nodes.AbstractMergeNode;
-import jdk.compiler.graal.nodes.ControlSinkNode;
-import jdk.compiler.graal.nodes.ControlSplitNode;
-import jdk.compiler.graal.nodes.DeoptimizeNode;
-import jdk.compiler.graal.nodes.FixedNode;
-import jdk.compiler.graal.nodes.FrameState;
-import jdk.compiler.graal.nodes.GraphState;
-import jdk.compiler.graal.nodes.GraphState.GuardsStage;
-import jdk.compiler.graal.nodes.GraphState.StageFlag;
-import jdk.compiler.graal.nodes.GuardNode;
-import jdk.compiler.graal.nodes.IfNode;
-import jdk.compiler.graal.nodes.LoopBeginNode;
-import jdk.compiler.graal.nodes.LoopExitNode;
-import jdk.compiler.graal.nodes.PhiNode;
-import jdk.compiler.graal.nodes.ProxyNode;
-import jdk.compiler.graal.nodes.StartNode;
-import jdk.compiler.graal.nodes.StaticDeoptimizingNode;
-import jdk.compiler.graal.nodes.StaticDeoptimizingNode.GuardPriority;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.StructuredGraph.ScheduleResult;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.VirtualState;
-import jdk.compiler.graal.nodes.calc.ConvertNode;
-import jdk.compiler.graal.nodes.calc.IsNullNode;
-import jdk.compiler.graal.nodes.cfg.ControlFlowGraph;
-import jdk.compiler.graal.nodes.cfg.HIRBlock;
-import jdk.compiler.graal.nodes.cfg.HIRLoop;
-import jdk.compiler.graal.nodes.cfg.LocationSet;
-import jdk.compiler.graal.nodes.memory.FloatingReadNode;
-import jdk.compiler.graal.nodes.memory.MemoryKill;
-import jdk.compiler.graal.nodes.memory.MultiMemoryKill;
-import jdk.compiler.graal.nodes.memory.SingleMemoryKill;
-import jdk.compiler.graal.nodes.spi.CoreProviders;
-import jdk.compiler.graal.nodes.spi.ValueProxy;
-import jdk.compiler.graal.nodes.virtual.AllocatedObjectNode;
-import jdk.compiler.graal.options.OptionValues;
+import jdk.graal.compiler.core.common.SuppressFBWarnings;
+import jdk.graal.compiler.core.common.cfg.AbstractControlFlowGraph;
+import jdk.graal.compiler.core.common.cfg.BlockMap;
+import jdk.graal.compiler.core.common.util.CompilationAlarm;
+import jdk.graal.compiler.debug.Assertions;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.Graph.NodeEvent;
+import jdk.graal.compiler.graph.Graph.NodeEventListener;
+import jdk.graal.compiler.graph.Graph.NodeEventScope;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeBitMap;
+import jdk.graal.compiler.graph.NodeMap;
+import jdk.graal.compiler.graph.NodeStack;
+import jdk.graal.compiler.nodes.AbstractBeginNode;
+import jdk.graal.compiler.nodes.AbstractEndNode;
+import jdk.graal.compiler.nodes.AbstractMergeNode;
+import jdk.graal.compiler.nodes.ControlSinkNode;
+import jdk.graal.compiler.nodes.ControlSplitNode;
+import jdk.graal.compiler.nodes.DeoptimizeNode;
+import jdk.graal.compiler.nodes.FixedNode;
+import jdk.graal.compiler.nodes.FrameState;
+import jdk.graal.compiler.nodes.GraphState;
+import jdk.graal.compiler.nodes.GraphState.GuardsStage;
+import jdk.graal.compiler.nodes.GraphState.StageFlag;
+import jdk.graal.compiler.nodes.GuardNode;
+import jdk.graal.compiler.nodes.IfNode;
+import jdk.graal.compiler.nodes.LoopBeginNode;
+import jdk.graal.compiler.nodes.LoopExitNode;
+import jdk.graal.compiler.nodes.PhiNode;
+import jdk.graal.compiler.nodes.ProxyNode;
+import jdk.graal.compiler.nodes.StartNode;
+import jdk.graal.compiler.nodes.StaticDeoptimizingNode;
+import jdk.graal.compiler.nodes.StaticDeoptimizingNode.GuardPriority;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.StructuredGraph.ScheduleResult;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.VirtualState;
+import jdk.graal.compiler.nodes.calc.ConvertNode;
+import jdk.graal.compiler.nodes.calc.IsNullNode;
+import jdk.graal.compiler.nodes.cfg.ControlFlowGraph;
+import jdk.graal.compiler.nodes.cfg.HIRBlock;
+import jdk.graal.compiler.nodes.cfg.HIRLoop;
+import jdk.graal.compiler.nodes.cfg.LocationSet;
+import jdk.graal.compiler.nodes.memory.FloatingReadNode;
+import jdk.graal.compiler.nodes.memory.MemoryKill;
+import jdk.graal.compiler.nodes.memory.MultiMemoryKill;
+import jdk.graal.compiler.nodes.memory.SingleMemoryKill;
+import jdk.graal.compiler.nodes.spi.CoreProviders;
+import jdk.graal.compiler.nodes.spi.ValueProxy;
+import jdk.graal.compiler.nodes.virtual.AllocatedObjectNode;
+import jdk.graal.compiler.options.OptionValues;
 import org.graalvm.word.LocationIdentity;
 
 public final class SchedulePhase extends BasePhase {
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/schedule/ScheduleVerification.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/schedule/ScheduleVerification.java
similarity index 89%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/schedule/ScheduleVerification.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/schedule/ScheduleVerification.java
index 2902d35436e5..9dcaeceaedd8 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/schedule/ScheduleVerification.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/schedule/ScheduleVerification.java
@@ -22,41 +22,41 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.phases.schedule;
+package jdk.graal.compiler.phases.schedule;
 
 import java.util.ArrayDeque;
 import java.util.List;
 
-import jdk.compiler.graal.phases.graph.ReentrantBlockIterator;
+import jdk.graal.compiler.phases.graph.ReentrantBlockIterator;
 import org.graalvm.collections.EconomicSet;
 import org.graalvm.collections.Equivalence;
-import jdk.compiler.graal.core.common.cfg.BlockMap;
-import jdk.compiler.graal.core.common.cfg.Loop;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeBitMap;
-import jdk.compiler.graal.graph.NodeMap;
-import jdk.compiler.graal.nodes.AbstractBeginNode;
-import jdk.compiler.graal.nodes.AbstractMergeNode;
-import jdk.compiler.graal.nodes.CallTargetNode;
-import jdk.compiler.graal.nodes.GraphState.StageFlag;
-import jdk.compiler.graal.nodes.GuardNode;
-import jdk.compiler.graal.nodes.LoopBeginNode;
-import jdk.compiler.graal.nodes.LoopExitNode;
-import jdk.compiler.graal.nodes.MemoryProxyNode;
-import jdk.compiler.graal.nodes.PhiNode;
-import jdk.compiler.graal.nodes.ProxyNode;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.VirtualState;
-import jdk.compiler.graal.nodes.calc.FloatingNode;
-import jdk.compiler.graal.nodes.cfg.HIRBlock;
-import jdk.compiler.graal.nodes.cfg.HIRLoop;
-import jdk.compiler.graal.nodes.memory.FloatingReadNode;
-import jdk.compiler.graal.nodes.memory.MemoryAccess;
-import jdk.compiler.graal.nodes.memory.MemoryKill;
-import jdk.compiler.graal.nodes.memory.MemoryPhiNode;
-import jdk.compiler.graal.nodes.memory.MultiMemoryKill;
-import jdk.compiler.graal.nodes.memory.SingleMemoryKill;
+import jdk.graal.compiler.core.common.cfg.BlockMap;
+import jdk.graal.compiler.core.common.cfg.Loop;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeBitMap;
+import jdk.graal.compiler.graph.NodeMap;
+import jdk.graal.compiler.nodes.AbstractBeginNode;
+import jdk.graal.compiler.nodes.AbstractMergeNode;
+import jdk.graal.compiler.nodes.CallTargetNode;
+import jdk.graal.compiler.nodes.GraphState.StageFlag;
+import jdk.graal.compiler.nodes.GuardNode;
+import jdk.graal.compiler.nodes.LoopBeginNode;
+import jdk.graal.compiler.nodes.LoopExitNode;
+import jdk.graal.compiler.nodes.MemoryProxyNode;
+import jdk.graal.compiler.nodes.PhiNode;
+import jdk.graal.compiler.nodes.ProxyNode;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.VirtualState;
+import jdk.graal.compiler.nodes.calc.FloatingNode;
+import jdk.graal.compiler.nodes.cfg.HIRBlock;
+import jdk.graal.compiler.nodes.cfg.HIRLoop;
+import jdk.graal.compiler.nodes.memory.FloatingReadNode;
+import jdk.graal.compiler.nodes.memory.MemoryAccess;
+import jdk.graal.compiler.nodes.memory.MemoryKill;
+import jdk.graal.compiler.nodes.memory.MemoryPhiNode;
+import jdk.graal.compiler.nodes.memory.MultiMemoryKill;
+import jdk.graal.compiler.nodes.memory.SingleMemoryKill;
 import org.graalvm.word.LocationIdentity;
 
 /**
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/tiers/CompilerConfiguration.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/tiers/CompilerConfiguration.java
similarity index 80%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/tiers/CompilerConfiguration.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/tiers/CompilerConfiguration.java
index 0d779ae73ef9..7f68c64c5f31 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/tiers/CompilerConfiguration.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/tiers/CompilerConfiguration.java
@@ -22,17 +22,17 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.phases.tiers;
-
-import jdk.compiler.graal.lir.phases.AllocationPhase.AllocationContext;
-import jdk.compiler.graal.lir.phases.FinalCodeAnalysisPhase.FinalCodeAnalysisContext;
-import jdk.compiler.graal.lir.phases.LIRPhaseSuite;
-import jdk.compiler.graal.lir.phases.PostAllocationOptimizationPhase.PostAllocationOptimizationContext;
-import jdk.compiler.graal.lir.phases.PreAllocationOptimizationPhase.PreAllocationOptimizationContext;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
-import jdk.compiler.graal.nodes.spi.Replacements;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.PhaseSuite;
+package jdk.graal.compiler.phases.tiers;
+
+import jdk.graal.compiler.lir.phases.AllocationPhase.AllocationContext;
+import jdk.graal.compiler.lir.phases.FinalCodeAnalysisPhase.FinalCodeAnalysisContext;
+import jdk.graal.compiler.lir.phases.LIRPhaseSuite;
+import jdk.graal.compiler.lir.phases.PostAllocationOptimizationPhase.PostAllocationOptimizationContext;
+import jdk.graal.compiler.lir.phases.PreAllocationOptimizationPhase.PreAllocationOptimizationContext;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
+import jdk.graal.compiler.nodes.spi.Replacements;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.PhaseSuite;
 
 import jdk.vm.ci.code.Architecture;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/tiers/HighTierContext.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/tiers/HighTierContext.java
similarity index 88%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/tiers/HighTierContext.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/tiers/HighTierContext.java
index fe1d9ae065fd..76a98ed57121 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/tiers/HighTierContext.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/tiers/HighTierContext.java
@@ -22,12 +22,12 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.phases.tiers;
+package jdk.graal.compiler.phases.tiers;
 
-import jdk.compiler.graal.nodes.spi.CoreProvidersDelegate;
-import jdk.compiler.graal.phases.OptimisticOptimizations;
-import jdk.compiler.graal.phases.PhaseSuite;
-import jdk.compiler.graal.phases.util.Providers;
+import jdk.graal.compiler.nodes.spi.CoreProvidersDelegate;
+import jdk.graal.compiler.phases.OptimisticOptimizations;
+import jdk.graal.compiler.phases.PhaseSuite;
+import jdk.graal.compiler.phases.util.Providers;
 
 public class HighTierContext extends CoreProvidersDelegate {
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/tiers/LowTierContext.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/tiers/LowTierContext.java
similarity index 91%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/tiers/LowTierContext.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/tiers/LowTierContext.java
index accab500cf66..adbbdfad16f8 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/tiers/LowTierContext.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/tiers/LowTierContext.java
@@ -22,10 +22,10 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.phases.tiers;
+package jdk.graal.compiler.phases.tiers;
 
-import jdk.compiler.graal.nodes.spi.CoreProvidersDelegate;
-import jdk.compiler.graal.phases.util.Providers;
+import jdk.graal.compiler.nodes.spi.CoreProvidersDelegate;
+import jdk.graal.compiler.phases.util.Providers;
 
 import jdk.vm.ci.code.TargetDescription;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/tiers/MidTierContext.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/tiers/MidTierContext.java
similarity index 91%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/tiers/MidTierContext.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/tiers/MidTierContext.java
index 337ea2564a78..7ceeb0e16e70 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/tiers/MidTierContext.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/tiers/MidTierContext.java
@@ -22,11 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.phases.tiers;
+package jdk.graal.compiler.phases.tiers;
 
-import jdk.compiler.graal.nodes.spi.CoreProvidersDelegate;
-import jdk.compiler.graal.phases.OptimisticOptimizations;
-import jdk.compiler.graal.phases.util.Providers;
+import jdk.graal.compiler.nodes.spi.CoreProvidersDelegate;
+import jdk.graal.compiler.phases.OptimisticOptimizations;
+import jdk.graal.compiler.phases.util.Providers;
 
 import jdk.vm.ci.code.TargetDescription;
 import jdk.vm.ci.meta.ProfilingInfo;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/tiers/Suites.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/tiers/Suites.java
similarity index 90%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/tiers/Suites.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/tiers/Suites.java
index fa791a710e2f..0466171857c0 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/tiers/Suites.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/tiers/Suites.java
@@ -22,15 +22,15 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.phases.tiers;
+package jdk.graal.compiler.phases.tiers;
 
-import jdk.compiler.graal.lir.alloc.RegisterAllocationPhase;
-import jdk.compiler.graal.lir.phases.AllocationPhase.AllocationContext;
-import jdk.compiler.graal.lir.phases.LIRPhase;
-import jdk.compiler.graal.lir.phases.LIRPhaseSuite;
-import jdk.compiler.graal.lir.phases.LIRSuites;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.PhaseSuite;
+import jdk.graal.compiler.lir.alloc.RegisterAllocationPhase;
+import jdk.graal.compiler.lir.phases.AllocationPhase.AllocationContext;
+import jdk.graal.compiler.lir.phases.LIRPhase;
+import jdk.graal.compiler.lir.phases.LIRPhaseSuite;
+import jdk.graal.compiler.lir.phases.LIRSuites;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.PhaseSuite;
 
 import jdk.vm.ci.code.Architecture;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/tiers/SuitesCreator.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/tiers/SuitesCreator.java
similarity index 92%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/tiers/SuitesCreator.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/tiers/SuitesCreator.java
index 24065b7ee34e..7af426dd8080 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/tiers/SuitesCreator.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/tiers/SuitesCreator.java
@@ -22,10 +22,10 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.phases.tiers;
+package jdk.graal.compiler.phases.tiers;
 
-import jdk.compiler.graal.lir.phases.LIRSuites;
-import jdk.compiler.graal.options.OptionValues;
+import jdk.graal.compiler.lir.phases.LIRSuites;
+import jdk.graal.compiler.options.OptionValues;
 
 import jdk.vm.ci.code.Architecture;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/tiers/SuitesProvider.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/tiers/SuitesProvider.java
similarity index 92%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/tiers/SuitesProvider.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/tiers/SuitesProvider.java
index 32294baadadf..19c708cf973d 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/tiers/SuitesProvider.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/tiers/SuitesProvider.java
@@ -22,11 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.phases.tiers;
+package jdk.graal.compiler.phases.tiers;
 
-import jdk.compiler.graal.lir.phases.LIRSuites;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.PhaseSuite;
+import jdk.graal.compiler.lir.phases.LIRSuites;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.PhaseSuite;
 
 import jdk.vm.ci.code.Architecture;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/tiers/TargetProvider.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/tiers/TargetProvider.java
similarity index 97%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/tiers/TargetProvider.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/tiers/TargetProvider.java
index d5b42d281972..fb54763cc15c 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/tiers/TargetProvider.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/tiers/TargetProvider.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.phases.tiers;
+package jdk.graal.compiler.phases.tiers;
 
 import jdk.vm.ci.code.TargetDescription;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/util/GraphOrder.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/util/GraphOrder.java
similarity index 91%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/util/GraphOrder.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/util/GraphOrder.java
index cd404432e827..ae450183bc58 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/util/GraphOrder.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/util/GraphOrder.java
@@ -22,45 +22,45 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.phases.util;
+package jdk.graal.compiler.phases.util;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import jdk.compiler.graal.phases.graph.ReentrantBlockIterator;
+import jdk.graal.compiler.phases.graph.ReentrantBlockIterator;
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.Equivalence;
-import jdk.compiler.graal.debug.Assertions;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.GraalGraphError;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeBitMap;
-import jdk.compiler.graal.graph.Position;
-import jdk.compiler.graal.nodes.AbstractBeginNode;
-import jdk.compiler.graal.nodes.AbstractEndNode;
-import jdk.compiler.graal.nodes.AbstractMergeNode;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.EndNode;
-import jdk.compiler.graal.nodes.FixedNode;
-import jdk.compiler.graal.nodes.FrameState;
-import jdk.compiler.graal.nodes.FullInfopointNode;
-import jdk.compiler.graal.nodes.GraphState.GuardsStage;
-import jdk.compiler.graal.nodes.GraphState.StageFlag;
-import jdk.compiler.graal.nodes.LoopBeginNode;
-import jdk.compiler.graal.nodes.LoopExitNode;
-import jdk.compiler.graal.nodes.PhiNode;
-import jdk.compiler.graal.nodes.ProxyNode;
-import jdk.compiler.graal.nodes.StateSplit;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.StructuredGraph.ScheduleResult;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.VirtualState.NodePositionClosure;
-import jdk.compiler.graal.nodes.cfg.HIRBlock;
-import jdk.compiler.graal.nodes.virtual.VirtualObjectNode;
-import jdk.compiler.graal.phases.graph.StatelessPostOrderNodeIterator;
-import jdk.compiler.graal.phases.schedule.SchedulePhase;
-import jdk.compiler.graal.phases.schedule.SchedulePhase.SchedulingStrategy;
+import jdk.graal.compiler.debug.Assertions;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.GraalGraphError;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeBitMap;
+import jdk.graal.compiler.graph.Position;
+import jdk.graal.compiler.nodes.AbstractBeginNode;
+import jdk.graal.compiler.nodes.AbstractEndNode;
+import jdk.graal.compiler.nodes.AbstractMergeNode;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.EndNode;
+import jdk.graal.compiler.nodes.FixedNode;
+import jdk.graal.compiler.nodes.FrameState;
+import jdk.graal.compiler.nodes.FullInfopointNode;
+import jdk.graal.compiler.nodes.GraphState.GuardsStage;
+import jdk.graal.compiler.nodes.GraphState.StageFlag;
+import jdk.graal.compiler.nodes.LoopBeginNode;
+import jdk.graal.compiler.nodes.LoopExitNode;
+import jdk.graal.compiler.nodes.PhiNode;
+import jdk.graal.compiler.nodes.ProxyNode;
+import jdk.graal.compiler.nodes.StateSplit;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.StructuredGraph.ScheduleResult;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.VirtualState.NodePositionClosure;
+import jdk.graal.compiler.nodes.cfg.HIRBlock;
+import jdk.graal.compiler.nodes.virtual.VirtualObjectNode;
+import jdk.graal.compiler.phases.graph.StatelessPostOrderNodeIterator;
+import jdk.graal.compiler.phases.schedule.SchedulePhase;
+import jdk.graal.compiler.phases.schedule.SchedulePhase.SchedulingStrategy;
 
 public final class GraphOrder {
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/util/Providers.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/util/Providers.java
similarity index 89%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/util/Providers.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/util/Providers.java
index 7962b685152b..8c1009f3aa85 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/util/Providers.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/util/Providers.java
@@ -22,22 +22,22 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.phases.util;
-
-import jdk.compiler.graal.api.replacements.SnippetReflectionProvider;
-import jdk.compiler.graal.core.common.spi.CodeGenProviders;
-import jdk.compiler.graal.core.common.spi.ConstantFieldProvider;
-import jdk.compiler.graal.core.common.spi.ForeignCallsProvider;
-import jdk.compiler.graal.core.common.spi.MetaAccessExtensionProvider;
-import jdk.compiler.graal.nodes.spi.CoreProviders;
-import jdk.compiler.graal.nodes.spi.LoopsDataProvider;
-import jdk.compiler.graal.nodes.spi.LoweringProvider;
-import jdk.compiler.graal.nodes.spi.PlatformConfigurationProvider;
-import jdk.compiler.graal.nodes.spi.Replacements;
-import jdk.compiler.graal.nodes.spi.StampProvider;
-import jdk.compiler.graal.nodes.spi.WordVerification;
-import jdk.compiler.graal.word.WordTypes;
-import jdk.compiler.graal.word.WordVerificationImpl;
+package jdk.graal.compiler.phases.util;
+
+import jdk.graal.compiler.api.replacements.SnippetReflectionProvider;
+import jdk.graal.compiler.core.common.spi.CodeGenProviders;
+import jdk.graal.compiler.core.common.spi.ConstantFieldProvider;
+import jdk.graal.compiler.core.common.spi.ForeignCallsProvider;
+import jdk.graal.compiler.core.common.spi.MetaAccessExtensionProvider;
+import jdk.graal.compiler.nodes.spi.CoreProviders;
+import jdk.graal.compiler.nodes.spi.LoopsDataProvider;
+import jdk.graal.compiler.nodes.spi.LoweringProvider;
+import jdk.graal.compiler.nodes.spi.PlatformConfigurationProvider;
+import jdk.graal.compiler.nodes.spi.Replacements;
+import jdk.graal.compiler.nodes.spi.StampProvider;
+import jdk.graal.compiler.nodes.spi.WordVerification;
+import jdk.graal.compiler.word.WordTypes;
+import jdk.graal.compiler.word.WordVerificationImpl;
 
 import jdk.vm.ci.code.CodeCacheProvider;
 import jdk.vm.ci.meta.ConstantReflectionProvider;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/util/ValueMergeUtil.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/util/ValueMergeUtil.java
similarity index 88%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/util/ValueMergeUtil.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/util/ValueMergeUtil.java
index fd037e83461c..e9a58c187d39 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/util/ValueMergeUtil.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/util/ValueMergeUtil.java
@@ -22,21 +22,21 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.phases.util;
+package jdk.graal.compiler.phases.util;
 
 import java.util.List;
 import java.util.function.Function;
 
-import jdk.compiler.graal.nodes.AbstractMergeNode;
-import jdk.compiler.graal.nodes.ControlSinkNode;
-import jdk.compiler.graal.nodes.EndNode;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.PhiNode;
-import jdk.compiler.graal.nodes.ReturnNode;
-import jdk.compiler.graal.nodes.UnwindNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.ValuePhiNode;
+import jdk.graal.compiler.nodes.AbstractMergeNode;
+import jdk.graal.compiler.nodes.ControlSinkNode;
+import jdk.graal.compiler.nodes.EndNode;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.PhiNode;
+import jdk.graal.compiler.nodes.ReturnNode;
+import jdk.graal.compiler.nodes.UnwindNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.ValuePhiNode;
 
 public class ValueMergeUtil {
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/printer/BciBlockMappingDumpHandler.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/printer/BciBlockMappingDumpHandler.java
similarity index 95%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/printer/BciBlockMappingDumpHandler.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/printer/BciBlockMappingDumpHandler.java
index dab491c2b549..204bec63b156 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/printer/BciBlockMappingDumpHandler.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/printer/BciBlockMappingDumpHandler.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.printer;
+package jdk.graal.compiler.printer;
 
 import java.io.IOException;
 import java.util.ArrayDeque;
@@ -32,20 +32,20 @@
 import java.util.HashSet;
 import java.util.Map;
 
-import jdk.compiler.graal.bytecode.Bytecode;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.debug.DebugDumpHandler;
-import jdk.compiler.graal.debug.DebugOptions;
-import jdk.compiler.graal.debug.DebugOptions.PrintGraphTarget;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.java.BciBlockMapping;
-import jdk.compiler.graal.java.BciBlockMapping.BciBlock;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.graphio.GraphElements;
-import jdk.compiler.graal.graphio.GraphOutput;
-import jdk.compiler.graal.graphio.GraphOutput.Builder;
-import jdk.compiler.graal.graphio.GraphStructure;
-import jdk.compiler.graal.graphio.GraphTypes;
+import jdk.graal.compiler.bytecode.Bytecode;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.debug.DebugDumpHandler;
+import jdk.graal.compiler.debug.DebugOptions;
+import jdk.graal.compiler.debug.DebugOptions.PrintGraphTarget;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.java.BciBlockMapping;
+import jdk.graal.compiler.java.BciBlockMapping.BciBlock;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.graphio.GraphElements;
+import jdk.graal.compiler.graphio.GraphOutput;
+import jdk.graal.compiler.graphio.GraphOutput.Builder;
+import jdk.graal.compiler.graphio.GraphStructure;
+import jdk.graal.compiler.graphio.GraphTypes;
 
 import jdk.vm.ci.meta.JavaType;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/printer/BinaryGraphPrinter.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/printer/BinaryGraphPrinter.java
similarity index 91%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/printer/BinaryGraphPrinter.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/printer/BinaryGraphPrinter.java
index 19d686eba22e..3778efd9aa07 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/printer/BinaryGraphPrinter.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/printer/BinaryGraphPrinter.java
@@ -22,10 +22,10 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.printer;
+package jdk.graal.compiler.printer;
 
-import static jdk.compiler.graal.graph.Edges.Type.Inputs;
-import static jdk.compiler.graal.graph.Edges.Type.Successors;
+import static jdk.graal.compiler.graph.Edges.Type.Inputs;
+import static jdk.graal.compiler.graph.Edges.Type.Successors;
 
 import java.io.IOException;
 import java.net.URI;
@@ -38,45 +38,45 @@
 import java.util.List;
 import java.util.Map;
 
-import jdk.compiler.graal.api.replacements.SnippetReflectionProvider;
-import jdk.compiler.graal.bytecode.Bytecode;
-import jdk.compiler.graal.core.common.cfg.BlockMap;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.debug.TTY;
-import jdk.compiler.graal.graph.Edges;
-import jdk.compiler.graal.graph.Graph;
-import jdk.compiler.graal.graph.InputEdges;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.graph.NodeMap;
-import jdk.compiler.graal.graph.NodeSourcePosition;
-import jdk.compiler.graal.graph.SourceLanguagePosition;
-import jdk.compiler.graal.nodes.AbstractBeginNode;
-import jdk.compiler.graal.nodes.AbstractEndNode;
-import jdk.compiler.graal.nodes.AbstractMergeNode;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.ControlSinkNode;
-import jdk.compiler.graal.nodes.ControlSplitNode;
-import jdk.compiler.graal.nodes.FixedNode;
-import jdk.compiler.graal.nodes.LoopBeginNode;
-import jdk.compiler.graal.nodes.PhiNode;
-import jdk.compiler.graal.nodes.ProxyNode;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.VirtualState;
-import jdk.compiler.graal.nodes.cfg.HIRBlock;
-import jdk.compiler.graal.nodes.cfg.ControlFlowGraph;
-import jdk.compiler.graal.nodes.memory.MemoryAccess;
-import jdk.compiler.graal.nodes.memory.MemoryKill;
-import jdk.compiler.graal.nodes.memory.MultiMemoryKill;
-import jdk.compiler.graal.nodes.memory.SingleMemoryKill;
-import jdk.compiler.graal.nodes.util.JavaConstantFormattable;
-import jdk.compiler.graal.graphio.GraphBlocks;
-import jdk.compiler.graal.graphio.GraphElements;
-import jdk.compiler.graal.graphio.GraphLocations;
-import jdk.compiler.graal.graphio.GraphOutput;
-import jdk.compiler.graal.graphio.GraphStructure;
-import jdk.compiler.graal.graphio.GraphTypes;
+import jdk.graal.compiler.api.replacements.SnippetReflectionProvider;
+import jdk.graal.compiler.bytecode.Bytecode;
+import jdk.graal.compiler.core.common.cfg.BlockMap;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.debug.TTY;
+import jdk.graal.compiler.graph.Edges;
+import jdk.graal.compiler.graph.Graph;
+import jdk.graal.compiler.graph.InputEdges;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.graph.NodeMap;
+import jdk.graal.compiler.graph.NodeSourcePosition;
+import jdk.graal.compiler.graph.SourceLanguagePosition;
+import jdk.graal.compiler.nodes.AbstractBeginNode;
+import jdk.graal.compiler.nodes.AbstractEndNode;
+import jdk.graal.compiler.nodes.AbstractMergeNode;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.ControlSinkNode;
+import jdk.graal.compiler.nodes.ControlSplitNode;
+import jdk.graal.compiler.nodes.FixedNode;
+import jdk.graal.compiler.nodes.LoopBeginNode;
+import jdk.graal.compiler.nodes.PhiNode;
+import jdk.graal.compiler.nodes.ProxyNode;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.VirtualState;
+import jdk.graal.compiler.nodes.cfg.HIRBlock;
+import jdk.graal.compiler.nodes.cfg.ControlFlowGraph;
+import jdk.graal.compiler.nodes.memory.MemoryAccess;
+import jdk.graal.compiler.nodes.memory.MemoryKill;
+import jdk.graal.compiler.nodes.memory.MultiMemoryKill;
+import jdk.graal.compiler.nodes.memory.SingleMemoryKill;
+import jdk.graal.compiler.nodes.util.JavaConstantFormattable;
+import jdk.graal.compiler.graphio.GraphBlocks;
+import jdk.graal.compiler.graphio.GraphElements;
+import jdk.graal.compiler.graphio.GraphLocations;
+import jdk.graal.compiler.graphio.GraphOutput;
+import jdk.graal.compiler.graphio.GraphStructure;
+import jdk.graal.compiler.graphio.GraphTypes;
 
 import jdk.vm.ci.meta.JavaType;
 import jdk.vm.ci.meta.ResolvedJavaField;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/printer/CFGPrinter.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/printer/CFGPrinter.java
similarity index 92%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/printer/CFGPrinter.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/printer/CFGPrinter.java
index 568a4d270117..6b6d1ed3548b 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/printer/CFGPrinter.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/printer/CFGPrinter.java
@@ -22,10 +22,10 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.printer;
+package jdk.graal.compiler.printer;
 
 import static java.lang.Character.toLowerCase;
-import static jdk.compiler.graal.core.match.ComplexMatchValue.INTERIOR_MATCH;
+import static jdk.graal.compiler.core.match.ComplexMatchValue.INTERIOR_MATCH;
 
 import java.io.OutputStream;
 import java.util.ArrayList;
@@ -35,33 +35,33 @@
 import java.util.Map;
 import java.util.TreeMap;
 
-import jdk.compiler.graal.bytecode.Bytecode;
-import jdk.compiler.graal.bytecode.BytecodeDisassembler;
-import jdk.compiler.graal.core.common.cfg.AbstractControlFlowGraph;
-import jdk.compiler.graal.core.common.cfg.BasicBlock;
-import jdk.compiler.graal.core.gen.NodeLIRBuilder;
-import jdk.compiler.graal.core.match.ComplexMatchValue;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeBitMap;
-import jdk.compiler.graal.graph.Position;
-import jdk.compiler.graal.lir.LIR;
-import jdk.compiler.graal.lir.LIRInstruction;
-import jdk.compiler.graal.lir.debug.IntervalDumper;
-import jdk.compiler.graal.lir.debug.IntervalDumper.IntervalVisitor;
-import jdk.compiler.graal.lir.gen.LIRGenerationResult;
-import jdk.compiler.graal.nodeinfo.Verbosity;
-import jdk.compiler.graal.nodes.AbstractBeginNode;
-import jdk.compiler.graal.nodes.AbstractMergeNode;
-import jdk.compiler.graal.nodes.FixedNode;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.FrameState;
-import jdk.compiler.graal.nodes.StateSplit;
-import jdk.compiler.graal.nodes.StructuredGraph.ScheduleResult;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.ValuePhiNode;
-import jdk.compiler.graal.nodes.calc.FloatingNode;
-import jdk.compiler.graal.nodes.cfg.ControlFlowGraph;
-import jdk.compiler.graal.nodes.cfg.HIRBlock;
+import jdk.graal.compiler.bytecode.Bytecode;
+import jdk.graal.compiler.bytecode.BytecodeDisassembler;
+import jdk.graal.compiler.core.common.cfg.AbstractControlFlowGraph;
+import jdk.graal.compiler.core.common.cfg.BasicBlock;
+import jdk.graal.compiler.core.gen.NodeLIRBuilder;
+import jdk.graal.compiler.core.match.ComplexMatchValue;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeBitMap;
+import jdk.graal.compiler.graph.Position;
+import jdk.graal.compiler.lir.LIR;
+import jdk.graal.compiler.lir.LIRInstruction;
+import jdk.graal.compiler.lir.debug.IntervalDumper;
+import jdk.graal.compiler.lir.debug.IntervalDumper.IntervalVisitor;
+import jdk.graal.compiler.lir.gen.LIRGenerationResult;
+import jdk.graal.compiler.nodeinfo.Verbosity;
+import jdk.graal.compiler.nodes.AbstractBeginNode;
+import jdk.graal.compiler.nodes.AbstractMergeNode;
+import jdk.graal.compiler.nodes.FixedNode;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.FrameState;
+import jdk.graal.compiler.nodes.StateSplit;
+import jdk.graal.compiler.nodes.StructuredGraph.ScheduleResult;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.ValuePhiNode;
+import jdk.graal.compiler.nodes.calc.FloatingNode;
+import jdk.graal.compiler.nodes.cfg.ControlFlowGraph;
+import jdk.graal.compiler.nodes.cfg.HIRBlock;
 
 import jdk.vm.ci.code.DebugInfo;
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/printer/CFGPrinterObserver.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/printer/CFGPrinterObserver.java
similarity index 91%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/printer/CFGPrinterObserver.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/printer/CFGPrinterObserver.java
index f724d9b06b5e..f6c6b3c2eb56 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/printer/CFGPrinterObserver.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/printer/CFGPrinterObserver.java
@@ -22,9 +22,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.printer;
+package jdk.graal.compiler.printer;
 
-import static jdk.compiler.graal.debug.DebugOptions.PrintBackendCFG;
+import static jdk.graal.compiler.debug.DebugOptions.PrintBackendCFG;
 
 import java.io.BufferedOutputStream;
 import java.io.IOException;
@@ -33,25 +33,25 @@
 import java.util.Collections;
 import java.util.List;
 
-import jdk.compiler.graal.code.CompilationResult;
-import jdk.compiler.graal.code.DisassemblerProvider;
-import jdk.compiler.graal.core.common.CompilationIdentifier;
-import jdk.compiler.graal.core.gen.NodeLIRBuilder;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.debug.DebugDumpHandler;
-import jdk.compiler.graal.debug.DebugDumpScope;
-import jdk.compiler.graal.debug.DebugOptions;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.debug.PathUtilities;
-import jdk.compiler.graal.debug.TTY;
-import jdk.compiler.graal.lir.LIR;
-import jdk.compiler.graal.lir.debug.IntervalDumper;
-import jdk.compiler.graal.lir.gen.LIRGenerationResult;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.StructuredGraph.ScheduleResult;
-import jdk.compiler.graal.nodes.cfg.ControlFlowGraph;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.serviceprovider.GraalServices;
+import jdk.graal.compiler.code.CompilationResult;
+import jdk.graal.compiler.code.DisassemblerProvider;
+import jdk.graal.compiler.core.common.CompilationIdentifier;
+import jdk.graal.compiler.core.gen.NodeLIRBuilder;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.debug.DebugDumpHandler;
+import jdk.graal.compiler.debug.DebugDumpScope;
+import jdk.graal.compiler.debug.DebugOptions;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.debug.PathUtilities;
+import jdk.graal.compiler.debug.TTY;
+import jdk.graal.compiler.lir.LIR;
+import jdk.graal.compiler.lir.debug.IntervalDumper;
+import jdk.graal.compiler.lir.gen.LIRGenerationResult;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.StructuredGraph.ScheduleResult;
+import jdk.graal.compiler.nodes.cfg.ControlFlowGraph;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.serviceprovider.GraalServices;
 
 import jdk.vm.ci.code.CodeCacheProvider;
 import jdk.vm.ci.code.InstalledCode;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/printer/CanonicalStringGraphPrinter.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/printer/CanonicalStringGraphPrinter.java
similarity index 90%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/printer/CanonicalStringGraphPrinter.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/printer/CanonicalStringGraphPrinter.java
index 646756e0a6ad..1bc8043ccbe5 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/printer/CanonicalStringGraphPrinter.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/printer/CanonicalStringGraphPrinter.java
@@ -22,12 +22,12 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.printer;
+package jdk.graal.compiler.printer;
 
-import static jdk.compiler.graal.debug.DebugOptions.CanonicalGraphStringsCheckConstants;
-import static jdk.compiler.graal.debug.DebugOptions.CanonicalGraphStringsExcludeVirtuals;
-import static jdk.compiler.graal.debug.DebugOptions.CanonicalGraphStringsRemoveIdentities;
-import static jdk.compiler.graal.debug.DebugOptions.PrintCanonicalGraphStringFlavor;
+import static jdk.graal.compiler.debug.DebugOptions.CanonicalGraphStringsCheckConstants;
+import static jdk.graal.compiler.debug.DebugOptions.CanonicalGraphStringsExcludeVirtuals;
+import static jdk.graal.compiler.debug.DebugOptions.CanonicalGraphStringsRemoveIdentities;
+import static jdk.graal.compiler.debug.DebugOptions.PrintCanonicalGraphStringFlavor;
 
 import java.io.BufferedWriter;
 import java.io.IOException;
@@ -41,28 +41,28 @@
 import java.util.Map;
 import java.util.regex.Pattern;
 
-import jdk.compiler.graal.api.replacements.SnippetReflectionProvider;
-import jdk.compiler.graal.core.common.Fields;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.debug.PathUtilities;
-import jdk.compiler.graal.graph.Graph;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeMap;
-import jdk.compiler.graal.graph.Position;
-import jdk.compiler.graal.nodeinfo.Verbosity;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.FixedNode;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.FrameState;
-import jdk.compiler.graal.nodes.FullInfopointNode;
-import jdk.compiler.graal.nodes.PhiNode;
-import jdk.compiler.graal.nodes.ProxyNode;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.cfg.HIRBlock;
-import jdk.compiler.graal.nodes.cfg.ControlFlowGraph;
-import jdk.compiler.graal.nodes.virtual.VirtualObjectNode;
-import jdk.compiler.graal.options.OptionValues;
+import jdk.graal.compiler.api.replacements.SnippetReflectionProvider;
+import jdk.graal.compiler.core.common.Fields;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.debug.PathUtilities;
+import jdk.graal.compiler.graph.Graph;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeMap;
+import jdk.graal.compiler.graph.Position;
+import jdk.graal.compiler.nodeinfo.Verbosity;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.FixedNode;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.FrameState;
+import jdk.graal.compiler.nodes.FullInfopointNode;
+import jdk.graal.compiler.nodes.PhiNode;
+import jdk.graal.compiler.nodes.ProxyNode;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.cfg.HIRBlock;
+import jdk.graal.compiler.nodes.cfg.ControlFlowGraph;
+import jdk.graal.compiler.nodes.virtual.VirtualObjectNode;
+import jdk.graal.compiler.options.OptionValues;
 
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/printer/CompilationPrinter.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/printer/CompilationPrinter.java
similarity index 97%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/printer/CompilationPrinter.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/printer/CompilationPrinter.java
index 7a8c9a5b1eb0..d47ac8fd86e9 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/printer/CompilationPrinter.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/printer/CompilationPrinter.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.printer;
+package jdk.graal.compiler.printer;
 
 import java.io.Closeable;
 import java.io.OutputStream;
@@ -30,9 +30,9 @@
 import java.util.List;
 import java.util.Map;
 
-import jdk.compiler.graal.core.common.CompilationIdentifier;
-import jdk.compiler.graal.debug.LogStream;
-import jdk.compiler.graal.lir.util.IndexedValueMap;
+import jdk.graal.compiler.core.common.CompilationIdentifier;
+import jdk.graal.compiler.debug.LogStream;
+import jdk.graal.compiler.lir.util.IndexedValueMap;
 
 import jdk.vm.ci.code.BytecodeFrame;
 import jdk.vm.ci.code.BytecodePosition;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/printer/GraalDebugHandlersFactory.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/printer/GraalDebugHandlersFactory.java
similarity index 83%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/printer/GraalDebugHandlersFactory.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/printer/GraalDebugHandlersFactory.java
index 436bb867b2df..6c026c18803b 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/printer/GraalDebugHandlersFactory.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/printer/GraalDebugHandlersFactory.java
@@ -22,26 +22,26 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.printer;
+package jdk.graal.compiler.printer;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import jdk.compiler.graal.api.replacements.SnippetReflectionProvider;
-import jdk.compiler.graal.debug.DebugCloseable;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.debug.DebugDumpHandler;
-import jdk.compiler.graal.debug.DebugHandler;
-import jdk.compiler.graal.debug.DebugHandlersFactory;
-import jdk.compiler.graal.debug.DebugOptions;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.nodeinfo.Verbosity;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.StructuredGraph.ScheduleResult;
-import jdk.compiler.graal.nodes.util.GraphUtil;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.schedule.SchedulePhase;
-import jdk.compiler.graal.serviceprovider.ServiceProvider;
+import jdk.graal.compiler.api.replacements.SnippetReflectionProvider;
+import jdk.graal.compiler.debug.DebugCloseable;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.debug.DebugDumpHandler;
+import jdk.graal.compiler.debug.DebugHandler;
+import jdk.graal.compiler.debug.DebugHandlersFactory;
+import jdk.graal.compiler.debug.DebugOptions;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.nodeinfo.Verbosity;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.StructuredGraph.ScheduleResult;
+import jdk.graal.compiler.nodes.util.GraphUtil;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.schedule.SchedulePhase;
+import jdk.graal.compiler.serviceprovider.ServiceProvider;
 
 @ServiceProvider(DebugHandlersFactory.class)
 public class GraalDebugHandlersFactory implements DebugHandlersFactory {
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/printer/GraphPrinter.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/printer/GraphPrinter.java
similarity index 94%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/printer/GraphPrinter.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/printer/GraphPrinter.java
index 2277df8de3b1..499b883f4f0e 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/printer/GraphPrinter.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/printer/GraphPrinter.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.printer;
+package jdk.graal.compiler.printer;
 
 import java.io.Closeable;
 import java.io.IOException;
@@ -34,15 +34,15 @@
 import java.util.Map;
 import java.util.Set;
 
-import jdk.compiler.graal.api.replacements.SnippetReflectionProvider;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.debug.DebugContext.Scope;
-import jdk.compiler.graal.graph.Graph;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.util.JavaConstantFormatter;
-import jdk.compiler.graal.phases.schedule.SchedulePhase;
-import jdk.compiler.graal.serviceprovider.GraalServices;
+import jdk.graal.compiler.api.replacements.SnippetReflectionProvider;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.debug.DebugContext.Scope;
+import jdk.graal.compiler.graph.Graph;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.util.JavaConstantFormatter;
+import jdk.graal.compiler.phases.schedule.SchedulePhase;
+import jdk.graal.compiler.serviceprovider.GraalServices;
 
 import jdk.vm.ci.meta.JavaConstant;
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/printer/GraphPrinterDumpHandler.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/printer/GraphPrinterDumpHandler.java
similarity index 94%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/printer/GraphPrinterDumpHandler.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/printer/GraphPrinterDumpHandler.java
index 445e1272da15..772dfaefbc27 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/printer/GraphPrinterDumpHandler.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/printer/GraphPrinterDumpHandler.java
@@ -22,10 +22,10 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.printer;
+package jdk.graal.compiler.printer;
 
-import static jdk.compiler.graal.debug.DebugConfig.asJavaMethod;
-import static jdk.compiler.graal.debug.DebugOptions.PrintUnmodifiedGraphs;
+import static jdk.graal.compiler.debug.DebugConfig.asJavaMethod;
+import static jdk.graal.compiler.debug.DebugOptions.PrintUnmodifiedGraphs;
 
 import java.io.IOException;
 import java.nio.channels.ClosedByInterruptException;
@@ -38,19 +38,19 @@
 import java.util.Map;
 import java.util.WeakHashMap;
 
-import jdk.compiler.graal.core.common.CompilationIdentifier;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.debug.DebugDumpHandler;
-import jdk.compiler.graal.debug.DebugDumpScope;
-import jdk.compiler.graal.debug.DebugOptions;
-import jdk.compiler.graal.debug.DebugOptions.PrintGraphTarget;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.debug.TTY;
-import jdk.compiler.graal.graph.Graph;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.contract.NodeCostUtil;
-import jdk.compiler.graal.serviceprovider.GraalServices;
+import jdk.graal.compiler.core.common.CompilationIdentifier;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.debug.DebugDumpHandler;
+import jdk.graal.compiler.debug.DebugDumpScope;
+import jdk.graal.compiler.debug.DebugOptions;
+import jdk.graal.compiler.debug.DebugOptions.PrintGraphTarget;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.debug.TTY;
+import jdk.graal.compiler.graph.Graph;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.contract.NodeCostUtil;
+import jdk.graal.compiler.serviceprovider.GraalServices;
 
 import jdk.vm.ci.meta.JavaMethod;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/printer/NoDeadCodeVerifyHandler.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/printer/NoDeadCodeVerifyHandler.java
similarity index 87%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/printer/NoDeadCodeVerifyHandler.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/printer/NoDeadCodeVerifyHandler.java
index 8f1cd020358d..6966ff3feb93 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/printer/NoDeadCodeVerifyHandler.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/printer/NoDeadCodeVerifyHandler.java
@@ -22,22 +22,22 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.printer;
+package jdk.graal.compiler.printer;
 
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.debug.DebugVerifyHandler;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.options.Option;
-import jdk.compiler.graal.options.OptionKey;
-import jdk.compiler.graal.options.OptionType;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.common.DeadCodeEliminationPhase;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.debug.DebugVerifyHandler;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.options.Option;
+import jdk.graal.compiler.options.OptionKey;
+import jdk.graal.compiler.options.OptionType;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.common.DeadCodeEliminationPhase;
 
 /**
  * Verifies that graphs have no dead code.
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/AllocationSnippets.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/AllocationSnippets.java
similarity index 95%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/AllocationSnippets.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/AllocationSnippets.java
index c48d503ad036..e55351118461 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/AllocationSnippets.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/AllocationSnippets.java
@@ -22,22 +22,22 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements;
-
-import static jdk.compiler.graal.api.directives.GraalDirectives.injectBranchProbability;
-import static jdk.compiler.graal.nodes.extended.BranchProbabilityNode.FAST_PATH_PROBABILITY;
-import static jdk.compiler.graal.nodes.extended.BranchProbabilityNode.LIKELY_PROBABILITY;
-import static jdk.compiler.graal.nodes.extended.BranchProbabilityNode.SLOW_PATH_PROBABILITY;
-import static jdk.compiler.graal.nodes.extended.BranchProbabilityNode.probability;
-import static jdk.compiler.graal.replacements.nodes.ExplodeLoopNode.explodeLoop;
-
-import jdk.compiler.graal.nodes.PrefetchAllocateNode;
-import jdk.compiler.graal.nodes.extended.MembarNode;
-import jdk.compiler.graal.nodes.memory.address.OffsetAddressNode;
-import jdk.compiler.graal.replacements.SnippetCounter.Group;
-import jdk.compiler.graal.replacements.nodes.ExplodeLoopNode;
-import jdk.compiler.graal.replacements.nodes.ZeroMemoryNode;
-import jdk.compiler.graal.word.Word;
+package jdk.graal.compiler.replacements;
+
+import static jdk.graal.compiler.api.directives.GraalDirectives.injectBranchProbability;
+import static jdk.graal.compiler.nodes.extended.BranchProbabilityNode.FAST_PATH_PROBABILITY;
+import static jdk.graal.compiler.nodes.extended.BranchProbabilityNode.LIKELY_PROBABILITY;
+import static jdk.graal.compiler.nodes.extended.BranchProbabilityNode.SLOW_PATH_PROBABILITY;
+import static jdk.graal.compiler.nodes.extended.BranchProbabilityNode.probability;
+import static jdk.graal.compiler.replacements.nodes.ExplodeLoopNode.explodeLoop;
+
+import jdk.graal.compiler.nodes.PrefetchAllocateNode;
+import jdk.graal.compiler.nodes.extended.MembarNode;
+import jdk.graal.compiler.nodes.memory.address.OffsetAddressNode;
+import jdk.graal.compiler.replacements.SnippetCounter.Group;
+import jdk.graal.compiler.replacements.nodes.ExplodeLoopNode;
+import jdk.graal.compiler.replacements.nodes.ZeroMemoryNode;
+import jdk.graal.compiler.word.Word;
 import org.graalvm.word.LocationIdentity;
 import org.graalvm.word.UnsignedWord;
 import org.graalvm.word.WordFactory;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/BigIntegerSnippets.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/BigIntegerSnippets.java
similarity index 88%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/BigIntegerSnippets.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/BigIntegerSnippets.java
index 326f909846a9..47602c2714b2 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/BigIntegerSnippets.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/BigIntegerSnippets.java
@@ -22,14 +22,14 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements;
+package jdk.graal.compiler.replacements;
 
-import jdk.compiler.graal.api.replacements.Snippet;
-import jdk.compiler.graal.nodes.ComputeObjectAddressNode;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.util.Providers;
-import jdk.compiler.graal.replacements.nodes.BigIntegerMultiplyToLenNode;
-import jdk.compiler.graal.word.Word;
+import jdk.graal.compiler.api.replacements.Snippet;
+import jdk.graal.compiler.nodes.ComputeObjectAddressNode;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.util.Providers;
+import jdk.graal.compiler.replacements.nodes.BigIntegerMultiplyToLenNode;
+import jdk.graal.compiler.word.Word;
 import org.graalvm.word.WordFactory;
 
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/BoxingSnippets.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/BoxingSnippets.java
similarity index 94%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/BoxingSnippets.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/BoxingSnippets.java
index 4a3bcdce0cba..43d078950dd2 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/BoxingSnippets.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/BoxingSnippets.java
@@ -22,23 +22,23 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements;
+package jdk.graal.compiler.replacements;
 
 import java.util.EnumMap;
 
-import jdk.compiler.graal.api.replacements.Snippet;
-import jdk.compiler.graal.api.replacements.Snippet.ConstantParameter;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.nodes.FieldLocationIdentity;
-import jdk.compiler.graal.nodes.NamedLocationIdentity;
-import jdk.compiler.graal.nodes.PiNode;
-import jdk.compiler.graal.nodes.extended.AbstractBoxingNode;
-import jdk.compiler.graal.nodes.extended.BoxNode;
-import jdk.compiler.graal.nodes.extended.UnboxNode;
-import jdk.compiler.graal.nodes.spi.CoreProviders;
-import jdk.compiler.graal.nodes.spi.LoweringTool;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.util.Providers;
+import jdk.graal.compiler.api.replacements.Snippet;
+import jdk.graal.compiler.api.replacements.Snippet.ConstantParameter;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.nodes.FieldLocationIdentity;
+import jdk.graal.compiler.nodes.NamedLocationIdentity;
+import jdk.graal.compiler.nodes.PiNode;
+import jdk.graal.compiler.nodes.extended.AbstractBoxingNode;
+import jdk.graal.compiler.nodes.extended.BoxNode;
+import jdk.graal.compiler.nodes.extended.UnboxNode;
+import jdk.graal.compiler.nodes.spi.CoreProviders;
+import jdk.graal.compiler.nodes.spi.LoweringTool;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.util.Providers;
 import org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/CachingPEGraphDecoder.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/CachingPEGraphDecoder.java
similarity index 86%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/CachingPEGraphDecoder.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/CachingPEGraphDecoder.java
index 7c4b9b36d446..843d8b2c2f58 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/CachingPEGraphDecoder.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/CachingPEGraphDecoder.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements;
+package jdk.graal.compiler.replacements;
 
 import static jdk.vm.ci.services.Services.IS_IN_NATIVE_IMAGE;
 
@@ -30,32 +30,32 @@
 import java.util.function.Supplier;
 
 import org.graalvm.collections.EconomicMap;
-import jdk.compiler.graal.bytecode.BytecodeProvider;
-import jdk.compiler.graal.core.common.GraalOptions;
-import jdk.compiler.graal.debug.DebugCloseable;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.debug.TimerKey;
-import jdk.compiler.graal.graph.SourceLanguagePositionProvider;
-import jdk.compiler.graal.java.GraphBuilderPhase;
-import jdk.compiler.graal.loop.phases.ConvertDeoptimizeToGuardPhase;
-import jdk.compiler.graal.nodes.EncodedGraph;
-import jdk.compiler.graal.nodes.GraphEncoder;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration;
-import jdk.compiler.graal.nodes.graphbuilderconf.InlineInvokePlugin;
-import jdk.compiler.graal.nodes.graphbuilderconf.IntrinsicContext;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins;
-import jdk.compiler.graal.nodes.graphbuilderconf.LoopExplosionPlugin;
-import jdk.compiler.graal.nodes.graphbuilderconf.NodePlugin;
-import jdk.compiler.graal.nodes.graphbuilderconf.ParameterPlugin;
-import jdk.compiler.graal.nodes.spi.CoreProviders;
-import jdk.compiler.graal.phases.BasePhase;
-import jdk.compiler.graal.phases.OptimisticOptimizations;
-import jdk.compiler.graal.phases.common.CanonicalizerPhase;
-import jdk.compiler.graal.phases.common.DominatorBasedGlobalValueNumberingPhase;
-import jdk.compiler.graal.phases.util.Providers;
+import jdk.graal.compiler.bytecode.BytecodeProvider;
+import jdk.graal.compiler.core.common.GraalOptions;
+import jdk.graal.compiler.debug.DebugCloseable;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.debug.TimerKey;
+import jdk.graal.compiler.graph.SourceLanguagePositionProvider;
+import jdk.graal.compiler.java.GraphBuilderPhase;
+import jdk.graal.compiler.loop.phases.ConvertDeoptimizeToGuardPhase;
+import jdk.graal.compiler.nodes.EncodedGraph;
+import jdk.graal.compiler.nodes.GraphEncoder;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.StructuredGraph.AllowAssumptions;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
+import jdk.graal.compiler.nodes.graphbuilderconf.InlineInvokePlugin;
+import jdk.graal.compiler.nodes.graphbuilderconf.IntrinsicContext;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins;
+import jdk.graal.compiler.nodes.graphbuilderconf.LoopExplosionPlugin;
+import jdk.graal.compiler.nodes.graphbuilderconf.NodePlugin;
+import jdk.graal.compiler.nodes.graphbuilderconf.ParameterPlugin;
+import jdk.graal.compiler.nodes.spi.CoreProviders;
+import jdk.graal.compiler.phases.BasePhase;
+import jdk.graal.compiler.phases.OptimisticOptimizations;
+import jdk.graal.compiler.phases.common.CanonicalizerPhase;
+import jdk.graal.compiler.phases.common.DominatorBasedGlobalValueNumberingPhase;
+import jdk.graal.compiler.phases.util.Providers;
 
 import jdk.vm.ci.code.Architecture;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/ConstantBindingParameterPlugin.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/ConstantBindingParameterPlugin.java
similarity index 87%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/ConstantBindingParameterPlugin.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/ConstantBindingParameterPlugin.java
index 0f0a326fba71..b147de5b2860 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/ConstantBindingParameterPlugin.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/ConstantBindingParameterPlugin.java
@@ -22,17 +22,17 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements;
+package jdk.graal.compiler.replacements;
 
-import jdk.compiler.graal.api.replacements.SnippetReflectionProvider;
-import jdk.compiler.graal.core.common.type.DataPointerConstant;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.core.common.type.StampPair;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.calc.FloatingNode;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderTool;
-import jdk.compiler.graal.nodes.graphbuilderconf.ParameterPlugin;
+import jdk.graal.compiler.api.replacements.SnippetReflectionProvider;
+import jdk.graal.compiler.core.common.type.DataPointerConstant;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.core.common.type.StampPair;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.calc.FloatingNode;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderTool;
+import jdk.graal.compiler.nodes.graphbuilderconf.ParameterPlugin;
 
 import jdk.vm.ci.meta.Constant;
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/DefaultJavaLoweringProvider.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/DefaultJavaLoweringProvider.java
similarity index 89%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/DefaultJavaLoweringProvider.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/DefaultJavaLoweringProvider.java
index 0d94c1d94f36..371e83ba4006 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/DefaultJavaLoweringProvider.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/DefaultJavaLoweringProvider.java
@@ -22,146 +22,146 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements;
+package jdk.graal.compiler.replacements;
 
 import static jdk.vm.ci.meta.DeoptimizationAction.InvalidateReprofile;
 import static jdk.vm.ci.meta.DeoptimizationReason.BoundsCheckException;
 import static jdk.vm.ci.meta.DeoptimizationReason.NullCheckException;
-import static jdk.compiler.graal.core.common.GraalOptions.EmitStringSubstitutions;
-import static jdk.compiler.graal.core.common.SpectrePHTMitigations.Options.SpectrePHTIndexMasking;
-import static jdk.compiler.graal.nodes.NamedLocationIdentity.ARRAY_LENGTH_LOCATION;
-import static jdk.compiler.graal.nodes.calc.BinaryArithmeticNode.branchlessMax;
-import static jdk.compiler.graal.nodes.calc.BinaryArithmeticNode.branchlessMin;
-import static jdk.compiler.graal.nodes.java.ArrayLengthNode.readArrayLength;
+import static jdk.graal.compiler.core.common.GraalOptions.EmitStringSubstitutions;
+import static jdk.graal.compiler.core.common.SpectrePHTMitigations.Options.SpectrePHTIndexMasking;
+import static jdk.graal.compiler.nodes.NamedLocationIdentity.ARRAY_LENGTH_LOCATION;
+import static jdk.graal.compiler.nodes.calc.BinaryArithmeticNode.branchlessMax;
+import static jdk.graal.compiler.nodes.calc.BinaryArithmeticNode.branchlessMin;
+import static jdk.graal.compiler.nodes.java.ArrayLengthNode.readArrayLength;
 
 import java.nio.ByteOrder;
 import java.util.ArrayList;
 import java.util.BitSet;
 import java.util.List;
 
-import jdk.compiler.graal.core.common.memory.BarrierType;
-import jdk.compiler.graal.core.common.memory.MemoryOrderMode;
-import jdk.compiler.graal.core.common.spi.ForeignCallsProvider;
-import jdk.compiler.graal.core.common.spi.MetaAccessExtensionProvider;
-import jdk.compiler.graal.core.common.type.AbstractPointerStamp;
-import jdk.compiler.graal.core.common.type.IntegerStamp;
-import jdk.compiler.graal.core.common.type.ObjectStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.core.common.type.TypeReference;
-import jdk.compiler.graal.debug.DebugCloseable;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.nodeinfo.InputType;
-import jdk.compiler.graal.nodes.CompressionNode.CompressionOp;
-import jdk.compiler.graal.nodes.ComputeObjectAddressNode;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.EndNode;
-import jdk.compiler.graal.nodes.FieldLocationIdentity;
-import jdk.compiler.graal.nodes.FixedNode;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.FrameState;
-import jdk.compiler.graal.nodes.GetObjectAddressNode;
-import jdk.compiler.graal.nodes.GraphState;
-import jdk.compiler.graal.nodes.IfNode;
-import jdk.compiler.graal.nodes.LogicNode;
-import jdk.compiler.graal.nodes.MergeNode;
-import jdk.compiler.graal.nodes.NamedLocationIdentity;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.PhiNode;
-import jdk.compiler.graal.nodes.PiNode;
-import jdk.compiler.graal.nodes.ProfileData.BranchProbabilityData;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.ValuePhiNode;
-import jdk.compiler.graal.nodes.calc.AddNode;
-import jdk.compiler.graal.nodes.calc.ConditionalNode;
-import jdk.compiler.graal.nodes.calc.FloatingIntegerDivRemNode;
-import jdk.compiler.graal.nodes.calc.IntegerBelowNode;
-import jdk.compiler.graal.nodes.calc.IntegerConvertNode;
-import jdk.compiler.graal.nodes.calc.IntegerDivRemNode;
-import jdk.compiler.graal.nodes.calc.IntegerEqualsNode;
-import jdk.compiler.graal.nodes.calc.IsNullNode;
-import jdk.compiler.graal.nodes.calc.LeftShiftNode;
-import jdk.compiler.graal.nodes.calc.NarrowNode;
-import jdk.compiler.graal.nodes.calc.ReinterpretNode;
-import jdk.compiler.graal.nodes.calc.RightShiftNode;
-import jdk.compiler.graal.nodes.calc.SignExtendNode;
-import jdk.compiler.graal.nodes.calc.SignedDivNode;
-import jdk.compiler.graal.nodes.calc.SignedFloatingIntegerDivNode;
-import jdk.compiler.graal.nodes.calc.SignedFloatingIntegerRemNode;
-import jdk.compiler.graal.nodes.calc.SignedRemNode;
-import jdk.compiler.graal.nodes.calc.SubNode;
-import jdk.compiler.graal.nodes.calc.UnpackEndianHalfNode;
-import jdk.compiler.graal.nodes.calc.ZeroExtendNode;
-import jdk.compiler.graal.nodes.debug.VerifyHeapNode;
-import jdk.compiler.graal.nodes.extended.BoxNode;
-import jdk.compiler.graal.nodes.extended.BranchProbabilityNode;
-import jdk.compiler.graal.nodes.extended.ClassIsArrayNode;
-import jdk.compiler.graal.nodes.extended.FixedValueAnchorNode;
-import jdk.compiler.graal.nodes.extended.ForeignCallNode;
-import jdk.compiler.graal.nodes.extended.GuardedUnsafeLoadNode;
-import jdk.compiler.graal.nodes.extended.GuardingNode;
-import jdk.compiler.graal.nodes.extended.JavaReadNode;
-import jdk.compiler.graal.nodes.extended.JavaWriteNode;
-import jdk.compiler.graal.nodes.extended.LoadArrayComponentHubNode;
-import jdk.compiler.graal.nodes.extended.LoadHubNode;
-import jdk.compiler.graal.nodes.extended.LoadHubOrNullNode;
-import jdk.compiler.graal.nodes.extended.MembarNode;
-import jdk.compiler.graal.nodes.extended.MembarNode.FenceKind;
-import jdk.compiler.graal.nodes.extended.ObjectIsArrayNode;
-import jdk.compiler.graal.nodes.extended.RawLoadNode;
-import jdk.compiler.graal.nodes.extended.RawStoreNode;
-import jdk.compiler.graal.nodes.extended.UnboxNode;
-import jdk.compiler.graal.nodes.extended.UnsafeMemoryLoadNode;
-import jdk.compiler.graal.nodes.extended.UnsafeMemoryStoreNode;
-import jdk.compiler.graal.nodes.gc.BarrierSet;
-import jdk.compiler.graal.nodes.java.AbstractNewObjectNode;
-import jdk.compiler.graal.nodes.java.AccessIndexedNode;
-import jdk.compiler.graal.nodes.java.ArrayLengthNode;
-import jdk.compiler.graal.nodes.java.AtomicReadAndAddNode;
-import jdk.compiler.graal.nodes.java.AtomicReadAndWriteNode;
-import jdk.compiler.graal.nodes.java.InstanceOfDynamicNode;
-import jdk.compiler.graal.nodes.java.InstanceOfNode;
-import jdk.compiler.graal.nodes.java.LoadFieldNode;
-import jdk.compiler.graal.nodes.java.LoadIndexedNode;
-import jdk.compiler.graal.nodes.java.LogicCompareAndSwapNode;
-import jdk.compiler.graal.nodes.java.LoweredAtomicReadAndAddNode;
-import jdk.compiler.graal.nodes.java.LoweredAtomicReadAndWriteNode;
-import jdk.compiler.graal.nodes.java.MonitorEnterNode;
-import jdk.compiler.graal.nodes.java.MonitorIdNode;
-import jdk.compiler.graal.nodes.java.NewArrayNode;
-import jdk.compiler.graal.nodes.java.NewInstanceNode;
-import jdk.compiler.graal.nodes.java.RegisterFinalizerNode;
-import jdk.compiler.graal.nodes.java.StoreFieldNode;
-import jdk.compiler.graal.nodes.java.StoreIndexedNode;
-import jdk.compiler.graal.nodes.java.UnsafeCompareAndExchangeNode;
-import jdk.compiler.graal.nodes.java.UnsafeCompareAndSwapNode;
-import jdk.compiler.graal.nodes.java.ValueCompareAndSwapNode;
-import jdk.compiler.graal.nodes.memory.ReadNode;
-import jdk.compiler.graal.nodes.memory.SideEffectFreeWriteNode;
-import jdk.compiler.graal.nodes.memory.WriteNode;
-import jdk.compiler.graal.nodes.memory.address.AddressNode;
-import jdk.compiler.graal.nodes.memory.address.IndexAddressNode;
-import jdk.compiler.graal.nodes.memory.address.OffsetAddressNode;
-import jdk.compiler.graal.nodes.spi.LIRLowerable;
-import jdk.compiler.graal.nodes.spi.Lowerable;
-import jdk.compiler.graal.nodes.spi.LoweringProvider;
-import jdk.compiler.graal.nodes.spi.LoweringTool;
-import jdk.compiler.graal.nodes.spi.PlatformConfigurationProvider;
-import jdk.compiler.graal.nodes.spi.Replacements;
-import jdk.compiler.graal.nodes.type.StampTool;
-import jdk.compiler.graal.nodes.util.GraphUtil;
-import jdk.compiler.graal.nodes.virtual.AllocatedObjectNode;
-import jdk.compiler.graal.nodes.virtual.CommitAllocationNode;
-import jdk.compiler.graal.nodes.virtual.VirtualArrayNode;
-import jdk.compiler.graal.nodes.virtual.VirtualInstanceNode;
-import jdk.compiler.graal.nodes.virtual.VirtualObjectNode;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.util.Providers;
-import jdk.compiler.graal.replacements.nodes.BinaryMathIntrinsicNode;
-import jdk.compiler.graal.replacements.nodes.IdentityHashCodeNode;
-import jdk.compiler.graal.replacements.nodes.UnaryMathIntrinsicNode;
+import jdk.graal.compiler.core.common.memory.BarrierType;
+import jdk.graal.compiler.core.common.memory.MemoryOrderMode;
+import jdk.graal.compiler.core.common.spi.ForeignCallsProvider;
+import jdk.graal.compiler.core.common.spi.MetaAccessExtensionProvider;
+import jdk.graal.compiler.core.common.type.AbstractPointerStamp;
+import jdk.graal.compiler.core.common.type.IntegerStamp;
+import jdk.graal.compiler.core.common.type.ObjectStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.core.common.type.TypeReference;
+import jdk.graal.compiler.debug.DebugCloseable;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.nodeinfo.InputType;
+import jdk.graal.compiler.nodes.CompressionNode.CompressionOp;
+import jdk.graal.compiler.nodes.ComputeObjectAddressNode;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.EndNode;
+import jdk.graal.compiler.nodes.FieldLocationIdentity;
+import jdk.graal.compiler.nodes.FixedNode;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.FrameState;
+import jdk.graal.compiler.nodes.GetObjectAddressNode;
+import jdk.graal.compiler.nodes.GraphState;
+import jdk.graal.compiler.nodes.IfNode;
+import jdk.graal.compiler.nodes.LogicNode;
+import jdk.graal.compiler.nodes.MergeNode;
+import jdk.graal.compiler.nodes.NamedLocationIdentity;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.PhiNode;
+import jdk.graal.compiler.nodes.PiNode;
+import jdk.graal.compiler.nodes.ProfileData.BranchProbabilityData;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.ValuePhiNode;
+import jdk.graal.compiler.nodes.calc.AddNode;
+import jdk.graal.compiler.nodes.calc.ConditionalNode;
+import jdk.graal.compiler.nodes.calc.FloatingIntegerDivRemNode;
+import jdk.graal.compiler.nodes.calc.IntegerBelowNode;
+import jdk.graal.compiler.nodes.calc.IntegerConvertNode;
+import jdk.graal.compiler.nodes.calc.IntegerDivRemNode;
+import jdk.graal.compiler.nodes.calc.IntegerEqualsNode;
+import jdk.graal.compiler.nodes.calc.IsNullNode;
+import jdk.graal.compiler.nodes.calc.LeftShiftNode;
+import jdk.graal.compiler.nodes.calc.NarrowNode;
+import jdk.graal.compiler.nodes.calc.ReinterpretNode;
+import jdk.graal.compiler.nodes.calc.RightShiftNode;
+import jdk.graal.compiler.nodes.calc.SignExtendNode;
+import jdk.graal.compiler.nodes.calc.SignedDivNode;
+import jdk.graal.compiler.nodes.calc.SignedFloatingIntegerDivNode;
+import jdk.graal.compiler.nodes.calc.SignedFloatingIntegerRemNode;
+import jdk.graal.compiler.nodes.calc.SignedRemNode;
+import jdk.graal.compiler.nodes.calc.SubNode;
+import jdk.graal.compiler.nodes.calc.UnpackEndianHalfNode;
+import jdk.graal.compiler.nodes.calc.ZeroExtendNode;
+import jdk.graal.compiler.nodes.debug.VerifyHeapNode;
+import jdk.graal.compiler.nodes.extended.BoxNode;
+import jdk.graal.compiler.nodes.extended.BranchProbabilityNode;
+import jdk.graal.compiler.nodes.extended.ClassIsArrayNode;
+import jdk.graal.compiler.nodes.extended.FixedValueAnchorNode;
+import jdk.graal.compiler.nodes.extended.ForeignCallNode;
+import jdk.graal.compiler.nodes.extended.GuardedUnsafeLoadNode;
+import jdk.graal.compiler.nodes.extended.GuardingNode;
+import jdk.graal.compiler.nodes.extended.JavaReadNode;
+import jdk.graal.compiler.nodes.extended.JavaWriteNode;
+import jdk.graal.compiler.nodes.extended.LoadArrayComponentHubNode;
+import jdk.graal.compiler.nodes.extended.LoadHubNode;
+import jdk.graal.compiler.nodes.extended.LoadHubOrNullNode;
+import jdk.graal.compiler.nodes.extended.MembarNode;
+import jdk.graal.compiler.nodes.extended.MembarNode.FenceKind;
+import jdk.graal.compiler.nodes.extended.ObjectIsArrayNode;
+import jdk.graal.compiler.nodes.extended.RawLoadNode;
+import jdk.graal.compiler.nodes.extended.RawStoreNode;
+import jdk.graal.compiler.nodes.extended.UnboxNode;
+import jdk.graal.compiler.nodes.extended.UnsafeMemoryLoadNode;
+import jdk.graal.compiler.nodes.extended.UnsafeMemoryStoreNode;
+import jdk.graal.compiler.nodes.gc.BarrierSet;
+import jdk.graal.compiler.nodes.java.AbstractNewObjectNode;
+import jdk.graal.compiler.nodes.java.AccessIndexedNode;
+import jdk.graal.compiler.nodes.java.ArrayLengthNode;
+import jdk.graal.compiler.nodes.java.AtomicReadAndAddNode;
+import jdk.graal.compiler.nodes.java.AtomicReadAndWriteNode;
+import jdk.graal.compiler.nodes.java.InstanceOfDynamicNode;
+import jdk.graal.compiler.nodes.java.InstanceOfNode;
+import jdk.graal.compiler.nodes.java.LoadFieldNode;
+import jdk.graal.compiler.nodes.java.LoadIndexedNode;
+import jdk.graal.compiler.nodes.java.LogicCompareAndSwapNode;
+import jdk.graal.compiler.nodes.java.LoweredAtomicReadAndAddNode;
+import jdk.graal.compiler.nodes.java.LoweredAtomicReadAndWriteNode;
+import jdk.graal.compiler.nodes.java.MonitorEnterNode;
+import jdk.graal.compiler.nodes.java.MonitorIdNode;
+import jdk.graal.compiler.nodes.java.NewArrayNode;
+import jdk.graal.compiler.nodes.java.NewInstanceNode;
+import jdk.graal.compiler.nodes.java.RegisterFinalizerNode;
+import jdk.graal.compiler.nodes.java.StoreFieldNode;
+import jdk.graal.compiler.nodes.java.StoreIndexedNode;
+import jdk.graal.compiler.nodes.java.UnsafeCompareAndExchangeNode;
+import jdk.graal.compiler.nodes.java.UnsafeCompareAndSwapNode;
+import jdk.graal.compiler.nodes.java.ValueCompareAndSwapNode;
+import jdk.graal.compiler.nodes.memory.ReadNode;
+import jdk.graal.compiler.nodes.memory.SideEffectFreeWriteNode;
+import jdk.graal.compiler.nodes.memory.WriteNode;
+import jdk.graal.compiler.nodes.memory.address.AddressNode;
+import jdk.graal.compiler.nodes.memory.address.IndexAddressNode;
+import jdk.graal.compiler.nodes.memory.address.OffsetAddressNode;
+import jdk.graal.compiler.nodes.spi.LIRLowerable;
+import jdk.graal.compiler.nodes.spi.Lowerable;
+import jdk.graal.compiler.nodes.spi.LoweringProvider;
+import jdk.graal.compiler.nodes.spi.LoweringTool;
+import jdk.graal.compiler.nodes.spi.PlatformConfigurationProvider;
+import jdk.graal.compiler.nodes.spi.Replacements;
+import jdk.graal.compiler.nodes.type.StampTool;
+import jdk.graal.compiler.nodes.util.GraphUtil;
+import jdk.graal.compiler.nodes.virtual.AllocatedObjectNode;
+import jdk.graal.compiler.nodes.virtual.CommitAllocationNode;
+import jdk.graal.compiler.nodes.virtual.VirtualArrayNode;
+import jdk.graal.compiler.nodes.virtual.VirtualInstanceNode;
+import jdk.graal.compiler.nodes.virtual.VirtualObjectNode;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.util.Providers;
+import jdk.graal.compiler.replacements.nodes.BinaryMathIntrinsicNode;
+import jdk.graal.compiler.replacements.nodes.IdentityHashCodeNode;
+import jdk.graal.compiler.replacements.nodes.UnaryMathIntrinsicNode;
 import org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.code.CodeUtil;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/DimensionsNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/DimensionsNode.java
similarity index 78%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/DimensionsNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/DimensionsNode.java
index 72ba34798fb8..c9852a9514ec 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/DimensionsNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/DimensionsNode.java
@@ -22,21 +22,21 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements;
+package jdk.graal.compiler.replacements;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_2;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_1;
 
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.lir.VirtualStackSlot;
-import jdk.compiler.graal.lir.gen.LIRGeneratorTool;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.spi.LIRLowerable;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
-import jdk.compiler.graal.word.Word;
-import jdk.compiler.graal.word.WordTypes;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.lir.VirtualStackSlot;
+import jdk.graal.compiler.lir.gen.LIRGeneratorTool;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.spi.LIRLowerable;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.word.Word;
+import jdk.graal.compiler.word.WordTypes;
 
 import jdk.vm.ci.meta.Value;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/GraphKit.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/GraphKit.java
similarity index 91%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/GraphKit.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/GraphKit.java
index 847fbdfd13c2..f2e9519fae90 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/GraphKit.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/GraphKit.java
@@ -22,60 +22,60 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements;
+package jdk.graal.compiler.replacements;
 
 import static jdk.vm.ci.code.BytecodeFrame.UNKNOWN_BCI;
 import static jdk.vm.ci.services.Services.IS_IN_NATIVE_IMAGE;
-import static jdk.compiler.graal.nodes.CallTargetNode.InvokeKind.Static;
+import static jdk.graal.compiler.nodes.CallTargetNode.InvokeKind.Static;
 
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.util.ArrayList;
 import java.util.List;
 
-import jdk.compiler.graal.core.common.CompilationIdentifier;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.core.common.type.StampPair;
-import jdk.compiler.graal.debug.DebugCloseable;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.Graph;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.Node.ValueNumberable;
-import jdk.compiler.graal.graph.NodeSourcePosition;
-import jdk.compiler.graal.java.FrameStateBuilder;
-import jdk.compiler.graal.java.GraphBuilderPhase;
-import jdk.compiler.graal.nodes.AbstractBeginNode;
-import jdk.compiler.graal.nodes.AbstractMergeNode;
-import jdk.compiler.graal.nodes.BeginNode;
-import jdk.compiler.graal.nodes.CallTargetNode;
-import jdk.compiler.graal.nodes.CallTargetNode.InvokeKind;
-import jdk.compiler.graal.nodes.EndNode;
-import jdk.compiler.graal.nodes.FixedNode;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.IfNode;
-import jdk.compiler.graal.nodes.InvokeNode;
-import jdk.compiler.graal.nodes.InvokeWithExceptionNode;
-import jdk.compiler.graal.nodes.LogicNode;
-import jdk.compiler.graal.nodes.MergeNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ProfileData.BranchProbabilityData;
-import jdk.compiler.graal.nodes.StateSplit;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.UnwindNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.WithExceptionNode;
-import jdk.compiler.graal.nodes.calc.FloatingNode;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderTool;
-import jdk.compiler.graal.nodes.java.ExceptionObjectNode;
-import jdk.compiler.graal.nodes.java.MethodCallTargetNode;
-import jdk.compiler.graal.nodes.spi.CoreProvidersDelegate;
-import jdk.compiler.graal.nodes.type.StampTool;
-import jdk.compiler.graal.phases.util.Providers;
-import jdk.compiler.graal.word.WordTypes;
+import jdk.graal.compiler.core.common.CompilationIdentifier;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.core.common.type.StampPair;
+import jdk.graal.compiler.debug.DebugCloseable;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.Graph;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.Node.ValueNumberable;
+import jdk.graal.compiler.graph.NodeSourcePosition;
+import jdk.graal.compiler.java.FrameStateBuilder;
+import jdk.graal.compiler.java.GraphBuilderPhase;
+import jdk.graal.compiler.nodes.AbstractBeginNode;
+import jdk.graal.compiler.nodes.AbstractMergeNode;
+import jdk.graal.compiler.nodes.BeginNode;
+import jdk.graal.compiler.nodes.CallTargetNode;
+import jdk.graal.compiler.nodes.CallTargetNode.InvokeKind;
+import jdk.graal.compiler.nodes.EndNode;
+import jdk.graal.compiler.nodes.FixedNode;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.IfNode;
+import jdk.graal.compiler.nodes.InvokeNode;
+import jdk.graal.compiler.nodes.InvokeWithExceptionNode;
+import jdk.graal.compiler.nodes.LogicNode;
+import jdk.graal.compiler.nodes.MergeNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ProfileData.BranchProbabilityData;
+import jdk.graal.compiler.nodes.StateSplit;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.UnwindNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.WithExceptionNode;
+import jdk.graal.compiler.nodes.calc.FloatingNode;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderTool;
+import jdk.graal.compiler.nodes.java.ExceptionObjectNode;
+import jdk.graal.compiler.nodes.java.MethodCallTargetNode;
+import jdk.graal.compiler.nodes.spi.CoreProvidersDelegate;
+import jdk.graal.compiler.nodes.type.StampTool;
+import jdk.graal.compiler.phases.util.Providers;
+import jdk.graal.compiler.word.WordTypes;
 
 import jdk.vm.ci.code.BytecodeFrame;
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/IdentityHashCodeSnippets.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/IdentityHashCodeSnippets.java
similarity index 80%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/IdentityHashCodeSnippets.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/IdentityHashCodeSnippets.java
index 10f19c45fe7c..44298a5f2237 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/IdentityHashCodeSnippets.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/IdentityHashCodeSnippets.java
@@ -22,20 +22,20 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements;
+package jdk.graal.compiler.replacements;
 
-import static jdk.compiler.graal.nodes.extended.BranchProbabilityNode.NOT_FREQUENT_PROBABILITY;
-import static jdk.compiler.graal.nodes.extended.BranchProbabilityNode.probability;
+import static jdk.graal.compiler.nodes.extended.BranchProbabilityNode.NOT_FREQUENT_PROBABILITY;
+import static jdk.graal.compiler.nodes.extended.BranchProbabilityNode.probability;
 
-import jdk.compiler.graal.api.replacements.Snippet;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.spi.LoweringTool;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.util.Providers;
-import jdk.compiler.graal.replacements.nodes.IdentityHashCodeNode;
-import jdk.compiler.graal.replacements.SnippetTemplate.AbstractTemplates;
-import jdk.compiler.graal.replacements.SnippetTemplate.Arguments;
-import jdk.compiler.graal.replacements.SnippetTemplate.SnippetInfo;
+import jdk.graal.compiler.api.replacements.Snippet;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.spi.LoweringTool;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.util.Providers;
+import jdk.graal.compiler.replacements.nodes.IdentityHashCodeNode;
+import jdk.graal.compiler.replacements.SnippetTemplate.AbstractTemplates;
+import jdk.graal.compiler.replacements.SnippetTemplate.Arguments;
+import jdk.graal.compiler.replacements.SnippetTemplate.SnippetInfo;
 import org.graalvm.word.LocationIdentity;
 
 public abstract class IdentityHashCodeSnippets implements Snippets {
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/InlineDuringParsingPlugin.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/InlineDuringParsingPlugin.java
similarity index 86%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/InlineDuringParsingPlugin.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/InlineDuringParsingPlugin.java
index ea6c7fc4ad4f..3f25d29be00d 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/InlineDuringParsingPlugin.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/InlineDuringParsingPlugin.java
@@ -22,18 +22,18 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements;
+package jdk.graal.compiler.replacements;
 
-import static jdk.compiler.graal.core.common.GraalOptions.TrivialInliningSize;
-import static jdk.compiler.graal.java.BytecodeParserOptions.InlineDuringParsing;
-import static jdk.compiler.graal.java.BytecodeParserOptions.InlineDuringParsingMaxDepth;
-import static jdk.compiler.graal.nodes.graphbuilderconf.InlineInvokePlugin.InlineInfo.createStandardInlineInfo;
+import static jdk.graal.compiler.core.common.GraalOptions.TrivialInliningSize;
+import static jdk.graal.compiler.java.BytecodeParserOptions.InlineDuringParsing;
+import static jdk.graal.compiler.java.BytecodeParserOptions.InlineDuringParsingMaxDepth;
+import static jdk.graal.compiler.nodes.graphbuilderconf.InlineInvokePlugin.InlineInfo.createStandardInlineInfo;
 
-import jdk.compiler.graal.java.BytecodeParserOptions;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext;
-import jdk.compiler.graal.nodes.graphbuilderconf.InlineInvokePlugin;
+import jdk.graal.compiler.java.BytecodeParserOptions;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext;
+import jdk.graal.compiler.nodes.graphbuilderconf.InlineInvokePlugin;
 
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 import jdk.vm.ci.services.Services;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/InstanceOfSnippetsTemplates.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/InstanceOfSnippetsTemplates.java
similarity index 89%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/InstanceOfSnippetsTemplates.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/InstanceOfSnippetsTemplates.java
index 6c0a67619b5f..73ba0dcd9104 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/InstanceOfSnippetsTemplates.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/InstanceOfSnippetsTemplates.java
@@ -22,37 +22,37 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements;
+package jdk.graal.compiler.replacements;
 
-import static jdk.compiler.graal.nodes.calc.CompareNode.createCompareNode;
+import static jdk.graal.compiler.nodes.calc.CompareNode.createCompareNode;
 
 import java.util.List;
 
-import jdk.compiler.graal.core.common.calc.CanonicalCondition;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.nodes.ConditionAnchorNode;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.FixedGuardNode;
-import jdk.compiler.graal.nodes.IfNode;
-import jdk.compiler.graal.nodes.LogicConstantNode;
-import jdk.compiler.graal.nodes.LogicNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.PhiNode;
-import jdk.compiler.graal.nodes.ShortCircuitOrNode;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.calc.CompareNode;
-import jdk.compiler.graal.nodes.calc.ConditionalNode;
-import jdk.compiler.graal.nodes.calc.FloatingNode;
-import jdk.compiler.graal.nodes.java.InstanceOfDynamicNode;
-import jdk.compiler.graal.nodes.java.InstanceOfNode;
-import jdk.compiler.graal.nodes.spi.LoweringTool;
-import jdk.compiler.graal.nodes.util.GraphUtil;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.util.Providers;
-import jdk.compiler.graal.replacements.SnippetTemplate.AbstractTemplates;
-import jdk.compiler.graal.replacements.SnippetTemplate.Arguments;
-import jdk.compiler.graal.replacements.SnippetTemplate.UsageReplacer;
+import jdk.graal.compiler.core.common.calc.CanonicalCondition;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.nodes.ConditionAnchorNode;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.FixedGuardNode;
+import jdk.graal.compiler.nodes.IfNode;
+import jdk.graal.compiler.nodes.LogicConstantNode;
+import jdk.graal.compiler.nodes.LogicNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.PhiNode;
+import jdk.graal.compiler.nodes.ShortCircuitOrNode;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.calc.CompareNode;
+import jdk.graal.compiler.nodes.calc.ConditionalNode;
+import jdk.graal.compiler.nodes.calc.FloatingNode;
+import jdk.graal.compiler.nodes.java.InstanceOfDynamicNode;
+import jdk.graal.compiler.nodes.java.InstanceOfNode;
+import jdk.graal.compiler.nodes.spi.LoweringTool;
+import jdk.graal.compiler.nodes.util.GraphUtil;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.util.Providers;
+import jdk.graal.compiler.replacements.SnippetTemplate.AbstractTemplates;
+import jdk.graal.compiler.replacements.SnippetTemplate.Arguments;
+import jdk.graal.compiler.replacements.SnippetTemplate.UsageReplacer;
 
 /**
  * Helper class for lowering {@link InstanceOfNode}s with snippets. The majority of the complexity
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/IntrinsicGraphBuilder.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/IntrinsicGraphBuilder.java
similarity index 87%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/IntrinsicGraphBuilder.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/IntrinsicGraphBuilder.java
index 1bcb8aecbaf6..a96fca1bcb3a 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/IntrinsicGraphBuilder.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/IntrinsicGraphBuilder.java
@@ -22,50 +22,50 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements;
+package jdk.graal.compiler.replacements;
 
 import static jdk.vm.ci.code.BytecodeFrame.AFTER_BCI;
 
-import jdk.compiler.graal.bytecode.Bytecode;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.core.common.type.StampPair;
-import jdk.compiler.graal.core.common.type.TypeReference;
-import jdk.compiler.graal.debug.DebugCloseable;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeSourcePosition;
-import jdk.compiler.graal.java.FrameStateBuilder;
-import jdk.compiler.graal.nodes.AbstractBeginNode;
-import jdk.compiler.graal.nodes.BeginNode;
-import jdk.compiler.graal.nodes.CallTargetNode;
-import jdk.compiler.graal.nodes.CallTargetNode.InvokeKind;
-import jdk.compiler.graal.nodes.DeoptimizeNode;
-import jdk.compiler.graal.nodes.EndNode;
-import jdk.compiler.graal.nodes.FixedNode;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.FrameState;
-import jdk.compiler.graal.nodes.Invokable;
-import jdk.compiler.graal.nodes.Invoke;
-import jdk.compiler.graal.nodes.ParameterNode;
-import jdk.compiler.graal.nodes.ReturnNode;
-import jdk.compiler.graal.nodes.StateSplit;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions;
-import jdk.compiler.graal.nodes.UnwindNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.WithExceptionNode;
-import jdk.compiler.graal.nodes.extended.BytecodeExceptionNode;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext;
-import jdk.compiler.graal.nodes.graphbuilderconf.IntrinsicContext;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin.Receiver;
-import jdk.compiler.graal.nodes.java.ExceptionObjectNode;
-import jdk.compiler.graal.nodes.spi.CoreProviders;
-import jdk.compiler.graal.nodes.spi.CoreProvidersDelegate;
-import jdk.compiler.graal.options.OptionValues;
+import jdk.graal.compiler.bytecode.Bytecode;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.core.common.type.StampPair;
+import jdk.graal.compiler.core.common.type.TypeReference;
+import jdk.graal.compiler.debug.DebugCloseable;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeSourcePosition;
+import jdk.graal.compiler.java.FrameStateBuilder;
+import jdk.graal.compiler.nodes.AbstractBeginNode;
+import jdk.graal.compiler.nodes.BeginNode;
+import jdk.graal.compiler.nodes.CallTargetNode;
+import jdk.graal.compiler.nodes.CallTargetNode.InvokeKind;
+import jdk.graal.compiler.nodes.DeoptimizeNode;
+import jdk.graal.compiler.nodes.EndNode;
+import jdk.graal.compiler.nodes.FixedNode;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.FrameState;
+import jdk.graal.compiler.nodes.Invokable;
+import jdk.graal.compiler.nodes.Invoke;
+import jdk.graal.compiler.nodes.ParameterNode;
+import jdk.graal.compiler.nodes.ReturnNode;
+import jdk.graal.compiler.nodes.StateSplit;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.StructuredGraph.AllowAssumptions;
+import jdk.graal.compiler.nodes.UnwindNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.WithExceptionNode;
+import jdk.graal.compiler.nodes.extended.BytecodeExceptionNode;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext;
+import jdk.graal.compiler.nodes.graphbuilderconf.IntrinsicContext;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin.Receiver;
+import jdk.graal.compiler.nodes.java.ExceptionObjectNode;
+import jdk.graal.compiler.nodes.spi.CoreProviders;
+import jdk.graal.compiler.nodes.spi.CoreProvidersDelegate;
+import jdk.graal.compiler.options.OptionValues;
 
 import jdk.vm.ci.code.BailoutException;
 import jdk.vm.ci.meta.DeoptimizationAction;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/InvocationPluginHelper.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/InvocationPluginHelper.java
similarity index 90%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/InvocationPluginHelper.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/InvocationPluginHelper.java
index 3a0a65844e7b..93ddd27d9cb6 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/InvocationPluginHelper.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/InvocationPluginHelper.java
@@ -22,60 +22,60 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements;
+package jdk.graal.compiler.replacements;
 
 import static jdk.vm.ci.services.Services.IS_BUILDING_NATIVE_IMAGE;
 
 import java.util.ArrayList;
 
-import jdk.compiler.graal.api.replacements.Snippet;
-import jdk.compiler.graal.core.common.calc.CanonicalCondition;
-import jdk.compiler.graal.core.common.calc.Condition;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.debug.DebugCloseable;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.nodes.AbstractBeginNode;
-import jdk.compiler.graal.nodes.BeginNode;
-import jdk.compiler.graal.nodes.ComputeObjectAddressNode;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.DeoptimizeNode;
-import jdk.compiler.graal.nodes.EndNode;
-import jdk.compiler.graal.nodes.FixedNode;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.FrameState;
-import jdk.compiler.graal.nodes.IfNode;
-import jdk.compiler.graal.nodes.Invoke;
-import jdk.compiler.graal.nodes.LogicNegationNode;
-import jdk.compiler.graal.nodes.LogicNode;
-import jdk.compiler.graal.nodes.MergeNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.PiNode;
-import jdk.compiler.graal.nodes.ProfileData;
-import jdk.compiler.graal.nodes.StateSplit;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.ValuePhiNode;
-import jdk.compiler.graal.nodes.calc.AddNode;
-import jdk.compiler.graal.nodes.calc.IntegerBelowNode;
-import jdk.compiler.graal.nodes.calc.IntegerEqualsNode;
-import jdk.compiler.graal.nodes.calc.IntegerLessThanNode;
-import jdk.compiler.graal.nodes.calc.LeftShiftNode;
-import jdk.compiler.graal.nodes.calc.ObjectEqualsNode;
-import jdk.compiler.graal.nodes.calc.OrNode;
-import jdk.compiler.graal.nodes.calc.RightShiftNode;
-import jdk.compiler.graal.nodes.calc.SignExtendNode;
-import jdk.compiler.graal.nodes.calc.SubNode;
-import jdk.compiler.graal.nodes.calc.UnsignedRightShiftNode;
-import jdk.compiler.graal.nodes.calc.XorNode;
-import jdk.compiler.graal.nodes.extended.GuardingNode;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin;
-import jdk.compiler.graal.nodes.java.ArrayLengthNode;
-import jdk.compiler.graal.nodes.java.LoadFieldNode;
-import jdk.compiler.graal.nodes.memory.address.AddressNode;
-import jdk.compiler.graal.nodes.memory.address.OffsetAddressNode;
-import jdk.compiler.graal.nodes.type.StampTool;
-import jdk.compiler.graal.word.Word;
+import jdk.graal.compiler.api.replacements.Snippet;
+import jdk.graal.compiler.core.common.calc.CanonicalCondition;
+import jdk.graal.compiler.core.common.calc.Condition;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.debug.DebugCloseable;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.nodes.AbstractBeginNode;
+import jdk.graal.compiler.nodes.BeginNode;
+import jdk.graal.compiler.nodes.ComputeObjectAddressNode;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.DeoptimizeNode;
+import jdk.graal.compiler.nodes.EndNode;
+import jdk.graal.compiler.nodes.FixedNode;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.FrameState;
+import jdk.graal.compiler.nodes.IfNode;
+import jdk.graal.compiler.nodes.Invoke;
+import jdk.graal.compiler.nodes.LogicNegationNode;
+import jdk.graal.compiler.nodes.LogicNode;
+import jdk.graal.compiler.nodes.MergeNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.PiNode;
+import jdk.graal.compiler.nodes.ProfileData;
+import jdk.graal.compiler.nodes.StateSplit;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.ValuePhiNode;
+import jdk.graal.compiler.nodes.calc.AddNode;
+import jdk.graal.compiler.nodes.calc.IntegerBelowNode;
+import jdk.graal.compiler.nodes.calc.IntegerEqualsNode;
+import jdk.graal.compiler.nodes.calc.IntegerLessThanNode;
+import jdk.graal.compiler.nodes.calc.LeftShiftNode;
+import jdk.graal.compiler.nodes.calc.ObjectEqualsNode;
+import jdk.graal.compiler.nodes.calc.OrNode;
+import jdk.graal.compiler.nodes.calc.RightShiftNode;
+import jdk.graal.compiler.nodes.calc.SignExtendNode;
+import jdk.graal.compiler.nodes.calc.SubNode;
+import jdk.graal.compiler.nodes.calc.UnsignedRightShiftNode;
+import jdk.graal.compiler.nodes.calc.XorNode;
+import jdk.graal.compiler.nodes.extended.GuardingNode;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin;
+import jdk.graal.compiler.nodes.java.ArrayLengthNode;
+import jdk.graal.compiler.nodes.java.LoadFieldNode;
+import jdk.graal.compiler.nodes.memory.address.AddressNode;
+import jdk.graal.compiler.nodes.memory.address.OffsetAddressNode;
+import jdk.graal.compiler.nodes.type.StampTool;
+import jdk.graal.compiler.word.Word;
 
 import jdk.vm.ci.code.CodeUtil;
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/IsArraySnippets.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/IsArraySnippets.java
similarity index 87%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/IsArraySnippets.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/IsArraySnippets.java
index 5c7af785dd6f..1684c2ba2400 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/IsArraySnippets.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/IsArraySnippets.java
@@ -22,18 +22,18 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements;
+package jdk.graal.compiler.replacements;
 
-import static jdk.compiler.graal.nodes.extended.BranchProbabilityNode.unknownProbability;
+import static jdk.graal.compiler.nodes.extended.BranchProbabilityNode.unknownProbability;
 
-import jdk.compiler.graal.api.replacements.Snippet;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.extended.ClassIsArrayNode;
-import jdk.compiler.graal.nodes.extended.ObjectIsArrayNode;
-import jdk.compiler.graal.nodes.spi.LoweringTool;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.util.Providers;
+import jdk.graal.compiler.api.replacements.Snippet;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.extended.ClassIsArrayNode;
+import jdk.graal.compiler.nodes.extended.ObjectIsArrayNode;
+import jdk.graal.compiler.nodes.spi.LoweringTool;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.util.Providers;
 
 public abstract class IsArraySnippets implements Snippets {
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/JavacBug.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/JavacBug.java
similarity index 97%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/JavacBug.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/JavacBug.java
index 9faf85097933..05bb3be3d883 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/JavacBug.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/JavacBug.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements;
+package jdk.graal.compiler.replacements;
 
 /**
  * Used to indicate that an otherwise strange looking code pattern is required to work around a bug
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/MethodHandlePlugin.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/MethodHandlePlugin.java
similarity index 88%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/MethodHandlePlugin.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/MethodHandlePlugin.java
index 508d81a6d358..e45174bbaf01 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/MethodHandlePlugin.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/MethodHandlePlugin.java
@@ -22,26 +22,26 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements;
+package jdk.graal.compiler.replacements;
 
-import static jdk.compiler.graal.core.common.GraalOptions.MaximumRecursiveInlining;
+import static jdk.graal.compiler.core.common.GraalOptions.MaximumRecursiveInlining;
 
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.core.common.type.StampPair;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.NodeInputList;
-import jdk.compiler.graal.nodes.CallTargetNode;
-import jdk.compiler.graal.nodes.CallTargetNode.InvokeKind;
-import jdk.compiler.graal.nodes.Invokable;
-import jdk.compiler.graal.nodes.Invoke;
-import jdk.compiler.graal.nodes.InvokeNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext;
-import jdk.compiler.graal.nodes.graphbuilderconf.NodePlugin;
-import jdk.compiler.graal.replacements.nodes.MacroInvokable;
-import jdk.compiler.graal.replacements.nodes.MacroNode;
-import jdk.compiler.graal.replacements.nodes.MethodHandleNode;
-import jdk.compiler.graal.replacements.nodes.ResolvedMethodHandleCallTargetNode;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.core.common.type.StampPair;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.NodeInputList;
+import jdk.graal.compiler.nodes.CallTargetNode;
+import jdk.graal.compiler.nodes.CallTargetNode.InvokeKind;
+import jdk.graal.compiler.nodes.Invokable;
+import jdk.graal.compiler.nodes.Invoke;
+import jdk.graal.compiler.nodes.InvokeNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext;
+import jdk.graal.compiler.nodes.graphbuilderconf.NodePlugin;
+import jdk.graal.compiler.replacements.nodes.MacroInvokable;
+import jdk.graal.compiler.replacements.nodes.MacroNode;
+import jdk.graal.compiler.replacements.nodes.MethodHandleNode;
+import jdk.graal.compiler.replacements.nodes.ResolvedMethodHandleCallTargetNode;
 
 import jdk.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.MethodHandleAccessProvider;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/MethodHandleWithExceptionPlugin.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/MethodHandleWithExceptionPlugin.java
similarity index 79%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/MethodHandleWithExceptionPlugin.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/MethodHandleWithExceptionPlugin.java
index c4ba6b68f74e..cb77c882f775 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/MethodHandleWithExceptionPlugin.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/MethodHandleWithExceptionPlugin.java
@@ -22,18 +22,18 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements;
+package jdk.graal.compiler.replacements;
 
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.core.common.type.StampPair;
-import jdk.compiler.graal.nodes.CallTargetNode;
-import jdk.compiler.graal.nodes.Invoke;
-import jdk.compiler.graal.nodes.InvokeWithExceptionNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext;
-import jdk.compiler.graal.replacements.nodes.MacroInvokable;
-import jdk.compiler.graal.replacements.nodes.MacroNode;
-import jdk.compiler.graal.replacements.nodes.MethodHandleWithExceptionNode;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.core.common.type.StampPair;
+import jdk.graal.compiler.nodes.CallTargetNode;
+import jdk.graal.compiler.nodes.Invoke;
+import jdk.graal.compiler.nodes.InvokeWithExceptionNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext;
+import jdk.graal.compiler.replacements.nodes.MacroInvokable;
+import jdk.graal.compiler.replacements.nodes.MacroNode;
+import jdk.graal.compiler.replacements.nodes.MethodHandleWithExceptionNode;
 
 import jdk.vm.ci.meta.MethodHandleAccessProvider;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/NodeIntrinsificationProvider.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/NodeIntrinsificationProvider.java
similarity index 86%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/NodeIntrinsificationProvider.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/NodeIntrinsificationProvider.java
index 1433433a7ee4..e6b815936a2b 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/NodeIntrinsificationProvider.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/NodeIntrinsificationProvider.java
@@ -22,17 +22,17 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements;
+package jdk.graal.compiler.replacements;
 
-import jdk.compiler.graal.api.replacements.SnippetReflectionProvider;
-import jdk.compiler.graal.core.common.spi.ForeignCallsProvider;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.core.common.type.TypeReference;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.nodes.graphbuilderconf.GeneratedPluginInjectionProvider;
-import jdk.compiler.graal.replacements.arraycopy.ArrayCopyForeignCalls;
-import jdk.compiler.graal.word.WordTypes;
+import jdk.graal.compiler.api.replacements.SnippetReflectionProvider;
+import jdk.graal.compiler.core.common.spi.ForeignCallsProvider;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.core.common.type.TypeReference;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.nodes.graphbuilderconf.GeneratedPluginInjectionProvider;
+import jdk.graal.compiler.replacements.arraycopy.ArrayCopyForeignCalls;
+import jdk.graal.compiler.word.WordTypes;
 
 import jdk.vm.ci.code.TargetDescription;
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/NodeStrideUtil.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/NodeStrideUtil.java
similarity index 93%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/NodeStrideUtil.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/NodeStrideUtil.java
index e91118a9d58f..bff35233cba4 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/NodeStrideUtil.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/NodeStrideUtil.java
@@ -22,12 +22,12 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements;
+package jdk.graal.compiler.replacements;
 
-import jdk.compiler.graal.core.common.Stride;
-import jdk.compiler.graal.core.common.StrideUtil;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.replacements.nodes.ArrayRegionCompareToNode;
+import jdk.graal.compiler.core.common.Stride;
+import jdk.graal.compiler.core.common.StrideUtil;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.replacements.nodes.ArrayRegionCompareToNode;
 
 /**
  * This class provides utility methods for "stride-agnostic" intrinsic nodes such as
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/NonNullParameterPlugin.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/NonNullParameterPlugin.java
similarity index 82%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/NonNullParameterPlugin.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/NonNullParameterPlugin.java
index b6014030576a..606424cb3e50 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/NonNullParameterPlugin.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/NonNullParameterPlugin.java
@@ -22,19 +22,19 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements;
+package jdk.graal.compiler.replacements;
 
 import java.util.BitSet;
 
-import jdk.compiler.graal.api.replacements.Snippet;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.core.common.type.StampPair;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.nodes.ParameterNode;
-import jdk.compiler.graal.nodes.calc.FloatingNode;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderTool;
-import jdk.compiler.graal.nodes.graphbuilderconf.ParameterPlugin;
+import jdk.graal.compiler.api.replacements.Snippet;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.core.common.type.StampPair;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.nodes.ParameterNode;
+import jdk.graal.compiler.nodes.calc.FloatingNode;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderTool;
+import jdk.graal.compiler.nodes.graphbuilderconf.ParameterPlugin;
 
 /**
  * A {@link ParameterPlugin} that sets non-null stamps for parameters annotated with
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/PEGraphDecoder.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/PEGraphDecoder.java
similarity index 93%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/PEGraphDecoder.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/PEGraphDecoder.java
index 73ec2e5b5284..b980382e3b5a 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/PEGraphDecoder.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/PEGraphDecoder.java
@@ -22,16 +22,16 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements;
+package jdk.graal.compiler.replacements;
 
-import static jdk.compiler.graal.debug.GraalError.unimplemented;
-import static jdk.compiler.graal.debug.GraalError.unimplementedOverride;
-import static jdk.compiler.graal.nodeinfo.InputType.Anchor;
-import static jdk.compiler.graal.nodeinfo.InputType.Guard;
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0;
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_IGNORED;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_0;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_IGNORED;
+import static jdk.graal.compiler.debug.GraalError.unimplemented;
+import static jdk.graal.compiler.debug.GraalError.unimplementedOverride;
+import static jdk.graal.compiler.nodeinfo.InputType.Anchor;
+import static jdk.graal.compiler.nodeinfo.InputType.Guard;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_0;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_IGNORED;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_0;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_IGNORED;
 
 import java.net.URI;
 import java.util.ArrayList;
@@ -43,97 +43,97 @@
 import java.util.concurrent.ConcurrentHashMap;
 
 import org.graalvm.collections.Pair;
-import jdk.compiler.graal.api.replacements.Fold;
-import jdk.compiler.graal.bytecode.Bytecode;
-import jdk.compiler.graal.bytecode.BytecodeProvider;
-import jdk.compiler.graal.core.common.PermanentBailoutException;
-import jdk.compiler.graal.core.common.cfg.CFGVerifier;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.core.common.type.StampPair;
-import jdk.compiler.graal.debug.DebugCloseable;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.debug.TimerKey;
-import jdk.compiler.graal.graph.IterableNodeType;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.Node.NodeIntrinsic;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.graph.NodeSourcePosition;
-import jdk.compiler.graal.graph.SourceLanguagePosition;
-import jdk.compiler.graal.graph.SourceLanguagePositionProvider;
-import jdk.compiler.graal.java.GraphBuilderPhase;
-import jdk.compiler.graal.nodeinfo.InputType;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.AbstractBeginNode;
-import jdk.compiler.graal.nodes.AbstractEndNode;
-import jdk.compiler.graal.nodes.AbstractMergeNode;
-import jdk.compiler.graal.nodes.BeginNode;
-import jdk.compiler.graal.nodes.CallTargetNode;
-import jdk.compiler.graal.nodes.CallTargetNode.InvokeKind;
-import jdk.compiler.graal.nodes.ControlSinkNode;
-import jdk.compiler.graal.nodes.ControlSplitNode;
-import jdk.compiler.graal.nodes.DeoptBciSupplier;
-import jdk.compiler.graal.nodes.DeoptimizeNode;
-import jdk.compiler.graal.nodes.EncodedGraph;
-import jdk.compiler.graal.nodes.FixedNode;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.FrameState;
-import jdk.compiler.graal.nodes.IfNode;
-import jdk.compiler.graal.nodes.Invokable;
-import jdk.compiler.graal.nodes.Invoke;
-import jdk.compiler.graal.nodes.InvokeNode;
-import jdk.compiler.graal.nodes.InvokeWithExceptionNode;
-import jdk.compiler.graal.nodes.MergeNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ParameterNode;
-import jdk.compiler.graal.nodes.PluginReplacementInterface;
-import jdk.compiler.graal.nodes.ReturnNode;
-import jdk.compiler.graal.nodes.SimplifyingGraphDecoder;
-import jdk.compiler.graal.nodes.StateSplit;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.UnwindNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.WithExceptionNode;
-import jdk.compiler.graal.nodes.calc.FloatingNode;
-import jdk.compiler.graal.nodes.cfg.ControlFlowGraph;
-import jdk.compiler.graal.nodes.extended.AnchoringNode;
-import jdk.compiler.graal.nodes.extended.BytecodeExceptionNode;
-import jdk.compiler.graal.nodes.extended.GuardingNode;
-import jdk.compiler.graal.nodes.extended.IntegerSwitchNode;
-import jdk.compiler.graal.nodes.graphbuilderconf.GeneratedInvocationPlugin;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext;
-import jdk.compiler.graal.nodes.graphbuilderconf.InlineInvokePlugin;
-import jdk.compiler.graal.nodes.graphbuilderconf.InlineInvokePlugin.InlineInfo;
-import jdk.compiler.graal.nodes.graphbuilderconf.IntrinsicContext;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins.InvocationPluginReceiver;
-import jdk.compiler.graal.nodes.graphbuilderconf.LoopExplosionPlugin;
-import jdk.compiler.graal.nodes.graphbuilderconf.LoopExplosionPlugin.LoopExplosionKind;
-import jdk.compiler.graal.nodes.graphbuilderconf.NodePlugin;
-import jdk.compiler.graal.nodes.graphbuilderconf.ParameterPlugin;
-import jdk.compiler.graal.nodes.java.ExceptionObjectNode;
-import jdk.compiler.graal.nodes.java.LoadFieldNode;
-import jdk.compiler.graal.nodes.java.LoadIndexedNode;
-import jdk.compiler.graal.nodes.java.MethodCallTargetNode;
-import jdk.compiler.graal.nodes.java.MonitorIdNode;
-import jdk.compiler.graal.nodes.java.NewArrayNode;
-import jdk.compiler.graal.nodes.java.NewInstanceNode;
-import jdk.compiler.graal.nodes.java.NewMultiArrayNode;
-import jdk.compiler.graal.nodes.java.StoreFieldNode;
-import jdk.compiler.graal.nodes.java.StoreIndexedNode;
-import jdk.compiler.graal.nodes.memory.MemoryKill;
-import jdk.compiler.graal.nodes.spi.Canonicalizable;
-import jdk.compiler.graal.nodes.spi.CoreProviders;
-import jdk.compiler.graal.nodes.spi.CoreProvidersDelegate;
-import jdk.compiler.graal.nodes.type.StampTool;
-import jdk.compiler.graal.nodes.util.GraphUtil;
-import jdk.compiler.graal.options.Option;
-import jdk.compiler.graal.options.OptionKey;
-import jdk.compiler.graal.options.OptionType;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.common.inlining.InliningUtil;
+import jdk.graal.compiler.api.replacements.Fold;
+import jdk.graal.compiler.bytecode.Bytecode;
+import jdk.graal.compiler.bytecode.BytecodeProvider;
+import jdk.graal.compiler.core.common.PermanentBailoutException;
+import jdk.graal.compiler.core.common.cfg.CFGVerifier;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.core.common.type.StampPair;
+import jdk.graal.compiler.debug.DebugCloseable;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.debug.TimerKey;
+import jdk.graal.compiler.graph.IterableNodeType;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.Node.NodeIntrinsic;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.graph.NodeSourcePosition;
+import jdk.graal.compiler.graph.SourceLanguagePosition;
+import jdk.graal.compiler.graph.SourceLanguagePositionProvider;
+import jdk.graal.compiler.java.GraphBuilderPhase;
+import jdk.graal.compiler.nodeinfo.InputType;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.AbstractBeginNode;
+import jdk.graal.compiler.nodes.AbstractEndNode;
+import jdk.graal.compiler.nodes.AbstractMergeNode;
+import jdk.graal.compiler.nodes.BeginNode;
+import jdk.graal.compiler.nodes.CallTargetNode;
+import jdk.graal.compiler.nodes.CallTargetNode.InvokeKind;
+import jdk.graal.compiler.nodes.ControlSinkNode;
+import jdk.graal.compiler.nodes.ControlSplitNode;
+import jdk.graal.compiler.nodes.DeoptBciSupplier;
+import jdk.graal.compiler.nodes.DeoptimizeNode;
+import jdk.graal.compiler.nodes.EncodedGraph;
+import jdk.graal.compiler.nodes.FixedNode;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.FrameState;
+import jdk.graal.compiler.nodes.IfNode;
+import jdk.graal.compiler.nodes.Invokable;
+import jdk.graal.compiler.nodes.Invoke;
+import jdk.graal.compiler.nodes.InvokeNode;
+import jdk.graal.compiler.nodes.InvokeWithExceptionNode;
+import jdk.graal.compiler.nodes.MergeNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ParameterNode;
+import jdk.graal.compiler.nodes.PluginReplacementInterface;
+import jdk.graal.compiler.nodes.ReturnNode;
+import jdk.graal.compiler.nodes.SimplifyingGraphDecoder;
+import jdk.graal.compiler.nodes.StateSplit;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.UnwindNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.WithExceptionNode;
+import jdk.graal.compiler.nodes.calc.FloatingNode;
+import jdk.graal.compiler.nodes.cfg.ControlFlowGraph;
+import jdk.graal.compiler.nodes.extended.AnchoringNode;
+import jdk.graal.compiler.nodes.extended.BytecodeExceptionNode;
+import jdk.graal.compiler.nodes.extended.GuardingNode;
+import jdk.graal.compiler.nodes.extended.IntegerSwitchNode;
+import jdk.graal.compiler.nodes.graphbuilderconf.GeneratedInvocationPlugin;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext;
+import jdk.graal.compiler.nodes.graphbuilderconf.InlineInvokePlugin;
+import jdk.graal.compiler.nodes.graphbuilderconf.InlineInvokePlugin.InlineInfo;
+import jdk.graal.compiler.nodes.graphbuilderconf.IntrinsicContext;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins.InvocationPluginReceiver;
+import jdk.graal.compiler.nodes.graphbuilderconf.LoopExplosionPlugin;
+import jdk.graal.compiler.nodes.graphbuilderconf.LoopExplosionPlugin.LoopExplosionKind;
+import jdk.graal.compiler.nodes.graphbuilderconf.NodePlugin;
+import jdk.graal.compiler.nodes.graphbuilderconf.ParameterPlugin;
+import jdk.graal.compiler.nodes.java.ExceptionObjectNode;
+import jdk.graal.compiler.nodes.java.LoadFieldNode;
+import jdk.graal.compiler.nodes.java.LoadIndexedNode;
+import jdk.graal.compiler.nodes.java.MethodCallTargetNode;
+import jdk.graal.compiler.nodes.java.MonitorIdNode;
+import jdk.graal.compiler.nodes.java.NewArrayNode;
+import jdk.graal.compiler.nodes.java.NewInstanceNode;
+import jdk.graal.compiler.nodes.java.NewMultiArrayNode;
+import jdk.graal.compiler.nodes.java.StoreFieldNode;
+import jdk.graal.compiler.nodes.java.StoreIndexedNode;
+import jdk.graal.compiler.nodes.memory.MemoryKill;
+import jdk.graal.compiler.nodes.spi.Canonicalizable;
+import jdk.graal.compiler.nodes.spi.CoreProviders;
+import jdk.graal.compiler.nodes.spi.CoreProvidersDelegate;
+import jdk.graal.compiler.nodes.type.StampTool;
+import jdk.graal.compiler.nodes.util.GraphUtil;
+import jdk.graal.compiler.options.Option;
+import jdk.graal.compiler.options.OptionKey;
+import jdk.graal.compiler.options.OptionType;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.common.inlining.InliningUtil;
 
 import jdk.vm.ci.code.Architecture;
 import jdk.vm.ci.code.BailoutException;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/PartialIntrinsicCallTargetNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/PartialIntrinsicCallTargetNode.java
similarity index 85%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/PartialIntrinsicCallTargetNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/PartialIntrinsicCallTargetNode.java
index 032b566b6dff..c301477646f4 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/PartialIntrinsicCallTargetNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/PartialIntrinsicCallTargetNode.java
@@ -22,17 +22,17 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements;
+package jdk.graal.compiler.replacements;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_UNKNOWN;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_UNKNOWN;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_UNKNOWN;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_UNKNOWN;
 
-import jdk.compiler.graal.core.common.type.StampPair;
-import jdk.compiler.graal.graph.IterableNodeType;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.CallTargetNode;
-import jdk.compiler.graal.nodes.ValueNode;
+import jdk.graal.compiler.core.common.type.StampPair;
+import jdk.graal.compiler.graph.IterableNodeType;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.CallTargetNode;
+import jdk.graal.compiler.nodes.ValueNode;
 
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/ReplacementsImpl.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/ReplacementsImpl.java
similarity index 89%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/ReplacementsImpl.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/ReplacementsImpl.java
index a049c005cacf..dc892e37ac1e 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/ReplacementsImpl.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/ReplacementsImpl.java
@@ -22,16 +22,16 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements;
+package jdk.graal.compiler.replacements;
 
 import static jdk.vm.ci.services.Services.IS_BUILDING_NATIVE_IMAGE;
 import static jdk.vm.ci.services.Services.IS_IN_NATIVE_IMAGE;
-import static jdk.compiler.graal.core.common.GraalOptions.UseSnippetGraphCache;
-import static jdk.compiler.graal.debug.DebugOptions.DebugStubsAndSnippets;
-import static jdk.compiler.graal.debug.DebugOptions.DumpOnError;
-import static jdk.compiler.graal.nodes.graphbuilderconf.InlineInvokePlugin.InlineInfo.createIntrinsicInlineInfo;
-import static jdk.compiler.graal.nodes.graphbuilderconf.IntrinsicContext.CompilationContext.INLINE_AFTER_PARSING;
-import static jdk.compiler.graal.phases.common.DeadCodeEliminationPhase.Optionality.Required;
+import static jdk.graal.compiler.core.common.GraalOptions.UseSnippetGraphCache;
+import static jdk.graal.compiler.debug.DebugOptions.DebugStubsAndSnippets;
+import static jdk.graal.compiler.debug.DebugOptions.DumpOnError;
+import static jdk.graal.compiler.nodes.graphbuilderconf.InlineInvokePlugin.InlineInfo.createIntrinsicInlineInfo;
+import static jdk.graal.compiler.nodes.graphbuilderconf.IntrinsicContext.CompilationContext.INLINE_AFTER_PARSING;
+import static jdk.graal.compiler.phases.common.DeadCodeEliminationPhase.Optionality.Required;
 
 import java.util.BitSet;
 import java.util.concurrent.ConcurrentHashMap;
@@ -41,54 +41,54 @@
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.Equivalence;
 import org.graalvm.collections.Pair;
-import jdk.compiler.graal.api.replacements.Fold;
-import jdk.compiler.graal.api.replacements.Snippet;
-import jdk.compiler.graal.api.replacements.SnippetReflectionProvider;
-import jdk.compiler.graal.api.replacements.SnippetTemplateCache;
-import jdk.compiler.graal.bytecode.BytecodeProvider;
-import jdk.compiler.graal.core.common.GraalOptions;
-import jdk.compiler.graal.core.common.spi.ForeignCallsProvider;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.core.common.type.TypeReference;
-import jdk.compiler.graal.debug.DebugCloseable;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.debug.DebugContext.Builder;
-import jdk.compiler.graal.debug.DebugContext.Description;
-import jdk.compiler.graal.debug.DebugHandlersFactory;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.debug.TimerKey;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.Node.NodeIntrinsic;
-import jdk.compiler.graal.graph.NodeSourcePosition;
-import jdk.compiler.graal.java.GraphBuilderPhase.Instance;
-import jdk.compiler.graal.loop.phases.ConvertDeoptimizeToGuardPhase;
-import jdk.compiler.graal.nodes.CallTargetNode;
-import jdk.compiler.graal.nodes.Invoke;
-import jdk.compiler.graal.nodes.StateSplit;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.graphbuilderconf.GeneratedInvocationPlugin;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderPlugin;
-import jdk.compiler.graal.nodes.graphbuilderconf.InlineInvokePlugin;
-import jdk.compiler.graal.nodes.graphbuilderconf.IntrinsicContext;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin;
-import jdk.compiler.graal.nodes.java.MethodCallTargetNode;
-import jdk.compiler.graal.nodes.spi.Replacements;
-import jdk.compiler.graal.nodes.spi.SnippetParameterInfo;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.OptimisticOptimizations;
-import jdk.compiler.graal.phases.common.CanonicalizerPhase;
-import jdk.compiler.graal.phases.common.DeadCodeEliminationPhase;
-import jdk.compiler.graal.phases.util.Providers;
-import jdk.compiler.graal.replacements.arraycopy.ArrayCopyForeignCalls;
-import jdk.compiler.graal.word.Word;
-import jdk.compiler.graal.word.WordOperationPlugin;
-import jdk.compiler.graal.word.WordTypes;
+import jdk.graal.compiler.api.replacements.Fold;
+import jdk.graal.compiler.api.replacements.Snippet;
+import jdk.graal.compiler.api.replacements.SnippetReflectionProvider;
+import jdk.graal.compiler.api.replacements.SnippetTemplateCache;
+import jdk.graal.compiler.bytecode.BytecodeProvider;
+import jdk.graal.compiler.core.common.GraalOptions;
+import jdk.graal.compiler.core.common.spi.ForeignCallsProvider;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.core.common.type.TypeReference;
+import jdk.graal.compiler.debug.DebugCloseable;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.debug.DebugContext.Builder;
+import jdk.graal.compiler.debug.DebugContext.Description;
+import jdk.graal.compiler.debug.DebugHandlersFactory;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.debug.TimerKey;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.Node.NodeIntrinsic;
+import jdk.graal.compiler.graph.NodeSourcePosition;
+import jdk.graal.compiler.java.GraphBuilderPhase.Instance;
+import jdk.graal.compiler.loop.phases.ConvertDeoptimizeToGuardPhase;
+import jdk.graal.compiler.nodes.CallTargetNode;
+import jdk.graal.compiler.nodes.Invoke;
+import jdk.graal.compiler.nodes.StateSplit;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.StructuredGraph.AllowAssumptions;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.graphbuilderconf.GeneratedInvocationPlugin;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderPlugin;
+import jdk.graal.compiler.nodes.graphbuilderconf.InlineInvokePlugin;
+import jdk.graal.compiler.nodes.graphbuilderconf.IntrinsicContext;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin;
+import jdk.graal.compiler.nodes.java.MethodCallTargetNode;
+import jdk.graal.compiler.nodes.spi.Replacements;
+import jdk.graal.compiler.nodes.spi.SnippetParameterInfo;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.OptimisticOptimizations;
+import jdk.graal.compiler.phases.common.CanonicalizerPhase;
+import jdk.graal.compiler.phases.common.DeadCodeEliminationPhase;
+import jdk.graal.compiler.phases.util.Providers;
+import jdk.graal.compiler.replacements.arraycopy.ArrayCopyForeignCalls;
+import jdk.graal.compiler.word.Word;
+import jdk.graal.compiler.word.WordOperationPlugin;
+import jdk.graal.compiler.word.WordTypes;
 
 import jdk.vm.ci.code.TargetDescription;
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/ReplacementsUtil.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/ReplacementsUtil.java
similarity index 93%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/ReplacementsUtil.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/ReplacementsUtil.java
index fcd47df6bc46..e1997eeb0c1c 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/ReplacementsUtil.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/ReplacementsUtil.java
@@ -22,12 +22,12 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements;
+package jdk.graal.compiler.replacements;
 
-import jdk.compiler.graal.api.replacements.Fold;
-import jdk.compiler.graal.api.replacements.Fold.InjectedParameter;
-import jdk.compiler.graal.debug.Assertions;
-import jdk.compiler.graal.replacements.nodes.AssertionNode;
+import jdk.graal.compiler.api.replacements.Fold;
+import jdk.graal.compiler.api.replacements.Fold.InjectedParameter;
+import jdk.graal.compiler.debug.Assertions;
+import jdk.graal.compiler.replacements.nodes.AssertionNode;
 
 import jdk.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.MetaAccessProvider;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/SnippetCounter.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/SnippetCounter.java
similarity index 98%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/SnippetCounter.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/SnippetCounter.java
index ff520b586495..c8ecdb3ac6fb 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/SnippetCounter.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/SnippetCounter.java
@@ -22,13 +22,13 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements;
+package jdk.graal.compiler.replacements;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import jdk.compiler.graal.core.common.GraalOptions;
+import jdk.graal.compiler.core.common.GraalOptions;
 
 /**
  * A counter that can (only) be {@linkplain #inc() incremented} from within a snippet for gathering
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/SnippetCounterNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/SnippetCounterNode.java
similarity index 81%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/SnippetCounterNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/SnippetCounterNode.java
index 151ca6c2a007..f13f639e6616 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/SnippetCounterNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/SnippetCounterNode.java
@@ -22,34 +22,34 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements;
+package jdk.graal.compiler.replacements;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_IGNORED;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_IGNORED;
-import static jdk.compiler.graal.replacements.SnippetTemplate.DEFAULT_REPLACER;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_IGNORED;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_IGNORED;
+import static jdk.graal.compiler.replacements.SnippetTemplate.DEFAULT_REPLACER;
 
 import java.util.Arrays;
 
-import jdk.compiler.graal.api.replacements.Fold;
-import jdk.compiler.graal.api.replacements.Snippet;
-import jdk.compiler.graal.api.replacements.Snippet.ConstantParameter;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.NamedLocationIdentity;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.Lowerable;
-import jdk.compiler.graal.nodes.spi.LoweringTool;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.util.Providers;
-import jdk.compiler.graal.replacements.SnippetTemplate.AbstractTemplates;
-import jdk.compiler.graal.replacements.SnippetTemplate.Arguments;
-import jdk.compiler.graal.replacements.SnippetTemplate.SnippetInfo;
-import jdk.compiler.graal.serviceprovider.GraalUnsafeAccess;
-import jdk.compiler.graal.word.ObjectAccess;
+import jdk.graal.compiler.api.replacements.Fold;
+import jdk.graal.compiler.api.replacements.Snippet;
+import jdk.graal.compiler.api.replacements.Snippet.ConstantParameter;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.NamedLocationIdentity;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.Lowerable;
+import jdk.graal.compiler.nodes.spi.LoweringTool;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.util.Providers;
+import jdk.graal.compiler.replacements.SnippetTemplate.AbstractTemplates;
+import jdk.graal.compiler.replacements.SnippetTemplate.Arguments;
+import jdk.graal.compiler.replacements.SnippetTemplate.SnippetInfo;
+import jdk.graal.compiler.serviceprovider.GraalUnsafeAccess;
+import jdk.graal.compiler.word.ObjectAccess;
 import org.graalvm.word.LocationIdentity;
 
 import sun.misc.Unsafe;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/SnippetIntegerHistogram.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/SnippetIntegerHistogram.java
similarity index 99%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/SnippetIntegerHistogram.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/SnippetIntegerHistogram.java
index c9db6853f719..d1fe0eb088c9 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/SnippetIntegerHistogram.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/SnippetIntegerHistogram.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements;
+package jdk.graal.compiler.replacements;
 
 /**
  * A histogram that can (only) be {@linkplain #inc(long) incremented} from within a snippet for
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/SnippetSubstitutionInvocationPlugin.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/SnippetSubstitutionInvocationPlugin.java
similarity index 88%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/SnippetSubstitutionInvocationPlugin.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/SnippetSubstitutionInvocationPlugin.java
index b7b6ddf8e782..17745322b13c 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/SnippetSubstitutionInvocationPlugin.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/SnippetSubstitutionInvocationPlugin.java
@@ -23,17 +23,17 @@
  * questions.
  */
 
-package jdk.compiler.graal.replacements;
+package jdk.graal.compiler.replacements;
 
 import java.lang.reflect.Type;
 
-import jdk.compiler.graal.api.replacements.Snippet;
-import jdk.compiler.graal.api.replacements.Snippet.ConstantParameter;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin;
-import jdk.compiler.graal.replacements.nodes.MacroNode;
+import jdk.graal.compiler.api.replacements.Snippet;
+import jdk.graal.compiler.api.replacements.Snippet.ConstantParameter;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin;
+import jdk.graal.compiler.replacements.nodes.MacroNode;
 
 import jdk.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/SnippetSubstitutionNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/SnippetSubstitutionNode.java
similarity index 85%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/SnippetSubstitutionNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/SnippetSubstitutionNode.java
index bc7df71841e1..bfa6c6d8eb31 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/SnippetSubstitutionNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/SnippetSubstitutionNode.java
@@ -22,20 +22,20 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements;
+package jdk.graal.compiler.replacements;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_IGNORED;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_IGNORED;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_IGNORED;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_IGNORED;
 
-import jdk.compiler.graal.replacements.nodes.MacroNode;
+import jdk.graal.compiler.replacements.nodes.MacroNode;
 import org.graalvm.collections.UnmodifiableEconomicMap;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.spi.Lowerable;
-import jdk.compiler.graal.nodes.spi.LoweringTool;
-import jdk.compiler.graal.replacements.nodes.FallbackInvokeWithExceptionNode;
-import jdk.compiler.graal.replacements.nodes.MacroWithExceptionNode;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.spi.Lowerable;
+import jdk.graal.compiler.nodes.spi.LoweringTool;
+import jdk.graal.compiler.replacements.nodes.FallbackInvokeWithExceptionNode;
+import jdk.graal.compiler.replacements.nodes.MacroWithExceptionNode;
 
 /**
  * A node that lowers a non-side effecting snippet.
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/SnippetTemplate.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/SnippetTemplate.java
similarity index 94%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/SnippetTemplate.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/SnippetTemplate.java
index f20c48c8eee4..c36745cc9321 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/SnippetTemplate.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/SnippetTemplate.java
@@ -22,16 +22,16 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements;
+package jdk.graal.compiler.replacements;
 
 import static java.util.FormattableFlags.ALTERNATE;
 import static jdk.vm.ci.services.Services.IS_IN_NATIVE_IMAGE;
-import static jdk.compiler.graal.debug.DebugContext.applyFormattingFlagsAndWidth;
-import static jdk.compiler.graal.debug.DebugOptions.DumpOnError;
-import static jdk.compiler.graal.graph.iterators.NodePredicates.isNotA;
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_IGNORED;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_IGNORED;
-import static jdk.compiler.graal.phases.common.DeadCodeEliminationPhase.Optionality.Required;
+import static jdk.graal.compiler.debug.DebugContext.applyFormattingFlagsAndWidth;
+import static jdk.graal.compiler.debug.DebugOptions.DumpOnError;
+import static jdk.graal.compiler.graph.iterators.NodePredicates.isNotA;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_IGNORED;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_IGNORED;
+import static jdk.graal.compiler.phases.common.DeadCodeEliminationPhase.Optionality.Required;
 import static org.graalvm.word.LocationIdentity.any;
 
 import java.lang.reflect.Array;
@@ -49,143 +49,143 @@
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Predicate;
 
-import jdk.compiler.graal.api.replacements.SnippetTemplateCache;
-import jdk.compiler.graal.nodes.BeginNode;
-import jdk.compiler.graal.nodes.UnreachableControlSinkNode;
-import jdk.compiler.graal.replacements.nodes.CStringConstant;
+import jdk.graal.compiler.api.replacements.SnippetTemplateCache;
+import jdk.graal.compiler.nodes.BeginNode;
+import jdk.graal.compiler.nodes.UnreachableControlSinkNode;
+import jdk.graal.compiler.replacements.nodes.CStringConstant;
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.EconomicSet;
 import org.graalvm.collections.Equivalence;
 import org.graalvm.collections.MapCursor;
 import org.graalvm.collections.UnmodifiableEconomicMap;
-import jdk.compiler.graal.api.replacements.Fold;
-import jdk.compiler.graal.api.replacements.Snippet;
-import jdk.compiler.graal.api.replacements.Snippet.ConstantParameter;
-import jdk.compiler.graal.api.replacements.Snippet.VarargsParameter;
-import jdk.compiler.graal.api.replacements.SnippetReflectionProvider;
-import jdk.compiler.graal.core.common.GraalOptions;
-import jdk.compiler.graal.core.common.RetryableBailoutException;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.core.common.type.StampPair;
-import jdk.compiler.graal.core.common.type.TypeReference;
-import jdk.compiler.graal.debug.Assertions;
-import jdk.compiler.graal.debug.CounterKey;
-import jdk.compiler.graal.debug.DebugCloseable;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.debug.DebugOptions;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.debug.TimerKey;
-import jdk.compiler.graal.graph.Graph.Mark;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.Node.NodeIntrinsic;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.graph.NodeMap;
-import jdk.compiler.graal.graph.NodeSourcePosition;
-import jdk.compiler.graal.graph.Position;
-import jdk.compiler.graal.loop.phases.LoopTransformations;
-import jdk.compiler.graal.nodeinfo.InputType;
-import jdk.compiler.graal.nodeinfo.NodeCycles;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodeinfo.NodeSize;
-import jdk.compiler.graal.nodes.AbstractBeginNode;
-import jdk.compiler.graal.nodes.AbstractMergeNode;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.ControlSinkNode;
-import jdk.compiler.graal.nodes.DeoptBciSupplier;
-import jdk.compiler.graal.nodes.DeoptimizingNode;
-import jdk.compiler.graal.nodes.DeoptimizingNode.DeoptBefore;
-import jdk.compiler.graal.nodes.EndNode;
-import jdk.compiler.graal.nodes.FixedNode;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.FrameState;
-import jdk.compiler.graal.nodes.GraphState.GuardsStage;
-import jdk.compiler.graal.nodes.GraphState.StageFlag;
-import jdk.compiler.graal.nodes.IfNode;
-import jdk.compiler.graal.nodes.InliningLog;
-import jdk.compiler.graal.nodes.InvokeWithExceptionNode;
-import jdk.compiler.graal.nodes.LogicConstantNode;
-import jdk.compiler.graal.nodes.LogicNode;
-import jdk.compiler.graal.nodes.LoopBeginNode;
-import jdk.compiler.graal.nodes.LoopExitNode;
-import jdk.compiler.graal.nodes.MemoryMapControlSinkNode;
-import jdk.compiler.graal.nodes.MergeNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ParameterNode;
-import jdk.compiler.graal.nodes.PhiNode;
-import jdk.compiler.graal.nodes.PiNode.Placeholder;
-import jdk.compiler.graal.nodes.PiNode.PlaceholderStamp;
-import jdk.compiler.graal.nodes.ProfileData;
-import jdk.compiler.graal.nodes.ProfileData.ProfileSource;
-import jdk.compiler.graal.nodes.ReturnNode;
-import jdk.compiler.graal.nodes.StartNode;
-import jdk.compiler.graal.nodes.StateSplit;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.UnreachableBeginNode;
-import jdk.compiler.graal.nodes.UnwindNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.ValueNodeInterface;
-import jdk.compiler.graal.nodes.ValuePhiNode;
-import jdk.compiler.graal.nodes.VirtualState.NodePositionClosure;
-import jdk.compiler.graal.nodes.WithExceptionNode;
-import jdk.compiler.graal.nodes.calc.FloatingNode;
-import jdk.compiler.graal.nodes.extended.AbstractBoxingNode;
-import jdk.compiler.graal.nodes.extended.CaptureStateBeginNode;
-import jdk.compiler.graal.nodes.extended.GuardedNode;
-import jdk.compiler.graal.nodes.java.AbstractNewObjectNode;
-import jdk.compiler.graal.nodes.java.ExceptionObjectNode;
-import jdk.compiler.graal.nodes.java.LoadIndexedNode;
-import jdk.compiler.graal.nodes.java.MethodCallTargetNode;
-import jdk.compiler.graal.nodes.java.StoreIndexedNode;
-import jdk.compiler.graal.nodes.loop.LoopEx;
-import jdk.compiler.graal.nodes.memory.MemoryAccess;
-import jdk.compiler.graal.nodes.memory.MemoryAnchorNode;
-import jdk.compiler.graal.nodes.memory.MemoryKill;
-import jdk.compiler.graal.nodes.memory.MemoryMap;
-import jdk.compiler.graal.nodes.memory.MemoryMapNode;
-import jdk.compiler.graal.nodes.memory.MemoryPhiNode;
-import jdk.compiler.graal.nodes.memory.MultiMemoryKill;
-import jdk.compiler.graal.nodes.memory.SingleMemoryKill;
-import jdk.compiler.graal.nodes.spi.ArrayLengthProvider;
-import jdk.compiler.graal.nodes.spi.Canonicalizable;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodes.spi.CoreProviders;
-import jdk.compiler.graal.nodes.spi.LoweringTool;
-import jdk.compiler.graal.nodes.spi.MemoryEdgeProxy;
-import jdk.compiler.graal.nodes.spi.Simplifiable;
-import jdk.compiler.graal.nodes.spi.SimplifierTool;
-import jdk.compiler.graal.nodes.spi.SnippetParameterInfo;
-import jdk.compiler.graal.nodes.type.StampTool;
-import jdk.compiler.graal.nodes.util.GraphUtil;
-import jdk.compiler.graal.options.Option;
-import jdk.compiler.graal.options.OptionKey;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.PhaseSuite;
-import jdk.compiler.graal.phases.common.CanonicalizerPhase;
-import jdk.compiler.graal.phases.common.DeadCodeEliminationPhase;
-import jdk.compiler.graal.phases.common.FloatingReadPhase;
-import jdk.compiler.graal.phases.common.FloatingReadPhase.MemoryMapImpl;
-import jdk.compiler.graal.phases.common.GuardLoweringPhase;
-import jdk.compiler.graal.phases.common.HighTierLoweringPhase;
-import jdk.compiler.graal.phases.common.IterativeConditionalEliminationPhase;
-import jdk.compiler.graal.phases.common.LowTierLoweringPhase;
-import jdk.compiler.graal.phases.common.LoweringPhase;
-import jdk.compiler.graal.phases.common.MidTierLoweringPhase;
-import jdk.compiler.graal.phases.common.RemoveValueProxyPhase;
-import jdk.compiler.graal.phases.common.SnippetFrameStateAssignment;
-import jdk.compiler.graal.phases.common.SnippetFrameStateAssignment.NodeStateAssignment;
-import jdk.compiler.graal.phases.common.SnippetFrameStateAssignment.SnippetFrameStateAssignmentClosure;
-import jdk.compiler.graal.phases.common.WriteBarrierAdditionPhase;
-import jdk.compiler.graal.phases.common.inlining.InliningUtil;
-import jdk.compiler.graal.phases.graph.ReentrantNodeIterator;
-import jdk.compiler.graal.phases.schedule.SchedulePhase.SchedulingStrategy;
-import jdk.compiler.graal.phases.util.Providers;
-import jdk.compiler.graal.replacements.nodes.ExplodeLoopNode;
-import jdk.compiler.graal.replacements.nodes.FallbackInvokeWithExceptionNode;
-import jdk.compiler.graal.replacements.nodes.LoadSnippetVarargParameterNode;
-import jdk.compiler.graal.replacements.nodes.MacroWithExceptionNode;
-import jdk.compiler.graal.virtual.phases.ea.PartialEscapePhase;
-import jdk.compiler.graal.util.CollectionsUtil;
+import jdk.graal.compiler.api.replacements.Fold;
+import jdk.graal.compiler.api.replacements.Snippet;
+import jdk.graal.compiler.api.replacements.Snippet.ConstantParameter;
+import jdk.graal.compiler.api.replacements.Snippet.VarargsParameter;
+import jdk.graal.compiler.api.replacements.SnippetReflectionProvider;
+import jdk.graal.compiler.core.common.GraalOptions;
+import jdk.graal.compiler.core.common.RetryableBailoutException;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.core.common.type.StampPair;
+import jdk.graal.compiler.core.common.type.TypeReference;
+import jdk.graal.compiler.debug.Assertions;
+import jdk.graal.compiler.debug.CounterKey;
+import jdk.graal.compiler.debug.DebugCloseable;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.debug.DebugOptions;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.debug.TimerKey;
+import jdk.graal.compiler.graph.Graph.Mark;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.Node.NodeIntrinsic;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.graph.NodeMap;
+import jdk.graal.compiler.graph.NodeSourcePosition;
+import jdk.graal.compiler.graph.Position;
+import jdk.graal.compiler.loop.phases.LoopTransformations;
+import jdk.graal.compiler.nodeinfo.InputType;
+import jdk.graal.compiler.nodeinfo.NodeCycles;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodeinfo.NodeSize;
+import jdk.graal.compiler.nodes.AbstractBeginNode;
+import jdk.graal.compiler.nodes.AbstractMergeNode;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.ControlSinkNode;
+import jdk.graal.compiler.nodes.DeoptBciSupplier;
+import jdk.graal.compiler.nodes.DeoptimizingNode;
+import jdk.graal.compiler.nodes.DeoptimizingNode.DeoptBefore;
+import jdk.graal.compiler.nodes.EndNode;
+import jdk.graal.compiler.nodes.FixedNode;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.FrameState;
+import jdk.graal.compiler.nodes.GraphState.GuardsStage;
+import jdk.graal.compiler.nodes.GraphState.StageFlag;
+import jdk.graal.compiler.nodes.IfNode;
+import jdk.graal.compiler.nodes.InliningLog;
+import jdk.graal.compiler.nodes.InvokeWithExceptionNode;
+import jdk.graal.compiler.nodes.LogicConstantNode;
+import jdk.graal.compiler.nodes.LogicNode;
+import jdk.graal.compiler.nodes.LoopBeginNode;
+import jdk.graal.compiler.nodes.LoopExitNode;
+import jdk.graal.compiler.nodes.MemoryMapControlSinkNode;
+import jdk.graal.compiler.nodes.MergeNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ParameterNode;
+import jdk.graal.compiler.nodes.PhiNode;
+import jdk.graal.compiler.nodes.PiNode.Placeholder;
+import jdk.graal.compiler.nodes.PiNode.PlaceholderStamp;
+import jdk.graal.compiler.nodes.ProfileData;
+import jdk.graal.compiler.nodes.ProfileData.ProfileSource;
+import jdk.graal.compiler.nodes.ReturnNode;
+import jdk.graal.compiler.nodes.StartNode;
+import jdk.graal.compiler.nodes.StateSplit;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.UnreachableBeginNode;
+import jdk.graal.compiler.nodes.UnwindNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.ValueNodeInterface;
+import jdk.graal.compiler.nodes.ValuePhiNode;
+import jdk.graal.compiler.nodes.VirtualState.NodePositionClosure;
+import jdk.graal.compiler.nodes.WithExceptionNode;
+import jdk.graal.compiler.nodes.calc.FloatingNode;
+import jdk.graal.compiler.nodes.extended.AbstractBoxingNode;
+import jdk.graal.compiler.nodes.extended.CaptureStateBeginNode;
+import jdk.graal.compiler.nodes.extended.GuardedNode;
+import jdk.graal.compiler.nodes.java.AbstractNewObjectNode;
+import jdk.graal.compiler.nodes.java.ExceptionObjectNode;
+import jdk.graal.compiler.nodes.java.LoadIndexedNode;
+import jdk.graal.compiler.nodes.java.MethodCallTargetNode;
+import jdk.graal.compiler.nodes.java.StoreIndexedNode;
+import jdk.graal.compiler.nodes.loop.LoopEx;
+import jdk.graal.compiler.nodes.memory.MemoryAccess;
+import jdk.graal.compiler.nodes.memory.MemoryAnchorNode;
+import jdk.graal.compiler.nodes.memory.MemoryKill;
+import jdk.graal.compiler.nodes.memory.MemoryMap;
+import jdk.graal.compiler.nodes.memory.MemoryMapNode;
+import jdk.graal.compiler.nodes.memory.MemoryPhiNode;
+import jdk.graal.compiler.nodes.memory.MultiMemoryKill;
+import jdk.graal.compiler.nodes.memory.SingleMemoryKill;
+import jdk.graal.compiler.nodes.spi.ArrayLengthProvider;
+import jdk.graal.compiler.nodes.spi.Canonicalizable;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodes.spi.CoreProviders;
+import jdk.graal.compiler.nodes.spi.LoweringTool;
+import jdk.graal.compiler.nodes.spi.MemoryEdgeProxy;
+import jdk.graal.compiler.nodes.spi.Simplifiable;
+import jdk.graal.compiler.nodes.spi.SimplifierTool;
+import jdk.graal.compiler.nodes.spi.SnippetParameterInfo;
+import jdk.graal.compiler.nodes.type.StampTool;
+import jdk.graal.compiler.nodes.util.GraphUtil;
+import jdk.graal.compiler.options.Option;
+import jdk.graal.compiler.options.OptionKey;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.PhaseSuite;
+import jdk.graal.compiler.phases.common.CanonicalizerPhase;
+import jdk.graal.compiler.phases.common.DeadCodeEliminationPhase;
+import jdk.graal.compiler.phases.common.FloatingReadPhase;
+import jdk.graal.compiler.phases.common.FloatingReadPhase.MemoryMapImpl;
+import jdk.graal.compiler.phases.common.GuardLoweringPhase;
+import jdk.graal.compiler.phases.common.HighTierLoweringPhase;
+import jdk.graal.compiler.phases.common.IterativeConditionalEliminationPhase;
+import jdk.graal.compiler.phases.common.LowTierLoweringPhase;
+import jdk.graal.compiler.phases.common.LoweringPhase;
+import jdk.graal.compiler.phases.common.MidTierLoweringPhase;
+import jdk.graal.compiler.phases.common.RemoveValueProxyPhase;
+import jdk.graal.compiler.phases.common.SnippetFrameStateAssignment;
+import jdk.graal.compiler.phases.common.SnippetFrameStateAssignment.NodeStateAssignment;
+import jdk.graal.compiler.phases.common.SnippetFrameStateAssignment.SnippetFrameStateAssignmentClosure;
+import jdk.graal.compiler.phases.common.WriteBarrierAdditionPhase;
+import jdk.graal.compiler.phases.common.inlining.InliningUtil;
+import jdk.graal.compiler.phases.graph.ReentrantNodeIterator;
+import jdk.graal.compiler.phases.schedule.SchedulePhase.SchedulingStrategy;
+import jdk.graal.compiler.phases.util.Providers;
+import jdk.graal.compiler.replacements.nodes.ExplodeLoopNode;
+import jdk.graal.compiler.replacements.nodes.FallbackInvokeWithExceptionNode;
+import jdk.graal.compiler.replacements.nodes.LoadSnippetVarargParameterNode;
+import jdk.graal.compiler.replacements.nodes.MacroWithExceptionNode;
+import jdk.graal.compiler.virtual.phases.ea.PartialEscapePhase;
+import jdk.graal.compiler.util.CollectionsUtil;
 import org.graalvm.word.LocationIdentity;
 import org.graalvm.word.WordBase;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/Snippets.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/Snippets.java
similarity index 93%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/Snippets.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/Snippets.java
index 76ed6692054f..be18009bc5e8 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/Snippets.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/Snippets.java
@@ -22,9 +22,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements;
+package jdk.graal.compiler.replacements;
 
-import jdk.compiler.graal.api.replacements.Snippet;
+import jdk.graal.compiler.api.replacements.Snippet;
 
 /**
  * Marker interface for a class that defines one or more {@link Snippet}s.
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/StandardGraphBuilderPlugins.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/StandardGraphBuilderPlugins.java
similarity index 92%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/StandardGraphBuilderPlugins.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/StandardGraphBuilderPlugins.java
index f928a933f6bc..4ce60b52446e 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/StandardGraphBuilderPlugins.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/StandardGraphBuilderPlugins.java
@@ -22,22 +22,22 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements;
+package jdk.graal.compiler.replacements;
 
 import static jdk.vm.ci.meta.DeoptimizationAction.InvalidateReprofile;
 import static jdk.vm.ci.meta.DeoptimizationAction.None;
 import static jdk.vm.ci.meta.DeoptimizationReason.TransferToInterpreter;
-import static jdk.compiler.graal.core.common.calc.Condition.LT;
-import static jdk.compiler.graal.core.common.memory.MemoryOrderMode.ACQUIRE;
-import static jdk.compiler.graal.core.common.memory.MemoryOrderMode.PLAIN;
-import static jdk.compiler.graal.core.common.memory.MemoryOrderMode.RELEASE;
-import static jdk.compiler.graal.core.common.memory.MemoryOrderMode.VOLATILE;
-import static jdk.compiler.graal.lir.gen.LIRGeneratorTool.CharsetName.ASCII;
-import static jdk.compiler.graal.lir.gen.LIRGeneratorTool.CharsetName.ISO_8859_1;
-import static jdk.compiler.graal.nodes.NamedLocationIdentity.OFF_HEAP_LOCATION;
-import static jdk.compiler.graal.replacements.BoxingSnippets.Templates.getCacheClass;
-import static jdk.compiler.graal.replacements.nodes.AESNode.CryptMode.DECRYPT;
-import static jdk.compiler.graal.replacements.nodes.AESNode.CryptMode.ENCRYPT;
+import static jdk.graal.compiler.core.common.calc.Condition.LT;
+import static jdk.graal.compiler.core.common.memory.MemoryOrderMode.ACQUIRE;
+import static jdk.graal.compiler.core.common.memory.MemoryOrderMode.PLAIN;
+import static jdk.graal.compiler.core.common.memory.MemoryOrderMode.RELEASE;
+import static jdk.graal.compiler.core.common.memory.MemoryOrderMode.VOLATILE;
+import static jdk.graal.compiler.lir.gen.LIRGeneratorTool.CharsetName.ASCII;
+import static jdk.graal.compiler.lir.gen.LIRGeneratorTool.CharsetName.ISO_8859_1;
+import static jdk.graal.compiler.nodes.NamedLocationIdentity.OFF_HEAP_LOCATION;
+import static jdk.graal.compiler.replacements.BoxingSnippets.Templates.getCacheClass;
+import static jdk.graal.compiler.replacements.nodes.AESNode.CryptMode.DECRYPT;
+import static jdk.graal.compiler.replacements.nodes.AESNode.CryptMode.ENCRYPT;
 
 import java.lang.reflect.Array;
 import java.lang.reflect.Field;
@@ -49,166 +49,166 @@
 import java.util.Objects;
 import java.util.function.BiFunction;
 
-import jdk.compiler.graal.api.directives.GraalDirectives;
-import jdk.compiler.graal.api.replacements.SnippetReflectionProvider;
-import jdk.compiler.graal.core.common.calc.Condition;
-import jdk.compiler.graal.core.common.calc.Condition.CanonicalizedCondition;
-import jdk.compiler.graal.core.common.calc.UnsignedMath;
-import jdk.compiler.graal.core.common.memory.BarrierType;
-import jdk.compiler.graal.core.common.memory.MemoryOrderMode;
-import jdk.compiler.graal.core.common.type.AbstractObjectStamp;
-import jdk.compiler.graal.core.common.type.AbstractPointerStamp;
-import jdk.compiler.graal.core.common.type.FloatStamp;
-import jdk.compiler.graal.core.common.type.IntegerStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.core.common.type.TypeReference;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.Edges;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeList;
-import jdk.compiler.graal.lir.gen.ArithmeticLIRGeneratorTool.RoundingMode;
-import jdk.compiler.graal.nodes.AbstractBeginNode;
-import jdk.compiler.graal.nodes.BeginNode;
-import jdk.compiler.graal.nodes.BreakpointNode;
-import jdk.compiler.graal.nodes.ComputeObjectAddressNode;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.DeoptimizeNode;
-import jdk.compiler.graal.nodes.EndNode;
-import jdk.compiler.graal.nodes.FixedGuardNode;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.IfNode;
-import jdk.compiler.graal.nodes.LogicNode;
-import jdk.compiler.graal.nodes.MergeNode;
-import jdk.compiler.graal.nodes.NamedLocationIdentity;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.PiNode;
-import jdk.compiler.graal.nodes.ProfileData.BranchProbabilityData;
-import jdk.compiler.graal.nodes.SpinWaitNode;
-import jdk.compiler.graal.nodes.StateSplit;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.ValuePhiNode;
-import jdk.compiler.graal.nodes.calc.AbsNode;
-import jdk.compiler.graal.nodes.calc.AddNode;
-import jdk.compiler.graal.nodes.calc.CompareNode;
-import jdk.compiler.graal.nodes.calc.ConditionalNode;
-import jdk.compiler.graal.nodes.calc.FloatEqualsNode;
-import jdk.compiler.graal.nodes.calc.IntegerBelowNode;
-import jdk.compiler.graal.nodes.calc.IntegerEqualsNode;
-import jdk.compiler.graal.nodes.calc.IntegerLessThanNode;
-import jdk.compiler.graal.nodes.calc.IntegerMulHighNode;
-import jdk.compiler.graal.nodes.calc.IntegerNormalizeCompareNode;
-import jdk.compiler.graal.nodes.calc.IsNullNode;
-import jdk.compiler.graal.nodes.calc.LeftShiftNode;
-import jdk.compiler.graal.nodes.calc.NarrowNode;
-import jdk.compiler.graal.nodes.calc.ObjectEqualsNode;
-import jdk.compiler.graal.nodes.calc.ReinterpretNode;
-import jdk.compiler.graal.nodes.calc.RightShiftNode;
-import jdk.compiler.graal.nodes.calc.RoundNode;
-import jdk.compiler.graal.nodes.calc.SignExtendNode;
-import jdk.compiler.graal.nodes.calc.SignumNode;
-import jdk.compiler.graal.nodes.calc.SqrtNode;
-import jdk.compiler.graal.nodes.calc.SubNode;
-import jdk.compiler.graal.nodes.calc.UnsignedDivNode;
-import jdk.compiler.graal.nodes.calc.UnsignedRemNode;
-import jdk.compiler.graal.nodes.calc.ZeroExtendNode;
-import jdk.compiler.graal.nodes.debug.BindToRegisterNode;
-import jdk.compiler.graal.nodes.debug.BlackholeNode;
-import jdk.compiler.graal.nodes.debug.ControlFlowAnchorNode;
-import jdk.compiler.graal.nodes.debug.NeverStripMineNode;
-import jdk.compiler.graal.nodes.debug.NeverWriteSinkNode;
-import jdk.compiler.graal.nodes.debug.SideEffectNode;
-import jdk.compiler.graal.nodes.debug.SpillRegistersNode;
-import jdk.compiler.graal.nodes.extended.BoxNode;
-import jdk.compiler.graal.nodes.extended.BoxNode.TrustedBoxedValue;
-import jdk.compiler.graal.nodes.extended.BranchProbabilityNode;
-import jdk.compiler.graal.nodes.extended.BytecodeExceptionNode;
-import jdk.compiler.graal.nodes.extended.BytecodeExceptionNode.BytecodeExceptionKind;
-import jdk.compiler.graal.nodes.extended.CacheWritebackNode;
-import jdk.compiler.graal.nodes.extended.CacheWritebackSyncNode;
-import jdk.compiler.graal.nodes.extended.ClassIsArrayNode;
-import jdk.compiler.graal.nodes.extended.GetClassNode;
-import jdk.compiler.graal.nodes.extended.GuardingNode;
-import jdk.compiler.graal.nodes.extended.JavaReadNode;
-import jdk.compiler.graal.nodes.extended.JavaWriteNode;
-import jdk.compiler.graal.nodes.extended.MembarNode;
-import jdk.compiler.graal.nodes.extended.ObjectIsArrayNode;
-import jdk.compiler.graal.nodes.extended.OpaqueValueNode;
-import jdk.compiler.graal.nodes.extended.RawLoadNode;
-import jdk.compiler.graal.nodes.extended.RawStoreNode;
-import jdk.compiler.graal.nodes.extended.SwitchCaseProbabilityNode;
-import jdk.compiler.graal.nodes.extended.UnboxNode;
-import jdk.compiler.graal.nodes.extended.UnsafeMemoryLoadNode;
-import jdk.compiler.graal.nodes.extended.UnsafeMemoryStoreNode;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin.InlineOnlyInvocationPlugin;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin.OptionalInvocationPlugin;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin.Receiver;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin.RequiredInlineOnlyInvocationPlugin;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin.RequiredInvocationPlugin;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins.Registration;
-import jdk.compiler.graal.nodes.graphbuilderconf.NodePlugin;
-import jdk.compiler.graal.nodes.java.ArrayLengthNode;
-import jdk.compiler.graal.nodes.java.AtomicReadAndAddNode;
-import jdk.compiler.graal.nodes.java.AtomicReadAndWriteNode;
-import jdk.compiler.graal.nodes.java.ClassIsAssignableFromNode;
-import jdk.compiler.graal.nodes.java.DynamicNewArrayNode;
-import jdk.compiler.graal.nodes.java.InstanceOfDynamicNode;
-import jdk.compiler.graal.nodes.java.InstanceOfNode;
-import jdk.compiler.graal.nodes.java.NewArrayNode;
-import jdk.compiler.graal.nodes.java.ReachabilityFenceNode;
-import jdk.compiler.graal.nodes.java.RegisterFinalizerNode;
-import jdk.compiler.graal.nodes.java.UnsafeCompareAndExchangeNode;
-import jdk.compiler.graal.nodes.java.UnsafeCompareAndSwapNode;
-import jdk.compiler.graal.nodes.memory.address.IndexAddressNode;
-import jdk.compiler.graal.nodes.spi.LoweringProvider;
-import jdk.compiler.graal.nodes.spi.Replacements;
-import jdk.compiler.graal.nodes.type.StampTool;
-import jdk.compiler.graal.nodes.util.ConstantFoldUtil;
-import jdk.compiler.graal.nodes.util.ConstantReflectionUtil;
-import jdk.compiler.graal.nodes.util.GraphUtil;
-import jdk.compiler.graal.nodes.virtual.EnsureVirtualizedNode;
-import jdk.compiler.graal.replacements.nodes.ArrayEqualsNode;
-import jdk.compiler.graal.replacements.nodes.BigIntegerSquareToLenNode;
-import jdk.compiler.graal.replacements.nodes.CountPositivesNode;
-import jdk.compiler.graal.replacements.nodes.MacroNode;
-import jdk.compiler.graal.replacements.nodes.arithmetic.IntegerAddExactNode;
-import jdk.compiler.graal.replacements.nodes.arithmetic.IntegerAddExactOverflowNode;
-import jdk.compiler.graal.replacements.nodes.arithmetic.IntegerAddExactSplitNode;
-import jdk.compiler.graal.replacements.nodes.arithmetic.IntegerExactArithmeticSplitNode;
-import jdk.compiler.graal.replacements.nodes.arithmetic.IntegerMulExactNode;
-import jdk.compiler.graal.replacements.nodes.arithmetic.IntegerMulExactOverflowNode;
-import jdk.compiler.graal.replacements.nodes.arithmetic.IntegerMulExactSplitNode;
-import jdk.compiler.graal.replacements.nodes.arithmetic.IntegerNegExactNode;
-import jdk.compiler.graal.replacements.nodes.arithmetic.IntegerNegExactOverflowNode;
-import jdk.compiler.graal.replacements.nodes.arithmetic.IntegerNegExactSplitNode;
-import jdk.compiler.graal.replacements.nodes.arithmetic.IntegerSubExactNode;
-import jdk.compiler.graal.replacements.nodes.arithmetic.IntegerSubExactOverflowNode;
-import jdk.compiler.graal.replacements.nodes.arithmetic.IntegerSubExactSplitNode;
-import jdk.compiler.graal.replacements.nodes.arithmetic.UnsignedMulHighNode;
-import jdk.compiler.graal.replacements.nodes.AESNode;
-import jdk.compiler.graal.replacements.nodes.AESNode.CryptMode;
-import jdk.compiler.graal.replacements.nodes.BigIntegerMulAddNode;
-import jdk.compiler.graal.replacements.nodes.CipherBlockChainingAESNode;
-import jdk.compiler.graal.replacements.nodes.CounterModeAESNode;
-import jdk.compiler.graal.replacements.nodes.EncodeArrayNode;
-import jdk.compiler.graal.replacements.nodes.GHASHProcessBlocksNode;
-import jdk.compiler.graal.replacements.nodes.LogNode;
-import jdk.compiler.graal.replacements.nodes.MessageDigestNode;
-import jdk.compiler.graal.replacements.nodes.MessageDigestNode.MD5Node;
-import jdk.compiler.graal.replacements.nodes.MessageDigestNode.SHA1Node;
-import jdk.compiler.graal.replacements.nodes.MessageDigestNode.SHA256Node;
-import jdk.compiler.graal.replacements.nodes.MessageDigestNode.SHA512Node;
-import jdk.compiler.graal.replacements.nodes.ProfileBooleanNode;
-import jdk.compiler.graal.replacements.nodes.ReverseBitsNode;
-import jdk.compiler.graal.replacements.nodes.ReverseBytesNode;
-import jdk.compiler.graal.replacements.nodes.VirtualizableInvokeMacroNode;
-import jdk.compiler.graal.serviceprovider.JavaVersionUtil;
-import jdk.compiler.graal.serviceprovider.SpeculationReasonGroup;
+import jdk.graal.compiler.api.directives.GraalDirectives;
+import jdk.graal.compiler.api.replacements.SnippetReflectionProvider;
+import jdk.graal.compiler.core.common.calc.Condition;
+import jdk.graal.compiler.core.common.calc.Condition.CanonicalizedCondition;
+import jdk.graal.compiler.core.common.calc.UnsignedMath;
+import jdk.graal.compiler.core.common.memory.BarrierType;
+import jdk.graal.compiler.core.common.memory.MemoryOrderMode;
+import jdk.graal.compiler.core.common.type.AbstractObjectStamp;
+import jdk.graal.compiler.core.common.type.AbstractPointerStamp;
+import jdk.graal.compiler.core.common.type.FloatStamp;
+import jdk.graal.compiler.core.common.type.IntegerStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.core.common.type.TypeReference;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.Edges;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeList;
+import jdk.graal.compiler.lir.gen.ArithmeticLIRGeneratorTool.RoundingMode;
+import jdk.graal.compiler.nodes.AbstractBeginNode;
+import jdk.graal.compiler.nodes.BeginNode;
+import jdk.graal.compiler.nodes.BreakpointNode;
+import jdk.graal.compiler.nodes.ComputeObjectAddressNode;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.DeoptimizeNode;
+import jdk.graal.compiler.nodes.EndNode;
+import jdk.graal.compiler.nodes.FixedGuardNode;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.IfNode;
+import jdk.graal.compiler.nodes.LogicNode;
+import jdk.graal.compiler.nodes.MergeNode;
+import jdk.graal.compiler.nodes.NamedLocationIdentity;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.PiNode;
+import jdk.graal.compiler.nodes.ProfileData.BranchProbabilityData;
+import jdk.graal.compiler.nodes.SpinWaitNode;
+import jdk.graal.compiler.nodes.StateSplit;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.ValuePhiNode;
+import jdk.graal.compiler.nodes.calc.AbsNode;
+import jdk.graal.compiler.nodes.calc.AddNode;
+import jdk.graal.compiler.nodes.calc.CompareNode;
+import jdk.graal.compiler.nodes.calc.ConditionalNode;
+import jdk.graal.compiler.nodes.calc.FloatEqualsNode;
+import jdk.graal.compiler.nodes.calc.IntegerBelowNode;
+import jdk.graal.compiler.nodes.calc.IntegerEqualsNode;
+import jdk.graal.compiler.nodes.calc.IntegerLessThanNode;
+import jdk.graal.compiler.nodes.calc.IntegerMulHighNode;
+import jdk.graal.compiler.nodes.calc.IntegerNormalizeCompareNode;
+import jdk.graal.compiler.nodes.calc.IsNullNode;
+import jdk.graal.compiler.nodes.calc.LeftShiftNode;
+import jdk.graal.compiler.nodes.calc.NarrowNode;
+import jdk.graal.compiler.nodes.calc.ObjectEqualsNode;
+import jdk.graal.compiler.nodes.calc.ReinterpretNode;
+import jdk.graal.compiler.nodes.calc.RightShiftNode;
+import jdk.graal.compiler.nodes.calc.RoundNode;
+import jdk.graal.compiler.nodes.calc.SignExtendNode;
+import jdk.graal.compiler.nodes.calc.SignumNode;
+import jdk.graal.compiler.nodes.calc.SqrtNode;
+import jdk.graal.compiler.nodes.calc.SubNode;
+import jdk.graal.compiler.nodes.calc.UnsignedDivNode;
+import jdk.graal.compiler.nodes.calc.UnsignedRemNode;
+import jdk.graal.compiler.nodes.calc.ZeroExtendNode;
+import jdk.graal.compiler.nodes.debug.BindToRegisterNode;
+import jdk.graal.compiler.nodes.debug.BlackholeNode;
+import jdk.graal.compiler.nodes.debug.ControlFlowAnchorNode;
+import jdk.graal.compiler.nodes.debug.NeverStripMineNode;
+import jdk.graal.compiler.nodes.debug.NeverWriteSinkNode;
+import jdk.graal.compiler.nodes.debug.SideEffectNode;
+import jdk.graal.compiler.nodes.debug.SpillRegistersNode;
+import jdk.graal.compiler.nodes.extended.BoxNode;
+import jdk.graal.compiler.nodes.extended.BoxNode.TrustedBoxedValue;
+import jdk.graal.compiler.nodes.extended.BranchProbabilityNode;
+import jdk.graal.compiler.nodes.extended.BytecodeExceptionNode;
+import jdk.graal.compiler.nodes.extended.BytecodeExceptionNode.BytecodeExceptionKind;
+import jdk.graal.compiler.nodes.extended.CacheWritebackNode;
+import jdk.graal.compiler.nodes.extended.CacheWritebackSyncNode;
+import jdk.graal.compiler.nodes.extended.ClassIsArrayNode;
+import jdk.graal.compiler.nodes.extended.GetClassNode;
+import jdk.graal.compiler.nodes.extended.GuardingNode;
+import jdk.graal.compiler.nodes.extended.JavaReadNode;
+import jdk.graal.compiler.nodes.extended.JavaWriteNode;
+import jdk.graal.compiler.nodes.extended.MembarNode;
+import jdk.graal.compiler.nodes.extended.ObjectIsArrayNode;
+import jdk.graal.compiler.nodes.extended.OpaqueValueNode;
+import jdk.graal.compiler.nodes.extended.RawLoadNode;
+import jdk.graal.compiler.nodes.extended.RawStoreNode;
+import jdk.graal.compiler.nodes.extended.SwitchCaseProbabilityNode;
+import jdk.graal.compiler.nodes.extended.UnboxNode;
+import jdk.graal.compiler.nodes.extended.UnsafeMemoryLoadNode;
+import jdk.graal.compiler.nodes.extended.UnsafeMemoryStoreNode;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin.InlineOnlyInvocationPlugin;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin.OptionalInvocationPlugin;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin.Receiver;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin.RequiredInlineOnlyInvocationPlugin;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin.RequiredInvocationPlugin;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins.Registration;
+import jdk.graal.compiler.nodes.graphbuilderconf.NodePlugin;
+import jdk.graal.compiler.nodes.java.ArrayLengthNode;
+import jdk.graal.compiler.nodes.java.AtomicReadAndAddNode;
+import jdk.graal.compiler.nodes.java.AtomicReadAndWriteNode;
+import jdk.graal.compiler.nodes.java.ClassIsAssignableFromNode;
+import jdk.graal.compiler.nodes.java.DynamicNewArrayNode;
+import jdk.graal.compiler.nodes.java.InstanceOfDynamicNode;
+import jdk.graal.compiler.nodes.java.InstanceOfNode;
+import jdk.graal.compiler.nodes.java.NewArrayNode;
+import jdk.graal.compiler.nodes.java.ReachabilityFenceNode;
+import jdk.graal.compiler.nodes.java.RegisterFinalizerNode;
+import jdk.graal.compiler.nodes.java.UnsafeCompareAndExchangeNode;
+import jdk.graal.compiler.nodes.java.UnsafeCompareAndSwapNode;
+import jdk.graal.compiler.nodes.memory.address.IndexAddressNode;
+import jdk.graal.compiler.nodes.spi.LoweringProvider;
+import jdk.graal.compiler.nodes.spi.Replacements;
+import jdk.graal.compiler.nodes.type.StampTool;
+import jdk.graal.compiler.nodes.util.ConstantFoldUtil;
+import jdk.graal.compiler.nodes.util.ConstantReflectionUtil;
+import jdk.graal.compiler.nodes.util.GraphUtil;
+import jdk.graal.compiler.nodes.virtual.EnsureVirtualizedNode;
+import jdk.graal.compiler.replacements.nodes.ArrayEqualsNode;
+import jdk.graal.compiler.replacements.nodes.BigIntegerSquareToLenNode;
+import jdk.graal.compiler.replacements.nodes.CountPositivesNode;
+import jdk.graal.compiler.replacements.nodes.MacroNode;
+import jdk.graal.compiler.replacements.nodes.arithmetic.IntegerAddExactNode;
+import jdk.graal.compiler.replacements.nodes.arithmetic.IntegerAddExactOverflowNode;
+import jdk.graal.compiler.replacements.nodes.arithmetic.IntegerAddExactSplitNode;
+import jdk.graal.compiler.replacements.nodes.arithmetic.IntegerExactArithmeticSplitNode;
+import jdk.graal.compiler.replacements.nodes.arithmetic.IntegerMulExactNode;
+import jdk.graal.compiler.replacements.nodes.arithmetic.IntegerMulExactOverflowNode;
+import jdk.graal.compiler.replacements.nodes.arithmetic.IntegerMulExactSplitNode;
+import jdk.graal.compiler.replacements.nodes.arithmetic.IntegerNegExactNode;
+import jdk.graal.compiler.replacements.nodes.arithmetic.IntegerNegExactOverflowNode;
+import jdk.graal.compiler.replacements.nodes.arithmetic.IntegerNegExactSplitNode;
+import jdk.graal.compiler.replacements.nodes.arithmetic.IntegerSubExactNode;
+import jdk.graal.compiler.replacements.nodes.arithmetic.IntegerSubExactOverflowNode;
+import jdk.graal.compiler.replacements.nodes.arithmetic.IntegerSubExactSplitNode;
+import jdk.graal.compiler.replacements.nodes.arithmetic.UnsignedMulHighNode;
+import jdk.graal.compiler.replacements.nodes.AESNode;
+import jdk.graal.compiler.replacements.nodes.AESNode.CryptMode;
+import jdk.graal.compiler.replacements.nodes.BigIntegerMulAddNode;
+import jdk.graal.compiler.replacements.nodes.CipherBlockChainingAESNode;
+import jdk.graal.compiler.replacements.nodes.CounterModeAESNode;
+import jdk.graal.compiler.replacements.nodes.EncodeArrayNode;
+import jdk.graal.compiler.replacements.nodes.GHASHProcessBlocksNode;
+import jdk.graal.compiler.replacements.nodes.LogNode;
+import jdk.graal.compiler.replacements.nodes.MessageDigestNode;
+import jdk.graal.compiler.replacements.nodes.MessageDigestNode.MD5Node;
+import jdk.graal.compiler.replacements.nodes.MessageDigestNode.SHA1Node;
+import jdk.graal.compiler.replacements.nodes.MessageDigestNode.SHA256Node;
+import jdk.graal.compiler.replacements.nodes.MessageDigestNode.SHA512Node;
+import jdk.graal.compiler.replacements.nodes.ProfileBooleanNode;
+import jdk.graal.compiler.replacements.nodes.ReverseBitsNode;
+import jdk.graal.compiler.replacements.nodes.ReverseBytesNode;
+import jdk.graal.compiler.replacements.nodes.VirtualizableInvokeMacroNode;
+import jdk.graal.compiler.serviceprovider.JavaVersionUtil;
+import jdk.graal.compiler.serviceprovider.SpeculationReasonGroup;
 import org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.code.Architecture;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/StringHelperIntrinsics.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/StringHelperIntrinsics.java
similarity index 97%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/StringHelperIntrinsics.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/StringHelperIntrinsics.java
index 6e0620bfd069..093781793daa 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/StringHelperIntrinsics.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/StringHelperIntrinsics.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements;
+package jdk.graal.compiler.replacements;
 
 // JaCoCo Exclude
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/StringLatin1InflateNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/StringLatin1InflateNode.java
similarity index 86%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/StringLatin1InflateNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/StringLatin1InflateNode.java
index b70a2b6949be..ce445bc53f16 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/StringLatin1InflateNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/StringLatin1InflateNode.java
@@ -23,24 +23,24 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements;
+package jdk.graal.compiler.replacements;
 
-import static jdk.compiler.graal.nodeinfo.InputType.Memory;
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_UNKNOWN;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_512;
+import static jdk.graal.compiler.nodeinfo.InputType.Memory;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_UNKNOWN;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_512;
 
 import java.util.EnumSet;
 
-import jdk.compiler.graal.core.common.spi.ForeignCallDescriptor;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.lir.GenerateStub;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.NamedLocationIdentity;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
-import jdk.compiler.graal.replacements.nodes.MemoryKillStubIntrinsicNode;
+import jdk.graal.compiler.core.common.spi.ForeignCallDescriptor;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.lir.GenerateStub;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.NamedLocationIdentity;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.replacements.nodes.MemoryKillStubIntrinsicNode;
 import org.graalvm.word.LocationIdentity;
 import org.graalvm.word.Pointer;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/StringLatin1Snippets.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/StringLatin1Snippets.java
similarity index 86%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/StringLatin1Snippets.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/StringLatin1Snippets.java
index 532d55a08d90..2ad1bf3d021a 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/StringLatin1Snippets.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/StringLatin1Snippets.java
@@ -23,21 +23,21 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements;
+package jdk.graal.compiler.replacements;
 
-import static jdk.compiler.graal.api.directives.GraalDirectives.LIKELY_PROBABILITY;
-import static jdk.compiler.graal.api.directives.GraalDirectives.UNLIKELY_PROBABILITY;
-import static jdk.compiler.graal.api.directives.GraalDirectives.injectBranchProbability;
-import static jdk.compiler.graal.replacements.StringHelperIntrinsics.getByte;
+import static jdk.graal.compiler.api.directives.GraalDirectives.LIKELY_PROBABILITY;
+import static jdk.graal.compiler.api.directives.GraalDirectives.UNLIKELY_PROBABILITY;
+import static jdk.graal.compiler.api.directives.GraalDirectives.injectBranchProbability;
+import static jdk.graal.compiler.replacements.StringHelperIntrinsics.getByte;
 
-import jdk.compiler.graal.api.replacements.Fold.InjectedParameter;
-import jdk.compiler.graal.api.replacements.Snippet;
-import jdk.compiler.graal.core.common.Stride;
-import jdk.compiler.graal.lir.gen.LIRGeneratorTool.ArrayIndexOfVariant;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.util.Providers;
-import jdk.compiler.graal.replacements.nodes.ArrayRegionEqualsNode;
-import jdk.compiler.graal.replacements.nodes.ArrayIndexOfNode;
+import jdk.graal.compiler.api.replacements.Fold.InjectedParameter;
+import jdk.graal.compiler.api.replacements.Snippet;
+import jdk.graal.compiler.core.common.Stride;
+import jdk.graal.compiler.lir.gen.LIRGeneratorTool.ArrayIndexOfVariant;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.util.Providers;
+import jdk.graal.compiler.replacements.nodes.ArrayRegionEqualsNode;
+import jdk.graal.compiler.replacements.nodes.ArrayIndexOfNode;
 
 import jdk.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.MetaAccessProvider;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/StringUTF16CompressNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/StringUTF16CompressNode.java
similarity index 85%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/StringUTF16CompressNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/StringUTF16CompressNode.java
index 11359092af48..a321b4449181 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/StringUTF16CompressNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/StringUTF16CompressNode.java
@@ -23,24 +23,24 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements;
+package jdk.graal.compiler.replacements;
 
-import static jdk.compiler.graal.nodeinfo.InputType.Memory;
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_UNKNOWN;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_512;
+import static jdk.graal.compiler.nodeinfo.InputType.Memory;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_UNKNOWN;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_512;
 
 import java.util.EnumSet;
 
-import jdk.compiler.graal.core.common.spi.ForeignCallDescriptor;
-import jdk.compiler.graal.core.common.type.IntegerStamp;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.lir.GenerateStub;
-import jdk.compiler.graal.lir.gen.LIRGeneratorTool;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.NamedLocationIdentity;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
-import jdk.compiler.graal.replacements.nodes.MemoryKillStubIntrinsicNode;
+import jdk.graal.compiler.core.common.spi.ForeignCallDescriptor;
+import jdk.graal.compiler.core.common.type.IntegerStamp;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.lir.GenerateStub;
+import jdk.graal.compiler.lir.gen.LIRGeneratorTool;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.NamedLocationIdentity;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.replacements.nodes.MemoryKillStubIntrinsicNode;
 import org.graalvm.word.LocationIdentity;
 import org.graalvm.word.Pointer;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/StringUTF16Snippets.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/StringUTF16Snippets.java
similarity index 89%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/StringUTF16Snippets.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/StringUTF16Snippets.java
index b0a3ca2bf96b..fafa3e83fa80 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/StringUTF16Snippets.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/StringUTF16Snippets.java
@@ -23,23 +23,23 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements;
+package jdk.graal.compiler.replacements;
 
-import static jdk.compiler.graal.api.directives.GraalDirectives.LIKELY_PROBABILITY;
-import static jdk.compiler.graal.api.directives.GraalDirectives.UNLIKELY_PROBABILITY;
-import static jdk.compiler.graal.api.directives.GraalDirectives.injectBranchProbability;
-import static jdk.compiler.graal.nodes.extended.BranchProbabilityNode.unknownProbability;
+import static jdk.graal.compiler.api.directives.GraalDirectives.LIKELY_PROBABILITY;
+import static jdk.graal.compiler.api.directives.GraalDirectives.UNLIKELY_PROBABILITY;
+import static jdk.graal.compiler.api.directives.GraalDirectives.injectBranchProbability;
+import static jdk.graal.compiler.nodes.extended.BranchProbabilityNode.unknownProbability;
 
-import jdk.compiler.graal.api.replacements.Fold.InjectedParameter;
-import jdk.compiler.graal.api.replacements.Snippet;
-import jdk.compiler.graal.core.common.Stride;
-import jdk.compiler.graal.lir.gen.LIRGeneratorTool.ArrayIndexOfVariant;
-import jdk.compiler.graal.nodes.extended.JavaReadNode;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.util.Providers;
-import jdk.compiler.graal.replacements.nodes.ArrayRegionEqualsNode;
-import jdk.compiler.graal.replacements.nodes.ArrayIndexOfNode;
+import jdk.graal.compiler.api.replacements.Fold.InjectedParameter;
+import jdk.graal.compiler.api.replacements.Snippet;
+import jdk.graal.compiler.core.common.Stride;
+import jdk.graal.compiler.lir.gen.LIRGeneratorTool.ArrayIndexOfVariant;
+import jdk.graal.compiler.nodes.extended.JavaReadNode;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.util.Providers;
+import jdk.graal.compiler.replacements.nodes.ArrayRegionEqualsNode;
+import jdk.graal.compiler.replacements.nodes.ArrayIndexOfNode;
 
 import jdk.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.MetaAccessProvider;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/TargetGraphBuilderPlugins.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/TargetGraphBuilderPlugins.java
similarity index 87%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/TargetGraphBuilderPlugins.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/TargetGraphBuilderPlugins.java
index 715c6c76f074..a0eafc3f8f50 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/TargetGraphBuilderPlugins.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/TargetGraphBuilderPlugins.java
@@ -22,11 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements;
+package jdk.graal.compiler.replacements;
 
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
-import jdk.compiler.graal.nodes.spi.Replacements;
-import jdk.compiler.graal.options.OptionValues;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
+import jdk.graal.compiler.nodes.spi.Replacements;
+import jdk.graal.compiler.options.OptionValues;
 
 import jdk.vm.ci.code.Architecture;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/aarch64/AArch64BitCountNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/aarch64/AArch64BitCountNode.java
similarity index 81%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/aarch64/AArch64BitCountNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/aarch64/AArch64BitCountNode.java
index 842ffa4736cc..04222232db88 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/aarch64/AArch64BitCountNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/aarch64/AArch64BitCountNode.java
@@ -23,15 +23,15 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements.aarch64;
+package jdk.graal.compiler.replacements.aarch64;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_4;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_4;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_4;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_4;
 
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.replacements.nodes.BitCountNode;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.replacements.nodes.BitCountNode;
 
 @NodeInfo(cycles = CYCLES_4, size = SIZE_4)
 public final class AArch64BitCountNode extends BitCountNode {
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/aarch64/AArch64GraphBuilderPlugins.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/aarch64/AArch64GraphBuilderPlugins.java
similarity index 91%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/aarch64/AArch64GraphBuilderPlugins.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/aarch64/AArch64GraphBuilderPlugins.java
index b0df694acf9c..98bce10eb0f9 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/aarch64/AArch64GraphBuilderPlugins.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/aarch64/AArch64GraphBuilderPlugins.java
@@ -22,56 +22,56 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements.aarch64;
+package jdk.graal.compiler.replacements.aarch64;
 
 import java.lang.reflect.Type;
 
-import jdk.compiler.graal.core.common.GraalOptions;
-import jdk.compiler.graal.core.common.Stride;
-import jdk.compiler.graal.core.common.calc.Condition;
-import jdk.compiler.graal.core.common.memory.BarrierType;
-import jdk.compiler.graal.core.common.memory.MemoryOrderMode;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.NamedLocationIdentity;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.calc.CopySignNode;
-import jdk.compiler.graal.nodes.calc.LeftShiftNode;
-import jdk.compiler.graal.nodes.calc.MaxNode;
-import jdk.compiler.graal.nodes.calc.MinNode;
-import jdk.compiler.graal.nodes.calc.NarrowNode;
-import jdk.compiler.graal.nodes.calc.RoundFloatToIntegerNode;
-import jdk.compiler.graal.nodes.calc.ZeroExtendNode;
-import jdk.compiler.graal.nodes.extended.JavaReadNode;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin.InlineOnlyInvocationPlugin;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins.Registration;
-import jdk.compiler.graal.nodes.java.ArrayLengthNode;
-import jdk.compiler.graal.nodes.memory.address.IndexAddressNode;
-import jdk.compiler.graal.nodes.spi.Replacements;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.replacements.InvocationPluginHelper;
-import jdk.compiler.graal.replacements.SnippetSubstitutionInvocationPlugin;
-import jdk.compiler.graal.replacements.SnippetTemplate;
-import jdk.compiler.graal.replacements.StringLatin1InflateNode;
-import jdk.compiler.graal.replacements.StringLatin1Snippets;
-import jdk.compiler.graal.replacements.StringUTF16CompressNode;
-import jdk.compiler.graal.replacements.StringUTF16Snippets;
-import jdk.compiler.graal.replacements.TargetGraphBuilderPlugins;
-import jdk.compiler.graal.replacements.nodes.BinaryMathIntrinsicNode;
-import jdk.compiler.graal.replacements.nodes.CountTrailingZerosNode;
-import jdk.compiler.graal.replacements.nodes.FloatToHalfFloatNode;
-import jdk.compiler.graal.replacements.nodes.FusedMultiplyAddNode;
-import jdk.compiler.graal.replacements.nodes.UnaryMathIntrinsicNode;
-import jdk.compiler.graal.replacements.nodes.ArrayCompareToNode;
-import jdk.compiler.graal.replacements.nodes.ArrayIndexOfNode;
-import jdk.compiler.graal.replacements.nodes.CountLeadingZerosNode;
-import jdk.compiler.graal.replacements.nodes.HalfFloatToFloatNode;
-import jdk.compiler.graal.replacements.nodes.MessageDigestNode;
-import jdk.compiler.graal.serviceprovider.JavaVersionUtil;
+import jdk.graal.compiler.core.common.GraalOptions;
+import jdk.graal.compiler.core.common.Stride;
+import jdk.graal.compiler.core.common.calc.Condition;
+import jdk.graal.compiler.core.common.memory.BarrierType;
+import jdk.graal.compiler.core.common.memory.MemoryOrderMode;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.NamedLocationIdentity;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.calc.CopySignNode;
+import jdk.graal.compiler.nodes.calc.LeftShiftNode;
+import jdk.graal.compiler.nodes.calc.MaxNode;
+import jdk.graal.compiler.nodes.calc.MinNode;
+import jdk.graal.compiler.nodes.calc.NarrowNode;
+import jdk.graal.compiler.nodes.calc.RoundFloatToIntegerNode;
+import jdk.graal.compiler.nodes.calc.ZeroExtendNode;
+import jdk.graal.compiler.nodes.extended.JavaReadNode;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin.InlineOnlyInvocationPlugin;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins.Registration;
+import jdk.graal.compiler.nodes.java.ArrayLengthNode;
+import jdk.graal.compiler.nodes.memory.address.IndexAddressNode;
+import jdk.graal.compiler.nodes.spi.Replacements;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.replacements.InvocationPluginHelper;
+import jdk.graal.compiler.replacements.SnippetSubstitutionInvocationPlugin;
+import jdk.graal.compiler.replacements.SnippetTemplate;
+import jdk.graal.compiler.replacements.StringLatin1InflateNode;
+import jdk.graal.compiler.replacements.StringLatin1Snippets;
+import jdk.graal.compiler.replacements.StringUTF16CompressNode;
+import jdk.graal.compiler.replacements.StringUTF16Snippets;
+import jdk.graal.compiler.replacements.TargetGraphBuilderPlugins;
+import jdk.graal.compiler.replacements.nodes.BinaryMathIntrinsicNode;
+import jdk.graal.compiler.replacements.nodes.CountTrailingZerosNode;
+import jdk.graal.compiler.replacements.nodes.FloatToHalfFloatNode;
+import jdk.graal.compiler.replacements.nodes.FusedMultiplyAddNode;
+import jdk.graal.compiler.replacements.nodes.UnaryMathIntrinsicNode;
+import jdk.graal.compiler.replacements.nodes.ArrayCompareToNode;
+import jdk.graal.compiler.replacements.nodes.ArrayIndexOfNode;
+import jdk.graal.compiler.replacements.nodes.CountLeadingZerosNode;
+import jdk.graal.compiler.replacements.nodes.HalfFloatToFloatNode;
+import jdk.graal.compiler.replacements.nodes.MessageDigestNode;
+import jdk.graal.compiler.serviceprovider.JavaVersionUtil;
 
 import jdk.vm.ci.aarch64.AArch64;
 import jdk.vm.ci.code.Architecture;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/aarch64/AArch64IntegerArithmeticSnippets.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/aarch64/AArch64IntegerArithmeticSnippets.java
similarity index 89%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/aarch64/AArch64IntegerArithmeticSnippets.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/aarch64/AArch64IntegerArithmeticSnippets.java
index 28c783c4ae7a..627eea393cc1 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/aarch64/AArch64IntegerArithmeticSnippets.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/aarch64/AArch64IntegerArithmeticSnippets.java
@@ -24,34 +24,34 @@
  * questions.
  */
 
-package jdk.compiler.graal.replacements.aarch64;
-
-import jdk.compiler.graal.api.replacements.Snippet;
-import jdk.compiler.graal.api.replacements.Snippet.ConstantParameter;
-import jdk.compiler.graal.core.common.type.IntegerStamp;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.Node.NodeIntrinsic;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.DeoptimizeNode;
-import jdk.compiler.graal.nodes.FrameState;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.PiNode;
-import jdk.compiler.graal.nodes.SnippetAnchorNode;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.calc.IntegerDivRemNode;
-import jdk.compiler.graal.nodes.calc.SignedDivNode;
-import jdk.compiler.graal.nodes.calc.SignedRemNode;
-import jdk.compiler.graal.nodes.calc.UnsignedDivNode;
-import jdk.compiler.graal.nodes.calc.UnsignedRemNode;
-import jdk.compiler.graal.nodes.extended.BranchProbabilityNode;
-import jdk.compiler.graal.nodes.extended.GuardingNode;
-import jdk.compiler.graal.nodes.spi.LoweringTool;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.util.Providers;
-import jdk.compiler.graal.replacements.SnippetTemplate;
-import jdk.compiler.graal.replacements.Snippets;
+package jdk.graal.compiler.replacements.aarch64;
+
+import jdk.graal.compiler.api.replacements.Snippet;
+import jdk.graal.compiler.api.replacements.Snippet.ConstantParameter;
+import jdk.graal.compiler.core.common.type.IntegerStamp;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.Node.NodeIntrinsic;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.DeoptimizeNode;
+import jdk.graal.compiler.nodes.FrameState;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.PiNode;
+import jdk.graal.compiler.nodes.SnippetAnchorNode;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.calc.IntegerDivRemNode;
+import jdk.graal.compiler.nodes.calc.SignedDivNode;
+import jdk.graal.compiler.nodes.calc.SignedRemNode;
+import jdk.graal.compiler.nodes.calc.UnsignedDivNode;
+import jdk.graal.compiler.nodes.calc.UnsignedRemNode;
+import jdk.graal.compiler.nodes.extended.BranchProbabilityNode;
+import jdk.graal.compiler.nodes.extended.GuardingNode;
+import jdk.graal.compiler.nodes.spi.LoweringTool;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.util.Providers;
+import jdk.graal.compiler.replacements.SnippetTemplate;
+import jdk.graal.compiler.replacements.Snippets;
 
 import jdk.vm.ci.meta.DeoptimizationAction;
 import jdk.vm.ci.meta.DeoptimizationReason;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/amd64/AMD64ConvertSnippets.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/amd64/AMD64ConvertSnippets.java
similarity index 91%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/amd64/AMD64ConvertSnippets.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/amd64/AMD64ConvertSnippets.java
index 6809620a903e..db1515e91a95 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/amd64/AMD64ConvertSnippets.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/amd64/AMD64ConvertSnippets.java
@@ -22,21 +22,21 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements.amd64;
-
-import static jdk.compiler.graal.nodes.extended.BranchProbabilityNode.SLOW_PATH_PROBABILITY;
-import static jdk.compiler.graal.nodes.extended.BranchProbabilityNode.probability;
-import static jdk.compiler.graal.nodes.extended.BranchProbabilityNode.unknownProbability;
-
-import jdk.compiler.graal.api.replacements.Snippet;
-import jdk.compiler.graal.nodes.GraphState.StageFlag;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.calc.FloatConvertNode;
-import jdk.compiler.graal.nodes.spi.LoweringTool;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.util.Providers;
-import jdk.compiler.graal.replacements.SnippetTemplate;
-import jdk.compiler.graal.replacements.Snippets;
+package jdk.graal.compiler.replacements.amd64;
+
+import static jdk.graal.compiler.nodes.extended.BranchProbabilityNode.SLOW_PATH_PROBABILITY;
+import static jdk.graal.compiler.nodes.extended.BranchProbabilityNode.probability;
+import static jdk.graal.compiler.nodes.extended.BranchProbabilityNode.unknownProbability;
+
+import jdk.graal.compiler.api.replacements.Snippet;
+import jdk.graal.compiler.nodes.GraphState.StageFlag;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.calc.FloatConvertNode;
+import jdk.graal.compiler.nodes.spi.LoweringTool;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.util.Providers;
+import jdk.graal.compiler.replacements.SnippetTemplate;
+import jdk.graal.compiler.replacements.Snippets;
 
 /**
  * Snippets used for conversion operations on AMD64 where the AMD64 instruction used does not match
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/amd64/AMD64FloatConvertNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/amd64/AMD64FloatConvertNode.java
similarity index 76%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/amd64/AMD64FloatConvertNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/amd64/AMD64FloatConvertNode.java
index 62a6034fc049..897b69047f05 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/amd64/AMD64FloatConvertNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/amd64/AMD64FloatConvertNode.java
@@ -22,30 +22,30 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements.amd64;
+package jdk.graal.compiler.replacements.amd64;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_8;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1;
-import static jdk.compiler.graal.nodes.calc.BinaryArithmeticNode.getArithmeticOpTable;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_8;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_1;
+import static jdk.graal.compiler.nodes.calc.BinaryArithmeticNode.getArithmeticOpTable;
 
-import jdk.compiler.graal.core.common.calc.FloatConvert;
-import jdk.compiler.graal.core.common.type.ArithmeticOpTable;
-import jdk.compiler.graal.core.common.type.ArithmeticOpTable.FloatConvertOp;
-import jdk.compiler.graal.core.common.type.ArithmeticOpTable.UnaryOp;
-import jdk.compiler.graal.core.common.type.IntegerStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.lir.gen.ArithmeticLIRGeneratorTool;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.calc.FloatConvertNode;
-import jdk.compiler.graal.nodes.calc.UnaryArithmeticNode;
-import jdk.compiler.graal.nodes.spi.ArithmeticLIRLowerable;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.core.common.calc.FloatConvert;
+import jdk.graal.compiler.core.common.type.ArithmeticOpTable;
+import jdk.graal.compiler.core.common.type.ArithmeticOpTable.FloatConvertOp;
+import jdk.graal.compiler.core.common.type.ArithmeticOpTable.UnaryOp;
+import jdk.graal.compiler.core.common.type.IntegerStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.lir.gen.ArithmeticLIRGeneratorTool;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.calc.FloatConvertNode;
+import jdk.graal.compiler.nodes.calc.UnaryArithmeticNode;
+import jdk.graal.compiler.nodes.spi.ArithmeticLIRLowerable;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
 
 import jdk.vm.ci.meta.JavaConstant;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/amd64/AMD64GraphBuilderPlugins.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/amd64/AMD64GraphBuilderPlugins.java
similarity index 90%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/amd64/AMD64GraphBuilderPlugins.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/amd64/AMD64GraphBuilderPlugins.java
index 0b8192a98dfa..610e058bb050 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/amd64/AMD64GraphBuilderPlugins.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/amd64/AMD64GraphBuilderPlugins.java
@@ -22,71 +22,71 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements.amd64;
+package jdk.graal.compiler.replacements.amd64;
 
-import static jdk.compiler.graal.nodes.calc.FloatTypeTestNode.FloatTypeTestOp.IS_INFINITE;
-import static jdk.compiler.graal.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation.COS;
-import static jdk.compiler.graal.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation.EXP;
-import static jdk.compiler.graal.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation.LOG;
-import static jdk.compiler.graal.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation.LOG10;
-import static jdk.compiler.graal.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation.SIN;
-import static jdk.compiler.graal.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation.TAN;
+import static jdk.graal.compiler.nodes.calc.FloatTypeTestNode.FloatTypeTestOp.IS_INFINITE;
+import static jdk.graal.compiler.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation.COS;
+import static jdk.graal.compiler.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation.EXP;
+import static jdk.graal.compiler.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation.LOG;
+import static jdk.graal.compiler.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation.LOG10;
+import static jdk.graal.compiler.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation.SIN;
+import static jdk.graal.compiler.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation.TAN;
 
 import java.lang.reflect.Type;
 import java.util.Arrays;
 
-import jdk.compiler.graal.core.common.GraalOptions;
-import jdk.compiler.graal.core.common.Stride;
-import jdk.compiler.graal.core.common.calc.Condition;
-import jdk.compiler.graal.core.common.memory.BarrierType;
-import jdk.compiler.graal.core.common.memory.MemoryOrderMode;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.NamedLocationIdentity;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.calc.CompressBitsNode;
-import jdk.compiler.graal.nodes.calc.CopySignNode;
-import jdk.compiler.graal.nodes.calc.ExpandBitsNode;
-import jdk.compiler.graal.nodes.calc.FloatTypeTestNode;
-import jdk.compiler.graal.nodes.calc.LeftShiftNode;
-import jdk.compiler.graal.nodes.calc.MaxNode;
-import jdk.compiler.graal.nodes.calc.MinNode;
-import jdk.compiler.graal.nodes.calc.NarrowNode;
-import jdk.compiler.graal.nodes.calc.RoundFloatToIntegerNode;
-import jdk.compiler.graal.nodes.calc.ZeroExtendNode;
-import jdk.compiler.graal.nodes.extended.JavaReadNode;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins.Registration;
-import jdk.compiler.graal.nodes.java.ArrayLengthNode;
-import jdk.compiler.graal.nodes.memory.address.IndexAddressNode;
-import jdk.compiler.graal.nodes.spi.Replacements;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.replacements.InvocationPluginHelper;
-import jdk.compiler.graal.replacements.SnippetSubstitutionInvocationPlugin;
-import jdk.compiler.graal.replacements.SnippetTemplate;
-import jdk.compiler.graal.replacements.StandardGraphBuilderPlugins;
-import jdk.compiler.graal.replacements.StringLatin1InflateNode;
-import jdk.compiler.graal.replacements.StringLatin1Snippets;
-import jdk.compiler.graal.replacements.StringUTF16CompressNode;
-import jdk.compiler.graal.replacements.StringUTF16Snippets;
-import jdk.compiler.graal.replacements.TargetGraphBuilderPlugins;
-import jdk.compiler.graal.replacements.nodes.BinaryMathIntrinsicNode;
-import jdk.compiler.graal.replacements.nodes.CountTrailingZerosNode;
-import jdk.compiler.graal.replacements.nodes.FloatToHalfFloatNode;
-import jdk.compiler.graal.replacements.nodes.FusedMultiplyAddNode;
-import jdk.compiler.graal.replacements.nodes.VectorizedHashCodeNode;
-import jdk.compiler.graal.replacements.nodes.ArrayCompareToNode;
-import jdk.compiler.graal.replacements.nodes.ArrayIndexOfNode;
-import jdk.compiler.graal.replacements.nodes.BitCountNode;
-import jdk.compiler.graal.replacements.nodes.CountLeadingZerosNode;
-import jdk.compiler.graal.replacements.nodes.HalfFloatToFloatNode;
-import jdk.compiler.graal.replacements.nodes.UnaryMathIntrinsicNode;
-import jdk.compiler.graal.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation;
-import jdk.compiler.graal.serviceprovider.JavaVersionUtil;
+import jdk.graal.compiler.core.common.GraalOptions;
+import jdk.graal.compiler.core.common.Stride;
+import jdk.graal.compiler.core.common.calc.Condition;
+import jdk.graal.compiler.core.common.memory.BarrierType;
+import jdk.graal.compiler.core.common.memory.MemoryOrderMode;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.NamedLocationIdentity;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.calc.CompressBitsNode;
+import jdk.graal.compiler.nodes.calc.CopySignNode;
+import jdk.graal.compiler.nodes.calc.ExpandBitsNode;
+import jdk.graal.compiler.nodes.calc.FloatTypeTestNode;
+import jdk.graal.compiler.nodes.calc.LeftShiftNode;
+import jdk.graal.compiler.nodes.calc.MaxNode;
+import jdk.graal.compiler.nodes.calc.MinNode;
+import jdk.graal.compiler.nodes.calc.NarrowNode;
+import jdk.graal.compiler.nodes.calc.RoundFloatToIntegerNode;
+import jdk.graal.compiler.nodes.calc.ZeroExtendNode;
+import jdk.graal.compiler.nodes.extended.JavaReadNode;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins.Registration;
+import jdk.graal.compiler.nodes.java.ArrayLengthNode;
+import jdk.graal.compiler.nodes.memory.address.IndexAddressNode;
+import jdk.graal.compiler.nodes.spi.Replacements;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.replacements.InvocationPluginHelper;
+import jdk.graal.compiler.replacements.SnippetSubstitutionInvocationPlugin;
+import jdk.graal.compiler.replacements.SnippetTemplate;
+import jdk.graal.compiler.replacements.StandardGraphBuilderPlugins;
+import jdk.graal.compiler.replacements.StringLatin1InflateNode;
+import jdk.graal.compiler.replacements.StringLatin1Snippets;
+import jdk.graal.compiler.replacements.StringUTF16CompressNode;
+import jdk.graal.compiler.replacements.StringUTF16Snippets;
+import jdk.graal.compiler.replacements.TargetGraphBuilderPlugins;
+import jdk.graal.compiler.replacements.nodes.BinaryMathIntrinsicNode;
+import jdk.graal.compiler.replacements.nodes.CountTrailingZerosNode;
+import jdk.graal.compiler.replacements.nodes.FloatToHalfFloatNode;
+import jdk.graal.compiler.replacements.nodes.FusedMultiplyAddNode;
+import jdk.graal.compiler.replacements.nodes.VectorizedHashCodeNode;
+import jdk.graal.compiler.replacements.nodes.ArrayCompareToNode;
+import jdk.graal.compiler.replacements.nodes.ArrayIndexOfNode;
+import jdk.graal.compiler.replacements.nodes.BitCountNode;
+import jdk.graal.compiler.replacements.nodes.CountLeadingZerosNode;
+import jdk.graal.compiler.replacements.nodes.HalfFloatToFloatNode;
+import jdk.graal.compiler.replacements.nodes.UnaryMathIntrinsicNode;
+import jdk.graal.compiler.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation;
+import jdk.graal.compiler.serviceprovider.JavaVersionUtil;
 
 import jdk.vm.ci.amd64.AMD64;
 import jdk.vm.ci.amd64.AMD64.CPUFeature;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/amd64/AMD64IntrinsicStubs.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/amd64/AMD64IntrinsicStubs.java
similarity index 89%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/amd64/AMD64IntrinsicStubs.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/amd64/AMD64IntrinsicStubs.java
index 64f6bd85416c..aad9b5da6409 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/amd64/AMD64IntrinsicStubs.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/amd64/AMD64IntrinsicStubs.java
@@ -22,19 +22,19 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements.amd64;
+package jdk.graal.compiler.replacements.amd64;
 
 import java.util.EnumSet;
 
-import jdk.compiler.graal.asm.amd64.AVXKind;
-import jdk.compiler.graal.core.common.Stride;
-import jdk.compiler.graal.core.common.StrideUtil;
-import jdk.compiler.graal.lir.amd64.AMD64ArrayEqualsOp;
-import jdk.compiler.graal.lir.gen.LIRGenerator;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.replacements.nodes.ArrayEqualsNode;
-import jdk.compiler.graal.replacements.nodes.ArrayRegionEqualsNode;
-import jdk.compiler.graal.replacements.nodes.ArrayRegionEqualsWithMaskNode;
+import jdk.graal.compiler.asm.amd64.AVXKind;
+import jdk.graal.compiler.core.common.Stride;
+import jdk.graal.compiler.core.common.StrideUtil;
+import jdk.graal.compiler.lir.amd64.AMD64ArrayEqualsOp;
+import jdk.graal.compiler.lir.gen.LIRGenerator;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.replacements.nodes.ArrayEqualsNode;
+import jdk.graal.compiler.replacements.nodes.ArrayRegionEqualsNode;
+import jdk.graal.compiler.replacements.nodes.ArrayRegionEqualsWithMaskNode;
 
 import jdk.vm.ci.amd64.AMD64;
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/arraycopy/ArrayCopyCallNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/arraycopy/ArrayCopyCallNode.java
similarity index 90%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/arraycopy/ArrayCopyCallNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/arraycopy/ArrayCopyCallNode.java
index a15620fa31ee..cdb090463243 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/arraycopy/ArrayCopyCallNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/arraycopy/ArrayCopyCallNode.java
@@ -23,42 +23,42 @@
  * questions.
  */
 //JaCoCo Exclude
-package jdk.compiler.graal.replacements.arraycopy;
+package jdk.graal.compiler.replacements.arraycopy;
 
-import static jdk.compiler.graal.nodeinfo.InputType.Memory;
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_UNKNOWN;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_UNKNOWN;
+import static jdk.graal.compiler.nodeinfo.InputType.Memory;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_UNKNOWN;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_UNKNOWN;
 
 import java.util.Arrays;
 
-import jdk.compiler.graal.core.common.spi.ForeignCallDescriptor;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.InputType;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.GetObjectAddressNode;
-import jdk.compiler.graal.nodes.NamedLocationIdentity;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.calc.AddNode;
-import jdk.compiler.graal.nodes.calc.IntegerConvertNode;
-import jdk.compiler.graal.nodes.calc.LeftShiftNode;
-import jdk.compiler.graal.nodes.extended.ForeignCallNode;
-import jdk.compiler.graal.nodes.memory.AbstractMemoryCheckpoint;
-import jdk.compiler.graal.nodes.memory.MemoryAccess;
-import jdk.compiler.graal.nodes.memory.MemoryKill;
-import jdk.compiler.graal.nodes.memory.SingleMemoryKill;
-import jdk.compiler.graal.nodes.memory.address.OffsetAddressNode;
-import jdk.compiler.graal.nodes.spi.Canonicalizable;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodes.spi.Lowerable;
-import jdk.compiler.graal.nodes.spi.LoweringTool;
-import jdk.compiler.graal.word.WordTypes;
+import jdk.graal.compiler.core.common.spi.ForeignCallDescriptor;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.InputType;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.GetObjectAddressNode;
+import jdk.graal.compiler.nodes.NamedLocationIdentity;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.calc.AddNode;
+import jdk.graal.compiler.nodes.calc.IntegerConvertNode;
+import jdk.graal.compiler.nodes.calc.LeftShiftNode;
+import jdk.graal.compiler.nodes.extended.ForeignCallNode;
+import jdk.graal.compiler.nodes.memory.AbstractMemoryCheckpoint;
+import jdk.graal.compiler.nodes.memory.MemoryAccess;
+import jdk.graal.compiler.nodes.memory.MemoryKill;
+import jdk.graal.compiler.nodes.memory.SingleMemoryKill;
+import jdk.graal.compiler.nodes.memory.address.OffsetAddressNode;
+import jdk.graal.compiler.nodes.spi.Canonicalizable;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodes.spi.Lowerable;
+import jdk.graal.compiler.nodes.spi.LoweringTool;
+import jdk.graal.compiler.word.WordTypes;
 import org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.code.CodeUtil;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/arraycopy/ArrayCopyForeignCalls.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/arraycopy/ArrayCopyForeignCalls.java
similarity index 91%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/arraycopy/ArrayCopyForeignCalls.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/arraycopy/ArrayCopyForeignCalls.java
index af81b1ae541d..4997bb956e83 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/arraycopy/ArrayCopyForeignCalls.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/arraycopy/ArrayCopyForeignCalls.java
@@ -22,9 +22,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements.arraycopy;
+package jdk.graal.compiler.replacements.arraycopy;
 
-import jdk.compiler.graal.core.common.spi.ForeignCallsProvider;
+import jdk.graal.compiler.core.common.spi.ForeignCallsProvider;
 
 public interface ArrayCopyForeignCalls extends ForeignCallsProvider, ArrayCopyLookup {
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/arraycopy/ArrayCopyLookup.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/arraycopy/ArrayCopyLookup.java
similarity index 93%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/arraycopy/ArrayCopyLookup.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/arraycopy/ArrayCopyLookup.java
index 5a5a3307767a..968113ac27b3 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/arraycopy/ArrayCopyLookup.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/arraycopy/ArrayCopyLookup.java
@@ -22,9 +22,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements.arraycopy;
+package jdk.graal.compiler.replacements.arraycopy;
 
-import jdk.compiler.graal.core.common.spi.ForeignCallDescriptor;
+import jdk.graal.compiler.core.common.spi.ForeignCallDescriptor;
 import org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/arraycopy/ArrayCopyNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/arraycopy/ArrayCopyNode.java
similarity index 84%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/arraycopy/ArrayCopyNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/arraycopy/ArrayCopyNode.java
index e70c47061209..eeef279ce815 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/arraycopy/ArrayCopyNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/arraycopy/ArrayCopyNode.java
@@ -22,19 +22,19 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements.arraycopy;
+package jdk.graal.compiler.replacements.arraycopy;
 
 import static org.graalvm.word.LocationIdentity.any;
 
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.spi.LoweringProvider;
-import jdk.compiler.graal.nodes.spi.LoweringTool;
-import jdk.compiler.graal.nodes.NamedLocationIdentity;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.Lowerable;
-import jdk.compiler.graal.nodes.type.StampTool;
-import jdk.compiler.graal.replacements.nodes.BasicArrayCopyNode;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.spi.LoweringProvider;
+import jdk.graal.compiler.nodes.spi.LoweringTool;
+import jdk.graal.compiler.nodes.NamedLocationIdentity;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.Lowerable;
+import jdk.graal.compiler.nodes.type.StampTool;
+import jdk.graal.compiler.replacements.nodes.BasicArrayCopyNode;
 import org.graalvm.word.LocationIdentity;
 
 /**
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/arraycopy/ArrayCopySnippets.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/arraycopy/ArrayCopySnippets.java
similarity index 94%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/arraycopy/ArrayCopySnippets.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/arraycopy/ArrayCopySnippets.java
index 2f6ba9270351..2eb9a53f040f 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/arraycopy/ArrayCopySnippets.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/arraycopy/ArrayCopySnippets.java
@@ -22,58 +22,58 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements.arraycopy;
+package jdk.graal.compiler.replacements.arraycopy;
 
 import static jdk.vm.ci.services.Services.IS_BUILDING_NATIVE_IMAGE;
-import static jdk.compiler.graal.nodes.extended.BranchProbabilityNode.DEOPT_PROBABILITY;
-import static jdk.compiler.graal.nodes.extended.BranchProbabilityNode.FAST_PATH_PROBABILITY;
-import static jdk.compiler.graal.nodes.extended.BranchProbabilityNode.FREQUENT_PROBABILITY;
-import static jdk.compiler.graal.nodes.extended.BranchProbabilityNode.NOT_FREQUENT_PROBABILITY;
-import static jdk.compiler.graal.nodes.extended.BranchProbabilityNode.probability;
+import static jdk.graal.compiler.nodes.extended.BranchProbabilityNode.DEOPT_PROBABILITY;
+import static jdk.graal.compiler.nodes.extended.BranchProbabilityNode.FAST_PATH_PROBABILITY;
+import static jdk.graal.compiler.nodes.extended.BranchProbabilityNode.FREQUENT_PROBABILITY;
+import static jdk.graal.compiler.nodes.extended.BranchProbabilityNode.NOT_FREQUENT_PROBABILITY;
+import static jdk.graal.compiler.nodes.extended.BranchProbabilityNode.probability;
 
 import java.util.EnumMap;
 import java.util.function.Supplier;
 
-import jdk.compiler.graal.replacements.ReplacementsUtil;
-import jdk.compiler.graal.replacements.SnippetCounter;
-import jdk.compiler.graal.replacements.SnippetIntegerHistogram;
-import jdk.compiler.graal.replacements.SnippetTemplate;
-import jdk.compiler.graal.replacements.Snippets;
+import jdk.graal.compiler.replacements.ReplacementsUtil;
+import jdk.graal.compiler.replacements.SnippetCounter;
+import jdk.graal.compiler.replacements.SnippetIntegerHistogram;
+import jdk.graal.compiler.replacements.SnippetTemplate;
+import jdk.graal.compiler.replacements.Snippets;
 import org.graalvm.collections.UnmodifiableEconomicMap;
-import jdk.compiler.graal.api.replacements.Fold.InjectedParameter;
-import jdk.compiler.graal.api.replacements.Snippet;
-import jdk.compiler.graal.api.replacements.Snippet.ConstantParameter;
-import jdk.compiler.graal.api.replacements.Snippet.NonNullParameter;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.nodes.CallTargetNode;
-import jdk.compiler.graal.nodes.DeoptimizeNode;
-import jdk.compiler.graal.nodes.FrameState;
-import jdk.compiler.graal.nodes.GraphState.GuardsStage;
-import jdk.compiler.graal.nodes.InvokeNode;
-import jdk.compiler.graal.nodes.InvokeWithExceptionNode;
-import jdk.compiler.graal.nodes.NamedLocationIdentity;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.PiNode;
-import jdk.compiler.graal.nodes.SnippetAnchorNode;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.UnreachableNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.extended.GuardedUnsafeLoadNode;
-import jdk.compiler.graal.nodes.extended.GuardingNode;
-import jdk.compiler.graal.nodes.extended.RawStoreNode;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins;
-import jdk.compiler.graal.nodes.java.ArrayLengthNode;
-import jdk.compiler.graal.nodes.spi.CoreProviders;
-import jdk.compiler.graal.nodes.spi.LoweringTool;
-import jdk.compiler.graal.nodes.type.StampTool;
-import jdk.compiler.graal.nodes.util.GraphUtil;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.PhaseSuite;
-import jdk.compiler.graal.phases.util.Providers;
-import jdk.compiler.graal.replacements.nodes.BasicArrayCopyNode;
+import jdk.graal.compiler.api.replacements.Fold.InjectedParameter;
+import jdk.graal.compiler.api.replacements.Snippet;
+import jdk.graal.compiler.api.replacements.Snippet.ConstantParameter;
+import jdk.graal.compiler.api.replacements.Snippet.NonNullParameter;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.nodes.CallTargetNode;
+import jdk.graal.compiler.nodes.DeoptimizeNode;
+import jdk.graal.compiler.nodes.FrameState;
+import jdk.graal.compiler.nodes.GraphState.GuardsStage;
+import jdk.graal.compiler.nodes.InvokeNode;
+import jdk.graal.compiler.nodes.InvokeWithExceptionNode;
+import jdk.graal.compiler.nodes.NamedLocationIdentity;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.PiNode;
+import jdk.graal.compiler.nodes.SnippetAnchorNode;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.UnreachableNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.extended.GuardedUnsafeLoadNode;
+import jdk.graal.compiler.nodes.extended.GuardingNode;
+import jdk.graal.compiler.nodes.extended.RawStoreNode;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins;
+import jdk.graal.compiler.nodes.java.ArrayLengthNode;
+import jdk.graal.compiler.nodes.spi.CoreProviders;
+import jdk.graal.compiler.nodes.spi.LoweringTool;
+import jdk.graal.compiler.nodes.type.StampTool;
+import jdk.graal.compiler.nodes.util.GraphUtil;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.PhaseSuite;
+import jdk.graal.compiler.phases.util.Providers;
+import jdk.graal.compiler.replacements.nodes.BasicArrayCopyNode;
 import org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.code.BytecodeFrame;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/arraycopy/ArrayCopyWithDelayedLoweringNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/arraycopy/ArrayCopyWithDelayedLoweringNode.java
similarity index 88%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/arraycopy/ArrayCopyWithDelayedLoweringNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/arraycopy/ArrayCopyWithDelayedLoweringNode.java
index e415e7782f19..9c6340d01f77 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/arraycopy/ArrayCopyWithDelayedLoweringNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/arraycopy/ArrayCopyWithDelayedLoweringNode.java
@@ -22,20 +22,20 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements.arraycopy;
+package jdk.graal.compiler.replacements.arraycopy;
 
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.InputType;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.GraphState;
-import jdk.compiler.graal.nodes.UnreachableBeginNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.loop.LoopExpandableNode;
-import jdk.compiler.graal.nodes.spi.Simplifiable;
-import jdk.compiler.graal.nodes.spi.SimplifierTool;
-import jdk.compiler.graal.nodes.type.StampTool;
-import jdk.compiler.graal.replacements.nodes.BasicArrayCopyNode;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.InputType;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.GraphState;
+import jdk.graal.compiler.nodes.UnreachableBeginNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.loop.LoopExpandableNode;
+import jdk.graal.compiler.nodes.spi.Simplifiable;
+import jdk.graal.compiler.nodes.spi.SimplifierTool;
+import jdk.graal.compiler.nodes.type.StampTool;
+import jdk.graal.compiler.replacements.nodes.BasicArrayCopyNode;
 
 import jdk.vm.ci.code.BytecodeFrame;
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/classfile/Classfile.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/classfile/Classfile.java
similarity index 98%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/classfile/Classfile.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/classfile/Classfile.java
index 29fcb1f41b20..9f4eca4eac0a 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/classfile/Classfile.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/classfile/Classfile.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements.classfile;
+package jdk.graal.compiler.replacements.classfile;
 
 import java.io.DataInputStream;
 import java.io.IOException;
@@ -30,7 +30,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import jdk.compiler.graal.replacements.classfile.ClassfileConstant.Utf8;
+import jdk.graal.compiler.replacements.classfile.ClassfileConstant.Utf8;
 
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 import jdk.vm.ci.meta.ResolvedJavaType;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/classfile/ClassfileBytecode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/classfile/ClassfileBytecode.java
similarity index 97%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/classfile/ClassfileBytecode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/classfile/ClassfileBytecode.java
index bc6010f54537..89740a1fb603 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/classfile/ClassfileBytecode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/classfile/ClassfileBytecode.java
@@ -22,15 +22,15 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements.classfile;
+package jdk.graal.compiler.replacements.classfile;
 
 import java.io.ByteArrayInputStream;
 import java.io.DataInputStream;
 import java.io.IOException;
 
-import jdk.compiler.graal.bytecode.Bytecode;
-import jdk.compiler.graal.bytecode.BytecodeProvider;
-import jdk.compiler.graal.debug.GraalError;
+import jdk.graal.compiler.bytecode.Bytecode;
+import jdk.graal.compiler.bytecode.BytecodeProvider;
+import jdk.graal.compiler.debug.GraalError;
 
 import jdk.vm.ci.meta.ConstantPool;
 import jdk.vm.ci.meta.ExceptionHandler;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/classfile/ClassfileBytecodeProvider.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/classfile/ClassfileBytecodeProvider.java
similarity index 97%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/classfile/ClassfileBytecodeProvider.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/classfile/ClassfileBytecodeProvider.java
index d07b7f65746d..66012fad2fed 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/classfile/ClassfileBytecodeProvider.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/classfile/ClassfileBytecodeProvider.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements.classfile;
+package jdk.graal.compiler.replacements.classfile;
 
 import java.io.DataInputStream;
 import java.io.IOException;
@@ -30,10 +30,10 @@
 
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.Equivalence;
-import jdk.compiler.graal.api.replacements.SnippetReflectionProvider;
-import jdk.compiler.graal.bytecode.Bytecode;
-import jdk.compiler.graal.bytecode.BytecodeProvider;
-import jdk.compiler.graal.serviceprovider.GraalServices;
+import jdk.graal.compiler.api.replacements.SnippetReflectionProvider;
+import jdk.graal.compiler.bytecode.Bytecode;
+import jdk.graal.compiler.bytecode.BytecodeProvider;
+import jdk.graal.compiler.serviceprovider.GraalServices;
 
 import jdk.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.MetaAccessProvider;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/classfile/ClassfileConstant.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/classfile/ClassfileConstant.java
similarity index 96%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/classfile/ClassfileConstant.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/classfile/ClassfileConstant.java
index 3739bfff802b..b31039a538d5 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/classfile/ClassfileConstant.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/classfile/ClassfileConstant.java
@@ -22,18 +22,18 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements.classfile;
+package jdk.graal.compiler.replacements.classfile;
 
-import static jdk.compiler.graal.bytecode.Bytecodes.GETFIELD;
-import static jdk.compiler.graal.bytecode.Bytecodes.GETSTATIC;
-import static jdk.compiler.graal.bytecode.Bytecodes.PUTFIELD;
-import static jdk.compiler.graal.bytecode.Bytecodes.PUTSTATIC;
+import static jdk.graal.compiler.bytecode.Bytecodes.GETFIELD;
+import static jdk.graal.compiler.bytecode.Bytecodes.GETSTATIC;
+import static jdk.graal.compiler.bytecode.Bytecodes.PUTFIELD;
+import static jdk.graal.compiler.bytecode.Bytecodes.PUTSTATIC;
 
 import java.io.DataInputStream;
 import java.io.IOException;
 
-import jdk.compiler.graal.bytecode.Bytecodes;
-import jdk.compiler.graal.debug.GraalError;
+import jdk.graal.compiler.bytecode.Bytecodes;
+import jdk.graal.compiler.debug.GraalError;
 
 import jdk.vm.ci.meta.JavaConstant;
 import jdk.vm.ci.meta.ResolvedJavaField;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/classfile/ClassfileConstantPool.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/classfile/ClassfileConstantPool.java
similarity index 95%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/classfile/ClassfileConstantPool.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/classfile/ClassfileConstantPool.java
index 4efaed684466..e462bd8261d8 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/classfile/ClassfileConstantPool.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/classfile/ClassfileConstantPool.java
@@ -22,20 +22,20 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements.classfile;
+package jdk.graal.compiler.replacements.classfile;
 
-import static jdk.compiler.graal.replacements.classfile.Classfile.skipFully;
-import static jdk.compiler.graal.replacements.classfile.ClassfileConstant.CONSTANT_Class;
+import static jdk.graal.compiler.replacements.classfile.Classfile.skipFully;
+import static jdk.graal.compiler.replacements.classfile.ClassfileConstant.CONSTANT_Class;
 
 import java.io.DataInputStream;
 import java.io.IOException;
 
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.replacements.classfile.ClassfileConstant.ClassRef;
-import jdk.compiler.graal.replacements.classfile.ClassfileConstant.ExecutableRef;
-import jdk.compiler.graal.replacements.classfile.ClassfileConstant.FieldRef;
-import jdk.compiler.graal.replacements.classfile.ClassfileConstant.Primitive;
-import jdk.compiler.graal.replacements.classfile.ClassfileConstant.Utf8;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.replacements.classfile.ClassfileConstant.ClassRef;
+import jdk.graal.compiler.replacements.classfile.ClassfileConstant.ExecutableRef;
+import jdk.graal.compiler.replacements.classfile.ClassfileConstant.FieldRef;
+import jdk.graal.compiler.replacements.classfile.ClassfileConstant.Primitive;
+import jdk.graal.compiler.replacements.classfile.ClassfileConstant.Utf8;
 
 import jdk.vm.ci.meta.ConstantPool;
 import jdk.vm.ci.meta.JavaConstant;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/classfile/ConstantPoolPatch.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/classfile/ConstantPoolPatch.java
similarity index 97%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/classfile/ConstantPoolPatch.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/classfile/ConstantPoolPatch.java
index c8833302d21d..5655c4f62b96 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/classfile/ConstantPoolPatch.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/classfile/ConstantPoolPatch.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements.classfile;
+package jdk.graal.compiler.replacements.classfile;
 
 import jdk.vm.ci.meta.JavaMethod;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/gc/G1WriteBarrierSnippets.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/gc/G1WriteBarrierSnippets.java
similarity index 93%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/gc/G1WriteBarrierSnippets.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/gc/G1WriteBarrierSnippets.java
index d1b1db056007..37777d5ff1e8 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/gc/G1WriteBarrierSnippets.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/gc/G1WriteBarrierSnippets.java
@@ -22,44 +22,44 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements.gc;
-
-import static jdk.compiler.graal.nodes.extended.BranchProbabilityNode.FREQUENT_PROBABILITY;
-import static jdk.compiler.graal.nodes.extended.BranchProbabilityNode.NOT_FREQUENT_PROBABILITY;
-import static jdk.compiler.graal.nodes.extended.BranchProbabilityNode.probability;
-
-import jdk.compiler.graal.api.directives.GraalDirectives;
-import jdk.compiler.graal.api.replacements.Snippet;
-import jdk.compiler.graal.api.replacements.Snippet.ConstantParameter;
-import jdk.compiler.graal.core.common.GraalOptions;
-import jdk.compiler.graal.core.common.memory.BarrierType;
-import jdk.compiler.graal.core.common.spi.ForeignCallDescriptor;
-import jdk.compiler.graal.graph.Node.ConstantNodeParameter;
-import jdk.compiler.graal.graph.Node.NodeIntrinsic;
-import jdk.compiler.graal.nodes.NamedLocationIdentity;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.extended.FixedValueAnchorNode;
-import jdk.compiler.graal.nodes.extended.ForeignCallNode;
-import jdk.compiler.graal.nodes.extended.MembarNode;
-import jdk.compiler.graal.nodes.extended.NullCheckNode;
-import jdk.compiler.graal.nodes.gc.G1ArrayRangePostWriteBarrier;
-import jdk.compiler.graal.nodes.gc.G1ArrayRangePreWriteBarrier;
-import jdk.compiler.graal.nodes.gc.G1PostWriteBarrier;
-import jdk.compiler.graal.nodes.gc.G1PreWriteBarrier;
-import jdk.compiler.graal.nodes.gc.G1ReferentFieldReadBarrier;
-import jdk.compiler.graal.nodes.memory.address.AddressNode;
-import jdk.compiler.graal.nodes.memory.address.AddressNode.Address;
-import jdk.compiler.graal.nodes.memory.address.OffsetAddressNode;
-import jdk.compiler.graal.nodes.spi.LoweringTool;
-import jdk.compiler.graal.nodes.type.NarrowOopStamp;
-import jdk.compiler.graal.replacements.SnippetCounter;
-import jdk.compiler.graal.replacements.SnippetTemplate;
-import jdk.compiler.graal.replacements.Snippets;
-import jdk.compiler.graal.replacements.nodes.AssertionNode;
-import jdk.compiler.graal.replacements.nodes.CStringConstant;
-import jdk.compiler.graal.word.Word;
+package jdk.graal.compiler.replacements.gc;
+
+import static jdk.graal.compiler.nodes.extended.BranchProbabilityNode.FREQUENT_PROBABILITY;
+import static jdk.graal.compiler.nodes.extended.BranchProbabilityNode.NOT_FREQUENT_PROBABILITY;
+import static jdk.graal.compiler.nodes.extended.BranchProbabilityNode.probability;
+
+import jdk.graal.compiler.api.directives.GraalDirectives;
+import jdk.graal.compiler.api.replacements.Snippet;
+import jdk.graal.compiler.api.replacements.Snippet.ConstantParameter;
+import jdk.graal.compiler.core.common.GraalOptions;
+import jdk.graal.compiler.core.common.memory.BarrierType;
+import jdk.graal.compiler.core.common.spi.ForeignCallDescriptor;
+import jdk.graal.compiler.graph.Node.ConstantNodeParameter;
+import jdk.graal.compiler.graph.Node.NodeIntrinsic;
+import jdk.graal.compiler.nodes.NamedLocationIdentity;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.extended.FixedValueAnchorNode;
+import jdk.graal.compiler.nodes.extended.ForeignCallNode;
+import jdk.graal.compiler.nodes.extended.MembarNode;
+import jdk.graal.compiler.nodes.extended.NullCheckNode;
+import jdk.graal.compiler.nodes.gc.G1ArrayRangePostWriteBarrier;
+import jdk.graal.compiler.nodes.gc.G1ArrayRangePreWriteBarrier;
+import jdk.graal.compiler.nodes.gc.G1PostWriteBarrier;
+import jdk.graal.compiler.nodes.gc.G1PreWriteBarrier;
+import jdk.graal.compiler.nodes.gc.G1ReferentFieldReadBarrier;
+import jdk.graal.compiler.nodes.memory.address.AddressNode;
+import jdk.graal.compiler.nodes.memory.address.AddressNode.Address;
+import jdk.graal.compiler.nodes.memory.address.OffsetAddressNode;
+import jdk.graal.compiler.nodes.spi.LoweringTool;
+import jdk.graal.compiler.nodes.type.NarrowOopStamp;
+import jdk.graal.compiler.replacements.SnippetCounter;
+import jdk.graal.compiler.replacements.SnippetTemplate;
+import jdk.graal.compiler.replacements.Snippets;
+import jdk.graal.compiler.replacements.nodes.AssertionNode;
+import jdk.graal.compiler.replacements.nodes.CStringConstant;
+import jdk.graal.compiler.word.Word;
 import org.graalvm.word.LocationIdentity;
 import org.graalvm.word.Pointer;
 import org.graalvm.word.UnsignedWord;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/gc/SerialWriteBarrierSnippets.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/gc/SerialWriteBarrierSnippets.java
similarity index 86%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/gc/SerialWriteBarrierSnippets.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/gc/SerialWriteBarrierSnippets.java
index f05a023881f3..05150ef5e834 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/gc/SerialWriteBarrierSnippets.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/gc/SerialWriteBarrierSnippets.java
@@ -22,24 +22,24 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements.gc;
-
-import static jdk.compiler.graal.nodes.extended.BranchProbabilityNode.NOT_FREQUENT_PROBABILITY;
-import static jdk.compiler.graal.nodes.extended.BranchProbabilityNode.probability;
-
-import jdk.compiler.graal.api.directives.GraalDirectives;
-import jdk.compiler.graal.api.replacements.Snippet;
-import jdk.compiler.graal.api.replacements.Snippet.ConstantParameter;
-import jdk.compiler.graal.nodes.gc.SerialArrayRangeWriteBarrier;
-import jdk.compiler.graal.nodes.gc.SerialWriteBarrier;
-import jdk.compiler.graal.nodes.memory.address.AddressNode.Address;
-import jdk.compiler.graal.nodes.memory.address.OffsetAddressNode;
-import jdk.compiler.graal.nodes.spi.LoweringTool;
-import jdk.compiler.graal.replacements.SnippetCounter;
-import jdk.compiler.graal.replacements.SnippetTemplate;
-import jdk.compiler.graal.replacements.Snippets;
-import jdk.compiler.graal.replacements.nodes.AssertionNode;
-import jdk.compiler.graal.word.Word;
+package jdk.graal.compiler.replacements.gc;
+
+import static jdk.graal.compiler.nodes.extended.BranchProbabilityNode.NOT_FREQUENT_PROBABILITY;
+import static jdk.graal.compiler.nodes.extended.BranchProbabilityNode.probability;
+
+import jdk.graal.compiler.api.directives.GraalDirectives;
+import jdk.graal.compiler.api.replacements.Snippet;
+import jdk.graal.compiler.api.replacements.Snippet.ConstantParameter;
+import jdk.graal.compiler.nodes.gc.SerialArrayRangeWriteBarrier;
+import jdk.graal.compiler.nodes.gc.SerialWriteBarrier;
+import jdk.graal.compiler.nodes.memory.address.AddressNode.Address;
+import jdk.graal.compiler.nodes.memory.address.OffsetAddressNode;
+import jdk.graal.compiler.nodes.spi.LoweringTool;
+import jdk.graal.compiler.replacements.SnippetCounter;
+import jdk.graal.compiler.replacements.SnippetTemplate;
+import jdk.graal.compiler.replacements.Snippets;
+import jdk.graal.compiler.replacements.nodes.AssertionNode;
+import jdk.graal.compiler.word.Word;
 import org.graalvm.word.Pointer;
 
 public abstract class SerialWriteBarrierSnippets extends WriteBarrierSnippets implements Snippets {
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/gc/WriteBarrierSnippets.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/gc/WriteBarrierSnippets.java
similarity index 83%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/gc/WriteBarrierSnippets.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/gc/WriteBarrierSnippets.java
index dad25b2a23b0..530a2857e7b8 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/gc/WriteBarrierSnippets.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/gc/WriteBarrierSnippets.java
@@ -22,18 +22,18 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements.gc;
+package jdk.graal.compiler.replacements.gc;
 
-import static jdk.compiler.graal.nodes.extended.BranchProbabilityNode.LIKELY_PROBABILITY;
-import static jdk.compiler.graal.nodes.extended.BranchProbabilityNode.NOT_LIKELY_PROBABILITY;
-import static jdk.compiler.graal.nodes.extended.BranchProbabilityNode.probability;
+import static jdk.graal.compiler.nodes.extended.BranchProbabilityNode.LIKELY_PROBABILITY;
+import static jdk.graal.compiler.nodes.extended.BranchProbabilityNode.NOT_LIKELY_PROBABILITY;
+import static jdk.graal.compiler.nodes.extended.BranchProbabilityNode.probability;
 
-import jdk.compiler.graal.nodes.NamedLocationIdentity;
-import jdk.compiler.graal.nodes.PiNode;
-import jdk.compiler.graal.nodes.SnippetAnchorNode;
-import jdk.compiler.graal.nodes.memory.address.AddressNode.Address;
-import jdk.compiler.graal.replacements.nodes.AssertionNode;
-import jdk.compiler.graal.word.Word;
+import jdk.graal.compiler.nodes.NamedLocationIdentity;
+import jdk.graal.compiler.nodes.PiNode;
+import jdk.graal.compiler.nodes.SnippetAnchorNode;
+import jdk.graal.compiler.nodes.memory.address.AddressNode.Address;
+import jdk.graal.compiler.replacements.nodes.AssertionNode;
+import jdk.graal.compiler.word.Word;
 import org.graalvm.word.LocationIdentity;
 import org.graalvm.word.WordFactory;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/AESNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/AESNode.java
similarity index 91%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/AESNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/AESNode.java
index 081874989de0..c441abe8ae9c 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/AESNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/AESNode.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements.nodes;
+package jdk.graal.compiler.replacements.nodes;
 
 import static jdk.vm.ci.amd64.AMD64.CPUFeature.AES;
 import static jdk.vm.ci.amd64.AMD64.CPUFeature.SSE2;
@@ -31,17 +31,17 @@
 
 import java.util.EnumSet;
 
-import jdk.compiler.graal.core.common.spi.ForeignCallDescriptor;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.lir.GenerateStub;
-import jdk.compiler.graal.nodeinfo.InputType;
-import jdk.compiler.graal.nodeinfo.NodeCycles;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodeinfo.NodeSize;
-import jdk.compiler.graal.nodes.NamedLocationIdentity;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.core.common.spi.ForeignCallDescriptor;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.lir.GenerateStub;
+import jdk.graal.compiler.nodeinfo.InputType;
+import jdk.graal.compiler.nodeinfo.NodeCycles;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodeinfo.NodeSize;
+import jdk.graal.compiler.nodes.NamedLocationIdentity;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
 import org.graalvm.word.LocationIdentity;
 import org.graalvm.word.Pointer;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ArrayCompareToForeignCalls.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/ArrayCompareToForeignCalls.java
similarity index 94%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ArrayCompareToForeignCalls.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/ArrayCompareToForeignCalls.java
index 46b603317454..76dad5d4f64b 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ArrayCompareToForeignCalls.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/ArrayCompareToForeignCalls.java
@@ -22,11 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements.nodes;
+package jdk.graal.compiler.replacements.nodes;
 
-import jdk.compiler.graal.core.common.Stride;
-import jdk.compiler.graal.core.common.spi.ForeignCallDescriptor;
-import jdk.compiler.graal.debug.GraalError;
+import jdk.graal.compiler.core.common.Stride;
+import jdk.graal.compiler.core.common.spi.ForeignCallDescriptor;
+import jdk.graal.compiler.debug.GraalError;
 import org.graalvm.word.Pointer;
 
 public final class ArrayCompareToForeignCalls {
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ArrayCompareToNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/ArrayCompareToNode.java
similarity index 87%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ArrayCompareToNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/ArrayCompareToNode.java
index f2396180795d..fe114dbcb521 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ArrayCompareToNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/ArrayCompareToNode.java
@@ -22,29 +22,29 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements.nodes;
+package jdk.graal.compiler.replacements.nodes;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_1024;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_16;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_1024;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_16;
 
 import java.util.EnumSet;
 
-import jdk.compiler.graal.core.common.Stride;
-import jdk.compiler.graal.core.common.spi.ForeignCallDescriptor;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.lir.GenerateStub;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.NamedLocationIdentity;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.Canonicalizable;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
-import jdk.compiler.graal.nodes.spi.Virtualizable;
-import jdk.compiler.graal.nodes.spi.VirtualizerTool;
-import jdk.compiler.graal.nodes.util.GraphUtil;
+import jdk.graal.compiler.core.common.Stride;
+import jdk.graal.compiler.core.common.spi.ForeignCallDescriptor;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.lir.GenerateStub;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.NamedLocationIdentity;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.Canonicalizable;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.nodes.spi.Virtualizable;
+import jdk.graal.compiler.nodes.spi.VirtualizerTool;
+import jdk.graal.compiler.nodes.util.GraphUtil;
 import org.graalvm.word.Pointer;
 
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ArrayCopyWithConversionsForeignCalls.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/ArrayCopyWithConversionsForeignCalls.java
similarity index 92%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ArrayCopyWithConversionsForeignCalls.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/ArrayCopyWithConversionsForeignCalls.java
index 03b9b65ff44c..4e57eecc4667 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ArrayCopyWithConversionsForeignCalls.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/ArrayCopyWithConversionsForeignCalls.java
@@ -22,12 +22,12 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements.nodes;
+package jdk.graal.compiler.replacements.nodes;
 
-import jdk.compiler.graal.core.common.Stride;
-import jdk.compiler.graal.core.common.spi.ForeignCallDescriptor;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.replacements.NodeStrideUtil;
+import jdk.graal.compiler.core.common.Stride;
+import jdk.graal.compiler.core.common.spi.ForeignCallDescriptor;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.replacements.NodeStrideUtil;
 
 public final class ArrayCopyWithConversionsForeignCalls {
     private static final ForeignCallDescriptor STUB_DYNAMIC_STRIDES = foreignCallDescriptor(
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ArrayCopyWithConversionsNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/ArrayCopyWithConversionsNode.java
similarity index 92%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ArrayCopyWithConversionsNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/ArrayCopyWithConversionsNode.java
index c94120c8886c..b1270f48a410 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ArrayCopyWithConversionsNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/ArrayCopyWithConversionsNode.java
@@ -22,25 +22,25 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements.nodes;
+package jdk.graal.compiler.replacements.nodes;
 
-import static jdk.compiler.graal.nodeinfo.InputType.Memory;
+import static jdk.graal.compiler.nodeinfo.InputType.Memory;
 
 import java.util.EnumSet;
 
-import jdk.compiler.graal.core.common.Stride;
-import jdk.compiler.graal.core.common.StrideUtil;
-import jdk.compiler.graal.core.common.spi.ForeignCallDescriptor;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.lir.GenerateStub;
-import jdk.compiler.graal.nodeinfo.NodeCycles;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodeinfo.NodeSize;
-import jdk.compiler.graal.nodes.NamedLocationIdentity;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
-import jdk.compiler.graal.replacements.NodeStrideUtil;
+import jdk.graal.compiler.core.common.Stride;
+import jdk.graal.compiler.core.common.StrideUtil;
+import jdk.graal.compiler.core.common.spi.ForeignCallDescriptor;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.lir.GenerateStub;
+import jdk.graal.compiler.nodeinfo.NodeCycles;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodeinfo.NodeSize;
+import jdk.graal.compiler.nodes.NamedLocationIdentity;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.replacements.NodeStrideUtil;
 import org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ArrayEqualsForeignCalls.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/ArrayEqualsForeignCalls.java
similarity index 93%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ArrayEqualsForeignCalls.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/ArrayEqualsForeignCalls.java
index b83b4f61d6bf..d2a5a64ba23a 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ArrayEqualsForeignCalls.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/ArrayEqualsForeignCalls.java
@@ -22,14 +22,14 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements.nodes;
+package jdk.graal.compiler.replacements.nodes;
 
-import jdk.compiler.graal.core.common.Stride;
-import jdk.compiler.graal.core.common.StrideUtil;
-import jdk.compiler.graal.core.common.spi.ForeignCallDescriptor;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.replacements.NodeStrideUtil;
+import jdk.graal.compiler.core.common.Stride;
+import jdk.graal.compiler.core.common.StrideUtil;
+import jdk.graal.compiler.core.common.spi.ForeignCallDescriptor;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.replacements.NodeStrideUtil;
 import org.graalvm.word.Pointer;
 
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ArrayEqualsNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/ArrayEqualsNode.java
similarity index 91%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ArrayEqualsNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/ArrayEqualsNode.java
index d6b7bad52588..0760492ea7f6 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ArrayEqualsNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/ArrayEqualsNode.java
@@ -22,31 +22,31 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements.nodes;
+package jdk.graal.compiler.replacements.nodes;
 
 import java.util.Arrays;
 import java.util.EnumSet;
 
-import jdk.compiler.graal.core.common.spi.ForeignCallDescriptor;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.lir.GenerateStub;
-import jdk.compiler.graal.nodeinfo.NodeCycles;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodeinfo.NodeSize;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.NamedLocationIdentity;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.Canonicalizable;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
-import jdk.compiler.graal.nodes.spi.Virtualizable;
-import jdk.compiler.graal.nodes.spi.VirtualizerTool;
-import jdk.compiler.graal.nodes.util.GraphUtil;
-import jdk.compiler.graal.nodes.virtual.VirtualObjectNode;
+import jdk.graal.compiler.core.common.spi.ForeignCallDescriptor;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.lir.GenerateStub;
+import jdk.graal.compiler.nodeinfo.NodeCycles;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodeinfo.NodeSize;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.NamedLocationIdentity;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.Canonicalizable;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.nodes.spi.Virtualizable;
+import jdk.graal.compiler.nodes.spi.VirtualizerTool;
+import jdk.graal.compiler.nodes.util.GraphUtil;
+import jdk.graal.compiler.nodes.virtual.VirtualObjectNode;
 import org.graalvm.word.Pointer;
 
 import jdk.vm.ci.meta.ConstantReflectionProvider;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ArrayEqualsWithMaskForeignCalls.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/ArrayEqualsWithMaskForeignCalls.java
similarity index 93%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ArrayEqualsWithMaskForeignCalls.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/ArrayEqualsWithMaskForeignCalls.java
index 16bf4630ac69..b01b8119899d 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ArrayEqualsWithMaskForeignCalls.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/ArrayEqualsWithMaskForeignCalls.java
@@ -22,13 +22,13 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements.nodes;
+package jdk.graal.compiler.replacements.nodes;
 
-import jdk.compiler.graal.core.common.Stride;
-import jdk.compiler.graal.core.common.spi.ForeignCallDescriptor;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.replacements.NodeStrideUtil;
+import jdk.graal.compiler.core.common.Stride;
+import jdk.graal.compiler.core.common.spi.ForeignCallDescriptor;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.replacements.NodeStrideUtil;
 import org.graalvm.word.Pointer;
 
 public final class ArrayEqualsWithMaskForeignCalls {
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ArrayIndexOfForeignCalls.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/ArrayIndexOfForeignCalls.java
similarity index 97%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ArrayIndexOfForeignCalls.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/ArrayIndexOfForeignCalls.java
index 3540ecedad48..f56769e8dafe 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ArrayIndexOfForeignCalls.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/ArrayIndexOfForeignCalls.java
@@ -22,16 +22,16 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements.nodes;
+package jdk.graal.compiler.replacements.nodes;
 
 import java.util.Arrays;
 import java.util.EnumSet;
 import java.util.stream.Stream;
 
-import jdk.compiler.graal.core.common.Stride;
-import jdk.compiler.graal.core.common.spi.ForeignCallDescriptor;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.lir.gen.LIRGeneratorTool;
+import jdk.graal.compiler.core.common.Stride;
+import jdk.graal.compiler.core.common.spi.ForeignCallDescriptor;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.lir.gen.LIRGeneratorTool;
 
 import jdk.vm.ci.amd64.AMD64;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ArrayIndexOfMacroNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/ArrayIndexOfMacroNode.java
similarity index 89%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ArrayIndexOfMacroNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/ArrayIndexOfMacroNode.java
index 56297b85dd20..89bbea798919 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ArrayIndexOfMacroNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/ArrayIndexOfMacroNode.java
@@ -22,18 +22,18 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements.nodes;
+package jdk.graal.compiler.replacements.nodes;
 
-import jdk.compiler.graal.core.common.Stride;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.lir.gen.LIRGeneratorTool;
-import jdk.compiler.graal.nodeinfo.NodeCycles;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodeinfo.NodeSize;
-import jdk.compiler.graal.nodes.ComputeObjectAddressNode;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.LoweringTool;
+import jdk.graal.compiler.core.common.Stride;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.lir.gen.LIRGeneratorTool;
+import jdk.graal.compiler.nodeinfo.NodeCycles;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodeinfo.NodeSize;
+import jdk.graal.compiler.nodes.ComputeObjectAddressNode;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.LoweringTool;
 import org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.code.Architecture;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ArrayIndexOfNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/ArrayIndexOfNode.java
similarity index 95%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ArrayIndexOfNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/ArrayIndexOfNode.java
index 547b5a41ea14..e1160628e358 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ArrayIndexOfNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/ArrayIndexOfNode.java
@@ -22,33 +22,33 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements.nodes;
+package jdk.graal.compiler.replacements.nodes;
 
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_16;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_16;
 
 import java.util.EnumSet;
 
-import jdk.compiler.graal.core.common.GraalOptions;
-import jdk.compiler.graal.core.common.Stride;
-import jdk.compiler.graal.core.common.spi.ForeignCallDescriptor;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.graph.NodeInputList;
-import jdk.compiler.graal.lir.GenerateStub;
-import jdk.compiler.graal.lir.gen.LIRGeneratorTool.ArrayIndexOfVariant;
-import jdk.compiler.graal.nodeinfo.NodeCycles;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.NamedLocationIdentity;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext;
-import jdk.compiler.graal.nodes.spi.Canonicalizable;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
-import jdk.compiler.graal.nodes.util.ConstantReflectionUtil;
+import jdk.graal.compiler.core.common.GraalOptions;
+import jdk.graal.compiler.core.common.Stride;
+import jdk.graal.compiler.core.common.spi.ForeignCallDescriptor;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.graph.NodeInputList;
+import jdk.graal.compiler.lir.GenerateStub;
+import jdk.graal.compiler.lir.gen.LIRGeneratorTool.ArrayIndexOfVariant;
+import jdk.graal.compiler.nodeinfo.NodeCycles;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.NamedLocationIdentity;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext;
+import jdk.graal.compiler.nodes.spi.Canonicalizable;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.nodes.util.ConstantReflectionUtil;
 import org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.aarch64.AArch64;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ArrayRegionCompareToForeignCalls.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/ArrayRegionCompareToForeignCalls.java
similarity index 92%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ArrayRegionCompareToForeignCalls.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/ArrayRegionCompareToForeignCalls.java
index c612ddaa588b..e04445063d23 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ArrayRegionCompareToForeignCalls.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/ArrayRegionCompareToForeignCalls.java
@@ -22,12 +22,12 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements.nodes;
+package jdk.graal.compiler.replacements.nodes;
 
-import jdk.compiler.graal.core.common.Stride;
-import jdk.compiler.graal.core.common.spi.ForeignCallDescriptor;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.replacements.NodeStrideUtil;
+import jdk.graal.compiler.core.common.Stride;
+import jdk.graal.compiler.core.common.spi.ForeignCallDescriptor;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.replacements.NodeStrideUtil;
 
 public final class ArrayRegionCompareToForeignCalls {
     private static final ForeignCallDescriptor STUB_DYNAMIC_STRIDES = ForeignCalls.pureFunctionForeignCallDescriptor("arrayRegionCompareToDynamicStrides",
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ArrayRegionCompareToNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/ArrayRegionCompareToNode.java
similarity index 93%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ArrayRegionCompareToNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/ArrayRegionCompareToNode.java
index 676a6ad45e46..cec8db5079f5 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ArrayRegionCompareToNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/ArrayRegionCompareToNode.java
@@ -22,29 +22,29 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements.nodes;
+package jdk.graal.compiler.replacements.nodes;
 
 import java.util.EnumSet;
 
-import jdk.compiler.graal.core.common.GraalOptions;
-import jdk.compiler.graal.core.common.Stride;
-import jdk.compiler.graal.core.common.StrideUtil;
-import jdk.compiler.graal.core.common.spi.ForeignCallDescriptor;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.lir.GenerateStub;
-import jdk.compiler.graal.nodeinfo.NodeCycles;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodeinfo.NodeSize;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.Canonicalizable;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
-import jdk.compiler.graal.nodes.util.ConstantReflectionUtil;
-import jdk.compiler.graal.replacements.NodeStrideUtil;
+import jdk.graal.compiler.core.common.GraalOptions;
+import jdk.graal.compiler.core.common.Stride;
+import jdk.graal.compiler.core.common.StrideUtil;
+import jdk.graal.compiler.core.common.spi.ForeignCallDescriptor;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.lir.GenerateStub;
+import jdk.graal.compiler.nodeinfo.NodeCycles;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodeinfo.NodeSize;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.Canonicalizable;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.nodes.util.ConstantReflectionUtil;
+import jdk.graal.compiler.replacements.NodeStrideUtil;
 import org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.meta.ConstantReflectionProvider;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ArrayRegionEqualsNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/ArrayRegionEqualsNode.java
similarity index 93%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ArrayRegionEqualsNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/ArrayRegionEqualsNode.java
index e88ada620a95..3fd5b86d5313 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ArrayRegionEqualsNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/ArrayRegionEqualsNode.java
@@ -22,29 +22,29 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements.nodes;
+package jdk.graal.compiler.replacements.nodes;
 
 import java.util.EnumSet;
 
-import jdk.compiler.graal.core.common.GraalOptions;
-import jdk.compiler.graal.core.common.Stride;
-import jdk.compiler.graal.core.common.StrideUtil;
-import jdk.compiler.graal.core.common.spi.ForeignCallDescriptor;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.lir.GenerateStub;
-import jdk.compiler.graal.nodeinfo.NodeCycles;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodeinfo.NodeSize;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.NamedLocationIdentity;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.Canonicalizable;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
-import jdk.compiler.graal.nodes.util.ConstantReflectionUtil;
-import jdk.compiler.graal.replacements.NodeStrideUtil;
+import jdk.graal.compiler.core.common.GraalOptions;
+import jdk.graal.compiler.core.common.Stride;
+import jdk.graal.compiler.core.common.StrideUtil;
+import jdk.graal.compiler.core.common.spi.ForeignCallDescriptor;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.lir.GenerateStub;
+import jdk.graal.compiler.nodeinfo.NodeCycles;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodeinfo.NodeSize;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.NamedLocationIdentity;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.Canonicalizable;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.nodes.util.ConstantReflectionUtil;
+import jdk.graal.compiler.replacements.NodeStrideUtil;
 import org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.meta.ConstantReflectionProvider;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ArrayRegionEqualsWithMaskNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/ArrayRegionEqualsWithMaskNode.java
similarity index 93%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ArrayRegionEqualsWithMaskNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/ArrayRegionEqualsWithMaskNode.java
index f00d61f12680..5b07aa58538c 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ArrayRegionEqualsWithMaskNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/ArrayRegionEqualsWithMaskNode.java
@@ -22,29 +22,29 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements.nodes;
+package jdk.graal.compiler.replacements.nodes;
 
 import java.util.EnumSet;
 
-import jdk.compiler.graal.core.common.GraalOptions;
-import jdk.compiler.graal.core.common.Stride;
-import jdk.compiler.graal.core.common.StrideUtil;
-import jdk.compiler.graal.core.common.spi.ForeignCallDescriptor;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.lir.GenerateStub;
-import jdk.compiler.graal.nodeinfo.NodeCycles;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodeinfo.NodeSize;
-import jdk.compiler.graal.nodes.ComputeObjectAddressNode;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.Canonicalizable;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
-import jdk.compiler.graal.nodes.util.ConstantReflectionUtil;
-import jdk.compiler.graal.replacements.NodeStrideUtil;
+import jdk.graal.compiler.core.common.GraalOptions;
+import jdk.graal.compiler.core.common.Stride;
+import jdk.graal.compiler.core.common.StrideUtil;
+import jdk.graal.compiler.core.common.spi.ForeignCallDescriptor;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.lir.GenerateStub;
+import jdk.graal.compiler.nodeinfo.NodeCycles;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodeinfo.NodeSize;
+import jdk.graal.compiler.nodes.ComputeObjectAddressNode;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.Canonicalizable;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.nodes.util.ConstantReflectionUtil;
+import jdk.graal.compiler.replacements.NodeStrideUtil;
 import org.graalvm.word.LocationIdentity;
 import org.graalvm.word.Pointer;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/AssertionNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/AssertionNode.java
similarity index 85%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/AssertionNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/AssertionNode.java
index 37ca7f747d0e..473c95673805 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/AssertionNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/AssertionNode.java
@@ -22,24 +22,24 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements.nodes;
-
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_IGNORED;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_IGNORED;
-
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodes.spi.Canonicalizable;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.LIRLowerable;
-import jdk.compiler.graal.nodes.spi.Lowerable;
-import jdk.compiler.graal.nodes.spi.LoweringTool;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
+package jdk.graal.compiler.replacements.nodes;
+
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_IGNORED;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_IGNORED;
+
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodes.spi.Canonicalizable;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.LIRLowerable;
+import jdk.graal.compiler.nodes.spi.Lowerable;
+import jdk.graal.compiler.nodes.spi.LoweringTool;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
 
 /**
  * Assertion nodes will go away as soon as the value evaluates to true. Compile-time assertions will
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/BasicArrayCopyNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/BasicArrayCopyNode.java
similarity index 88%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/BasicArrayCopyNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/BasicArrayCopyNode.java
index 26150b195c57..8ae91ad74f6b 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/BasicArrayCopyNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/BasicArrayCopyNode.java
@@ -22,38 +22,38 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements.nodes;
+package jdk.graal.compiler.replacements.nodes;
 
-import static jdk.compiler.graal.nodeinfo.InputType.Memory;
-import static jdk.compiler.graal.nodeinfo.InputType.State;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_64;
+import static jdk.graal.compiler.nodeinfo.InputType.Memory;
+import static jdk.graal.compiler.nodeinfo.InputType.State;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_64;
 import static org.graalvm.word.LocationIdentity.any;
 
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.InputType;
-import jdk.compiler.graal.nodeinfo.NodeCycles;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.DeoptBciSupplier;
-import jdk.compiler.graal.nodes.DeoptimizingNode;
-import jdk.compiler.graal.nodes.FrameState;
-import jdk.compiler.graal.nodes.NamedLocationIdentity;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.StateSplit;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.WithExceptionNode;
-import jdk.compiler.graal.nodes.java.LoadIndexedNode;
-import jdk.compiler.graal.nodes.memory.MemoryAccess;
-import jdk.compiler.graal.nodes.memory.MemoryKill;
-import jdk.compiler.graal.nodes.memory.SingleMemoryKill;
-import jdk.compiler.graal.nodes.spi.Lowerable;
-import jdk.compiler.graal.nodes.spi.Virtualizable;
-import jdk.compiler.graal.nodes.spi.VirtualizerTool;
-import jdk.compiler.graal.nodes.type.StampTool;
-import jdk.compiler.graal.nodes.virtual.VirtualArrayNode;
-import jdk.compiler.graal.nodes.virtual.VirtualObjectNode;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.InputType;
+import jdk.graal.compiler.nodeinfo.NodeCycles;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.DeoptBciSupplier;
+import jdk.graal.compiler.nodes.DeoptimizingNode;
+import jdk.graal.compiler.nodes.FrameState;
+import jdk.graal.compiler.nodes.NamedLocationIdentity;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.StateSplit;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.WithExceptionNode;
+import jdk.graal.compiler.nodes.java.LoadIndexedNode;
+import jdk.graal.compiler.nodes.memory.MemoryAccess;
+import jdk.graal.compiler.nodes.memory.MemoryKill;
+import jdk.graal.compiler.nodes.memory.SingleMemoryKill;
+import jdk.graal.compiler.nodes.spi.Lowerable;
+import jdk.graal.compiler.nodes.spi.Virtualizable;
+import jdk.graal.compiler.nodes.spi.VirtualizerTool;
+import jdk.graal.compiler.nodes.type.StampTool;
+import jdk.graal.compiler.nodes.virtual.VirtualArrayNode;
+import jdk.graal.compiler.nodes.virtual.VirtualObjectNode;
 import org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.code.BytecodeFrame;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/BasicObjectCloneNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/BasicObjectCloneNode.java
similarity index 84%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/BasicObjectCloneNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/BasicObjectCloneNode.java
index d6ccb31f8569..c47ed02effd3 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/BasicObjectCloneNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/BasicObjectCloneNode.java
@@ -22,22 +22,22 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements.nodes;
+package jdk.graal.compiler.replacements.nodes;
 
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_8;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_8;
 
-import jdk.compiler.graal.core.common.type.ObjectStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.core.common.type.StampPair;
-import jdk.compiler.graal.graph.IterableNodeType;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeCycles;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.FrameState;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.Canonicalizable;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.core.common.type.ObjectStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.core.common.type.StampPair;
+import jdk.graal.compiler.graph.IterableNodeType;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeCycles;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.FrameState;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.Canonicalizable;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
 
 @NodeInfo(cycles = NodeCycles.CYCLES_UNKNOWN, cyclesRationale = "see rationale in MacroNode", size = SIZE_8)
 public abstract class BasicObjectCloneNode extends MacroNode implements ObjectClone, IterableNodeType, Canonicalizable {
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/BigIntegerMulAddNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/BigIntegerMulAddNode.java
similarity index 87%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/BigIntegerMulAddNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/BigIntegerMulAddNode.java
index 8c72f692277f..3d2c92d658fa 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/BigIntegerMulAddNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/BigIntegerMulAddNode.java
@@ -22,21 +22,21 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements.nodes;
+package jdk.graal.compiler.replacements.nodes;
 
 import java.util.EnumSet;
 
-import jdk.compiler.graal.core.common.spi.ForeignCallDescriptor;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.lir.GenerateStub;
-import jdk.compiler.graal.nodeinfo.InputType;
-import jdk.compiler.graal.nodeinfo.NodeCycles;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodeinfo.NodeSize;
-import jdk.compiler.graal.nodes.NamedLocationIdentity;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.core.common.spi.ForeignCallDescriptor;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.lir.GenerateStub;
+import jdk.graal.compiler.nodeinfo.InputType;
+import jdk.graal.compiler.nodeinfo.NodeCycles;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodeinfo.NodeSize;
+import jdk.graal.compiler.nodes.NamedLocationIdentity;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
 import org.graalvm.word.LocationIdentity;
 import org.graalvm.word.Pointer;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/BigIntegerMultiplyToLenNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/BigIntegerMultiplyToLenNode.java
similarity index 88%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/BigIntegerMultiplyToLenNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/BigIntegerMultiplyToLenNode.java
index f9d8c0230b9a..6b9bfb7dfd1f 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/BigIntegerMultiplyToLenNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/BigIntegerMultiplyToLenNode.java
@@ -22,21 +22,21 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements.nodes;
+package jdk.graal.compiler.replacements.nodes;
 
 import java.util.EnumSet;
 
-import jdk.compiler.graal.core.common.spi.ForeignCallDescriptor;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.lir.GenerateStub;
-import jdk.compiler.graal.nodeinfo.InputType;
-import jdk.compiler.graal.nodeinfo.NodeCycles;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodeinfo.NodeSize;
-import jdk.compiler.graal.nodes.NamedLocationIdentity;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.core.common.spi.ForeignCallDescriptor;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.lir.GenerateStub;
+import jdk.graal.compiler.nodeinfo.InputType;
+import jdk.graal.compiler.nodeinfo.NodeCycles;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodeinfo.NodeSize;
+import jdk.graal.compiler.nodes.NamedLocationIdentity;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
 import org.graalvm.word.LocationIdentity;
 import org.graalvm.word.Pointer;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/BigIntegerSquareToLenNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/BigIntegerSquareToLenNode.java
similarity index 87%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/BigIntegerSquareToLenNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/BigIntegerSquareToLenNode.java
index 5711f8e548c3..47dc803ca3d7 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/BigIntegerSquareToLenNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/BigIntegerSquareToLenNode.java
@@ -22,21 +22,21 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements.nodes;
+package jdk.graal.compiler.replacements.nodes;
 
 import java.util.EnumSet;
 
-import jdk.compiler.graal.core.common.spi.ForeignCallDescriptor;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.lir.GenerateStub;
-import jdk.compiler.graal.nodeinfo.InputType;
-import jdk.compiler.graal.nodeinfo.NodeCycles;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodeinfo.NodeSize;
-import jdk.compiler.graal.nodes.NamedLocationIdentity;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.core.common.spi.ForeignCallDescriptor;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.lir.GenerateStub;
+import jdk.graal.compiler.nodeinfo.InputType;
+import jdk.graal.compiler.nodeinfo.NodeCycles;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodeinfo.NodeSize;
+import jdk.graal.compiler.nodes.NamedLocationIdentity;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
 import org.graalvm.word.LocationIdentity;
 import org.graalvm.word.Pointer;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/BinaryMathIntrinsicNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/BinaryMathIntrinsicNode.java
similarity index 84%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/BinaryMathIntrinsicNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/BinaryMathIntrinsicNode.java
index 3ca9cea9781b..7bec9d20f86f 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/BinaryMathIntrinsicNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/BinaryMathIntrinsicNode.java
@@ -22,31 +22,31 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements.nodes;
-
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_1024;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1;
-
-import jdk.compiler.graal.core.common.spi.ForeignCallSignature;
-import jdk.compiler.graal.core.common.type.FloatStamp;
-import jdk.compiler.graal.core.common.type.PrimitiveStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.lir.gen.ArithmeticLIRGeneratorTool;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.calc.BinaryNode;
-import jdk.compiler.graal.nodes.calc.FloatDivNode;
-import jdk.compiler.graal.nodes.calc.MulNode;
-import jdk.compiler.graal.nodes.calc.SqrtNode;
-import jdk.compiler.graal.nodes.spi.ArithmeticLIRLowerable;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodes.spi.Lowerable;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
+package jdk.graal.compiler.replacements.nodes;
+
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_1024;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_1;
+
+import jdk.graal.compiler.core.common.spi.ForeignCallSignature;
+import jdk.graal.compiler.core.common.type.FloatStamp;
+import jdk.graal.compiler.core.common.type.PrimitiveStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.lir.gen.ArithmeticLIRGeneratorTool;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.calc.BinaryNode;
+import jdk.graal.compiler.nodes.calc.FloatDivNode;
+import jdk.graal.compiler.nodes.calc.MulNode;
+import jdk.graal.compiler.nodes.calc.SqrtNode;
+import jdk.graal.compiler.nodes.spi.ArithmeticLIRLowerable;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodes.spi.Lowerable;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
 
 import jdk.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.Value;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/BitCountNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/BitCountNode.java
similarity index 78%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/BitCountNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/BitCountNode.java
index d3662a630400..7e23b8ff1a8b 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/BitCountNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/BitCountNode.java
@@ -22,24 +22,24 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements.nodes;
+package jdk.graal.compiler.replacements.nodes;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_2;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_1;
 
-import jdk.compiler.graal.core.common.type.IntegerStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.lir.gen.ArithmeticLIRGeneratorTool;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.calc.UnaryNode;
-import jdk.compiler.graal.nodes.spi.ArithmeticLIRLowerable;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.core.common.type.IntegerStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.lir.gen.ArithmeticLIRGeneratorTool;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.calc.UnaryNode;
+import jdk.graal.compiler.nodes.spi.ArithmeticLIRLowerable;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
 
 import jdk.vm.ci.code.CodeUtil;
 import jdk.vm.ci.meta.JavaConstant;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/BitScanForwardNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/BitScanForwardNode.java
similarity index 81%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/BitScanForwardNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/BitScanForwardNode.java
index 560f3c36eb4e..0d1004fd8437 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/BitScanForwardNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/BitScanForwardNode.java
@@ -22,25 +22,25 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements.nodes;
+package jdk.graal.compiler.replacements.nodes;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_2;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_1;
 
-import jdk.compiler.graal.core.common.type.IntegerStamp;
-import jdk.compiler.graal.core.common.type.PrimitiveStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.lir.gen.ArithmeticLIRGeneratorTool;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.calc.UnaryNode;
-import jdk.compiler.graal.nodes.spi.ArithmeticLIRLowerable;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.core.common.type.IntegerStamp;
+import jdk.graal.compiler.core.common.type.PrimitiveStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.lir.gen.ArithmeticLIRGeneratorTool;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.calc.UnaryNode;
+import jdk.graal.compiler.nodes.spi.ArithmeticLIRLowerable;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
 
 import jdk.vm.ci.code.CodeUtil;
 import jdk.vm.ci.meta.JavaConstant;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/BitScanReverseNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/BitScanReverseNode.java
similarity index 81%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/BitScanReverseNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/BitScanReverseNode.java
index 0798179572ca..d7cb9d19a8c4 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/BitScanReverseNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/BitScanReverseNode.java
@@ -22,25 +22,25 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements.nodes;
+package jdk.graal.compiler.replacements.nodes;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_2;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_1;
 
-import jdk.compiler.graal.core.common.type.IntegerStamp;
-import jdk.compiler.graal.core.common.type.PrimitiveStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.lir.gen.ArithmeticLIRGeneratorTool;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.calc.UnaryNode;
-import jdk.compiler.graal.nodes.spi.ArithmeticLIRLowerable;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.core.common.type.IntegerStamp;
+import jdk.graal.compiler.core.common.type.PrimitiveStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.lir.gen.ArithmeticLIRGeneratorTool;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.calc.UnaryNode;
+import jdk.graal.compiler.nodes.spi.ArithmeticLIRLowerable;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
 
 import jdk.vm.ci.code.CodeUtil;
 import jdk.vm.ci.meta.JavaConstant;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/CStringConstant.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/CStringConstant.java
similarity index 87%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/CStringConstant.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/CStringConstant.java
index 61ee7a8f4d4f..c5643e74668e 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/CStringConstant.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/CStringConstant.java
@@ -22,20 +22,20 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements.nodes;
+package jdk.graal.compiler.replacements.nodes;
 
 import java.nio.ByteBuffer;
 import java.nio.charset.Charset;
 import java.util.Objects;
 
-import jdk.compiler.graal.core.common.type.DataPointerConstant;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.Node.ConstantNodeParameter;
-import jdk.compiler.graal.graph.Node.NodeIntrinsic;
-import jdk.compiler.graal.graph.Node.NodeIntrinsicFactory;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext;
-import jdk.compiler.graal.word.Word;
+import jdk.graal.compiler.core.common.type.DataPointerConstant;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.Node.ConstantNodeParameter;
+import jdk.graal.compiler.graph.Node.NodeIntrinsic;
+import jdk.graal.compiler.graph.Node.NodeIntrinsicFactory;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext;
+import jdk.graal.compiler.word.Word;
 
 import jdk.vm.ci.meta.JavaKind;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/CalcStringAttributesForeignCalls.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/CalcStringAttributesForeignCalls.java
similarity index 96%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/CalcStringAttributesForeignCalls.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/CalcStringAttributesForeignCalls.java
index 5315239502d0..4682bc032113 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/CalcStringAttributesForeignCalls.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/CalcStringAttributesForeignCalls.java
@@ -22,10 +22,10 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements.nodes;
+package jdk.graal.compiler.replacements.nodes;
 
-import jdk.compiler.graal.core.common.spi.ForeignCallDescriptor;
-import jdk.compiler.graal.debug.GraalError;
+import jdk.graal.compiler.core.common.spi.ForeignCallDescriptor;
+import jdk.graal.compiler.debug.GraalError;
 
 public final class CalcStringAttributesForeignCalls {
     private static final ForeignCallDescriptor STUB_CALC_STRING_ATTRIBUTES_LATIN1 = foreignCallDescriptor("calcStringAttributesLatin1", int.class);
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/CalcStringAttributesMacroNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/CalcStringAttributesMacroNode.java
similarity index 90%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/CalcStringAttributesMacroNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/CalcStringAttributesMacroNode.java
index ea840fa77d23..a539d3fdecae 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/CalcStringAttributesMacroNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/CalcStringAttributesMacroNode.java
@@ -22,14 +22,14 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements.nodes;
+package jdk.graal.compiler.replacements.nodes;
 
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.lir.gen.LIRGeneratorTool;
-import jdk.compiler.graal.nodeinfo.NodeCycles;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodeinfo.NodeSize;
-import jdk.compiler.graal.nodes.spi.LoweringTool;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.lir.gen.LIRGeneratorTool;
+import jdk.graal.compiler.nodeinfo.NodeCycles;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodeinfo.NodeSize;
+import jdk.graal.compiler.nodes.spi.LoweringTool;
 import org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.aarch64.AArch64;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/CalcStringAttributesNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/CalcStringAttributesNode.java
similarity index 94%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/CalcStringAttributesNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/CalcStringAttributesNode.java
index 6fae0e0024fb..9f5077242ab7 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/CalcStringAttributesNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/CalcStringAttributesNode.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements.nodes;
+package jdk.graal.compiler.replacements.nodes;
 
 import static jdk.vm.ci.amd64.AMD64.CPUFeature.POPCNT;
 import static jdk.vm.ci.amd64.AMD64.CPUFeature.SSE;
@@ -34,16 +34,16 @@
 
 import java.util.EnumSet;
 
-import jdk.compiler.graal.core.common.spi.ForeignCallDescriptor;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.lir.GenerateStub;
-import jdk.compiler.graal.lir.gen.LIRGeneratorTool;
-import jdk.compiler.graal.nodeinfo.NodeCycles;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodeinfo.NodeSize;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.core.common.spi.ForeignCallDescriptor;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.lir.GenerateStub;
+import jdk.graal.compiler.lir.gen.LIRGeneratorTool;
+import jdk.graal.compiler.nodeinfo.NodeCycles;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodeinfo.NodeSize;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
 import org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.aarch64.AArch64;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/CipherBlockChainingAESNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/CipherBlockChainingAESNode.java
similarity index 91%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/CipherBlockChainingAESNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/CipherBlockChainingAESNode.java
index fec2dd398f68..81c8ebb514e3 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/CipherBlockChainingAESNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/CipherBlockChainingAESNode.java
@@ -22,22 +22,22 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements.nodes;
+package jdk.graal.compiler.replacements.nodes;
 
 import java.util.EnumSet;
 
-import jdk.compiler.graal.core.common.spi.ForeignCallDescriptor;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.lir.GenerateStub;
-import jdk.compiler.graal.nodeinfo.InputType;
-import jdk.compiler.graal.nodeinfo.NodeCycles;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodeinfo.NodeSize;
-import jdk.compiler.graal.nodes.NamedLocationIdentity;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
-import jdk.compiler.graal.replacements.nodes.AESNode.CryptMode;
+import jdk.graal.compiler.core.common.spi.ForeignCallDescriptor;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.lir.GenerateStub;
+import jdk.graal.compiler.nodeinfo.InputType;
+import jdk.graal.compiler.nodeinfo.NodeCycles;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodeinfo.NodeSize;
+import jdk.graal.compiler.nodes.NamedLocationIdentity;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.replacements.nodes.AESNode.CryptMode;
 import org.graalvm.word.LocationIdentity;
 import org.graalvm.word.Pointer;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/CountLeadingZerosNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/CountLeadingZerosNode.java
similarity index 79%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/CountLeadingZerosNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/CountLeadingZerosNode.java
index f7aabd9f8bc3..e7b21f822d4b 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/CountLeadingZerosNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/CountLeadingZerosNode.java
@@ -22,25 +22,25 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements.nodes;
+package jdk.graal.compiler.replacements.nodes;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_2;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_1;
 
-import jdk.compiler.graal.core.common.type.IntegerStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.lir.gen.ArithmeticLIRGeneratorTool;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.calc.UnaryNode;
-import jdk.compiler.graal.nodes.spi.ArithmeticLIRLowerable;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodes.spi.Lowerable;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
-import jdk.compiler.graal.nodes.type.StampTool;
+import jdk.graal.compiler.core.common.type.IntegerStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.lir.gen.ArithmeticLIRGeneratorTool;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.calc.UnaryNode;
+import jdk.graal.compiler.nodes.spi.ArithmeticLIRLowerable;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodes.spi.Lowerable;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.nodes.type.StampTool;
 
 import jdk.vm.ci.meta.JavaConstant;
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/CountPositivesNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/CountPositivesNode.java
similarity index 84%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/CountPositivesNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/CountPositivesNode.java
index d98e4ade9981..94a891c1b0bd 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/CountPositivesNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/CountPositivesNode.java
@@ -22,21 +22,21 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements.nodes;
+package jdk.graal.compiler.replacements.nodes;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_UNKNOWN;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_64;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_UNKNOWN;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_64;
 
 import java.util.EnumSet;
 
-import jdk.compiler.graal.core.common.spi.ForeignCallDescriptor;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.lir.GenerateStub;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.NamedLocationIdentity;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.core.common.spi.ForeignCallDescriptor;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.lir.GenerateStub;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.NamedLocationIdentity;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
 import org.graalvm.word.Pointer;
 
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/CountTrailingZerosNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/CountTrailingZerosNode.java
similarity index 79%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/CountTrailingZerosNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/CountTrailingZerosNode.java
index 36a05dfff28a..9051dde88086 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/CountTrailingZerosNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/CountTrailingZerosNode.java
@@ -22,25 +22,25 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements.nodes;
+package jdk.graal.compiler.replacements.nodes;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_2;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_1;
 
-import jdk.compiler.graal.core.common.type.IntegerStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.lir.gen.ArithmeticLIRGeneratorTool;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.calc.UnaryNode;
-import jdk.compiler.graal.nodes.spi.ArithmeticLIRLowerable;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodes.spi.Lowerable;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
-import jdk.compiler.graal.nodes.type.StampTool;
+import jdk.graal.compiler.core.common.type.IntegerStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.lir.gen.ArithmeticLIRGeneratorTool;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.calc.UnaryNode;
+import jdk.graal.compiler.nodes.spi.ArithmeticLIRLowerable;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodes.spi.Lowerable;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.nodes.type.StampTool;
 
 import jdk.vm.ci.meta.JavaConstant;
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/CounterModeAESNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/CounterModeAESNode.java
similarity index 90%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/CounterModeAESNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/CounterModeAESNode.java
index 75e13bba087c..a3b81e911c8f 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/CounterModeAESNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/CounterModeAESNode.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements.nodes;
+package jdk.graal.compiler.replacements.nodes;
 
 import static jdk.vm.ci.amd64.AMD64.CPUFeature.AES;
 import static jdk.vm.ci.amd64.AMD64.CPUFeature.SSE2;
@@ -32,20 +32,20 @@
 
 import java.util.EnumSet;
 
-import jdk.compiler.graal.core.common.spi.ForeignCallDescriptor;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.graph.NodeInputList;
-import jdk.compiler.graal.lir.GenerateStub;
-import jdk.compiler.graal.nodeinfo.InputType;
-import jdk.compiler.graal.nodeinfo.NodeCycles;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodeinfo.NodeSize;
-import jdk.compiler.graal.nodes.NamedLocationIdentity;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.core.common.spi.ForeignCallDescriptor;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.graph.NodeInputList;
+import jdk.graal.compiler.lir.GenerateStub;
+import jdk.graal.compiler.nodeinfo.InputType;
+import jdk.graal.compiler.nodeinfo.NodeCycles;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodeinfo.NodeSize;
+import jdk.graal.compiler.nodes.NamedLocationIdentity;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
 import org.graalvm.word.LocationIdentity;
 import org.graalvm.word.Pointer;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/EncodeArrayNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/EncodeArrayNode.java
similarity index 87%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/EncodeArrayNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/EncodeArrayNode.java
index 5fb068c9a6d5..b5006f91d3eb 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/EncodeArrayNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/EncodeArrayNode.java
@@ -22,25 +22,25 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements.nodes;
+package jdk.graal.compiler.replacements.nodes;
 
-import static jdk.compiler.graal.nodeinfo.InputType.Memory;
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_UNKNOWN;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_64;
+import static jdk.graal.compiler.nodeinfo.InputType.Memory;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_UNKNOWN;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_64;
 
 import java.util.EnumSet;
 
-import jdk.compiler.graal.core.common.spi.ForeignCallDescriptor;
-import jdk.compiler.graal.core.common.type.IntegerStamp;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.lir.GenerateStub;
-import jdk.compiler.graal.lir.gen.LIRGeneratorTool.CharsetName;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.NamedLocationIdentity;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.core.common.spi.ForeignCallDescriptor;
+import jdk.graal.compiler.core.common.type.IntegerStamp;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.lir.GenerateStub;
+import jdk.graal.compiler.lir.gen.LIRGeneratorTool.CharsetName;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.NamedLocationIdentity;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
 import org.graalvm.word.LocationIdentity;
 import org.graalvm.word.Pointer;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ExplodeLoopNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/ExplodeLoopNode.java
similarity index 81%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ExplodeLoopNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/ExplodeLoopNode.java
index fe37cddc519c..e07f3c6d3cbf 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ExplodeLoopNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/ExplodeLoopNode.java
@@ -22,21 +22,21 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements.nodes;
+package jdk.graal.compiler.replacements.nodes;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_0;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_0;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_0;
 
 import java.util.ArrayList;
 
-import jdk.compiler.graal.api.replacements.Snippet.VarargsParameter;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.graph.spi.NodeWithIdentity;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.LoopBeginNode;
+import jdk.graal.compiler.api.replacements.Snippet.VarargsParameter;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.graph.spi.NodeWithIdentity;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.LoopBeginNode;
 
 /**
  * Placeholder node to denote to snippet preparation that the following loop must be completely
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/FallbackInvokeWithExceptionNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/FallbackInvokeWithExceptionNode.java
similarity index 80%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/FallbackInvokeWithExceptionNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/FallbackInvokeWithExceptionNode.java
index 86693ad42892..8f361060536a 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/FallbackInvokeWithExceptionNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/FallbackInvokeWithExceptionNode.java
@@ -22,20 +22,20 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements.nodes;
+package jdk.graal.compiler.replacements.nodes;
 
-import static jdk.compiler.graal.nodeinfo.InputType.Memory;
-import static jdk.compiler.graal.nodeinfo.InputType.Value;
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_UNKNOWN;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_UNKNOWN;
-import static jdk.compiler.graal.nodes.Invoke.CYCLES_UNKNOWN_RATIONALE;
-import static jdk.compiler.graal.nodes.Invoke.SIZE_UNKNOWN_RATIONALE;
+import static jdk.graal.compiler.nodeinfo.InputType.Memory;
+import static jdk.graal.compiler.nodeinfo.InputType.Value;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_UNKNOWN;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_UNKNOWN;
+import static jdk.graal.compiler.nodes.Invoke.CYCLES_UNKNOWN_RATIONALE;
+import static jdk.graal.compiler.nodes.Invoke.SIZE_UNKNOWN_RATIONALE;
 
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.WithExceptionNode;
-import jdk.compiler.graal.nodes.memory.SingleMemoryKill;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.WithExceptionNode;
+import jdk.graal.compiler.nodes.memory.SingleMemoryKill;
 import org.graalvm.word.LocationIdentity;
 
 /**
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/FloatToHalfFloatNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/FloatToHalfFloatNode.java
similarity index 78%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/FloatToHalfFloatNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/FloatToHalfFloatNode.java
index 4b3a3e80517b..bb177f485a19 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/FloatToHalfFloatNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/FloatToHalfFloatNode.java
@@ -22,20 +22,20 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements.nodes;
+package jdk.graal.compiler.replacements.nodes;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_32;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_32;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_32;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_32;
 
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.calc.UnaryNode;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodes.spi.LIRLowerable;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.calc.UnaryNode;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodes.spi.LIRLowerable;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
 
 import jdk.vm.ci.meta.JavaConstant;
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ForeignCalls.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/ForeignCalls.java
similarity index 93%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ForeignCalls.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/ForeignCalls.java
index 1bcb7d275308..c0b00619d1d8 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ForeignCalls.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/ForeignCalls.java
@@ -22,9 +22,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements.nodes;
+package jdk.graal.compiler.replacements.nodes;
 
-import jdk.compiler.graal.core.common.spi.ForeignCallDescriptor;
+import jdk.graal.compiler.core.common.spi.ForeignCallDescriptor;
 import org.graalvm.word.LocationIdentity;
 
 public final class ForeignCalls {
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/FusedMultiplyAddNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/FusedMultiplyAddNode.java
similarity index 83%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/FusedMultiplyAddNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/FusedMultiplyAddNode.java
index 834ff062a833..18711afe12c2 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/FusedMultiplyAddNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/FusedMultiplyAddNode.java
@@ -22,28 +22,28 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements.nodes;
+package jdk.graal.compiler.replacements.nodes;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_2;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_1;
 
-import jdk.compiler.graal.core.common.type.FloatStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.lir.gen.ArithmeticLIRGeneratorTool;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.calc.TernaryNode;
-import jdk.compiler.graal.nodes.spi.ArithmeticLIRLowerable;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.core.common.type.FloatStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.lir.gen.ArithmeticLIRGeneratorTool;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.calc.TernaryNode;
+import jdk.graal.compiler.nodes.spi.ArithmeticLIRLowerable;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
 
 import jdk.vm.ci.meta.JavaConstant;
 import jdk.vm.ci.meta.JavaKind;
-import jdk.compiler.graal.serviceprovider.GraalServices;
+import jdk.graal.compiler.serviceprovider.GraalServices;
 
 @NodeInfo(cycles = CYCLES_2, size = SIZE_1)
 public final class FusedMultiplyAddNode extends TernaryNode implements ArithmeticLIRLowerable {
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/GHASHProcessBlocksNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/GHASHProcessBlocksNode.java
similarity index 89%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/GHASHProcessBlocksNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/GHASHProcessBlocksNode.java
index e50ffd434ffb..3de0070930f9 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/GHASHProcessBlocksNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/GHASHProcessBlocksNode.java
@@ -22,24 +22,24 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements.nodes;
+package jdk.graal.compiler.replacements.nodes;
 
 import static jdk.vm.ci.amd64.AMD64.CPUFeature.CLMUL;
 import static jdk.vm.ci.amd64.AMD64.CPUFeature.SSSE3;
 
 import java.util.EnumSet;
 
-import jdk.compiler.graal.core.common.spi.ForeignCallDescriptor;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.lir.GenerateStub;
-import jdk.compiler.graal.nodeinfo.InputType;
-import jdk.compiler.graal.nodeinfo.NodeCycles;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodeinfo.NodeSize;
-import jdk.compiler.graal.nodes.NamedLocationIdentity;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.core.common.spi.ForeignCallDescriptor;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.lir.GenerateStub;
+import jdk.graal.compiler.nodeinfo.InputType;
+import jdk.graal.compiler.nodeinfo.NodeCycles;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodeinfo.NodeSize;
+import jdk.graal.compiler.nodes.NamedLocationIdentity;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
 import org.graalvm.word.LocationIdentity;
 import org.graalvm.word.Pointer;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/HalfFloatToFloatNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/HalfFloatToFloatNode.java
similarity index 78%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/HalfFloatToFloatNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/HalfFloatToFloatNode.java
index 68304f189b11..2dd80b38ca55 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/HalfFloatToFloatNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/HalfFloatToFloatNode.java
@@ -22,20 +22,20 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements.nodes;
+package jdk.graal.compiler.replacements.nodes;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_32;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_32;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_32;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_32;
 
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.calc.UnaryNode;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodes.spi.LIRLowerable;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.calc.UnaryNode;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodes.spi.LIRLowerable;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
 
 import jdk.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.Value;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/IdentityHashCodeNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/IdentityHashCodeNode.java
similarity index 77%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/IdentityHashCodeNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/IdentityHashCodeNode.java
index 4d4e854f920e..4adb68bcdaa0 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/IdentityHashCodeNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/IdentityHashCodeNode.java
@@ -22,22 +22,22 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements.nodes;
+package jdk.graal.compiler.replacements.nodes;
 
-import jdk.compiler.graal.core.common.type.AbstractObjectStamp;
-import jdk.compiler.graal.core.common.type.IntegerStamp;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.AbstractStateSplit;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.DeoptBciSupplier;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.memory.SingleMemoryKill;
-import jdk.compiler.graal.nodes.spi.Canonicalizable;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodes.spi.Lowerable;
+import jdk.graal.compiler.core.common.type.AbstractObjectStamp;
+import jdk.graal.compiler.core.common.type.IntegerStamp;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.AbstractStateSplit;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.DeoptBciSupplier;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.memory.SingleMemoryKill;
+import jdk.graal.compiler.nodes.spi.Canonicalizable;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodes.spi.Lowerable;
 
 import jdk.vm.ci.meta.JavaConstant;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/IntrinsicMethodNodeInterface.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/IntrinsicMethodNodeInterface.java
similarity index 87%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/IntrinsicMethodNodeInterface.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/IntrinsicMethodNodeInterface.java
index ba409a2c423e..1b8678a42fe1 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/IntrinsicMethodNodeInterface.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/IntrinsicMethodNodeInterface.java
@@ -22,17 +22,17 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements.nodes;
+package jdk.graal.compiler.replacements.nodes;
 
-import static jdk.compiler.graal.core.common.GraalOptions.InlineGraalStubs;
+import static jdk.graal.compiler.core.common.GraalOptions.InlineGraalStubs;
 
-import jdk.compiler.graal.core.common.spi.ForeignCallDescriptor;
-import jdk.compiler.graal.core.common.spi.ForeignCallLinkage;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.ValueNodeInterface;
-import jdk.compiler.graal.nodes.spi.LIRLowerable;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.core.common.spi.ForeignCallDescriptor;
+import jdk.graal.compiler.core.common.spi.ForeignCallLinkage;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.ValueNodeInterface;
+import jdk.graal.compiler.nodes.spi.LIRLowerable;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
 
 import jdk.vm.ci.code.Architecture;
 import jdk.vm.ci.meta.Value;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/LoadSnippetVarargParameterNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/LoadSnippetVarargParameterNode.java
similarity index 75%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/LoadSnippetVarargParameterNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/LoadSnippetVarargParameterNode.java
index 03b522118e80..eca63ec2e940 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/LoadSnippetVarargParameterNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/LoadSnippetVarargParameterNode.java
@@ -22,22 +22,22 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements.nodes;
+package jdk.graal.compiler.replacements.nodes;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_0;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_0;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_0;
 
-import jdk.compiler.graal.api.replacements.Snippet.VarargsParameter;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.graph.NodeInputList;
-import jdk.compiler.graal.nodes.spi.Canonicalizable;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.ParameterNode;
-import jdk.compiler.graal.nodes.ValueNode;
+import jdk.graal.compiler.api.replacements.Snippet.VarargsParameter;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.graph.NodeInputList;
+import jdk.graal.compiler.nodes.spi.Canonicalizable;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.ParameterNode;
+import jdk.graal.compiler.nodes.ValueNode;
 
 /**
  * Implements the semantics of {@link VarargsParameter}.
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/LogNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/LogNode.java
similarity index 85%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/LogNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/LogNode.java
index b2a22e87ac11..e4187e1c3766 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/LogNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/LogNode.java
@@ -22,20 +22,20 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements.nodes;
+package jdk.graal.compiler.replacements.nodes;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_UNKNOWN;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_UNKNOWN;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_UNKNOWN;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_UNKNOWN;
 
 import java.io.PrintStream;
 
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.Lowerable;
-import jdk.compiler.graal.nodes.spi.LoweringTool;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.Lowerable;
+import jdk.graal.compiler.nodes.spi.LoweringTool;
 
 /**
  * High-level node for simple low level logging. This node can be used early on in high-tier to
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/MacroInvokable.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/MacroInvokable.java
similarity index 84%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/MacroInvokable.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/MacroInvokable.java
index e637d7392121..c670795ce394 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/MacroInvokable.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/MacroInvokable.java
@@ -22,34 +22,34 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements.nodes;
+package jdk.graal.compiler.replacements.nodes;
 
 import static jdk.vm.ci.code.BytecodeFrame.isPlaceholderBci;
 
-import jdk.compiler.graal.core.common.type.StampPair;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.NodeInputList;
-import jdk.compiler.graal.nodes.CallTargetNode;
-import jdk.compiler.graal.nodes.FixedNodeInterface;
-import jdk.compiler.graal.nodes.GraphState;
-import jdk.compiler.graal.nodes.Invokable;
-import jdk.compiler.graal.nodes.Invoke;
-import jdk.compiler.graal.nodes.StateSplit;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.java.MethodCallTargetNode;
-import jdk.compiler.graal.nodes.memory.SingleMemoryKill;
-import jdk.compiler.graal.nodes.spi.Lowerable;
-import jdk.compiler.graal.nodes.spi.LoweringTool;
-import jdk.compiler.graal.phases.common.CanonicalizerPhase;
-import jdk.compiler.graal.phases.common.FrameStateAssignmentPhase;
-import jdk.compiler.graal.phases.common.GuardLoweringPhase;
-import jdk.compiler.graal.phases.common.HighTierLoweringPhase;
-import jdk.compiler.graal.phases.common.LowTierLoweringPhase;
-import jdk.compiler.graal.phases.common.LoweringPhase;
-import jdk.compiler.graal.phases.common.MidTierLoweringPhase;
-import jdk.compiler.graal.phases.common.RemoveValueProxyPhase;
+import jdk.graal.compiler.core.common.type.StampPair;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.NodeInputList;
+import jdk.graal.compiler.nodes.CallTargetNode;
+import jdk.graal.compiler.nodes.FixedNodeInterface;
+import jdk.graal.compiler.nodes.GraphState;
+import jdk.graal.compiler.nodes.Invokable;
+import jdk.graal.compiler.nodes.Invoke;
+import jdk.graal.compiler.nodes.StateSplit;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.java.MethodCallTargetNode;
+import jdk.graal.compiler.nodes.memory.SingleMemoryKill;
+import jdk.graal.compiler.nodes.spi.Lowerable;
+import jdk.graal.compiler.nodes.spi.LoweringTool;
+import jdk.graal.compiler.phases.common.CanonicalizerPhase;
+import jdk.graal.compiler.phases.common.FrameStateAssignmentPhase;
+import jdk.graal.compiler.phases.common.GuardLoweringPhase;
+import jdk.graal.compiler.phases.common.HighTierLoweringPhase;
+import jdk.graal.compiler.phases.common.LowTierLoweringPhase;
+import jdk.graal.compiler.phases.common.LoweringPhase;
+import jdk.graal.compiler.phases.common.MidTierLoweringPhase;
+import jdk.graal.compiler.phases.common.RemoveValueProxyPhase;
 
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/MacroNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/MacroNode.java
similarity index 91%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/MacroNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/MacroNode.java
index bd094a80f7ff..8d3f00b6901e 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/MacroNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/MacroNode.java
@@ -22,31 +22,31 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements.nodes;
+package jdk.graal.compiler.replacements.nodes;
 
 import static jdk.vm.ci.code.BytecodeFrame.isPlaceholderBci;
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_UNKNOWN;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_UNKNOWN;
-
-import jdk.compiler.graal.core.common.type.ObjectStamp;
-import jdk.compiler.graal.core.common.type.StampPair;
-import jdk.compiler.graal.debug.DebugCloseable;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.graph.NodeInputList;
-import jdk.compiler.graal.nodeinfo.InputType;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.CallTargetNode.InvokeKind;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.FrameState;
-import jdk.compiler.graal.nodes.InliningLog;
-import jdk.compiler.graal.nodes.Invoke;
-import jdk.compiler.graal.nodes.InvokeNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext;
-import jdk.compiler.graal.nodes.java.MethodCallTargetNode;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_UNKNOWN;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_UNKNOWN;
+
+import jdk.graal.compiler.core.common.type.ObjectStamp;
+import jdk.graal.compiler.core.common.type.StampPair;
+import jdk.graal.compiler.debug.DebugCloseable;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.graph.NodeInputList;
+import jdk.graal.compiler.nodeinfo.InputType;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.CallTargetNode.InvokeKind;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.FrameState;
+import jdk.graal.compiler.nodes.InliningLog;
+import jdk.graal.compiler.nodes.Invoke;
+import jdk.graal.compiler.nodes.InvokeNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext;
+import jdk.graal.compiler.nodes.java.MethodCallTargetNode;
 import org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/MacroWithExceptionNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/MacroWithExceptionNode.java
similarity index 88%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/MacroWithExceptionNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/MacroWithExceptionNode.java
index 0b5c814b9e85..563a6cbe4a9c 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/MacroWithExceptionNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/MacroWithExceptionNode.java
@@ -22,29 +22,29 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements.nodes;
+package jdk.graal.compiler.replacements.nodes;
 
 import static jdk.vm.ci.code.BytecodeFrame.isPlaceholderBci;
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_UNKNOWN;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_UNKNOWN;
-
-import jdk.compiler.graal.core.common.type.StampPair;
-import jdk.compiler.graal.debug.DebugCloseable;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.graph.NodeInputList;
-import jdk.compiler.graal.nodeinfo.InputType;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.CallTargetNode.InvokeKind;
-import jdk.compiler.graal.nodes.FrameState;
-import jdk.compiler.graal.nodes.InliningLog;
-import jdk.compiler.graal.nodes.Invoke;
-import jdk.compiler.graal.nodes.InvokeWithExceptionNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.WithExceptionNode;
-import jdk.compiler.graal.nodes.java.MethodCallTargetNode;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_UNKNOWN;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_UNKNOWN;
+
+import jdk.graal.compiler.core.common.type.StampPair;
+import jdk.graal.compiler.debug.DebugCloseable;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.graph.NodeInputList;
+import jdk.graal.compiler.nodeinfo.InputType;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.CallTargetNode.InvokeKind;
+import jdk.graal.compiler.nodes.FrameState;
+import jdk.graal.compiler.nodes.InliningLog;
+import jdk.graal.compiler.nodes.Invoke;
+import jdk.graal.compiler.nodes.InvokeWithExceptionNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.WithExceptionNode;
+import jdk.graal.compiler.nodes.java.MethodCallTargetNode;
 import org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/MemoryKillStubIntrinsicNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/MemoryKillStubIntrinsicNode.java
similarity index 86%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/MemoryKillStubIntrinsicNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/MemoryKillStubIntrinsicNode.java
index df98ccf3a9b9..b97ac5c2693a 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/MemoryKillStubIntrinsicNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/MemoryKillStubIntrinsicNode.java
@@ -22,19 +22,19 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements.nodes;
+package jdk.graal.compiler.replacements.nodes;
 
-import static jdk.compiler.graal.nodeinfo.InputType.Memory;
+import static jdk.graal.compiler.nodeinfo.InputType.Memory;
 
 import java.util.EnumSet;
 
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.memory.AbstractMemoryCheckpoint;
-import jdk.compiler.graal.nodes.memory.MemoryAccess;
-import jdk.compiler.graal.nodes.memory.MemoryKill;
-import jdk.compiler.graal.nodes.memory.MultiMemoryKill;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.memory.AbstractMemoryCheckpoint;
+import jdk.graal.compiler.nodes.memory.MemoryAccess;
+import jdk.graal.compiler.nodes.memory.MemoryKill;
+import jdk.graal.compiler.nodes.memory.MultiMemoryKill;
 import org.graalvm.word.LocationIdentity;
 
 /**
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/MessageDigestNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/MessageDigestNode.java
similarity index 94%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/MessageDigestNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/MessageDigestNode.java
index ec8223c7778e..c89bc1953ba9 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/MessageDigestNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/MessageDigestNode.java
@@ -22,24 +22,24 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements.nodes;
+package jdk.graal.compiler.replacements.nodes;
 
-import static jdk.compiler.graal.nodeinfo.InputType.Memory;
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_UNKNOWN;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_128;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_256;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_64;
+import static jdk.graal.compiler.nodeinfo.InputType.Memory;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_UNKNOWN;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_128;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_256;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_64;
 
 import java.util.EnumSet;
 
-import jdk.compiler.graal.core.common.spi.ForeignCallDescriptor;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.lir.GenerateStub;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.NamedLocationIdentity;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.core.common.spi.ForeignCallDescriptor;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.lir.GenerateStub;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.NamedLocationIdentity;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
 import org.graalvm.word.LocationIdentity;
 import org.graalvm.word.Pointer;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/MethodHandleNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/MethodHandleNode.java
similarity index 92%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/MethodHandleNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/MethodHandleNode.java
index c089e1111cb1..c7bcad4eabed 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/MethodHandleNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/MethodHandleNode.java
@@ -22,44 +22,44 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements.nodes;
+package jdk.graal.compiler.replacements.nodes;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_UNKNOWN;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_UNKNOWN;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_UNKNOWN;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_UNKNOWN;
 
 import java.lang.invoke.MethodHandle;
 import java.util.Arrays;
 
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.core.common.type.StampPair;
-import jdk.compiler.graal.core.common.type.TypeReference;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.CallTargetNode;
-import jdk.compiler.graal.nodes.CallTargetNode.InvokeKind;
-import jdk.compiler.graal.nodes.FixedGuardNode;
-import jdk.compiler.graal.nodes.FixedNode;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.GuardNode;
-import jdk.compiler.graal.nodes.Invoke;
-import jdk.compiler.graal.nodes.InvokeNode;
-import jdk.compiler.graal.nodes.LogicNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.PiNode;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.extended.AnchoringNode;
-import jdk.compiler.graal.nodes.extended.GuardingNode;
-import jdk.compiler.graal.nodes.extended.ValueAnchorNode;
-import jdk.compiler.graal.nodes.java.InstanceOfNode;
-import jdk.compiler.graal.nodes.java.MethodCallTargetNode;
-import jdk.compiler.graal.nodes.spi.Simplifiable;
-import jdk.compiler.graal.nodes.spi.SimplifierTool;
-import jdk.compiler.graal.nodes.type.StampTool;
-import jdk.compiler.graal.nodes.util.GraphUtil;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.core.common.type.StampPair;
+import jdk.graal.compiler.core.common.type.TypeReference;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.CallTargetNode;
+import jdk.graal.compiler.nodes.CallTargetNode.InvokeKind;
+import jdk.graal.compiler.nodes.FixedGuardNode;
+import jdk.graal.compiler.nodes.FixedNode;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.GuardNode;
+import jdk.graal.compiler.nodes.Invoke;
+import jdk.graal.compiler.nodes.InvokeNode;
+import jdk.graal.compiler.nodes.LogicNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.PiNode;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.extended.AnchoringNode;
+import jdk.graal.compiler.nodes.extended.GuardingNode;
+import jdk.graal.compiler.nodes.extended.ValueAnchorNode;
+import jdk.graal.compiler.nodes.java.InstanceOfNode;
+import jdk.graal.compiler.nodes.java.MethodCallTargetNode;
+import jdk.graal.compiler.nodes.spi.Simplifiable;
+import jdk.graal.compiler.nodes.spi.SimplifierTool;
+import jdk.graal.compiler.nodes.type.StampTool;
+import jdk.graal.compiler.nodes.util.GraphUtil;
 
 import jdk.vm.ci.meta.Assumptions;
 import jdk.vm.ci.meta.Assumptions.AssumptionResult;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/MethodHandleWithExceptionNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/MethodHandleWithExceptionNode.java
similarity index 86%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/MethodHandleWithExceptionNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/MethodHandleWithExceptionNode.java
index 8d05d4f7adf1..8fb050317fa4 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/MethodHandleWithExceptionNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/MethodHandleWithExceptionNode.java
@@ -22,20 +22,20 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements.nodes;
+package jdk.graal.compiler.replacements.nodes;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_UNKNOWN;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_UNKNOWN;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_UNKNOWN;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_UNKNOWN;
 
 import java.lang.invoke.MethodHandle;
 
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.InvokeWithExceptionNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.WithExceptionNode;
-import jdk.compiler.graal.nodes.spi.Simplifiable;
-import jdk.compiler.graal.nodes.spi.SimplifierTool;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.InvokeWithExceptionNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.WithExceptionNode;
+import jdk.graal.compiler.nodes.spi.Simplifiable;
+import jdk.graal.compiler.nodes.spi.SimplifierTool;
 
 import jdk.vm.ci.meta.MethodHandleAccessProvider;
 import jdk.vm.ci.meta.MethodHandleAccessProvider.IntrinsicMethod;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ObjectClone.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/ObjectClone.java
similarity index 87%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ObjectClone.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/ObjectClone.java
index b368dc76c03b..90be44788921 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ObjectClone.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/ObjectClone.java
@@ -22,28 +22,28 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements.nodes;
+package jdk.graal.compiler.replacements.nodes;
 
 import java.util.Collections;
 
-import jdk.compiler.graal.core.common.type.AbstractPointerStamp;
-import jdk.compiler.graal.core.common.type.ObjectStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.graph.NodeSourcePosition;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.StateSplit;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.java.LoadFieldNode;
-import jdk.compiler.graal.nodes.java.LoadIndexedNode;
-import jdk.compiler.graal.nodes.java.MonitorIdNode;
-import jdk.compiler.graal.nodes.spi.ArrayLengthProvider;
-import jdk.compiler.graal.nodes.spi.VirtualizableAllocation;
-import jdk.compiler.graal.nodes.spi.VirtualizerTool;
-import jdk.compiler.graal.nodes.util.GraphUtil;
-import jdk.compiler.graal.nodes.virtual.VirtualArrayNode;
-import jdk.compiler.graal.nodes.virtual.VirtualInstanceNode;
-import jdk.compiler.graal.nodes.virtual.VirtualObjectNode;
+import jdk.graal.compiler.core.common.type.AbstractPointerStamp;
+import jdk.graal.compiler.core.common.type.ObjectStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.graph.NodeSourcePosition;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.StateSplit;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.java.LoadFieldNode;
+import jdk.graal.compiler.nodes.java.LoadIndexedNode;
+import jdk.graal.compiler.nodes.java.MonitorIdNode;
+import jdk.graal.compiler.nodes.spi.ArrayLengthProvider;
+import jdk.graal.compiler.nodes.spi.VirtualizableAllocation;
+import jdk.graal.compiler.nodes.spi.VirtualizerTool;
+import jdk.graal.compiler.nodes.util.GraphUtil;
+import jdk.graal.compiler.nodes.virtual.VirtualArrayNode;
+import jdk.graal.compiler.nodes.virtual.VirtualInstanceNode;
+import jdk.graal.compiler.nodes.virtual.VirtualObjectNode;
 
 import jdk.vm.ci.meta.Assumptions;
 import jdk.vm.ci.meta.ConstantReflectionProvider;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ProfileBooleanNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/ProfileBooleanNode.java
similarity index 85%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ProfileBooleanNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/ProfileBooleanNode.java
index d700a3851fe0..03596f726773 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ProfileBooleanNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/ProfileBooleanNode.java
@@ -22,23 +22,23 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements.nodes;
+package jdk.graal.compiler.replacements.nodes;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_UNKNOWN;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_UNKNOWN;
-import static jdk.compiler.graal.nodes.util.ConstantReflectionUtil.loadIntArrayConstant;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_UNKNOWN;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_UNKNOWN;
+import static jdk.graal.compiler.nodes.util.ConstantReflectionUtil.loadIntArrayConstant;
 
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodes.spi.Simplifiable;
-import jdk.compiler.graal.nodes.spi.SimplifierTool;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.FixedGuardNode;
-import jdk.compiler.graal.nodes.LogicConstantNode;
-import jdk.compiler.graal.nodes.LogicNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.calc.IntegerEqualsNode;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodes.spi.Simplifiable;
+import jdk.graal.compiler.nodes.spi.SimplifierTool;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.FixedGuardNode;
+import jdk.graal.compiler.nodes.LogicConstantNode;
+import jdk.graal.compiler.nodes.LogicNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.calc.IntegerEqualsNode;
 
 import jdk.vm.ci.meta.ConstantReflectionProvider;
 import jdk.vm.ci.meta.DeoptimizationAction;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/PureFunctionMacroNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/PureFunctionMacroNode.java
similarity index 87%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/PureFunctionMacroNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/PureFunctionMacroNode.java
index 9f7322f0ceaf..135633ae233b 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/PureFunctionMacroNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/PureFunctionMacroNode.java
@@ -22,15 +22,15 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements.nodes;
+package jdk.graal.compiler.replacements.nodes;
 
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodes.spi.Canonicalizable;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.ValueNode;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodes.spi.Canonicalizable;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.ValueNode;
 
 import jdk.vm.ci.meta.JavaConstant;
 import jdk.vm.ci.meta.MetaAccessProvider;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/PureFunctionStubIntrinsicNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/PureFunctionStubIntrinsicNode.java
similarity index 88%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/PureFunctionStubIntrinsicNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/PureFunctionStubIntrinsicNode.java
index ee4dc6362b49..db05f3bfd998 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/PureFunctionStubIntrinsicNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/PureFunctionStubIntrinsicNode.java
@@ -22,18 +22,18 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements.nodes;
+package jdk.graal.compiler.replacements.nodes;
 
-import static jdk.compiler.graal.nodeinfo.InputType.Memory;
+import static jdk.graal.compiler.nodeinfo.InputType.Memory;
 
 import java.util.EnumSet;
 
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.memory.MemoryAccess;
-import jdk.compiler.graal.nodes.memory.MemoryKill;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.memory.MemoryAccess;
+import jdk.graal.compiler.nodes.memory.MemoryKill;
 import org.graalvm.word.LocationIdentity;
 
 /**
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ReadRegisterNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/ReadRegisterNode.java
similarity index 83%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ReadRegisterNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/ReadRegisterNode.java
index 344207209eaa..18989f136c69 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ReadRegisterNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/ReadRegisterNode.java
@@ -22,22 +22,22 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements.nodes;
+package jdk.graal.compiler.replacements.nodes;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_0;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_0;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_0;
 
-import jdk.compiler.graal.core.common.LIRKind;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.lir.gen.LIRGenerator;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodeinfo.Verbosity;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.spi.LIRLowerable;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.core.common.LIRKind;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.lir.gen.LIRGenerator;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodeinfo.Verbosity;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.spi.LIRLowerable;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
 
 import jdk.vm.ci.code.Register;
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ReflectionGetCallerClassNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/ReflectionGetCallerClassNode.java
similarity index 89%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ReflectionGetCallerClassNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/ReflectionGetCallerClassNode.java
index 90d5a4fa22ce..bb9ed2a2b174 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ReflectionGetCallerClassNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/ReflectionGetCallerClassNode.java
@@ -22,18 +22,18 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements.nodes;
+package jdk.graal.compiler.replacements.nodes;
 
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.FrameState;
-import jdk.compiler.graal.nodes.spi.Canonicalizable;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodes.spi.Lowerable;
-import jdk.compiler.graal.nodes.spi.LoweringTool;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.FrameState;
+import jdk.graal.compiler.nodes.spi.Canonicalizable;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodes.spi.Lowerable;
+import jdk.graal.compiler.nodes.spi.LoweringTool;
 
 import jdk.vm.ci.meta.ConstantReflectionProvider;
 import jdk.vm.ci.meta.MetaAccessProvider;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ResolvedMethodHandleCallTargetNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/ResolvedMethodHandleCallTargetNode.java
similarity index 89%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ResolvedMethodHandleCallTargetNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/ResolvedMethodHandleCallTargetNode.java
index 27bedd73f654..470b497cc282 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ResolvedMethodHandleCallTargetNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/ResolvedMethodHandleCallTargetNode.java
@@ -22,20 +22,20 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements.nodes;
+package jdk.graal.compiler.replacements.nodes;
 
 import java.lang.invoke.MethodHandle;
 
-import jdk.compiler.graal.core.common.type.StampPair;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.graph.NodeInputList;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.java.MethodCallTargetNode;
-import jdk.compiler.graal.nodes.spi.Lowerable;
-import jdk.compiler.graal.nodes.spi.LoweringTool;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.core.common.type.StampPair;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.graph.NodeInputList;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.java.MethodCallTargetNode;
+import jdk.graal.compiler.nodes.spi.Lowerable;
+import jdk.graal.compiler.nodes.spi.LoweringTool;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
 
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ReverseBitsNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/ReverseBitsNode.java
similarity index 81%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ReverseBitsNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/ReverseBitsNode.java
index 4ab9aabf0a86..1b268e791198 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ReverseBitsNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/ReverseBitsNode.java
@@ -22,22 +22,22 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements.nodes;
+package jdk.graal.compiler.replacements.nodes;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_32;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_32;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_32;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_32;
 
-import jdk.compiler.graal.core.common.type.IntegerStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.calc.UnaryNode;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodes.spi.LIRLowerable;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.core.common.type.IntegerStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.calc.UnaryNode;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodes.spi.LIRLowerable;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
 
 import jdk.vm.ci.code.CodeUtil;
 import jdk.vm.ci.meta.Value;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ReverseBytesNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/ReverseBytesNode.java
similarity index 83%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ReverseBytesNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/ReverseBytesNode.java
index 3054b3a18edd..eed1bd4bdb18 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ReverseBytesNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/ReverseBytesNode.java
@@ -22,22 +22,22 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements.nodes;
+package jdk.graal.compiler.replacements.nodes;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_1;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_1;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_1;
 
-import jdk.compiler.graal.core.common.type.IntegerStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.calc.UnaryNode;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodes.spi.LIRLowerable;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.core.common.type.IntegerStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.calc.UnaryNode;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodes.spi.LIRLowerable;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
 
 import jdk.vm.ci.code.CodeUtil;
 import jdk.vm.ci.meta.Value;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/UnaryMathIntrinsicNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/UnaryMathIntrinsicNode.java
similarity index 87%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/UnaryMathIntrinsicNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/UnaryMathIntrinsicNode.java
index 2cc51f47222a..ace592b70828 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/UnaryMathIntrinsicNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/UnaryMathIntrinsicNode.java
@@ -22,28 +22,28 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements.nodes;
-
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_64;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1;
-
-import jdk.compiler.graal.core.common.spi.ForeignCallSignature;
-import jdk.compiler.graal.core.common.type.FloatStamp;
-import jdk.compiler.graal.core.common.type.PrimitiveStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.lir.gen.ArithmeticLIRGeneratorTool;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.calc.UnaryNode;
-import jdk.compiler.graal.nodes.spi.ArithmeticLIRLowerable;
-import jdk.compiler.graal.nodes.spi.Lowerable;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
+package jdk.graal.compiler.replacements.nodes;
+
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_64;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_1;
+
+import jdk.graal.compiler.core.common.spi.ForeignCallSignature;
+import jdk.graal.compiler.core.common.type.FloatStamp;
+import jdk.graal.compiler.core.common.type.PrimitiveStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.lir.gen.ArithmeticLIRGeneratorTool;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.calc.UnaryNode;
+import jdk.graal.compiler.nodes.spi.ArithmeticLIRLowerable;
+import jdk.graal.compiler.nodes.spi.Lowerable;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
 
 import jdk.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.Value;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/VectorizedHashCodeNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/VectorizedHashCodeNode.java
similarity index 91%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/VectorizedHashCodeNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/VectorizedHashCodeNode.java
index 58fd4ecf9933..6ffe4d5033f0 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/VectorizedHashCodeNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/VectorizedHashCodeNode.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements.nodes;
+package jdk.graal.compiler.replacements.nodes;
 
 import static jdk.vm.ci.amd64.AMD64.CPUFeature.AVX;
 import static jdk.vm.ci.amd64.AMD64.CPUFeature.AVX2;
@@ -34,17 +34,17 @@
 
 import java.util.EnumSet;
 
-import jdk.compiler.graal.core.common.spi.ForeignCallDescriptor;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.lir.GenerateStub;
-import jdk.compiler.graal.nodeinfo.NodeCycles;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodeinfo.NodeSize;
-import jdk.compiler.graal.nodes.NamedLocationIdentity;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.core.common.spi.ForeignCallDescriptor;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.lir.GenerateStub;
+import jdk.graal.compiler.nodeinfo.NodeCycles;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodeinfo.NodeSize;
+import jdk.graal.compiler.nodes.NamedLocationIdentity;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
 import org.graalvm.word.Pointer;
 
 import jdk.vm.ci.amd64.AMD64;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/VectorizedMismatchNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/VectorizedMismatchNode.java
similarity index 89%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/VectorizedMismatchNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/VectorizedMismatchNode.java
index dbcbd692cf69..ecddf5e53722 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/VectorizedMismatchNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/VectorizedMismatchNode.java
@@ -22,19 +22,19 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements.nodes;
+package jdk.graal.compiler.replacements.nodes;
 
 import java.util.EnumSet;
 
-import jdk.compiler.graal.core.common.spi.ForeignCallDescriptor;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.lir.GenerateStub;
-import jdk.compiler.graal.nodeinfo.NodeCycles;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodeinfo.NodeSize;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.core.common.spi.ForeignCallDescriptor;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.lir.GenerateStub;
+import jdk.graal.compiler.nodeinfo.NodeCycles;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodeinfo.NodeSize;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
 import org.graalvm.word.LocationIdentity;
 import org.graalvm.word.Pointer;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/VirtualizableInvokeMacroNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/VirtualizableInvokeMacroNode.java
similarity index 84%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/VirtualizableInvokeMacroNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/VirtualizableInvokeMacroNode.java
index 9fd6545ff2f7..df963aac5fef 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/VirtualizableInvokeMacroNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/VirtualizableInvokeMacroNode.java
@@ -22,14 +22,14 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements.nodes;
+package jdk.graal.compiler.replacements.nodes;
 
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.Virtualizable;
-import jdk.compiler.graal.nodes.spi.VirtualizerTool;
-import jdk.compiler.graal.nodes.virtual.VirtualObjectNode;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.Virtualizable;
+import jdk.graal.compiler.nodes.spi.VirtualizerTool;
+import jdk.graal.compiler.nodes.virtual.VirtualObjectNode;
 
 /**
  * A helper class to allow elimination of byte code instrumentation that could interfere with escape
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/WriteRegisterNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/WriteRegisterNode.java
similarity index 81%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/WriteRegisterNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/WriteRegisterNode.java
index 8b9cf9879834..ca62d9352280 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/WriteRegisterNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/WriteRegisterNode.java
@@ -22,19 +22,19 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements.nodes;
+package jdk.graal.compiler.replacements.nodes;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_2;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_1;
 
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodeinfo.Verbosity;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.LIRLowerable;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodeinfo.Verbosity;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.LIRLowerable;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
 
 import jdk.vm.ci.code.Register;
 import jdk.vm.ci.meta.Value;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ZeroMemoryNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/ZeroMemoryNode.java
similarity index 77%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ZeroMemoryNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/ZeroMemoryNode.java
index 96c260ad2a3c..a9ee64679b66 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ZeroMemoryNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/ZeroMemoryNode.java
@@ -22,24 +22,24 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements.nodes;
+package jdk.graal.compiler.replacements.nodes;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_8;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_8;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_8;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_8;
 
-import jdk.compiler.graal.core.common.memory.BarrierType;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.InputType;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.memory.FixedAccessNode;
-import jdk.compiler.graal.nodes.memory.SingleMemoryKill;
-import jdk.compiler.graal.nodes.memory.address.AddressNode;
-import jdk.compiler.graal.nodes.memory.address.OffsetAddressNode;
-import jdk.compiler.graal.nodes.spi.LIRLowerable;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
-import jdk.compiler.graal.word.Word;
+import jdk.graal.compiler.core.common.memory.BarrierType;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.InputType;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.memory.FixedAccessNode;
+import jdk.graal.compiler.nodes.memory.SingleMemoryKill;
+import jdk.graal.compiler.nodes.memory.address.AddressNode;
+import jdk.graal.compiler.nodes.memory.address.OffsetAddressNode;
+import jdk.graal.compiler.nodes.spi.LIRLowerable;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.word.Word;
 import org.graalvm.word.LocationIdentity;
 
 /**
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/arithmetic/BinaryIntegerExactArithmeticSplitNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/arithmetic/BinaryIntegerExactArithmeticSplitNode.java
similarity index 85%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/arithmetic/BinaryIntegerExactArithmeticSplitNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/arithmetic/BinaryIntegerExactArithmeticSplitNode.java
index 73988a502dc2..82a4722664ae 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/arithmetic/BinaryIntegerExactArithmeticSplitNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/arithmetic/BinaryIntegerExactArithmeticSplitNode.java
@@ -22,14 +22,14 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements.nodes.arithmetic;
+package jdk.graal.compiler.replacements.nodes.arithmetic;
 
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.graph.IterableNodeType;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.AbstractBeginNode;
-import jdk.compiler.graal.nodes.ValueNode;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.graph.IterableNodeType;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.AbstractBeginNode;
+import jdk.graal.compiler.nodes.ValueNode;
 
 @NodeInfo
 public abstract class BinaryIntegerExactArithmeticSplitNode extends IntegerExactArithmeticSplitNode implements IterableNodeType {
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerAddExactNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/arithmetic/IntegerAddExactNode.java
similarity index 86%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerAddExactNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/arithmetic/IntegerAddExactNode.java
index aa08eb151aff..ddb6feefc0fa 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerAddExactNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/arithmetic/IntegerAddExactNode.java
@@ -22,24 +22,24 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements.nodes.arithmetic;
-
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_2;
-
-import jdk.compiler.graal.core.common.type.IntegerStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.graph.IterableNodeType;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.InputType;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.calc.AddNode;
-import jdk.compiler.graal.nodes.extended.GuardedNode;
-import jdk.compiler.graal.nodes.extended.GuardingNode;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
+package jdk.graal.compiler.replacements.nodes.arithmetic;
+
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_2;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_2;
+
+import jdk.graal.compiler.core.common.type.IntegerStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.graph.IterableNodeType;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.InputType;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.calc.AddNode;
+import jdk.graal.compiler.nodes.extended.GuardedNode;
+import jdk.graal.compiler.nodes.extended.GuardingNode;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
 
 import jdk.vm.ci.code.CodeUtil;
 import jdk.vm.ci.meta.JavaConstant;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerAddExactOverflowNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/arithmetic/IntegerAddExactOverflowNode.java
similarity index 82%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerAddExactOverflowNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/arithmetic/IntegerAddExactOverflowNode.java
index c20231823b46..8397611d8970 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerAddExactOverflowNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/arithmetic/IntegerAddExactOverflowNode.java
@@ -23,23 +23,23 @@
  * questions.
  */
 
-package jdk.compiler.graal.replacements.nodes.arithmetic;
+package jdk.graal.compiler.replacements.nodes.arithmetic;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_2;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_2;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_2;
 
-import jdk.compiler.graal.core.common.type.IntegerStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.graph.IterableNodeType;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.AbstractBeginNode;
-import jdk.compiler.graal.nodes.LogicConstantNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.calc.BinaryNode;
-import jdk.compiler.graal.nodes.spi.Canonicalizable.BinaryCommutative;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.core.common.type.IntegerStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.graph.IterableNodeType;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.AbstractBeginNode;
+import jdk.graal.compiler.nodes.LogicConstantNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.calc.BinaryNode;
+import jdk.graal.compiler.nodes.spi.Canonicalizable.BinaryCommutative;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
 
 import jdk.vm.ci.meta.JavaConstant;
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerAddExactSplitNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/arithmetic/IntegerAddExactSplitNode.java
similarity index 78%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerAddExactSplitNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/arithmetic/IntegerAddExactSplitNode.java
index 04be0a11d852..b8fef13960e0 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerAddExactSplitNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/arithmetic/IntegerAddExactSplitNode.java
@@ -22,23 +22,23 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements.nodes.arithmetic;
+package jdk.graal.compiler.replacements.nodes.arithmetic;
 
-import jdk.compiler.graal.core.common.type.IntegerStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodes.spi.SimplifierTool;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.AbstractBeginNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.calc.AddNode;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.core.common.type.IntegerStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodes.spi.SimplifierTool;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.AbstractBeginNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.calc.AddNode;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
 
 import jdk.vm.ci.meta.Value;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_2;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_2;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_2;
 
 @NodeInfo(cycles = CYCLES_2, cyclesRationale = "add+cmp", size = SIZE_2)
 public final class IntegerAddExactSplitNode extends BinaryIntegerExactArithmeticSplitNode {
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerExactArithmeticNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/arithmetic/IntegerExactArithmeticNode.java
similarity index 95%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerExactArithmeticNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/arithmetic/IntegerExactArithmeticNode.java
index 1f406dce9238..d012a40edd68 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerExactArithmeticNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/arithmetic/IntegerExactArithmeticNode.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements.nodes.arithmetic;
+package jdk.graal.compiler.replacements.nodes.arithmetic;
 
 public interface IntegerExactArithmeticNode {
 }
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerExactArithmeticSplitNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/arithmetic/IntegerExactArithmeticSplitNode.java
similarity index 84%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerExactArithmeticSplitNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/arithmetic/IntegerExactArithmeticSplitNode.java
index 04fc5c513e56..4bc5cb9922bc 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerExactArithmeticSplitNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/arithmetic/IntegerExactArithmeticSplitNode.java
@@ -22,18 +22,18 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements.nodes.arithmetic;
+package jdk.graal.compiler.replacements.nodes.arithmetic;
 
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.AbstractBeginNode;
-import jdk.compiler.graal.nodes.ControlSplitNode;
-import jdk.compiler.graal.nodes.ProfileData.BranchProbabilityData;
-import jdk.compiler.graal.nodes.extended.BranchProbabilityNode;
-import jdk.compiler.graal.nodes.spi.LIRLowerable;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
-import jdk.compiler.graal.nodes.spi.Simplifiable;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.AbstractBeginNode;
+import jdk.graal.compiler.nodes.ControlSplitNode;
+import jdk.graal.compiler.nodes.ProfileData.BranchProbabilityData;
+import jdk.graal.compiler.nodes.extended.BranchProbabilityNode;
+import jdk.graal.compiler.nodes.spi.LIRLowerable;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.nodes.spi.Simplifiable;
 
 import jdk.vm.ci.meta.Value;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerExactOverflowNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/arithmetic/IntegerExactOverflowNode.java
similarity index 85%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerExactOverflowNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/arithmetic/IntegerExactOverflowNode.java
index 610123b2e531..d28044b1cf49 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerExactOverflowNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/arithmetic/IntegerExactOverflowNode.java
@@ -23,25 +23,25 @@
  * questions.
  */
 
-package jdk.compiler.graal.replacements.nodes.arithmetic;
+package jdk.graal.compiler.replacements.nodes.arithmetic;
 
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodes.spi.Canonicalizable;
-import jdk.compiler.graal.nodes.spi.Simplifiable;
-import jdk.compiler.graal.nodes.spi.SimplifierTool;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.AbstractBeginNode;
-import jdk.compiler.graal.nodes.IfNode;
-import jdk.compiler.graal.nodes.LogicNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.calc.BinaryNode;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodes.spi.Canonicalizable;
+import jdk.graal.compiler.nodes.spi.Simplifiable;
+import jdk.graal.compiler.nodes.spi.SimplifierTool;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.AbstractBeginNode;
+import jdk.graal.compiler.nodes.IfNode;
+import jdk.graal.compiler.nodes.LogicNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.calc.BinaryNode;
 
 import java.util.List;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_2;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_2;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_2;
 
 @NodeInfo(cycles = CYCLES_2, size = SIZE_2)
 public abstract class IntegerExactOverflowNode extends LogicNode implements Canonicalizable.Binary, Simplifiable {
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerMulExactNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/arithmetic/IntegerMulExactNode.java
similarity index 86%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerMulExactNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/arithmetic/IntegerMulExactNode.java
index 23cd5371b4e2..3a06097f5180 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerMulExactNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/arithmetic/IntegerMulExactNode.java
@@ -22,22 +22,22 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements.nodes.arithmetic;
+package jdk.graal.compiler.replacements.nodes.arithmetic;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_4;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_2;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_4;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_2;
 
-import jdk.compiler.graal.core.common.type.IntegerStamp;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodeinfo.InputType;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.calc.MulNode;
-import jdk.compiler.graal.nodes.extended.GuardedNode;
-import jdk.compiler.graal.nodes.extended.GuardingNode;
+import jdk.graal.compiler.core.common.type.IntegerStamp;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodeinfo.InputType;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.calc.MulNode;
+import jdk.graal.compiler.nodes.extended.GuardedNode;
+import jdk.graal.compiler.nodes.extended.GuardingNode;
 
 import jdk.vm.ci.meta.JavaConstant;
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerMulExactOverflowNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/arithmetic/IntegerMulExactOverflowNode.java
similarity index 83%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerMulExactOverflowNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/arithmetic/IntegerMulExactOverflowNode.java
index fd70b5597502..9581b36ea592 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerMulExactOverflowNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/arithmetic/IntegerMulExactOverflowNode.java
@@ -23,22 +23,22 @@
  * questions.
  */
 
-package jdk.compiler.graal.replacements.nodes.arithmetic;
+package jdk.graal.compiler.replacements.nodes.arithmetic;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_4;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_2;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_4;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_2;
 
-import jdk.compiler.graal.core.common.type.IntegerStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.AbstractBeginNode;
-import jdk.compiler.graal.nodes.LogicConstantNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.calc.BinaryNode;
-import jdk.compiler.graal.nodes.spi.Canonicalizable;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.core.common.type.IntegerStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.AbstractBeginNode;
+import jdk.graal.compiler.nodes.LogicConstantNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.calc.BinaryNode;
+import jdk.graal.compiler.nodes.spi.Canonicalizable;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
 
 import jdk.vm.ci.meta.JavaConstant;
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerMulExactSplitNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/arithmetic/IntegerMulExactSplitNode.java
similarity index 78%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerMulExactSplitNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/arithmetic/IntegerMulExactSplitNode.java
index 7079e7a5ff6b..e8e5a4b51abc 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerMulExactSplitNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/arithmetic/IntegerMulExactSplitNode.java
@@ -22,21 +22,21 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements.nodes.arithmetic;
+package jdk.graal.compiler.replacements.nodes.arithmetic;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_4;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_4;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_4;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_4;
 
-import jdk.compiler.graal.core.common.type.IntegerStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.AbstractBeginNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.calc.MulNode;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
-import jdk.compiler.graal.nodes.spi.SimplifierTool;
+import jdk.graal.compiler.core.common.type.IntegerStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.AbstractBeginNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.calc.MulNode;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.nodes.spi.SimplifierTool;
 
 import jdk.vm.ci.meta.Value;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerNegExactNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/arithmetic/IntegerNegExactNode.java
similarity index 83%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerNegExactNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/arithmetic/IntegerNegExactNode.java
index 941cb9e12fe4..b6b9c2a3b622 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerNegExactNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/arithmetic/IntegerNegExactNode.java
@@ -22,24 +22,24 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements.nodes.arithmetic;
+package jdk.graal.compiler.replacements.nodes.arithmetic;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_2;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_2;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_2;
 
-import jdk.compiler.graal.core.common.type.IntegerStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.graph.IterableNodeType;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.InputType;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.calc.NegateNode;
-import jdk.compiler.graal.nodes.extended.GuardedNode;
-import jdk.compiler.graal.nodes.extended.GuardingNode;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.core.common.type.IntegerStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.graph.IterableNodeType;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.InputType;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.calc.NegateNode;
+import jdk.graal.compiler.nodes.extended.GuardedNode;
+import jdk.graal.compiler.nodes.extended.GuardingNode;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
 
 import jdk.vm.ci.meta.JavaConstant;
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerNegExactOverflowNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/arithmetic/IntegerNegExactOverflowNode.java
similarity index 81%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerNegExactOverflowNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/arithmetic/IntegerNegExactOverflowNode.java
index e9d155480be4..860fa9021e38 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerNegExactOverflowNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/arithmetic/IntegerNegExactOverflowNode.java
@@ -23,27 +23,27 @@
  * questions.
  */
 
-package jdk.compiler.graal.replacements.nodes.arithmetic;
+package jdk.graal.compiler.replacements.nodes.arithmetic;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_4;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_2;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_4;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_2;
 
 import java.util.List;
 
-import jdk.compiler.graal.core.common.type.IntegerStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.AbstractBeginNode;
-import jdk.compiler.graal.nodes.IfNode;
-import jdk.compiler.graal.nodes.LogicConstantNode;
-import jdk.compiler.graal.nodes.LogicNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.Canonicalizable;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodes.spi.Simplifiable;
-import jdk.compiler.graal.nodes.spi.SimplifierTool;
+import jdk.graal.compiler.core.common.type.IntegerStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.AbstractBeginNode;
+import jdk.graal.compiler.nodes.IfNode;
+import jdk.graal.compiler.nodes.LogicConstantNode;
+import jdk.graal.compiler.nodes.LogicNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.Canonicalizable;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodes.spi.Simplifiable;
+import jdk.graal.compiler.nodes.spi.SimplifierTool;
 
 import jdk.vm.ci.meta.JavaConstant;
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerNegExactSplitNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/arithmetic/IntegerNegExactSplitNode.java
similarity index 78%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerNegExactSplitNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/arithmetic/IntegerNegExactSplitNode.java
index 58690865d801..798c026bd542 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerNegExactSplitNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/arithmetic/IntegerNegExactSplitNode.java
@@ -22,21 +22,21 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements.nodes.arithmetic;
+package jdk.graal.compiler.replacements.nodes.arithmetic;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_2;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_2;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_2;
 
-import jdk.compiler.graal.core.common.type.IntegerStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.AbstractBeginNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.calc.NegateNode;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
-import jdk.compiler.graal.nodes.spi.SimplifierTool;
+import jdk.graal.compiler.core.common.type.IntegerStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.AbstractBeginNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.calc.NegateNode;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.nodes.spi.SimplifierTool;
 
 import jdk.vm.ci.meta.Value;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerSubExactNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/arithmetic/IntegerSubExactNode.java
similarity index 84%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerSubExactNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/arithmetic/IntegerSubExactNode.java
index 6501f0e6ae6d..cd1dfbc59a57 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerSubExactNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/arithmetic/IntegerSubExactNode.java
@@ -22,24 +22,24 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements.nodes.arithmetic;
+package jdk.graal.compiler.replacements.nodes.arithmetic;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_2;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_2;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_2;
 
-import jdk.compiler.graal.core.common.type.IntegerStamp;
-import jdk.compiler.graal.graph.IterableNodeType;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.InputType;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.calc.SubNode;
-import jdk.compiler.graal.nodes.extended.GuardedNode;
-import jdk.compiler.graal.nodes.extended.GuardingNode;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodes.util.GraphUtil;
+import jdk.graal.compiler.core.common.type.IntegerStamp;
+import jdk.graal.compiler.graph.IterableNodeType;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.InputType;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.calc.SubNode;
+import jdk.graal.compiler.nodes.extended.GuardedNode;
+import jdk.graal.compiler.nodes.extended.GuardingNode;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodes.util.GraphUtil;
 
 import jdk.vm.ci.meta.JavaConstant;
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerSubExactOverflowNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/arithmetic/IntegerSubExactOverflowNode.java
similarity index 83%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerSubExactOverflowNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/arithmetic/IntegerSubExactOverflowNode.java
index 15174d8e071b..58f77585b70c 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerSubExactOverflowNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/arithmetic/IntegerSubExactOverflowNode.java
@@ -23,22 +23,22 @@
  * questions.
  */
 
-package jdk.compiler.graal.replacements.nodes.arithmetic;
+package jdk.graal.compiler.replacements.nodes.arithmetic;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_2;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_2;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_2;
 
-import jdk.compiler.graal.core.common.type.IntegerStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.AbstractBeginNode;
-import jdk.compiler.graal.nodes.LogicConstantNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.calc.BinaryNode;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodes.util.GraphUtil;
+import jdk.graal.compiler.core.common.type.IntegerStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.AbstractBeginNode;
+import jdk.graal.compiler.nodes.LogicConstantNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.calc.BinaryNode;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodes.util.GraphUtil;
 
 import jdk.vm.ci.meta.JavaConstant;
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerSubExactSplitNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/arithmetic/IntegerSubExactSplitNode.java
similarity index 78%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerSubExactSplitNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/arithmetic/IntegerSubExactSplitNode.java
index 36d02f35f0f2..9ef8ee3b2d89 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerSubExactSplitNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/arithmetic/IntegerSubExactSplitNode.java
@@ -22,23 +22,23 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements.nodes.arithmetic;
+package jdk.graal.compiler.replacements.nodes.arithmetic;
 
-import jdk.compiler.graal.core.common.type.IntegerStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.AbstractBeginNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.calc.SubNode;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
-import jdk.compiler.graal.nodes.spi.SimplifierTool;
+import jdk.graal.compiler.core.common.type.IntegerStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.AbstractBeginNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.calc.SubNode;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.nodes.spi.SimplifierTool;
 
 import jdk.vm.ci.meta.Value;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_2;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_2;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_2;
 
 @NodeInfo(cycles = CYCLES_2, cyclesRationale = "sub+cmp", size = SIZE_2)
 public final class IntegerSubExactSplitNode extends BinaryIntegerExactArithmeticSplitNode {
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/arithmetic/UnsignedMulHighNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/arithmetic/UnsignedMulHighNode.java
similarity index 79%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/arithmetic/UnsignedMulHighNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/arithmetic/UnsignedMulHighNode.java
index ed031b003ccc..9691cbaf5c3c 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/arithmetic/UnsignedMulHighNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/nodes/arithmetic/UnsignedMulHighNode.java
@@ -22,24 +22,24 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.replacements.nodes.arithmetic;
+package jdk.graal.compiler.replacements.nodes.arithmetic;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_2;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_2;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_2;
 
-import jdk.compiler.graal.core.common.type.ArithmeticOpTable;
-import jdk.compiler.graal.core.common.type.ArithmeticOpTable.BinaryOp;
-import jdk.compiler.graal.core.common.type.ArithmeticOpTable.BinaryOp.UMulHigh;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodes.spi.Canonicalizable;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.lir.gen.ArithmeticLIRGeneratorTool;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.calc.BinaryArithmeticNode;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.core.common.type.ArithmeticOpTable;
+import jdk.graal.compiler.core.common.type.ArithmeticOpTable.BinaryOp;
+import jdk.graal.compiler.core.common.type.ArithmeticOpTable.BinaryOp.UMulHigh;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodes.spi.Canonicalizable;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.lir.gen.ArithmeticLIRGeneratorTool;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.calc.BinaryArithmeticNode;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
 
 import jdk.vm.ci.meta.Constant;
 import jdk.vm.ci.meta.PrimitiveConstant;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/runtime/RuntimeProvider.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/runtime/RuntimeProvider.java
similarity index 95%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/runtime/RuntimeProvider.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/runtime/RuntimeProvider.java
index 7259f8e9ed1a..0ab730b81680 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/runtime/RuntimeProvider.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/runtime/RuntimeProvider.java
@@ -22,11 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.runtime;
+package jdk.graal.compiler.runtime;
 
 import jdk.vm.ci.code.Architecture;
 
-import jdk.compiler.graal.core.target.Backend;
+import jdk.graal.compiler.core.target.Backend;
 
 /**
  * A runtime supporting a host backend as well, zero or more additional backends.
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/serviceprovider/GlobalAtomicLong.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/serviceprovider/GlobalAtomicLong.java
similarity index 97%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/serviceprovider/GlobalAtomicLong.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/serviceprovider/GlobalAtomicLong.java
index fa57acd15371..4bef14b89b27 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/serviceprovider/GlobalAtomicLong.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/serviceprovider/GlobalAtomicLong.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.serviceprovider;
+package jdk.graal.compiler.serviceprovider;
 
 import java.lang.ref.Cleaner;
 import java.util.concurrent.atomic.AtomicLong;
@@ -79,7 +79,7 @@ public String toString() {
         }
     }
 
-    // Substituted by Target_jdk_compiler_graal_serviceprovider_GlobalAtomicLong
+    // Substituted by Target_jdk_graal_compiler_serviceprovider_GlobalAtomicLong
     private long getAddress() {
         if (address == 0L) {
             synchronized (this) {
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/serviceprovider/GraalServices.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/serviceprovider/GraalServices.java
similarity index 98%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/serviceprovider/GraalServices.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/serviceprovider/GraalServices.java
index 94587b997dc7..6455d3bd97d6 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/serviceprovider/GraalServices.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/serviceprovider/GraalServices.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.serviceprovider;
+package jdk.graal.compiler.serviceprovider;
 
 import static java.lang.Thread.currentThread;
 import static jdk.vm.ci.services.Services.IS_BUILDING_NATIVE_IMAGE;
@@ -123,8 +123,8 @@ public static  Iterable load(Class service) {
      */
     private static boolean isHotSpotGraalModule(String name) {
         if (name != null) {
-            return name.equals("jdk.compiler.graal") ||
-                            name.equals("jdk.compiler.graal.management") ||
+            return name.equals("jdk.graal.compiler") ||
+                            name.equals("jdk.graal.compiler.management") ||
                             name.equals("com.oracle.graal.graal_enterprise");
         }
         return false;
@@ -509,6 +509,6 @@ public static boolean hasLookupMethodWithCaller() {
      */
     public static void notifyLowMemoryPoint(@SuppressWarnings("unused") boolean fullGC) {
         // Substituted by
-        // com.oracle.svm.hotspot.libgraal.Target_jdk_compiler_graal_serviceprovider_GraalServices
+        // com.oracle.svm.hotspot.libgraal.Target_jdk_graal_compiler_serviceprovider_GraalServices
     }
 }
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/serviceprovider/GraalUnsafeAccess.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/serviceprovider/GraalUnsafeAccess.java
similarity index 98%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/serviceprovider/GraalUnsafeAccess.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/serviceprovider/GraalUnsafeAccess.java
index 26cd896d7797..f8006001291a 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/serviceprovider/GraalUnsafeAccess.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/serviceprovider/GraalUnsafeAccess.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.serviceprovider;
+package jdk.graal.compiler.serviceprovider;
 
 import java.lang.reflect.Field;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/serviceprovider/IsolateUtil.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/serviceprovider/IsolateUtil.java
similarity index 93%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/serviceprovider/IsolateUtil.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/serviceprovider/IsolateUtil.java
index fddd5d062560..f2f4b63ffb28 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/serviceprovider/IsolateUtil.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/serviceprovider/IsolateUtil.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.serviceprovider;
+package jdk.graal.compiler.serviceprovider;
 
 /**
  * Utility methods that provide access to isolate details.
@@ -34,7 +34,7 @@ public final class IsolateUtil {
      */
     public static long getIsolateAddress() {
         // Substituted by
-        // com.oracle.svm.graal.Target_jdk_compiler_graal_serviceprovider_IsolateUtil
+        // com.oracle.svm.graal.Target_jdk_graal_compiler_serviceprovider_IsolateUtil
         return 0;
     }
 
@@ -45,7 +45,7 @@ public static long getIsolateAddress() {
      */
     public static long getIsolateID() {
         // Substituted by
-        // com.oracle.svm.graal.Target_jdk_compiler_graal_serviceprovider_IsolateUtil
+        // com.oracle.svm.graal.Target_jdk_graal_compiler_serviceprovider_IsolateUtil
         return 0;
     }
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/serviceprovider/JMXService.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/serviceprovider/JMXService.java
similarity index 97%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/serviceprovider/JMXService.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/serviceprovider/JMXService.java
index 24751f4ef23d..58b76bbb2250 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/serviceprovider/JMXService.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/serviceprovider/JMXService.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.serviceprovider;
+package jdk.graal.compiler.serviceprovider;
 
 import java.util.List;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/serviceprovider/JavaVersionUtil.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/serviceprovider/JavaVersionUtil.java
similarity index 97%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/serviceprovider/JavaVersionUtil.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/serviceprovider/JavaVersionUtil.java
index 41c97a16cd4c..d7db5bd73148 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/serviceprovider/JavaVersionUtil.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/serviceprovider/JavaVersionUtil.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.serviceprovider;
+package jdk.graal.compiler.serviceprovider;
 
 import java.lang.Runtime.Version;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/serviceprovider/OWNERS.toml b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/serviceprovider/OWNERS.toml
similarity index 100%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/serviceprovider/OWNERS.toml
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/serviceprovider/OWNERS.toml
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/serviceprovider/ServiceProvider.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/serviceprovider/ServiceProvider.java
similarity index 97%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/serviceprovider/ServiceProvider.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/serviceprovider/ServiceProvider.java
index 74c9bf323a32..889937d31b1f 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/serviceprovider/ServiceProvider.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/serviceprovider/ServiceProvider.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.serviceprovider;
+package jdk.graal.compiler.serviceprovider;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/serviceprovider/SpeculationEncodingAdapter.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/serviceprovider/SpeculationEncodingAdapter.java
similarity index 98%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/serviceprovider/SpeculationEncodingAdapter.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/serviceprovider/SpeculationEncodingAdapter.java
index 47eb4ead7205..ec087b8ce5a4 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/serviceprovider/SpeculationEncodingAdapter.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/serviceprovider/SpeculationEncodingAdapter.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.serviceprovider;
+package jdk.graal.compiler.serviceprovider;
 
 import java.util.ArrayList;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/serviceprovider/SpeculationReasonGroup.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/serviceprovider/SpeculationReasonGroup.java
similarity index 99%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/serviceprovider/SpeculationReasonGroup.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/serviceprovider/SpeculationReasonGroup.java
index c62fd082195f..838717e50337 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/serviceprovider/SpeculationReasonGroup.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/serviceprovider/SpeculationReasonGroup.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.serviceprovider;
+package jdk.graal.compiler.serviceprovider;
 
 import java.util.Arrays;
 import java.util.HashSet;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/serviceprovider/UnencodedSpeculationReason.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/serviceprovider/UnencodedSpeculationReason.java
similarity index 98%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/serviceprovider/UnencodedSpeculationReason.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/serviceprovider/UnencodedSpeculationReason.java
index 12b6ba729e81..b840efbc2b59 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/serviceprovider/UnencodedSpeculationReason.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/serviceprovider/UnencodedSpeculationReason.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.serviceprovider;
+package jdk.graal.compiler.serviceprovider;
 
 import java.util.Arrays;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/AbstractKnownTruffleTypes.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/AbstractKnownTruffleTypes.java
similarity index 98%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/AbstractKnownTruffleTypes.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/AbstractKnownTruffleTypes.java
index 8ccce536bbf0..0ed5433248c1 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/AbstractKnownTruffleTypes.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/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;
+package jdk.graal.compiler.truffle;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -31,7 +31,7 @@
 import java.util.List;
 import java.util.Map;
 
-import jdk.compiler.graal.debug.GraalError;
+import jdk.graal.compiler.debug.GraalError;
 
 import com.oracle.truffle.compiler.TruffleCompilerRuntime;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/AbstractTruffleCompilationSupport.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/AbstractTruffleCompilationSupport.java
similarity index 98%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/AbstractTruffleCompilationSupport.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/AbstractTruffleCompilationSupport.java
index e707b60c77ad..60cc8846f515 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/AbstractTruffleCompilationSupport.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/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;
+package jdk.graal.compiler.truffle;
 
 import com.oracle.truffle.compiler.TruffleCompilationSupport;
 import com.oracle.truffle.compiler.TruffleCompilerOptionDescriptor;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/CommunityPartialEvaluatorConfiguration.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/CommunityPartialEvaluatorConfiguration.java
similarity index 93%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/CommunityPartialEvaluatorConfiguration.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/CommunityPartialEvaluatorConfiguration.java
index ad9b2d4da551..136e392138a0 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/CommunityPartialEvaluatorConfiguration.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/CommunityPartialEvaluatorConfiguration.java
@@ -22,9 +22,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle;
+package jdk.graal.compiler.truffle;
 
-import jdk.compiler.graal.serviceprovider.ServiceProvider;
+import jdk.graal.compiler.serviceprovider.ServiceProvider;
 
 @ServiceProvider(PartialEvaluatorConfiguration.class)
 public class CommunityPartialEvaluatorConfiguration implements PartialEvaluatorConfiguration {
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/EconomyPartialEvaluatorConfiguration.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/EconomyPartialEvaluatorConfiguration.java
similarity index 93%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/EconomyPartialEvaluatorConfiguration.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/EconomyPartialEvaluatorConfiguration.java
index be45650f4f32..617c16df9212 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/EconomyPartialEvaluatorConfiguration.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/EconomyPartialEvaluatorConfiguration.java
@@ -22,9 +22,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle;
+package jdk.graal.compiler.truffle;
 
-import jdk.compiler.graal.serviceprovider.ServiceProvider;
+import jdk.graal.compiler.serviceprovider.ServiceProvider;
 
 @ServiceProvider(PartialEvaluatorConfiguration.class)
 public class EconomyPartialEvaluatorConfiguration implements PartialEvaluatorConfiguration {
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/ExpansionStatistics.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/ExpansionStatistics.java
similarity index 98%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/ExpansionStatistics.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/ExpansionStatistics.java
index 87b42f4e169e..7b33f80fa5b7 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/ExpansionStatistics.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/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;
+package jdk.graal.compiler.truffle;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;
@@ -40,18 +40,18 @@
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeSourcePosition;
-import jdk.compiler.graal.graph.SourceLanguagePosition;
-import jdk.compiler.graal.nodes.IfNode;
-import jdk.compiler.graal.nodes.InvokeNode;
-import jdk.compiler.graal.nodes.LoopBeginNode;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.cfg.ControlFlowGraph;
-import jdk.compiler.graal.nodes.cfg.HIRBlock;
-import jdk.compiler.graal.nodes.spi.VirtualizableAllocation;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.schedule.SchedulePhase;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeSourcePosition;
+import jdk.graal.compiler.graph.SourceLanguagePosition;
+import jdk.graal.compiler.nodes.IfNode;
+import jdk.graal.compiler.nodes.InvokeNode;
+import jdk.graal.compiler.nodes.LoopBeginNode;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.cfg.ControlFlowGraph;
+import jdk.graal.compiler.nodes.cfg.HIRBlock;
+import jdk.graal.compiler.nodes.spi.VirtualizableAllocation;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.schedule.SchedulePhase;
 
 import com.oracle.truffle.compiler.TruffleCompilable;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/GraphTooBigBailoutException.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/GraphTooBigBailoutException.java
similarity index 93%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/GraphTooBigBailoutException.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/GraphTooBigBailoutException.java
index d414a09ddc4b..e4073cbe82ab 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/GraphTooBigBailoutException.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/GraphTooBigBailoutException.java
@@ -22,9 +22,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle;
+package jdk.graal.compiler.truffle;
 
-import jdk.compiler.graal.core.common.PermanentBailoutException;
+import jdk.graal.compiler.core.common.PermanentBailoutException;
 
 @SuppressWarnings("serial")
 public final class GraphTooBigBailoutException extends PermanentBailoutException {
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/KnownTruffleTypes.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/KnownTruffleTypes.java
similarity index 99%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/KnownTruffleTypes.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/KnownTruffleTypes.java
index 02abe832de46..3c53d9cc5fcb 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/KnownTruffleTypes.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/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;
+package jdk.graal.compiler.truffle;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.ref.Reference;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/OWNERS.toml b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/OWNERS.toml
similarity index 100%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/OWNERS.toml
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/OWNERS.toml
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/PEAgnosticInlineInvokePlugin.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/PEAgnosticInlineInvokePlugin.java
similarity index 92%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/PEAgnosticInlineInvokePlugin.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/PEAgnosticInlineInvokePlugin.java
index 1b01c2049262..f81860227a54 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/PEAgnosticInlineInvokePlugin.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/PEAgnosticInlineInvokePlugin.java
@@ -22,17 +22,17 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle;
+package jdk.graal.compiler.truffle;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import org.graalvm.collections.EconomicSet;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.nodes.Invoke;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext;
-import jdk.compiler.graal.nodes.graphbuilderconf.InlineInvokePlugin;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.nodes.Invoke;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext;
+import jdk.graal.compiler.nodes.graphbuilderconf.InlineInvokePlugin;
 
 import jdk.vm.ci.meta.JavaConstant;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/ParsingInlineInvokePlugin.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/ParsingInlineInvokePlugin.java
similarity index 91%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/ParsingInlineInvokePlugin.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/ParsingInlineInvokePlugin.java
index 13c327ed23f3..e69e51d43126 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/ParsingInlineInvokePlugin.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/ParsingInlineInvokePlugin.java
@@ -22,14 +22,14 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle;
+package jdk.graal.compiler.truffle;
 
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext;
-import jdk.compiler.graal.nodes.graphbuilderconf.InlineInvokePlugin;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins;
-import jdk.compiler.graal.nodes.graphbuilderconf.LoopExplosionPlugin;
-import jdk.compiler.graal.replacements.ReplacementsImpl;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext;
+import jdk.graal.compiler.nodes.graphbuilderconf.InlineInvokePlugin;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins;
+import jdk.graal.compiler.nodes.graphbuilderconf.LoopExplosionPlugin;
+import jdk.graal.compiler.replacements.ReplacementsImpl;
 
 import jdk.vm.ci.meta.JavaConstant;
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/PartialEvaluator.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/PartialEvaluator.java
similarity index 92%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/PartialEvaluator.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/PartialEvaluator.java
index 2fc39d5d2598..de560cad7f67 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/PartialEvaluator.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/PartialEvaluator.java
@@ -22,48 +22,48 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle;
+package jdk.graal.compiler.truffle;
 
 import java.net.URI;
 import java.nio.Buffer;
 import java.util.function.Supplier;
 
-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 jdk.graal.compiler.truffle.phases.DeoptimizeOnExceptionPhase;
+import jdk.graal.compiler.truffle.phases.InstrumentPhase;
+import jdk.graal.compiler.truffle.substitutions.GraphBuilderInvocationPluginProvider;
+import jdk.graal.compiler.truffle.substitutions.TruffleGraphBuilderPlugins;
 import org.graalvm.collections.EconomicMap;
-import jdk.compiler.graal.core.common.type.StampPair;
-import jdk.compiler.graal.graph.Graph;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.SourceLanguagePosition;
-import jdk.compiler.graal.graph.SourceLanguagePositionProvider;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.DeoptimizeNode;
-import jdk.compiler.graal.nodes.EncodedGraph;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.calc.FloatingNode;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderTool;
-import jdk.compiler.graal.nodes.graphbuilderconf.InlineInvokePlugin;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins;
-import jdk.compiler.graal.nodes.graphbuilderconf.LoopExplosionPlugin;
-import jdk.compiler.graal.nodes.graphbuilderconf.NodePlugin;
-import jdk.compiler.graal.nodes.graphbuilderconf.ParameterPlugin;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.contract.NodeCostUtil;
-import jdk.compiler.graal.phases.util.Providers;
-import jdk.compiler.graal.replacements.CachingPEGraphDecoder;
-import jdk.compiler.graal.replacements.InlineDuringParsingPlugin;
-import jdk.compiler.graal.replacements.PEGraphDecoder;
-import jdk.compiler.graal.replacements.ReplacementsImpl;
-import jdk.compiler.graal.serviceprovider.GraalServices;
-import jdk.compiler.graal.serviceprovider.JavaVersionUtil;
-import jdk.compiler.graal.serviceprovider.SpeculationReasonGroup;
+import jdk.graal.compiler.core.common.type.StampPair;
+import jdk.graal.compiler.graph.Graph;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.SourceLanguagePosition;
+import jdk.graal.compiler.graph.SourceLanguagePositionProvider;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.DeoptimizeNode;
+import jdk.graal.compiler.nodes.EncodedGraph;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.calc.FloatingNode;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderTool;
+import jdk.graal.compiler.nodes.graphbuilderconf.InlineInvokePlugin;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins;
+import jdk.graal.compiler.nodes.graphbuilderconf.LoopExplosionPlugin;
+import jdk.graal.compiler.nodes.graphbuilderconf.NodePlugin;
+import jdk.graal.compiler.nodes.graphbuilderconf.ParameterPlugin;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.contract.NodeCostUtil;
+import jdk.graal.compiler.phases.util.Providers;
+import jdk.graal.compiler.replacements.CachingPEGraphDecoder;
+import jdk.graal.compiler.replacements.InlineDuringParsingPlugin;
+import jdk.graal.compiler.replacements.PEGraphDecoder;
+import jdk.graal.compiler.replacements.ReplacementsImpl;
+import jdk.graal.compiler.serviceprovider.GraalServices;
+import jdk.graal.compiler.serviceprovider.JavaVersionUtil;
+import jdk.graal.compiler.serviceprovider.SpeculationReasonGroup;
 
 import com.oracle.truffle.compiler.ConstantFieldInfo;
 import com.oracle.truffle.compiler.PartialEvaluationMethodInfo;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/PartialEvaluatorConfiguration.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/PartialEvaluatorConfiguration.java
similarity index 87%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/PartialEvaluatorConfiguration.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/PartialEvaluatorConfiguration.java
index cb2b3744044d..d38d73f6983c 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/PartialEvaluatorConfiguration.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/PartialEvaluatorConfiguration.java
@@ -22,13 +22,13 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle;
+package jdk.graal.compiler.truffle;
 
-import jdk.compiler.graal.truffle.substitutions.GraphDecoderInvocationPluginProvider;
+import jdk.graal.compiler.truffle.substitutions.GraphDecoderInvocationPluginProvider;
 import jdk.vm.ci.code.Architecture;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins;
-import jdk.compiler.graal.phases.util.Providers;
-import jdk.compiler.graal.serviceprovider.GraalServices;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins;
+import jdk.graal.compiler.phases.util.Providers;
+import jdk.graal.compiler.serviceprovider.GraalServices;
 
 public interface PartialEvaluatorConfiguration {
     /**
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/PerformanceInformationHandler.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/PerformanceInformationHandler.java
similarity index 94%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/PerformanceInformationHandler.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/PerformanceInformationHandler.java
index ce8dc65a31b3..0a5b2438cc13 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/PerformanceInformationHandler.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/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;
+package jdk.graal.compiler.truffle;
 
 import java.io.Closeable;
 import java.util.ArrayList;
@@ -33,23 +33,23 @@
 import java.util.Map;
 import java.util.Set;
 
-import jdk.compiler.graal.truffle.phases.TruffleTier;
+import jdk.graal.compiler.truffle.phases.TruffleTier;
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.Equivalence;
 import org.graalvm.collections.MapCursor;
-import jdk.compiler.graal.core.common.cfg.Loop;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.nodes.ControlSplitNode;
-import jdk.compiler.graal.nodes.ProfileData.ProfileSource;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.cfg.ControlFlowGraph;
-import jdk.compiler.graal.nodes.cfg.HIRBlock;
-import jdk.compiler.graal.nodes.java.InstanceOfNode;
-import jdk.compiler.graal.nodes.java.MethodCallTargetNode;
-import jdk.compiler.graal.nodes.util.GraphUtil;
-import jdk.compiler.graal.options.OptionValues;
+import jdk.graal.compiler.core.common.cfg.Loop;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.nodes.ControlSplitNode;
+import jdk.graal.compiler.nodes.ProfileData.ProfileSource;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.cfg.ControlFlowGraph;
+import jdk.graal.compiler.nodes.cfg.HIRBlock;
+import jdk.graal.compiler.nodes.java.InstanceOfNode;
+import jdk.graal.compiler.nodes.java.MethodCallTargetNode;
+import jdk.graal.compiler.nodes.util.GraphUtil;
+import jdk.graal.compiler.options.OptionValues;
 
 import com.oracle.truffle.compiler.TruffleCompilable;
 import com.oracle.truffle.compiler.TruffleCompilerRuntime;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/PostPartialEvaluationSuite.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/PostPartialEvaluationSuite.java
similarity index 80%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/PostPartialEvaluationSuite.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/PostPartialEvaluationSuite.java
index 2ce32cbacc3d..b1fa5ad404c0 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/PostPartialEvaluationSuite.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/PostPartialEvaluationSuite.java
@@ -22,20 +22,20 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle;
+package jdk.graal.compiler.truffle;
 
-import jdk.compiler.graal.loop.phases.ConvertDeoptimizeToGuardPhase;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.java.MethodCallTargetNode;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.BasePhase;
-import jdk.compiler.graal.phases.PhaseSuite;
-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.phases.FrameAccessVerificationPhase;
-import jdk.compiler.graal.truffle.phases.PhiTransformPhase;
-import jdk.compiler.graal.virtual.phases.ea.PartialEscapePhase;
+import jdk.graal.compiler.loop.phases.ConvertDeoptimizeToGuardPhase;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.java.MethodCallTargetNode;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.BasePhase;
+import jdk.graal.compiler.phases.PhaseSuite;
+import jdk.graal.compiler.phases.common.CanonicalizerPhase;
+import jdk.graal.compiler.phases.common.ConditionalEliminationPhase;
+import jdk.graal.compiler.phases.common.inlining.InliningUtil;
+import jdk.graal.compiler.truffle.phases.FrameAccessVerificationPhase;
+import jdk.graal.compiler.truffle.phases.PhiTransformPhase;
+import jdk.graal.compiler.virtual.phases.ea.PartialEscapePhase;
 
 public class PostPartialEvaluationSuite extends PhaseSuite {
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/SuppressFBWarnings.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/SuppressFBWarnings.java
similarity index 97%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/SuppressFBWarnings.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/SuppressFBWarnings.java
index 6528d372b1fc..bd1b443d1216 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/SuppressFBWarnings.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/SuppressFBWarnings.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle;
+package jdk.graal.compiler.truffle;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleAST.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/TruffleAST.java
similarity index 96%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleAST.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/TruffleAST.java
index 66458e589018..120ac3f5c63a 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleAST.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/TruffleAST.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle;
+package jdk.graal.compiler.truffle;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -31,15 +31,15 @@
 import java.util.List;
 import java.util.Map;
 
-import jdk.compiler.graal.debug.JavaMethodContext;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeSourcePosition;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.truffle.phases.inlining.CallNode;
-import jdk.compiler.graal.truffle.phases.inlining.CallTree;
-import jdk.compiler.graal.graphio.GraphBlocks;
-import jdk.compiler.graal.graphio.GraphStructure;
+import jdk.graal.compiler.debug.JavaMethodContext;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeSourcePosition;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.truffle.phases.inlining.CallNode;
+import jdk.graal.compiler.truffle.phases.inlining.CallTree;
+import jdk.graal.compiler.graphio.GraphBlocks;
+import jdk.graal.compiler.graphio.GraphStructure;
 
 import com.oracle.truffle.compiler.ConstantFieldInfo;
 import com.oracle.truffle.compiler.TruffleCompilable;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleCompilation.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/TruffleCompilation.java
similarity index 95%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleCompilation.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/TruffleCompilation.java
index a0a47db69427..84234433029e 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleCompilation.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/TruffleCompilation.java
@@ -22,13 +22,13 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle;
+package jdk.graal.compiler.truffle;
 
 import java.util.function.Consumer;
 
-import jdk.compiler.graal.debug.LogStream;
-import jdk.compiler.graal.debug.TTY;
-import jdk.compiler.graal.nodes.StructuredGraph;
+import jdk.graal.compiler.debug.LogStream;
+import jdk.graal.compiler.debug.TTY;
+import jdk.graal.compiler.nodes.StructuredGraph;
 
 import com.oracle.truffle.compiler.TruffleCompilable;
 import com.oracle.truffle.compiler.TruffleCompilationTask;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleCompilationIdentifier.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/TruffleCompilationIdentifier.java
similarity index 93%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleCompilationIdentifier.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/TruffleCompilationIdentifier.java
index 883a02da2944..e5e480242c1c 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleCompilationIdentifier.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/TruffleCompilationIdentifier.java
@@ -22,9 +22,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle;
+package jdk.graal.compiler.truffle;
 
-import jdk.compiler.graal.core.common.CompilationIdentifier;
+import jdk.graal.compiler.core.common.CompilationIdentifier;
 
 import com.oracle.truffle.compiler.TruffleCompilable;
 import com.oracle.truffle.compiler.TruffleCompilationTask;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleCompilerConfiguration.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/TruffleCompilerConfiguration.java
similarity index 93%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleCompilerConfiguration.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/TruffleCompilerConfiguration.java
index 64ca3bed960d..4ca4aba8fe44 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleCompilerConfiguration.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/TruffleCompilerConfiguration.java
@@ -22,15 +22,15 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle;
+package jdk.graal.compiler.truffle;
 
 import java.util.Arrays;
 import java.util.List;
 
-import jdk.compiler.graal.api.replacements.SnippetReflectionProvider;
-import jdk.compiler.graal.core.target.Backend;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration;
-import jdk.compiler.graal.phases.tiers.Suites;
+import jdk.graal.compiler.api.replacements.SnippetReflectionProvider;
+import jdk.graal.compiler.core.target.Backend;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
+import jdk.graal.compiler.phases.tiers.Suites;
 
 import com.oracle.truffle.compiler.TruffleCompilerRuntime;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleCompilerImpl.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/TruffleCompilerImpl.java
similarity index 92%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleCompilerImpl.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/TruffleCompilerImpl.java
index 1b3643777658..31950828579a 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleCompilerImpl.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/TruffleCompilerImpl.java
@@ -22,16 +22,16 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle;
+package jdk.graal.compiler.truffle;
 
 import static jdk.vm.ci.runtime.JVMCICompiler.INVOCATION_ENTRY_BCI;
-import static jdk.compiler.graal.core.CompilationWrapper.ExceptionAction.Diagnose;
-import static jdk.compiler.graal.core.common.CompilationRequestIdentifier.asCompilationRequest;
-import static jdk.compiler.graal.phases.OptimisticOptimizations.ALL;
-import static jdk.compiler.graal.phases.OptimisticOptimizations.Optimization.RemoveNeverExecutedCode;
-import static jdk.compiler.graal.phases.OptimisticOptimizations.Optimization.UseExceptionProbability;
-import static jdk.compiler.graal.phases.OptimisticOptimizations.Optimization.UseTypeCheckHints;
-import static jdk.compiler.graal.phases.OptimisticOptimizations.Optimization.UseTypeCheckedInlining;
+import static jdk.graal.compiler.core.CompilationWrapper.ExceptionAction.Diagnose;
+import static jdk.graal.compiler.core.common.CompilationRequestIdentifier.asCompilationRequest;
+import static jdk.graal.compiler.phases.OptimisticOptimizations.ALL;
+import static jdk.graal.compiler.phases.OptimisticOptimizations.Optimization.RemoveNeverExecutedCode;
+import static jdk.graal.compiler.phases.OptimisticOptimizations.Optimization.UseExceptionProbability;
+import static jdk.graal.compiler.phases.OptimisticOptimizations.Optimization.UseTypeCheckHints;
+import static jdk.graal.compiler.phases.OptimisticOptimizations.Optimization.UseTypeCheckedInlining;
 
 import java.io.PrintStream;
 import java.util.ArrayList;
@@ -41,55 +41,55 @@
 import java.util.Map;
 import java.util.function.Consumer;
 
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.truffle.nodes.AnyExtendNode;
-import jdk.compiler.graal.truffle.nodes.TruffleAssumption;
-import jdk.compiler.graal.truffle.phases.InstrumentPhase;
-import jdk.compiler.graal.truffle.phases.InstrumentationSuite;
-import jdk.compiler.graal.truffle.phases.TruffleTier;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.truffle.nodes.AnyExtendNode;
+import jdk.graal.compiler.truffle.nodes.TruffleAssumption;
+import jdk.graal.compiler.truffle.phases.InstrumentPhase;
+import jdk.graal.compiler.truffle.phases.InstrumentationSuite;
+import jdk.graal.compiler.truffle.phases.TruffleTier;
 import org.graalvm.collections.EconomicMap;
-import jdk.compiler.graal.api.replacements.SnippetReflectionProvider;
-import jdk.compiler.graal.code.CompilationResult;
-import jdk.compiler.graal.core.CompilationPrinter;
-import jdk.compiler.graal.core.CompilationWatchDog;
-import jdk.compiler.graal.core.CompilationWrapper;
-import jdk.compiler.graal.core.CompilationWrapper.ExceptionAction;
-import jdk.compiler.graal.core.GraalCompiler;
-import jdk.compiler.graal.core.common.CompilationIdentifier;
-import jdk.compiler.graal.core.common.CompilationIdentifier.Verbosity;
-import jdk.compiler.graal.core.common.RetryableBailoutException;
-import jdk.compiler.graal.core.common.util.CompilationAlarm;
-import jdk.compiler.graal.core.target.Backend;
-import jdk.compiler.graal.debug.DebugCloseable;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.debug.DebugContext.Builder;
-import jdk.compiler.graal.debug.DebugContext.Scope;
-import jdk.compiler.graal.debug.DebugDumpScope;
-import jdk.compiler.graal.debug.DiagnosticsOutputDirectory;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.debug.Indent;
-import jdk.compiler.graal.debug.LogStream;
-import jdk.compiler.graal.debug.MemUseTrackerKey;
-import jdk.compiler.graal.debug.TTY;
-import jdk.compiler.graal.debug.TimerKey;
-import jdk.compiler.graal.lir.asm.CompilationResultBuilderFactory;
-import jdk.compiler.graal.lir.phases.LIRSuites;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.calc.ZeroExtendNode;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration.BytecodeExceptionMode;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
-import jdk.compiler.graal.options.OptionDescriptor;
-import jdk.compiler.graal.options.OptionKey;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.options.OptionsParser;
-import jdk.compiler.graal.phases.OptimisticOptimizations;
-import jdk.compiler.graal.phases.PhaseSuite;
-import jdk.compiler.graal.phases.tiers.HighTierContext;
-import jdk.compiler.graal.phases.tiers.Suites;
-import jdk.compiler.graal.phases.util.Providers;
-import jdk.compiler.graal.serviceprovider.GraalServices;
+import jdk.graal.compiler.api.replacements.SnippetReflectionProvider;
+import jdk.graal.compiler.code.CompilationResult;
+import jdk.graal.compiler.core.CompilationPrinter;
+import jdk.graal.compiler.core.CompilationWatchDog;
+import jdk.graal.compiler.core.CompilationWrapper;
+import jdk.graal.compiler.core.CompilationWrapper.ExceptionAction;
+import jdk.graal.compiler.core.GraalCompiler;
+import jdk.graal.compiler.core.common.CompilationIdentifier;
+import jdk.graal.compiler.core.common.CompilationIdentifier.Verbosity;
+import jdk.graal.compiler.core.common.RetryableBailoutException;
+import jdk.graal.compiler.core.common.util.CompilationAlarm;
+import jdk.graal.compiler.core.target.Backend;
+import jdk.graal.compiler.debug.DebugCloseable;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.debug.DebugContext.Builder;
+import jdk.graal.compiler.debug.DebugContext.Scope;
+import jdk.graal.compiler.debug.DebugDumpScope;
+import jdk.graal.compiler.debug.DiagnosticsOutputDirectory;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.debug.Indent;
+import jdk.graal.compiler.debug.LogStream;
+import jdk.graal.compiler.debug.MemUseTrackerKey;
+import jdk.graal.compiler.debug.TTY;
+import jdk.graal.compiler.debug.TimerKey;
+import jdk.graal.compiler.lir.asm.CompilationResultBuilderFactory;
+import jdk.graal.compiler.lir.phases.LIRSuites;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.calc.ZeroExtendNode;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.BytecodeExceptionMode;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
+import jdk.graal.compiler.options.OptionDescriptor;
+import jdk.graal.compiler.options.OptionKey;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.options.OptionsParser;
+import jdk.graal.compiler.phases.OptimisticOptimizations;
+import jdk.graal.compiler.phases.PhaseSuite;
+import jdk.graal.compiler.phases.tiers.HighTierContext;
+import jdk.graal.compiler.phases.tiers.Suites;
+import jdk.graal.compiler.phases.util.Providers;
+import jdk.graal.compiler.serviceprovider.GraalServices;
 
 import com.oracle.truffle.compiler.OptimizedAssumptionDependency;
 import com.oracle.truffle.compiler.TruffleCompilable;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleCompilerOptions.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/TruffleCompilerOptions.java
similarity index 97%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleCompilerOptions.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/TruffleCompilerOptions.java
index 480d3b484fc5..b28675a45b8e 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleCompilerOptions.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/TruffleCompilerOptions.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle;
+package jdk.graal.compiler.truffle;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -31,14 +31,14 @@
 import java.util.Set;
 
 import org.graalvm.collections.EconomicMap;
-import jdk.compiler.graal.core.common.GraalOptions;
-import jdk.compiler.graal.options.Option;
-import jdk.compiler.graal.options.OptionDescriptor;
-import jdk.compiler.graal.options.OptionGroup;
-import jdk.compiler.graal.options.OptionKey;
-import jdk.compiler.graal.options.OptionType;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.options.OptionsParser;
+import jdk.graal.compiler.core.common.GraalOptions;
+import jdk.graal.compiler.options.Option;
+import jdk.graal.compiler.options.OptionDescriptor;
+import jdk.graal.compiler.options.OptionGroup;
+import jdk.graal.compiler.options.OptionKey;
+import jdk.graal.compiler.options.OptionType;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.options.OptionsParser;
 
 import com.oracle.truffle.compiler.TruffleCompilerOptionDescriptor;
 import com.oracle.truffle.compiler.TruffleCompilerOptionDescriptor.Type;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleConstantFieldProvider.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/TruffleConstantFieldProvider.java
similarity index 97%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleConstantFieldProvider.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/TruffleConstantFieldProvider.java
index 687a4bdd3a2e..376bacead4d5 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleConstantFieldProvider.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/TruffleConstantFieldProvider.java
@@ -22,9 +22,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle;
+package jdk.graal.compiler.truffle;
 
-import jdk.compiler.graal.core.common.spi.ConstantFieldProvider;
+import jdk.graal.compiler.core.common.spi.ConstantFieldProvider;
 
 import com.oracle.truffle.compiler.ConstantFieldInfo;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleDebugHandlersFactory.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/TruffleDebugHandlersFactory.java
similarity index 84%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleDebugHandlersFactory.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/TruffleDebugHandlersFactory.java
index 49ce4bc2d731..66809577641f 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleDebugHandlersFactory.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/TruffleDebugHandlersFactory.java
@@ -22,22 +22,22 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle;
+package jdk.graal.compiler.truffle;
 
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.debug.DebugDumpHandler;
-import jdk.compiler.graal.debug.DebugHandler;
-import jdk.compiler.graal.debug.DebugHandlersFactory;
-import jdk.compiler.graal.debug.DebugOptions;
-import jdk.compiler.graal.debug.DebugOptions.PrintGraphTarget;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.serviceprovider.ServiceProvider;
-import jdk.compiler.graal.graphio.GraphOutput;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.debug.DebugDumpHandler;
+import jdk.graal.compiler.debug.DebugHandler;
+import jdk.graal.compiler.debug.DebugHandlersFactory;
+import jdk.graal.compiler.debug.DebugOptions;
+import jdk.graal.compiler.debug.DebugOptions.PrintGraphTarget;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.serviceprovider.ServiceProvider;
+import jdk.graal.compiler.graphio.GraphOutput;
 
 @ServiceProvider(DebugHandlersFactory.class)
 public class TruffleDebugHandlersFactory implements DebugHandlersFactory {
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleDebugJavaMethod.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/TruffleDebugJavaMethod.java
similarity index 99%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleDebugJavaMethod.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/TruffleDebugJavaMethod.java
index e6f7dc59927f..24ad470cb4b0 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleDebugJavaMethod.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/TruffleDebugJavaMethod.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle;
+package jdk.graal.compiler.truffle;
 
 import com.oracle.truffle.compiler.TruffleCompilable;
 import com.oracle.truffle.compiler.TruffleCompilationTask;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleElementCache.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/TruffleElementCache.java
similarity index 96%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleElementCache.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/TruffleElementCache.java
index 0c3690b3d498..6e5d0a216d2f 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleElementCache.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/TruffleElementCache.java
@@ -22,13 +22,13 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle;
+package jdk.graal.compiler.truffle;
 
 import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import jdk.compiler.graal.core.common.util.MethodKey;
+import jdk.graal.compiler.core.common.util.MethodKey;
 
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleInliningScope.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/TruffleInliningScope.java
similarity index 93%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleInliningScope.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/TruffleInliningScope.java
index ae471204ae3f..6511bbce5d64 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleInliningScope.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/TruffleInliningScope.java
@@ -22,13 +22,13 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle;
+package jdk.graal.compiler.truffle;
 
 import java.io.Closeable;
 
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.truffle.phases.inlining.CallTree;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.truffle.phases.inlining.CallTree;
 
 /**
  * Scope class intended to capture the inlined call tree during dumping. This scope has no effect if
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleStringConstantFieldProvider.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/TruffleStringConstantFieldProvider.java
similarity index 97%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleStringConstantFieldProvider.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/TruffleStringConstantFieldProvider.java
index 53d7fc1800de..1f88a3691066 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleStringConstantFieldProvider.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/TruffleStringConstantFieldProvider.java
@@ -22,10 +22,10 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle;
+package jdk.graal.compiler.truffle;
 
-import jdk.compiler.graal.core.common.spi.ConstantFieldProvider;
-import jdk.compiler.graal.phases.util.Providers;
+import jdk.graal.compiler.core.common.spi.ConstantFieldProvider;
+import jdk.graal.compiler.phases.util.Providers;
 
 import jdk.vm.ci.meta.JavaConstant;
 import jdk.vm.ci.meta.MetaAccessProvider;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleTierConfiguration.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/TruffleTierConfiguration.java
similarity index 89%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleTierConfiguration.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/TruffleTierConfiguration.java
index de1a6c26b711..493f6ea5a207 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleTierConfiguration.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/TruffleTierConfiguration.java
@@ -22,14 +22,14 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle;
+package jdk.graal.compiler.truffle;
 
-import jdk.compiler.graal.core.target.Backend;
-import jdk.compiler.graal.lir.phases.LIRSuites;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.tiers.Suites;
-import jdk.compiler.graal.phases.util.Providers;
-import jdk.compiler.graal.truffle.phases.TruffleCompilerPhases;
+import jdk.graal.compiler.core.target.Backend;
+import jdk.graal.compiler.lir.phases.LIRSuites;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.tiers.Suites;
+import jdk.graal.compiler.phases.util.Providers;
+import jdk.graal.compiler.truffle.phases.TruffleCompilerPhases;
 
 public final class TruffleTierConfiguration {
     private final PartialEvaluatorConfiguration configuration;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleTierContext.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/TruffleTierContext.java
similarity index 91%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleTierContext.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/TruffleTierContext.java
index 1f7b9221fbe4..eb67685d9d4e 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleTierContext.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/TruffleTierContext.java
@@ -22,21 +22,21 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle;
+package jdk.graal.compiler.truffle;
 
 import java.util.Objects;
 
-import jdk.compiler.graal.core.common.CompilationIdentifier;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.nodes.Cancellable;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.OptimisticOptimizations;
-import jdk.compiler.graal.phases.PhaseSuite;
-import jdk.compiler.graal.phases.tiers.HighTierContext;
-import jdk.compiler.graal.phases.util.Providers;
-import jdk.compiler.graal.truffle.nodes.TruffleAssumption;
+import jdk.graal.compiler.core.common.CompilationIdentifier;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.nodes.Cancellable;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.OptimisticOptimizations;
+import jdk.graal.compiler.phases.PhaseSuite;
+import jdk.graal.compiler.phases.tiers.HighTierContext;
+import jdk.graal.compiler.phases.util.Providers;
+import jdk.graal.compiler.truffle.nodes.TruffleAssumption;
 
 import com.oracle.truffle.compiler.TruffleCompilable;
 import com.oracle.truffle.compiler.TruffleCompilationTask;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/host/HostInliningPhase.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/host/HostInliningPhase.java
similarity index 96%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/host/HostInliningPhase.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/host/HostInliningPhase.java
index 03b35b52b5c7..919efa168ee7 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/host/HostInliningPhase.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/host/HostInliningPhase.java
@@ -22,10 +22,10 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.host;
+package jdk.graal.compiler.truffle.host;
 
-import static jdk.compiler.graal.core.common.GraalOptions.Intrinsify;
-import static jdk.compiler.graal.phases.common.DeadCodeEliminationPhase.Optionality.Optional;
+import static jdk.graal.compiler.core.common.GraalOptions.Intrinsify;
+import static jdk.graal.compiler.phases.common.DeadCodeEliminationPhase.Optionality.Optional;
 
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
@@ -41,45 +41,45 @@
 import org.graalvm.collections.EconomicSet;
 import org.graalvm.collections.Equivalence;
 import org.graalvm.collections.UnmodifiableEconomicMap;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.core.phases.HighTier;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.nodes.AbstractBeginNode;
-import jdk.compiler.graal.nodes.AbstractEndNode;
-import jdk.compiler.graal.nodes.CallTargetNode.InvokeKind;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.FixedGuardNode;
-import jdk.compiler.graal.nodes.FixedNode;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.IfNode;
-import jdk.compiler.graal.nodes.Invoke;
-import jdk.compiler.graal.nodes.LogicNode;
-import jdk.compiler.graal.nodes.LoopEndNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ParameterNode;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.UnwindNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.cfg.ControlFlowGraph;
-import jdk.compiler.graal.nodes.cfg.HIRBlock;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext;
-import jdk.compiler.graal.nodes.graphbuilderconf.InlineInvokePlugin;
-import jdk.compiler.graal.nodes.java.MethodCallTargetNode;
-import jdk.compiler.graal.options.Option;
-import jdk.compiler.graal.options.OptionKey;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.BasePhase;
-import jdk.compiler.graal.phases.OptimisticOptimizations;
-import jdk.compiler.graal.phases.common.AbstractInliningPhase;
-import jdk.compiler.graal.phases.common.CanonicalizerPhase;
-import jdk.compiler.graal.phases.common.DeadCodeEliminationPhase;
-import jdk.compiler.graal.phases.common.inlining.InliningUtil;
-import jdk.compiler.graal.phases.contract.NodeCostUtil;
-import jdk.compiler.graal.phases.tiers.HighTierContext;
-import jdk.compiler.graal.truffle.KnownTruffleTypes;
-import jdk.compiler.graal.truffle.PartialEvaluator;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.core.phases.HighTier;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.nodes.AbstractBeginNode;
+import jdk.graal.compiler.nodes.AbstractEndNode;
+import jdk.graal.compiler.nodes.CallTargetNode.InvokeKind;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.FixedGuardNode;
+import jdk.graal.compiler.nodes.FixedNode;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.IfNode;
+import jdk.graal.compiler.nodes.Invoke;
+import jdk.graal.compiler.nodes.LogicNode;
+import jdk.graal.compiler.nodes.LoopEndNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ParameterNode;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.UnwindNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.cfg.ControlFlowGraph;
+import jdk.graal.compiler.nodes.cfg.HIRBlock;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext;
+import jdk.graal.compiler.nodes.graphbuilderconf.InlineInvokePlugin;
+import jdk.graal.compiler.nodes.java.MethodCallTargetNode;
+import jdk.graal.compiler.options.Option;
+import jdk.graal.compiler.options.OptionKey;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.BasePhase;
+import jdk.graal.compiler.phases.OptimisticOptimizations;
+import jdk.graal.compiler.phases.common.AbstractInliningPhase;
+import jdk.graal.compiler.phases.common.CanonicalizerPhase;
+import jdk.graal.compiler.phases.common.DeadCodeEliminationPhase;
+import jdk.graal.compiler.phases.common.inlining.InliningUtil;
+import jdk.graal.compiler.phases.contract.NodeCostUtil;
+import jdk.graal.compiler.phases.tiers.HighTierContext;
+import jdk.graal.compiler.truffle.KnownTruffleTypes;
+import jdk.graal.compiler.truffle.PartialEvaluator;
 
 import com.oracle.truffle.compiler.HostMethodInfo;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/host/InjectImmutableFrameFieldsPhase.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/host/InjectImmutableFrameFieldsPhase.java
similarity index 86%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/host/InjectImmutableFrameFieldsPhase.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/host/InjectImmutableFrameFieldsPhase.java
index 8cadbe4b3366..c73828646e92 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/host/InjectImmutableFrameFieldsPhase.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/host/InjectImmutableFrameFieldsPhase.java
@@ -22,18 +22,18 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.host;
+package jdk.graal.compiler.truffle.host;
 
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.java.LoadFieldNode;
-import jdk.compiler.graal.options.Option;
-import jdk.compiler.graal.options.OptionKey;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.BasePhase;
-import jdk.compiler.graal.phases.PhaseSuite;
-import jdk.compiler.graal.phases.common.HighTierLoweringPhase;
-import jdk.compiler.graal.phases.tiers.HighTierContext;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.java.LoadFieldNode;
+import jdk.graal.compiler.options.Option;
+import jdk.graal.compiler.options.OptionKey;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.BasePhase;
+import jdk.graal.compiler.phases.PhaseSuite;
+import jdk.graal.compiler.phases.common.HighTierLoweringPhase;
+import jdk.graal.compiler.phases.tiers.HighTierContext;
 
 import jdk.vm.ci.meta.ResolvedJavaField;
 import jdk.vm.ci.meta.ResolvedJavaType;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/host/TruffleHostEnvironment.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/host/TruffleHostEnvironment.java
similarity index 96%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/host/TruffleHostEnvironment.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/host/TruffleHostEnvironment.java
index 775ca9c98ce2..42951a1ad830 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/host/TruffleHostEnvironment.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/host/TruffleHostEnvironment.java
@@ -22,12 +22,12 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.host;
+package jdk.graal.compiler.truffle.host;
 
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.serviceprovider.GraalServices;
-import jdk.compiler.graal.truffle.TruffleCompilerConfiguration;
-import jdk.compiler.graal.truffle.TruffleCompilerImpl;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.serviceprovider.GraalServices;
+import jdk.graal.compiler.truffle.TruffleCompilerConfiguration;
+import jdk.graal.compiler.truffle.TruffleCompilerImpl;
 
 import com.oracle.truffle.compiler.HostMethodInfo;
 import com.oracle.truffle.compiler.TruffleCompilable;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/host/TruffleKnownHostTypes.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/host/TruffleKnownHostTypes.java
similarity index 96%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/host/TruffleKnownHostTypes.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/host/TruffleKnownHostTypes.java
index 1df5619ca13d..d7f22476ab24 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/host/TruffleKnownHostTypes.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/host/TruffleKnownHostTypes.java
@@ -22,10 +22,10 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.host;
+package jdk.graal.compiler.truffle.host;
 
-import jdk.compiler.graal.truffle.AbstractKnownTruffleTypes;
-import jdk.compiler.graal.truffle.KnownTruffleTypes;
+import jdk.graal.compiler.truffle.AbstractKnownTruffleTypes;
+import jdk.graal.compiler.truffle.KnownTruffleTypes;
 
 import com.oracle.truffle.compiler.TruffleCompilerRuntime;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/HotSpotKnownTruffleTypes.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/hotspot/HotSpotKnownTruffleTypes.java
similarity index 96%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/HotSpotKnownTruffleTypes.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/hotspot/HotSpotKnownTruffleTypes.java
index b0e325fd23b7..a4dc2339beb6 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/HotSpotKnownTruffleTypes.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/hotspot/HotSpotKnownTruffleTypes.java
@@ -22,12 +22,12 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.hotspot;
+package jdk.graal.compiler.truffle.hotspot;
 
 import java.lang.ref.SoftReference;
 import java.lang.ref.WeakReference;
 
-import jdk.compiler.graal.truffle.KnownTruffleTypes;
+import jdk.graal.compiler.truffle.KnownTruffleTypes;
 
 import com.oracle.truffle.compiler.TruffleCompilerRuntime;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/HotSpotPartialEvaluator.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/hotspot/HotSpotPartialEvaluator.java
similarity index 92%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/HotSpotPartialEvaluator.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/hotspot/HotSpotPartialEvaluator.java
index 0af1bf1237f5..ffef4c899bcb 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/HotSpotPartialEvaluator.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/hotspot/HotSpotPartialEvaluator.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.hotspot;
+package jdk.graal.compiler.truffle.hotspot;
 
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
@@ -30,16 +30,16 @@
 import java.util.function.Supplier;
 
 import org.graalvm.collections.EconomicMap;
-import jdk.compiler.graal.core.common.util.FieldKey;
-import jdk.compiler.graal.core.common.util.MethodKey;
-import jdk.compiler.graal.hotspot.HotSpotGraalServices;
-import jdk.compiler.graal.nodes.EncodedGraph;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.truffle.PartialEvaluator;
-import jdk.compiler.graal.truffle.TruffleCompilerConfiguration;
-import jdk.compiler.graal.truffle.TruffleElementCache;
+import jdk.graal.compiler.core.common.util.FieldKey;
+import jdk.graal.compiler.core.common.util.MethodKey;
+import jdk.graal.compiler.hotspot.HotSpotGraalServices;
+import jdk.graal.compiler.nodes.EncodedGraph;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.truffle.PartialEvaluator;
+import jdk.graal.compiler.truffle.TruffleCompilerConfiguration;
+import jdk.graal.compiler.truffle.TruffleElementCache;
 
 import com.oracle.truffle.compiler.ConstantFieldInfo;
 import com.oracle.truffle.compiler.PartialEvaluationMethodInfo;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/HotSpotTruffleCompilationIdentifier.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/hotspot/HotSpotTruffleCompilationIdentifier.java
similarity index 93%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/HotSpotTruffleCompilationIdentifier.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/hotspot/HotSpotTruffleCompilationIdentifier.java
index e5d5dca32470..3dfd6a1d9758 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/HotSpotTruffleCompilationIdentifier.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/hotspot/HotSpotTruffleCompilationIdentifier.java
@@ -22,10 +22,10 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.hotspot;
+package jdk.graal.compiler.truffle.hotspot;
 
-import jdk.compiler.graal.hotspot.HotSpotCompilationIdentifier;
-import jdk.compiler.graal.truffle.TruffleCompilationIdentifier;
+import jdk.graal.compiler.hotspot.HotSpotCompilationIdentifier;
+import jdk.graal.compiler.truffle.TruffleCompilationIdentifier;
 
 import com.oracle.truffle.compiler.TruffleCompilable;
 import com.oracle.truffle.compiler.TruffleCompilationTask;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/HotSpotTruffleCompilationSupport.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/hotspot/HotSpotTruffleCompilationSupport.java
similarity index 91%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/HotSpotTruffleCompilationSupport.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/hotspot/HotSpotTruffleCompilationSupport.java
index 243de5a744ab..203db6654c7a 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/HotSpotTruffleCompilationSupport.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/hotspot/HotSpotTruffleCompilationSupport.java
@@ -22,12 +22,12 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.hotspot;
+package jdk.graal.compiler.truffle.hotspot;
 
-import jdk.compiler.graal.hotspot.CompilerConfigurationFactory;
-import jdk.compiler.graal.hotspot.HotSpotGraalOptionValues;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.truffle.AbstractTruffleCompilationSupport;
+import jdk.graal.compiler.hotspot.CompilerConfigurationFactory;
+import jdk.graal.compiler.hotspot.HotSpotGraalOptionValues;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.truffle.AbstractTruffleCompilationSupport;
 
 import com.oracle.truffle.compiler.TruffleCompiler;
 import com.oracle.truffle.compiler.TruffleCompilerRuntime;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/HotSpotTruffleCompilerImpl.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/hotspot/HotSpotTruffleCompilerImpl.java
similarity index 86%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/HotSpotTruffleCompilerImpl.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/hotspot/HotSpotTruffleCompilerImpl.java
index 0f884857dea2..e74ae619b2c6 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/HotSpotTruffleCompilerImpl.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/hotspot/HotSpotTruffleCompilerImpl.java
@@ -22,11 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.hotspot;
+package jdk.graal.compiler.truffle.hotspot;
 
-import static jdk.compiler.graal.core.GraalCompiler.compileGraph;
-import static jdk.compiler.graal.debug.DebugOptions.DebugStubsAndSnippets;
-import static jdk.compiler.graal.hotspot.meta.HotSpotSuitesProvider.withNodeSourcePosition;
+import static jdk.graal.compiler.core.GraalCompiler.compileGraph;
+import static jdk.graal.compiler.debug.DebugOptions.DebugStubsAndSnippets;
+import static jdk.graal.compiler.hotspot.meta.HotSpotSuitesProvider.withNodeSourcePosition;
 
 import java.io.PrintStream;
 import java.util.ArrayList;
@@ -34,60 +34,60 @@
 import java.util.ListIterator;
 import java.util.Map;
 
-import jdk.compiler.graal.api.replacements.SnippetReflectionProvider;
-import jdk.compiler.graal.api.runtime.GraalJVMCICompiler;
-import jdk.compiler.graal.code.CompilationResult;
-import jdk.compiler.graal.core.CompilationWrapper.ExceptionAction;
-import jdk.compiler.graal.core.common.CompilationIdentifier;
-import jdk.compiler.graal.core.target.Backend;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.debug.DebugContext.Activation;
-import jdk.compiler.graal.debug.DebugHandlersFactory;
-import jdk.compiler.graal.debug.DiagnosticsOutputDirectory;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.hotspot.CompilerConfigurationFactory;
-import jdk.compiler.graal.hotspot.EconomyCompilerConfigurationFactory;
-import jdk.compiler.graal.hotspot.HotSpotBackend;
-import jdk.compiler.graal.hotspot.HotSpotBackendFactory;
-import jdk.compiler.graal.hotspot.HotSpotCompilationIdentifier;
-import jdk.compiler.graal.hotspot.HotSpotCompiledCodeBuilder;
-import jdk.compiler.graal.hotspot.HotSpotGraalCompilerFactory;
-import jdk.compiler.graal.hotspot.HotSpotGraalOptionValues;
-import jdk.compiler.graal.hotspot.HotSpotGraalRuntimeProvider;
-import jdk.compiler.graal.hotspot.HotSpotGraalServices;
-import jdk.compiler.graal.hotspot.HotSpotGraphBuilderInstance;
-import jdk.compiler.graal.hotspot.meta.HotSpotLoweringProvider;
-import jdk.compiler.graal.java.GraphBuilderPhase;
-import jdk.compiler.graal.lir.asm.CompilationResultBuilderFactory;
-import jdk.compiler.graal.lir.asm.EntryPointDecorator;
-import jdk.compiler.graal.lir.phases.LIRSuites;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins;
-import jdk.compiler.graal.options.Option;
-import jdk.compiler.graal.options.OptionKey;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.BasePhase;
-import jdk.compiler.graal.phases.OptimisticOptimizations;
-import jdk.compiler.graal.phases.PhaseSuite;
-import jdk.compiler.graal.phases.Speculative;
-import jdk.compiler.graal.phases.common.AbstractInliningPhase;
-import jdk.compiler.graal.phases.tiers.CompilerConfiguration;
-import jdk.compiler.graal.phases.tiers.HighTierContext;
-import jdk.compiler.graal.phases.tiers.Suites;
-import jdk.compiler.graal.phases.tiers.SuitesProvider;
-import jdk.compiler.graal.phases.util.Providers;
-import jdk.compiler.graal.printer.GraalDebugHandlersFactory;
-import jdk.compiler.graal.serviceprovider.GraalServices;
-import jdk.compiler.graal.truffle.host.InjectImmutableFrameFieldsPhase;
-import jdk.compiler.graal.truffle.PartialEvaluatorConfiguration;
-import jdk.compiler.graal.truffle.TruffleCompilationIdentifier;
-import jdk.compiler.graal.truffle.TruffleCompilerConfiguration;
-import jdk.compiler.graal.truffle.TruffleCompilerImpl;
-import jdk.compiler.graal.truffle.TruffleTierConfiguration;
-import jdk.compiler.graal.truffle.host.HostInliningPhase;
+import jdk.graal.compiler.api.replacements.SnippetReflectionProvider;
+import jdk.graal.compiler.api.runtime.GraalJVMCICompiler;
+import jdk.graal.compiler.code.CompilationResult;
+import jdk.graal.compiler.core.CompilationWrapper.ExceptionAction;
+import jdk.graal.compiler.core.common.CompilationIdentifier;
+import jdk.graal.compiler.core.target.Backend;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.debug.DebugContext.Activation;
+import jdk.graal.compiler.debug.DebugHandlersFactory;
+import jdk.graal.compiler.debug.DiagnosticsOutputDirectory;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.hotspot.CompilerConfigurationFactory;
+import jdk.graal.compiler.hotspot.EconomyCompilerConfigurationFactory;
+import jdk.graal.compiler.hotspot.HotSpotBackend;
+import jdk.graal.compiler.hotspot.HotSpotBackendFactory;
+import jdk.graal.compiler.hotspot.HotSpotCompilationIdentifier;
+import jdk.graal.compiler.hotspot.HotSpotCompiledCodeBuilder;
+import jdk.graal.compiler.hotspot.HotSpotGraalCompilerFactory;
+import jdk.graal.compiler.hotspot.HotSpotGraalOptionValues;
+import jdk.graal.compiler.hotspot.HotSpotGraalRuntimeProvider;
+import jdk.graal.compiler.hotspot.HotSpotGraalServices;
+import jdk.graal.compiler.hotspot.HotSpotGraphBuilderInstance;
+import jdk.graal.compiler.hotspot.meta.HotSpotLoweringProvider;
+import jdk.graal.compiler.java.GraphBuilderPhase;
+import jdk.graal.compiler.lir.asm.CompilationResultBuilderFactory;
+import jdk.graal.compiler.lir.asm.EntryPointDecorator;
+import jdk.graal.compiler.lir.phases.LIRSuites;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.StructuredGraph.AllowAssumptions;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins;
+import jdk.graal.compiler.options.Option;
+import jdk.graal.compiler.options.OptionKey;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.BasePhase;
+import jdk.graal.compiler.phases.OptimisticOptimizations;
+import jdk.graal.compiler.phases.PhaseSuite;
+import jdk.graal.compiler.phases.Speculative;
+import jdk.graal.compiler.phases.common.AbstractInliningPhase;
+import jdk.graal.compiler.phases.tiers.CompilerConfiguration;
+import jdk.graal.compiler.phases.tiers.HighTierContext;
+import jdk.graal.compiler.phases.tiers.Suites;
+import jdk.graal.compiler.phases.tiers.SuitesProvider;
+import jdk.graal.compiler.phases.util.Providers;
+import jdk.graal.compiler.printer.GraalDebugHandlersFactory;
+import jdk.graal.compiler.serviceprovider.GraalServices;
+import jdk.graal.compiler.truffle.host.InjectImmutableFrameFieldsPhase;
+import jdk.graal.compiler.truffle.PartialEvaluatorConfiguration;
+import jdk.graal.compiler.truffle.TruffleCompilationIdentifier;
+import jdk.graal.compiler.truffle.TruffleCompilerConfiguration;
+import jdk.graal.compiler.truffle.TruffleCompilerImpl;
+import jdk.graal.compiler.truffle.TruffleTierConfiguration;
+import jdk.graal.compiler.truffle.host.HostInliningPhase;
 
 import com.oracle.truffle.compiler.TruffleCompilable;
 import com.oracle.truffle.compiler.TruffleCompilationTask;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/HotSpotTruffleGraphBuilderPlugins.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/hotspot/HotSpotTruffleGraphBuilderPlugins.java
similarity index 87%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/HotSpotTruffleGraphBuilderPlugins.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/hotspot/HotSpotTruffleGraphBuilderPlugins.java
index 89bd549aef88..b85cd0826128 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/HotSpotTruffleGraphBuilderPlugins.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/hotspot/HotSpotTruffleGraphBuilderPlugins.java
@@ -22,20 +22,20 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.hotspot;
+package jdk.graal.compiler.truffle.hotspot;
 
 import java.lang.ref.Reference;
 
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.hotspot.nodes.HotSpotLoadReservedReferenceNode;
-import jdk.compiler.graal.hotspot.nodes.HotSpotStoreReservedReferenceNode;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin.RequiredInvocationPlugin;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins;
-import jdk.compiler.graal.word.WordTypes;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.hotspot.nodes.HotSpotLoadReservedReferenceNode;
+import jdk.graal.compiler.hotspot.nodes.HotSpotStoreReservedReferenceNode;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin.RequiredInvocationPlugin;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins;
+import jdk.graal.compiler.word.WordTypes;
 
 import jdk.vm.ci.meta.JavaConstant;
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/HotSpotTruffleHostEnvironment.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/hotspot/HotSpotTruffleHostEnvironment.java
similarity index 92%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/HotSpotTruffleHostEnvironment.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/hotspot/HotSpotTruffleHostEnvironment.java
index f8950d260b3b..e226e97d2ab5 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/HotSpotTruffleHostEnvironment.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/hotspot/HotSpotTruffleHostEnvironment.java
@@ -22,12 +22,12 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.hotspot;
+package jdk.graal.compiler.truffle.hotspot;
 
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.truffle.host.TruffleHostEnvironment;
-import jdk.compiler.graal.truffle.TruffleCompilerImpl;
-import jdk.compiler.graal.truffle.TruffleElementCache;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.truffle.host.TruffleHostEnvironment;
+import jdk.graal.compiler.truffle.TruffleCompilerImpl;
+import jdk.graal.compiler.truffle.TruffleElementCache;
 
 import com.oracle.truffle.compiler.HostMethodInfo;
 import com.oracle.truffle.compiler.TruffleCompilable;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/HotSpotTruffleHostEnvironmentLookup.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/hotspot/HotSpotTruffleHostEnvironmentLookup.java
similarity index 94%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/HotSpotTruffleHostEnvironmentLookup.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/hotspot/HotSpotTruffleHostEnvironmentLookup.java
index 2e70f3b5e729..a5ddab8abdda 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/HotSpotTruffleHostEnvironmentLookup.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/hotspot/HotSpotTruffleHostEnvironmentLookup.java
@@ -22,12 +22,12 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.hotspot;
+package jdk.graal.compiler.truffle.hotspot;
 
 import java.util.concurrent.atomic.AtomicReference;
 
-import jdk.compiler.graal.serviceprovider.ServiceProvider;
-import jdk.compiler.graal.truffle.host.TruffleHostEnvironment;
+import jdk.graal.compiler.serviceprovider.ServiceProvider;
+import jdk.graal.compiler.truffle.host.TruffleHostEnvironment;
 
 import com.oracle.truffle.compiler.TruffleCompilerRuntime;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/HotSpotTruffleLoweringExtensions.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/hotspot/HotSpotTruffleLoweringExtensions.java
similarity index 91%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/HotSpotTruffleLoweringExtensions.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/hotspot/HotSpotTruffleLoweringExtensions.java
index 3ad38ede8ec2..c7be41f61dcb 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/HotSpotTruffleLoweringExtensions.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/hotspot/HotSpotTruffleLoweringExtensions.java
@@ -22,13 +22,13 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.hotspot;
+package jdk.graal.compiler.truffle.hotspot;
 
 import java.util.Collections;
 import java.util.List;
 
-import jdk.compiler.graal.hotspot.meta.DefaultHotSpotLoweringProvider;
-import jdk.compiler.graal.hotspot.meta.DefaultHotSpotLoweringProvider.Extension;
+import jdk.graal.compiler.hotspot.meta.DefaultHotSpotLoweringProvider;
+import jdk.graal.compiler.hotspot.meta.DefaultHotSpotLoweringProvider.Extension;
 
 /**
  * Lowering of HotSpot Truffle specific nodes.
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/HotSpotTruffleSafepointLoweringSnippet.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/hotspot/HotSpotTruffleSafepointLoweringSnippet.java
similarity index 78%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/HotSpotTruffleSafepointLoweringSnippet.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/hotspot/HotSpotTruffleSafepointLoweringSnippet.java
index 8c835564c1e4..bff77a126d8c 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/HotSpotTruffleSafepointLoweringSnippet.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/hotspot/HotSpotTruffleSafepointLoweringSnippet.java
@@ -22,42 +22,42 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.hotspot;
-
-import static jdk.compiler.graal.hotspot.meta.HotSpotForeignCallDescriptor.Transition.SAFEPOINT;
-import static jdk.compiler.graal.hotspot.meta.HotSpotForeignCallsProviderImpl.NO_LOCATIONS;
-import static jdk.compiler.graal.replacements.SnippetTemplate.DEFAULT_REPLACER;
-
-import jdk.compiler.graal.api.replacements.Snippet;
-import jdk.compiler.graal.api.replacements.Snippet.ConstantParameter;
-import jdk.compiler.graal.core.common.spi.ForeignCallDescriptor;
-import jdk.compiler.graal.debug.DebugHandlersFactory;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.Node.ConstantNodeParameter;
-import jdk.compiler.graal.graph.Node.NodeIntrinsic;
-import jdk.compiler.graal.hotspot.GraalHotSpotVMConfig;
-import jdk.compiler.graal.hotspot.meta.DefaultHotSpotLoweringProvider;
-import jdk.compiler.graal.hotspot.meta.HotSpotForeignCallDescriptor;
-import jdk.compiler.graal.hotspot.meta.HotSpotForeignCallDescriptor.Reexecutability;
-import jdk.compiler.graal.hotspot.meta.HotSpotHostForeignCallsProvider;
-import jdk.compiler.graal.hotspot.meta.HotSpotProviders;
-import jdk.compiler.graal.hotspot.nodes.CurrentJavaThreadNode;
-import jdk.compiler.graal.nodes.NamedLocationIdentity;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.extended.BranchProbabilityNode;
-import jdk.compiler.graal.nodes.extended.ForeignCallNode;
-import jdk.compiler.graal.nodes.spi.LoweringTool;
-import jdk.compiler.graal.nodes.util.GraphUtil;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.replacements.SnippetTemplate;
-import jdk.compiler.graal.replacements.SnippetTemplate.AbstractTemplates;
-import jdk.compiler.graal.replacements.SnippetTemplate.Arguments;
-import jdk.compiler.graal.replacements.SnippetTemplate.SnippetInfo;
-import jdk.compiler.graal.replacements.Snippets;
-import jdk.compiler.graal.truffle.nodes.TruffleSafepointNode;
-import jdk.compiler.graal.truffle.phases.TruffleSafepointInsertionPhase;
-import jdk.compiler.graal.word.Word;
+package jdk.graal.compiler.truffle.hotspot;
+
+import static jdk.graal.compiler.hotspot.meta.HotSpotForeignCallDescriptor.Transition.SAFEPOINT;
+import static jdk.graal.compiler.hotspot.meta.HotSpotForeignCallsProviderImpl.NO_LOCATIONS;
+import static jdk.graal.compiler.replacements.SnippetTemplate.DEFAULT_REPLACER;
+
+import jdk.graal.compiler.api.replacements.Snippet;
+import jdk.graal.compiler.api.replacements.Snippet.ConstantParameter;
+import jdk.graal.compiler.core.common.spi.ForeignCallDescriptor;
+import jdk.graal.compiler.debug.DebugHandlersFactory;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.Node.ConstantNodeParameter;
+import jdk.graal.compiler.graph.Node.NodeIntrinsic;
+import jdk.graal.compiler.hotspot.GraalHotSpotVMConfig;
+import jdk.graal.compiler.hotspot.meta.DefaultHotSpotLoweringProvider;
+import jdk.graal.compiler.hotspot.meta.HotSpotForeignCallDescriptor;
+import jdk.graal.compiler.hotspot.meta.HotSpotForeignCallDescriptor.Reexecutability;
+import jdk.graal.compiler.hotspot.meta.HotSpotHostForeignCallsProvider;
+import jdk.graal.compiler.hotspot.meta.HotSpotProviders;
+import jdk.graal.compiler.hotspot.nodes.CurrentJavaThreadNode;
+import jdk.graal.compiler.nodes.NamedLocationIdentity;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.extended.BranchProbabilityNode;
+import jdk.graal.compiler.nodes.extended.ForeignCallNode;
+import jdk.graal.compiler.nodes.spi.LoweringTool;
+import jdk.graal.compiler.nodes.util.GraphUtil;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.replacements.SnippetTemplate;
+import jdk.graal.compiler.replacements.SnippetTemplate.AbstractTemplates;
+import jdk.graal.compiler.replacements.SnippetTemplate.Arguments;
+import jdk.graal.compiler.replacements.SnippetTemplate.SnippetInfo;
+import jdk.graal.compiler.replacements.Snippets;
+import jdk.graal.compiler.truffle.nodes.TruffleSafepointNode;
+import jdk.graal.compiler.truffle.phases.TruffleSafepointInsertionPhase;
+import jdk.graal.compiler.word.Word;
 import org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.common.NativeImageReinitialize;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/TruffleCallBoundaryInstrumentationFactory.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/hotspot/TruffleCallBoundaryInstrumentationFactory.java
similarity index 86%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/TruffleCallBoundaryInstrumentationFactory.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/hotspot/TruffleCallBoundaryInstrumentationFactory.java
index 1a18928f8068..491b627b8a0a 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/TruffleCallBoundaryInstrumentationFactory.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/hotspot/TruffleCallBoundaryInstrumentationFactory.java
@@ -22,13 +22,13 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.hotspot;
+package jdk.graal.compiler.truffle.hotspot;
 
-import jdk.compiler.graal.hotspot.GraalHotSpotVMConfig;
-import jdk.compiler.graal.hotspot.meta.HotSpotRegistersProvider;
-import jdk.compiler.graal.lir.asm.CompilationResultBuilder;
-import jdk.compiler.graal.lir.asm.EntryPointDecorator;
-import jdk.compiler.graal.truffle.TruffleCompilerConfiguration;
+import jdk.graal.compiler.hotspot.GraalHotSpotVMConfig;
+import jdk.graal.compiler.hotspot.meta.HotSpotRegistersProvider;
+import jdk.graal.compiler.lir.asm.CompilationResultBuilder;
+import jdk.graal.compiler.lir.asm.EntryPointDecorator;
+import jdk.graal.compiler.truffle.TruffleCompilerConfiguration;
 
 import com.oracle.truffle.compiler.TruffleCompilable;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/TruffleCommunityCompilerConfiguration.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/hotspot/TruffleCommunityCompilerConfiguration.java
similarity index 86%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/TruffleCommunityCompilerConfiguration.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/hotspot/TruffleCommunityCompilerConfiguration.java
index 7113f0aa3b3d..4cd4f6821e59 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/TruffleCommunityCompilerConfiguration.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/hotspot/TruffleCommunityCompilerConfiguration.java
@@ -22,16 +22,16 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.hotspot;
+package jdk.graal.compiler.truffle.hotspot;
 
-import jdk.compiler.graal.core.phases.CommunityCompilerConfiguration;
-import jdk.compiler.graal.core.phases.HighTier;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
-import jdk.compiler.graal.nodes.spi.Replacements;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.truffle.host.InjectImmutableFrameFieldsPhase;
-import jdk.compiler.graal.truffle.host.HostInliningPhase;
-import jdk.compiler.graal.truffle.substitutions.TruffleInvocationPlugins;
+import jdk.graal.compiler.core.phases.CommunityCompilerConfiguration;
+import jdk.graal.compiler.core.phases.HighTier;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
+import jdk.graal.compiler.nodes.spi.Replacements;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.truffle.host.InjectImmutableFrameFieldsPhase;
+import jdk.graal.compiler.truffle.host.HostInliningPhase;
+import jdk.graal.compiler.truffle.substitutions.TruffleInvocationPlugins;
 
 import com.oracle.truffle.compiler.TruffleCompilerRuntime;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/TruffleCommunityCompilerConfigurationFactory.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/hotspot/TruffleCommunityCompilerConfigurationFactory.java
similarity index 87%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/TruffleCommunityCompilerConfigurationFactory.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/hotspot/TruffleCommunityCompilerConfigurationFactory.java
index ecdc5ded9b36..ba4e6d395c77 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/TruffleCommunityCompilerConfigurationFactory.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/hotspot/TruffleCommunityCompilerConfigurationFactory.java
@@ -22,12 +22,12 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.hotspot;
+package jdk.graal.compiler.truffle.hotspot;
 
-import jdk.compiler.graal.hotspot.CommunityCompilerConfigurationFactory;
-import jdk.compiler.graal.hotspot.CompilerConfigurationFactory;
-import jdk.compiler.graal.phases.tiers.CompilerConfiguration;
-import jdk.compiler.graal.serviceprovider.ServiceProvider;
+import jdk.graal.compiler.hotspot.CommunityCompilerConfigurationFactory;
+import jdk.graal.compiler.hotspot.CompilerConfigurationFactory;
+import jdk.graal.compiler.phases.tiers.CompilerConfiguration;
+import jdk.graal.compiler.serviceprovider.ServiceProvider;
 
 /**
  * Factory for creating the default configuration for the community edition of Graal.
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/TruffleEntryPointDecorator.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/hotspot/TruffleEntryPointDecorator.java
similarity index 82%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/TruffleEntryPointDecorator.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/hotspot/TruffleEntryPointDecorator.java
index c9f728a60785..bb66cfc69314 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/TruffleEntryPointDecorator.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/hotspot/TruffleEntryPointDecorator.java
@@ -22,18 +22,18 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.hotspot;
+package jdk.graal.compiler.truffle.hotspot;
 
-import static jdk.compiler.graal.hotspot.meta.HotSpotHostForeignCallsProvider.Z_FIELD_BARRIER;
+import static jdk.graal.compiler.hotspot.meta.HotSpotHostForeignCallsProvider.Z_FIELD_BARRIER;
 
-import jdk.compiler.graal.core.common.spi.CodeGenProviders;
-import jdk.compiler.graal.core.common.spi.ForeignCallLinkage;
-import jdk.compiler.graal.hotspot.GraalHotSpotVMConfig;
-import jdk.compiler.graal.hotspot.HotSpotGraalRuntime;
-import jdk.compiler.graal.hotspot.meta.HotSpotRegistersProvider;
-import jdk.compiler.graal.lir.asm.EntryPointDecorator;
-import jdk.compiler.graal.lir.gen.LIRGenerationResult;
-import jdk.compiler.graal.truffle.TruffleCompilerConfiguration;
+import jdk.graal.compiler.core.common.spi.CodeGenProviders;
+import jdk.graal.compiler.core.common.spi.ForeignCallLinkage;
+import jdk.graal.compiler.hotspot.GraalHotSpotVMConfig;
+import jdk.graal.compiler.hotspot.HotSpotGraalRuntime;
+import jdk.graal.compiler.hotspot.meta.HotSpotRegistersProvider;
+import jdk.graal.compiler.lir.asm.EntryPointDecorator;
+import jdk.graal.compiler.lir.gen.LIRGenerationResult;
+import jdk.graal.compiler.truffle.TruffleCompilerConfiguration;
 
 import jdk.vm.ci.meta.MetaAccessProvider;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/aarch64/AArch64TruffleCallBoundaryInstrumentationFactory.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/hotspot/aarch64/AArch64TruffleCallBoundaryInstrumentationFactory.java
similarity index 77%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/aarch64/AArch64TruffleCallBoundaryInstrumentationFactory.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/hotspot/aarch64/AArch64TruffleCallBoundaryInstrumentationFactory.java
index 7d7984578f40..a478bc5a61b2 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/aarch64/AArch64TruffleCallBoundaryInstrumentationFactory.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/hotspot/aarch64/AArch64TruffleCallBoundaryInstrumentationFactory.java
@@ -22,31 +22,31 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.hotspot.aarch64;
+package jdk.graal.compiler.truffle.hotspot.aarch64;
 
 import static jdk.vm.ci.hotspot.HotSpotCallingConventionType.JavaCall;
 import static jdk.vm.ci.meta.JavaKind.Object;
-import static jdk.compiler.graal.hotspot.meta.HotSpotHostForeignCallsProvider.Z_FIELD_BARRIER;
+import static jdk.graal.compiler.hotspot.meta.HotSpotHostForeignCallsProvider.Z_FIELD_BARRIER;
 
-import jdk.compiler.graal.asm.Label;
-import jdk.compiler.graal.asm.aarch64.AArch64Address;
-import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler;
-import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler.ScratchRegister;
-import jdk.compiler.graal.core.common.CompressEncoding;
-import jdk.compiler.graal.core.common.spi.ForeignCallLinkage;
-import jdk.compiler.graal.hotspot.GraalHotSpotVMConfig;
-import jdk.compiler.graal.hotspot.HotSpotGraalRuntime;
-import jdk.compiler.graal.hotspot.aarch64.AArch64HotSpotBackend;
-import jdk.compiler.graal.hotspot.aarch64.AArch64HotSpotMove;
-import jdk.compiler.graal.hotspot.aarch64.AArch64HotSpotZBarrierSetLIRGenerator;
-import jdk.compiler.graal.hotspot.meta.HotSpotRegistersProvider;
-import jdk.compiler.graal.lir.aarch64.AArch64FrameMap;
-import jdk.compiler.graal.lir.asm.CompilationResultBuilder;
-import jdk.compiler.graal.lir.asm.EntryPointDecorator;
-import jdk.compiler.graal.serviceprovider.ServiceProvider;
-import jdk.compiler.graal.truffle.TruffleCompilerConfiguration;
-import jdk.compiler.graal.truffle.hotspot.TruffleCallBoundaryInstrumentationFactory;
-import jdk.compiler.graal.truffle.hotspot.TruffleEntryPointDecorator;
+import jdk.graal.compiler.asm.Label;
+import jdk.graal.compiler.asm.aarch64.AArch64Address;
+import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler;
+import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler.ScratchRegister;
+import jdk.graal.compiler.core.common.CompressEncoding;
+import jdk.graal.compiler.core.common.spi.ForeignCallLinkage;
+import jdk.graal.compiler.hotspot.GraalHotSpotVMConfig;
+import jdk.graal.compiler.hotspot.HotSpotGraalRuntime;
+import jdk.graal.compiler.hotspot.aarch64.AArch64HotSpotBackend;
+import jdk.graal.compiler.hotspot.aarch64.AArch64HotSpotMove;
+import jdk.graal.compiler.hotspot.aarch64.AArch64HotSpotZBarrierSetLIRGenerator;
+import jdk.graal.compiler.hotspot.meta.HotSpotRegistersProvider;
+import jdk.graal.compiler.lir.aarch64.AArch64FrameMap;
+import jdk.graal.compiler.lir.asm.CompilationResultBuilder;
+import jdk.graal.compiler.lir.asm.EntryPointDecorator;
+import jdk.graal.compiler.serviceprovider.ServiceProvider;
+import jdk.graal.compiler.truffle.TruffleCompilerConfiguration;
+import jdk.graal.compiler.truffle.hotspot.TruffleCallBoundaryInstrumentationFactory;
+import jdk.graal.compiler.truffle.hotspot.TruffleEntryPointDecorator;
 
 import jdk.vm.ci.code.Register;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/amd64/AMD64TruffleCallBoundaryInstrumentationFactory.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/hotspot/amd64/AMD64TruffleCallBoundaryInstrumentationFactory.java
similarity index 78%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/amd64/AMD64TruffleCallBoundaryInstrumentationFactory.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/hotspot/amd64/AMD64TruffleCallBoundaryInstrumentationFactory.java
index c8d6b33c7bf5..3f62150745ae 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/amd64/AMD64TruffleCallBoundaryInstrumentationFactory.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/hotspot/amd64/AMD64TruffleCallBoundaryInstrumentationFactory.java
@@ -22,29 +22,29 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.hotspot.amd64;
+package jdk.graal.compiler.truffle.hotspot.amd64;
 
 import static jdk.vm.ci.hotspot.HotSpotCallingConventionType.JavaCall;
-import static jdk.compiler.graal.hotspot.meta.HotSpotHostForeignCallsProvider.Z_FIELD_BARRIER;
+import static jdk.graal.compiler.hotspot.meta.HotSpotHostForeignCallsProvider.Z_FIELD_BARRIER;
 
-import jdk.compiler.graal.asm.Label;
-import jdk.compiler.graal.asm.amd64.AMD64Address;
-import jdk.compiler.graal.asm.amd64.AMD64Assembler.ConditionFlag;
-import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler;
-import jdk.compiler.graal.core.common.CompressEncoding;
-import jdk.compiler.graal.core.common.spi.ForeignCallLinkage;
-import jdk.compiler.graal.hotspot.GraalHotSpotVMConfig;
-import jdk.compiler.graal.hotspot.HotSpotGraalRuntime;
-import jdk.compiler.graal.hotspot.amd64.AMD64HotSpotBackend;
-import jdk.compiler.graal.hotspot.amd64.AMD64HotSpotZBarrierSetLIRGenerator;
-import jdk.compiler.graal.hotspot.meta.HotSpotRegistersProvider;
-import jdk.compiler.graal.lir.amd64.AMD64Move;
-import jdk.compiler.graal.lir.asm.CompilationResultBuilder;
-import jdk.compiler.graal.lir.asm.EntryPointDecorator;
-import jdk.compiler.graal.serviceprovider.ServiceProvider;
-import jdk.compiler.graal.truffle.hotspot.TruffleCallBoundaryInstrumentationFactory;
-import jdk.compiler.graal.truffle.hotspot.TruffleEntryPointDecorator;
-import jdk.compiler.graal.truffle.TruffleCompilerConfiguration;
+import jdk.graal.compiler.asm.Label;
+import jdk.graal.compiler.asm.amd64.AMD64Address;
+import jdk.graal.compiler.asm.amd64.AMD64Assembler.ConditionFlag;
+import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler;
+import jdk.graal.compiler.core.common.CompressEncoding;
+import jdk.graal.compiler.core.common.spi.ForeignCallLinkage;
+import jdk.graal.compiler.hotspot.GraalHotSpotVMConfig;
+import jdk.graal.compiler.hotspot.HotSpotGraalRuntime;
+import jdk.graal.compiler.hotspot.amd64.AMD64HotSpotBackend;
+import jdk.graal.compiler.hotspot.amd64.AMD64HotSpotZBarrierSetLIRGenerator;
+import jdk.graal.compiler.hotspot.meta.HotSpotRegistersProvider;
+import jdk.graal.compiler.lir.amd64.AMD64Move;
+import jdk.graal.compiler.lir.asm.CompilationResultBuilder;
+import jdk.graal.compiler.lir.asm.EntryPointDecorator;
+import jdk.graal.compiler.serviceprovider.ServiceProvider;
+import jdk.graal.compiler.truffle.hotspot.TruffleCallBoundaryInstrumentationFactory;
+import jdk.graal.compiler.truffle.hotspot.TruffleEntryPointDecorator;
+import jdk.graal.compiler.truffle.TruffleCompilerConfiguration;
 
 import jdk.vm.ci.amd64.AMD64;
 import jdk.vm.ci.code.Register;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/AnyExtendNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/nodes/AnyExtendNode.java
similarity index 76%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/AnyExtendNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/nodes/AnyExtendNode.java
index 33c42d22b8e3..c254570bf0d7 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/AnyExtendNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/nodes/AnyExtendNode.java
@@ -22,21 +22,21 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.nodes;
+package jdk.graal.compiler.truffle.nodes;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_1;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_1;
 
-import jdk.compiler.graal.core.common.type.IntegerStamp;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.IterableNodeType;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodeinfo.NodeSize;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.calc.FloatingNode;
-import jdk.compiler.graal.nodes.calc.SignExtendNode;
-import jdk.compiler.graal.nodes.calc.ZeroExtendNode;
+import jdk.graal.compiler.core.common.type.IntegerStamp;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.IterableNodeType;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodeinfo.NodeSize;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.calc.FloatingNode;
+import jdk.graal.compiler.nodes.calc.SignExtendNode;
+import jdk.graal.compiler.nodes.calc.ZeroExtendNode;
 
 import jdk.vm.ci.meta.JavaKind;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/IsCompilationConstantNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/nodes/IsCompilationConstantNode.java
similarity index 79%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/IsCompilationConstantNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/nodes/IsCompilationConstantNode.java
index 0cbc6def5fd9..fd716663f051 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/IsCompilationConstantNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/nodes/IsCompilationConstantNode.java
@@ -22,23 +22,23 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.nodes;
+package jdk.graal.compiler.truffle.nodes;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_0;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_1;
 
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodes.spi.Canonicalizable;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.calc.FloatingNode;
-import jdk.compiler.graal.nodes.extended.BoxNode;
-import jdk.compiler.graal.nodes.spi.Lowerable;
-import jdk.compiler.graal.nodes.spi.LoweringTool;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodes.spi.Canonicalizable;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.calc.FloatingNode;
+import jdk.graal.compiler.nodes.extended.BoxNode;
+import jdk.graal.compiler.nodes.spi.Lowerable;
+import jdk.graal.compiler.nodes.spi.LoweringTool;
 
 import jdk.vm.ci.meta.JavaKind;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/ObjectLocationIdentity.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/nodes/ObjectLocationIdentity.java
similarity index 93%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/ObjectLocationIdentity.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/nodes/ObjectLocationIdentity.java
index a705f04be8c4..178cb9ee3cb8 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/ObjectLocationIdentity.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/nodes/ObjectLocationIdentity.java
@@ -22,12 +22,12 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.nodes;
+package jdk.graal.compiler.truffle.nodes;
 
 import java.util.Objects;
 
-import jdk.compiler.graal.nodes.util.JavaConstantFormattable;
-import jdk.compiler.graal.nodes.util.JavaConstantFormatter;
+import jdk.graal.compiler.nodes.util.JavaConstantFormattable;
+import jdk.graal.compiler.nodes.util.JavaConstantFormatter;
 import org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.meta.JavaConstant;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/SpeculativeExceptionAnchorNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/nodes/SpeculativeExceptionAnchorNode.java
similarity index 84%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/SpeculativeExceptionAnchorNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/nodes/SpeculativeExceptionAnchorNode.java
index 52f76a54d157..40270612f5cf 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/SpeculativeExceptionAnchorNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/nodes/SpeculativeExceptionAnchorNode.java
@@ -22,20 +22,20 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.nodes;
+package jdk.graal.compiler.truffle.nodes;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_0;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_0;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_0;
 
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodes.spi.Canonicalizable;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.DeoptimizeNode;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.truffle.PartialEvaluator;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodes.spi.Canonicalizable;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.DeoptimizeNode;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.truffle.PartialEvaluator;
 
 import jdk.vm.ci.meta.DeoptimizationAction;
 import jdk.vm.ci.meta.DeoptimizationReason;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/TruffleAssumption.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/nodes/TruffleAssumption.java
similarity index 97%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/TruffleAssumption.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/nodes/TruffleAssumption.java
index 590e6aa2a4c4..ee6e717337fb 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/TruffleAssumption.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/nodes/TruffleAssumption.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.nodes;
+package jdk.graal.compiler.truffle.nodes;
 
 import jdk.vm.ci.meta.Assumptions;
 import jdk.vm.ci.meta.JavaConstant;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/TruffleSafepointNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/nodes/TruffleSafepointNode.java
similarity index 81%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/TruffleSafepointNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/nodes/TruffleSafepointNode.java
index c578b4b3cb6e..a6a63ef73eae 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/TruffleSafepointNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/nodes/TruffleSafepointNode.java
@@ -22,19 +22,19 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.nodes;
+package jdk.graal.compiler.truffle.nodes;
 
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_4;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_4;
 
 import java.util.Objects;
 
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeCycles;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.DeoptimizingFixedWithNextNode;
-import jdk.compiler.graal.nodes.spi.Lowerable;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeCycles;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.DeoptimizingFixedWithNextNode;
+import jdk.graal.compiler.nodes.spi.Lowerable;
 
 @NodeInfo(cycles = NodeCycles.CYCLES_4, cyclesRationale = "read + call", size = SIZE_4)
 public final class TruffleSafepointNode extends DeoptimizingFixedWithNextNode implements Lowerable {
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/asserts/NeverPartOfCompilationNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/nodes/asserts/NeverPartOfCompilationNode.java
similarity index 79%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/asserts/NeverPartOfCompilationNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/nodes/asserts/NeverPartOfCompilationNode.java
index 5c2af7a0153a..7d2d8f0ced3e 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/asserts/NeverPartOfCompilationNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/nodes/asserts/NeverPartOfCompilationNode.java
@@ -22,19 +22,19 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.nodes.asserts;
+package jdk.graal.compiler.truffle.nodes.asserts;
 
-import static jdk.compiler.graal.nodeinfo.InputType.State;
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_0;
+import static jdk.graal.compiler.nodeinfo.InputType.State;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_0;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_0;
 
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.IterableNodeType;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.ControlSinkNode;
-import jdk.compiler.graal.nodes.FrameState;
-import jdk.compiler.graal.nodes.StateSplit;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.IterableNodeType;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.ControlSinkNode;
+import jdk.graal.compiler.nodes.FrameState;
+import jdk.graal.compiler.nodes.StateSplit;
 
 @NodeInfo(cycles = CYCLES_0, size = SIZE_0)
 public final class NeverPartOfCompilationNode extends ControlSinkNode implements StateSplit, IterableNodeType {
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/AllowMaterializeNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/nodes/frame/AllowMaterializeNode.java
similarity index 78%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/AllowMaterializeNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/nodes/frame/AllowMaterializeNode.java
index 7f6460ede916..a128adcee8c2 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/AllowMaterializeNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/nodes/frame/AllowMaterializeNode.java
@@ -22,20 +22,20 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.nodes.frame;
+package jdk.graal.compiler.truffle.nodes.frame;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_0;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_0;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_0;
 
-import jdk.compiler.graal.graph.IterableNodeType;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.Virtualizable;
-import jdk.compiler.graal.nodes.spi.VirtualizerTool;
-import jdk.compiler.graal.nodes.virtual.VirtualObjectNode;
+import jdk.graal.compiler.graph.IterableNodeType;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.Virtualizable;
+import jdk.graal.compiler.nodes.spi.VirtualizerTool;
+import jdk.graal.compiler.nodes.virtual.VirtualObjectNode;
 
 /**
  * Intrinsic node for materializing a Truffle frame.
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/ForceMaterializeNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/nodes/frame/ForceMaterializeNode.java
similarity index 77%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/ForceMaterializeNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/nodes/frame/ForceMaterializeNode.java
index d080cdc5b897..3dd28ccd4902 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/ForceMaterializeNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/nodes/frame/ForceMaterializeNode.java
@@ -22,18 +22,18 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.nodes.frame;
+package jdk.graal.compiler.truffle.nodes.frame;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_0;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_0;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_0;
 
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.LIRLowerable;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.LIRLowerable;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
 
 @NodeInfo(cycles = CYCLES_0, size = SIZE_0)
 public final class ForceMaterializeNode extends FixedWithNextNode implements LIRLowerable {
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/NewFrameNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/nodes/frame/NewFrameNode.java
similarity index 92%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/NewFrameNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/nodes/frame/NewFrameNode.java
index 1cf3ccb3a6bb..a46ce302e335 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/NewFrameNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/nodes/frame/NewFrameNode.java
@@ -22,40 +22,40 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.nodes.frame;
+package jdk.graal.compiler.truffle.nodes.frame;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_0;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_0;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_0;
 
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.core.common.type.TypeReference;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.IterableNodeType;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.graph.NodeInputList;
-import jdk.compiler.graal.graph.NodeSourcePosition;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext;
-import jdk.compiler.graal.nodes.java.MonitorIdNode;
-import jdk.compiler.graal.nodes.spi.Canonicalizable;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodes.spi.VirtualizableAllocation;
-import jdk.compiler.graal.nodes.spi.VirtualizerTool;
-import jdk.compiler.graal.nodes.virtual.VirtualArrayNode;
-import jdk.compiler.graal.nodes.virtual.VirtualInstanceNode;
-import jdk.compiler.graal.nodes.virtual.VirtualObjectNode;
-import jdk.compiler.graal.serviceprovider.SpeculationReasonGroup;
-import jdk.compiler.graal.truffle.KnownTruffleTypes;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.core.common.type.TypeReference;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.IterableNodeType;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.graph.NodeInputList;
+import jdk.graal.compiler.graph.NodeSourcePosition;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext;
+import jdk.graal.compiler.nodes.java.MonitorIdNode;
+import jdk.graal.compiler.nodes.spi.Canonicalizable;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodes.spi.VirtualizableAllocation;
+import jdk.graal.compiler.nodes.spi.VirtualizerTool;
+import jdk.graal.compiler.nodes.virtual.VirtualArrayNode;
+import jdk.graal.compiler.nodes.virtual.VirtualInstanceNode;
+import jdk.graal.compiler.nodes.virtual.VirtualObjectNode;
+import jdk.graal.compiler.serviceprovider.SpeculationReasonGroup;
+import jdk.graal.compiler.truffle.KnownTruffleTypes;
 
 import jdk.vm.ci.meta.ConstantReflectionProvider;
 import jdk.vm.ci.meta.JavaConstant;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/VirtualFrameAccessFlags.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/nodes/frame/VirtualFrameAccessFlags.java
similarity index 98%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/VirtualFrameAccessFlags.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/nodes/frame/VirtualFrameAccessFlags.java
index 7bc3aa4219eb..2977fa63160a 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/VirtualFrameAccessFlags.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/nodes/frame/VirtualFrameAccessFlags.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.compiler.graal.truffle.nodes.frame;
+package jdk.graal.compiler.truffle.nodes.frame;
 
 public enum VirtualFrameAccessFlags {
     // Does not access the frame storage (getTag / isX)
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/VirtualFrameAccessType.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/nodes/frame/VirtualFrameAccessType.java
similarity index 96%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/VirtualFrameAccessType.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/nodes/frame/VirtualFrameAccessType.java
index 57bc484d60e8..6436b48030c4 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/VirtualFrameAccessType.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/nodes/frame/VirtualFrameAccessType.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.nodes.frame;
+package jdk.graal.compiler.truffle.nodes.frame;
 
 public enum VirtualFrameAccessType {
     Indexed,
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/VirtualFrameAccessVerificationNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/nodes/frame/VirtualFrameAccessVerificationNode.java
similarity index 94%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/VirtualFrameAccessVerificationNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/nodes/frame/VirtualFrameAccessVerificationNode.java
index fce3e762b97c..d8e820efa3f3 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/VirtualFrameAccessVerificationNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/nodes/frame/VirtualFrameAccessVerificationNode.java
@@ -23,10 +23,10 @@
  * questions.
  */
 
-package jdk.compiler.graal.truffle.nodes.frame;
+package jdk.graal.compiler.truffle.nodes.frame;
 
-import jdk.compiler.graal.nodes.ValueNodeInterface;
-import jdk.compiler.graal.truffle.phases.FrameAccessVerificationPhase;
+import jdk.graal.compiler.nodes.ValueNodeInterface;
+import jdk.graal.compiler.truffle.phases.FrameAccessVerificationPhase;
 
 /**
  * Interface used to update the frame verification state in {@link FrameAccessVerificationPhase}.
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/VirtualFrameAccessorNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/nodes/frame/VirtualFrameAccessorNode.java
similarity index 86%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/VirtualFrameAccessorNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/nodes/frame/VirtualFrameAccessorNode.java
index e712f26c5619..7643475bdfce 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/VirtualFrameAccessorNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/nodes/frame/VirtualFrameAccessorNode.java
@@ -22,23 +22,23 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.nodes.frame;
-
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_0;
-
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.FixedGuardNode;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.LogicConstantNode;
-import jdk.compiler.graal.nodes.LogicNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.debug.ControlFlowAnchored;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin.Receiver;
-import jdk.compiler.graal.nodes.spi.VirtualizerTool;
+package jdk.graal.compiler.truffle.nodes.frame;
+
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_0;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_0;
+
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.FixedGuardNode;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.LogicConstantNode;
+import jdk.graal.compiler.nodes.LogicNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.debug.ControlFlowAnchored;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin.Receiver;
+import jdk.graal.compiler.nodes.spi.VirtualizerTool;
 
 import jdk.vm.ci.meta.DeoptimizationAction;
 import jdk.vm.ci.meta.DeoptimizationReason;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/VirtualFrameClearNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/nodes/frame/VirtualFrameClearNode.java
similarity index 85%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/VirtualFrameClearNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/nodes/frame/VirtualFrameClearNode.java
index 7cddde079df5..943c7540b397 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/VirtualFrameClearNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/nodes/frame/VirtualFrameClearNode.java
@@ -23,21 +23,21 @@
  * questions.
  */
 
-package jdk.compiler.graal.truffle.nodes.frame;
+package jdk.graal.compiler.truffle.nodes.frame;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_0;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_0;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_0;
 
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.IterableNodeType;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin.Receiver;
-import jdk.compiler.graal.nodes.spi.Virtualizable;
-import jdk.compiler.graal.nodes.spi.VirtualizerTool;
-import jdk.compiler.graal.nodes.virtual.VirtualObjectNode;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.IterableNodeType;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin.Receiver;
+import jdk.graal.compiler.nodes.spi.Virtualizable;
+import jdk.graal.compiler.nodes.spi.VirtualizerTool;
+import jdk.graal.compiler.nodes.virtual.VirtualObjectNode;
 
 import jdk.vm.ci.meta.JavaKind;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/VirtualFrameCopyNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/nodes/frame/VirtualFrameCopyNode.java
similarity index 87%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/VirtualFrameCopyNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/nodes/frame/VirtualFrameCopyNode.java
index dc868a5e7ef5..1a7ce33d5fd1 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/VirtualFrameCopyNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/nodes/frame/VirtualFrameCopyNode.java
@@ -22,19 +22,19 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.nodes.frame;
+package jdk.graal.compiler.truffle.nodes.frame;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_0;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_0;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_0;
 
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin.Receiver;
-import jdk.compiler.graal.nodes.spi.Virtualizable;
-import jdk.compiler.graal.nodes.spi.VirtualizerTool;
-import jdk.compiler.graal.nodes.virtual.VirtualObjectNode;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin.Receiver;
+import jdk.graal.compiler.nodes.spi.Virtualizable;
+import jdk.graal.compiler.nodes.spi.VirtualizerTool;
+import jdk.graal.compiler.nodes.virtual.VirtualObjectNode;
 
 @NodeInfo(cycles = CYCLES_0, size = SIZE_0)
 public final class VirtualFrameCopyNode extends VirtualFrameAccessorNode implements Virtualizable {
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/VirtualFrameGetNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/nodes/frame/VirtualFrameGetNode.java
similarity index 86%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/VirtualFrameGetNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/nodes/frame/VirtualFrameGetNode.java
index cd61d48c6dd9..6da43e9657b3 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/VirtualFrameGetNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/nodes/frame/VirtualFrameGetNode.java
@@ -22,30 +22,30 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.nodes.frame;
-
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_0;
-
-import jdk.compiler.graal.core.common.type.PrimitiveStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.FixedGuardNode;
-import jdk.compiler.graal.nodes.LogicNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.calc.ConditionalNode;
-import jdk.compiler.graal.nodes.calc.IntegerEqualsNode;
-import jdk.compiler.graal.nodes.calc.NarrowNode;
-import jdk.compiler.graal.nodes.calc.ReinterpretNode;
-import jdk.compiler.graal.nodes.calc.SignExtendNode;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin.Receiver;
-import jdk.compiler.graal.nodes.spi.Virtualizable;
-import jdk.compiler.graal.nodes.spi.VirtualizerTool;
-import jdk.compiler.graal.nodes.virtual.VirtualObjectNode;
+package jdk.graal.compiler.truffle.nodes.frame;
+
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_0;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_0;
+
+import jdk.graal.compiler.core.common.type.PrimitiveStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.FixedGuardNode;
+import jdk.graal.compiler.nodes.LogicNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.calc.ConditionalNode;
+import jdk.graal.compiler.nodes.calc.IntegerEqualsNode;
+import jdk.graal.compiler.nodes.calc.NarrowNode;
+import jdk.graal.compiler.nodes.calc.ReinterpretNode;
+import jdk.graal.compiler.nodes.calc.SignExtendNode;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin.Receiver;
+import jdk.graal.compiler.nodes.spi.Virtualizable;
+import jdk.graal.compiler.nodes.spi.VirtualizerTool;
+import jdk.graal.compiler.nodes.virtual.VirtualObjectNode;
 
 import jdk.vm.ci.meta.DeoptimizationAction;
 import jdk.vm.ci.meta.DeoptimizationReason;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/VirtualFrameGetTagNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/nodes/frame/VirtualFrameGetTagNode.java
similarity index 81%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/VirtualFrameGetTagNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/nodes/frame/VirtualFrameGetTagNode.java
index d4300842f382..5365d7770cdb 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/VirtualFrameGetTagNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/nodes/frame/VirtualFrameGetTagNode.java
@@ -22,22 +22,22 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.nodes.frame;
+package jdk.graal.compiler.truffle.nodes.frame;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_0;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_0;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_0;
 
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.LogicNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.calc.ConditionalNode;
-import jdk.compiler.graal.nodes.calc.IntegerLessThanNode;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin.Receiver;
-import jdk.compiler.graal.nodes.spi.Virtualizable;
-import jdk.compiler.graal.nodes.spi.VirtualizerTool;
-import jdk.compiler.graal.nodes.virtual.VirtualObjectNode;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.LogicNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.calc.ConditionalNode;
+import jdk.graal.compiler.nodes.calc.IntegerLessThanNode;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin.Receiver;
+import jdk.graal.compiler.nodes.spi.Virtualizable;
+import jdk.graal.compiler.nodes.spi.VirtualizerTool;
+import jdk.graal.compiler.nodes.virtual.VirtualObjectNode;
 
 import jdk.vm.ci.meta.JavaKind;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/VirtualFrameIsNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/nodes/frame/VirtualFrameIsNode.java
similarity index 80%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/VirtualFrameIsNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/nodes/frame/VirtualFrameIsNode.java
index 6b9e5dbad715..ee568a526c38 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/VirtualFrameIsNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/nodes/frame/VirtualFrameIsNode.java
@@ -22,22 +22,22 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.nodes.frame;
+package jdk.graal.compiler.truffle.nodes.frame;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_0;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_0;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_0;
 
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.LogicNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.calc.ConditionalNode;
-import jdk.compiler.graal.nodes.calc.IntegerEqualsNode;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin.Receiver;
-import jdk.compiler.graal.nodes.spi.Virtualizable;
-import jdk.compiler.graal.nodes.spi.VirtualizerTool;
-import jdk.compiler.graal.nodes.virtual.VirtualObjectNode;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.LogicNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.calc.ConditionalNode;
+import jdk.graal.compiler.nodes.calc.IntegerEqualsNode;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin.Receiver;
+import jdk.graal.compiler.nodes.spi.Virtualizable;
+import jdk.graal.compiler.nodes.spi.VirtualizerTool;
+import jdk.graal.compiler.nodes.virtual.VirtualObjectNode;
 
 import jdk.vm.ci.meta.JavaKind;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/VirtualFrameSetNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/nodes/frame/VirtualFrameSetNode.java
similarity index 88%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/VirtualFrameSetNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/nodes/frame/VirtualFrameSetNode.java
index 8a65b3e5a322..cf40f112648d 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/VirtualFrameSetNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/nodes/frame/VirtualFrameSetNode.java
@@ -22,25 +22,25 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.nodes.frame;
-
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_0;
-
-import jdk.compiler.graal.core.common.type.PrimitiveStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.calc.ReinterpretNode;
-import jdk.compiler.graal.nodes.calc.ZeroExtendNode;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin.Receiver;
-import jdk.compiler.graal.nodes.spi.Virtualizable;
-import jdk.compiler.graal.nodes.spi.VirtualizerTool;
-import jdk.compiler.graal.nodes.virtual.VirtualObjectNode;
+package jdk.graal.compiler.truffle.nodes.frame;
+
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_0;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_0;
+
+import jdk.graal.compiler.core.common.type.PrimitiveStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.calc.ReinterpretNode;
+import jdk.graal.compiler.nodes.calc.ZeroExtendNode;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin.Receiver;
+import jdk.graal.compiler.nodes.spi.Virtualizable;
+import jdk.graal.compiler.nodes.spi.VirtualizerTool;
+import jdk.graal.compiler.nodes.virtual.VirtualObjectNode;
 
 import jdk.vm.ci.meta.JavaKind;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/VirtualFrameSwapNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/nodes/frame/VirtualFrameSwapNode.java
similarity index 88%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/VirtualFrameSwapNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/nodes/frame/VirtualFrameSwapNode.java
index 38f39f2cc592..45d5ab42ffe7 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/VirtualFrameSwapNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/nodes/frame/VirtualFrameSwapNode.java
@@ -22,19 +22,19 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.nodes.frame;
+package jdk.graal.compiler.truffle.nodes.frame;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_0;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_0;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_0;
 
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin.Receiver;
-import jdk.compiler.graal.nodes.spi.Virtualizable;
-import jdk.compiler.graal.nodes.spi.VirtualizerTool;
-import jdk.compiler.graal.nodes.virtual.VirtualObjectNode;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin.Receiver;
+import jdk.graal.compiler.nodes.spi.Virtualizable;
+import jdk.graal.compiler.nodes.spi.VirtualizerTool;
+import jdk.graal.compiler.nodes.virtual.VirtualObjectNode;
 
 @NodeInfo(cycles = CYCLES_0, size = SIZE_0)
 public final class VirtualFrameSwapNode extends VirtualFrameAccessorNode implements Virtualizable {
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/DeoptimizeOnExceptionPhase.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/phases/DeoptimizeOnExceptionPhase.java
similarity index 87%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/DeoptimizeOnExceptionPhase.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/phases/DeoptimizeOnExceptionPhase.java
index 65f52d80d973..eee623cf104a 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/DeoptimizeOnExceptionPhase.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/phases/DeoptimizeOnExceptionPhase.java
@@ -22,17 +22,17 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.phases;
+package jdk.graal.compiler.truffle.phases;
 
 import java.util.function.Predicate;
 
-import jdk.compiler.graal.nodes.AbstractBeginNode;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.Invoke;
-import jdk.compiler.graal.nodes.InvokeWithExceptionNode;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.phases.Phase;
-import jdk.compiler.graal.truffle.nodes.SpeculativeExceptionAnchorNode;
+import jdk.graal.compiler.nodes.AbstractBeginNode;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.Invoke;
+import jdk.graal.compiler.nodes.InvokeWithExceptionNode;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.phases.Phase;
+import jdk.graal.compiler.truffle.nodes.SpeculativeExceptionAnchorNode;
 
 import jdk.vm.ci.meta.DeoptimizationAction;
 import jdk.vm.ci.meta.DeoptimizationReason;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/FrameAccessVerificationPhase.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/phases/FrameAccessVerificationPhase.java
similarity index 91%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/FrameAccessVerificationPhase.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/phases/FrameAccessVerificationPhase.java
index 6a921f57d692..3fb8746cf293 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/FrameAccessVerificationPhase.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/phases/FrameAccessVerificationPhase.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.compiler.graal.truffle.phases;
+package jdk.graal.compiler.truffle.phases;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -34,35 +34,35 @@
 import java.util.List;
 import java.util.Map;
 
-import jdk.compiler.graal.truffle.nodes.frame.NewFrameNode;
-import jdk.compiler.graal.truffle.nodes.frame.VirtualFrameAccessFlags;
-import jdk.compiler.graal.truffle.nodes.frame.VirtualFrameAccessType;
-import jdk.compiler.graal.truffle.nodes.frame.VirtualFrameAccessVerificationNode;
-import jdk.compiler.graal.truffle.nodes.frame.VirtualFrameSetNode;
+import jdk.graal.compiler.truffle.nodes.frame.NewFrameNode;
+import jdk.graal.compiler.truffle.nodes.frame.VirtualFrameAccessFlags;
+import jdk.graal.compiler.truffle.nodes.frame.VirtualFrameAccessType;
+import jdk.graal.compiler.truffle.nodes.frame.VirtualFrameAccessVerificationNode;
+import jdk.graal.compiler.truffle.nodes.frame.VirtualFrameSetNode;
 import org.graalvm.collections.EconomicMap;
-import jdk.compiler.graal.core.common.util.CompilationAlarm;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.graph.Graph;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.nodes.AbstractBeginNode;
-import jdk.compiler.graal.nodes.AbstractEndNode;
-import jdk.compiler.graal.nodes.AbstractMergeNode;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.DeoptimizeNode;
-import jdk.compiler.graal.nodes.FixedNode;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.LoopBeginNode;
-import jdk.compiler.graal.nodes.LoopEndNode;
-import jdk.compiler.graal.nodes.LoopExitNode;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.util.GraphUtil;
-import jdk.compiler.graal.phases.BasePhase;
-import jdk.compiler.graal.phases.graph.ReentrantNodeIterator;
-import jdk.compiler.graal.phases.graph.ReentrantNodeIterator.LoopInfo;
-import jdk.compiler.graal.phases.graph.ReentrantNodeIterator.NodeIteratorClosure;
-import jdk.compiler.graal.truffle.PerformanceInformationHandler;
-import jdk.compiler.graal.truffle.TruffleCompilerOptions.PerformanceWarningKind;
-import jdk.compiler.graal.truffle.TruffleTierContext;
+import jdk.graal.compiler.core.common.util.CompilationAlarm;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.graph.Graph;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.nodes.AbstractBeginNode;
+import jdk.graal.compiler.nodes.AbstractEndNode;
+import jdk.graal.compiler.nodes.AbstractMergeNode;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.DeoptimizeNode;
+import jdk.graal.compiler.nodes.FixedNode;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.LoopBeginNode;
+import jdk.graal.compiler.nodes.LoopEndNode;
+import jdk.graal.compiler.nodes.LoopExitNode;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.util.GraphUtil;
+import jdk.graal.compiler.phases.BasePhase;
+import jdk.graal.compiler.phases.graph.ReentrantNodeIterator;
+import jdk.graal.compiler.phases.graph.ReentrantNodeIterator.LoopInfo;
+import jdk.graal.compiler.phases.graph.ReentrantNodeIterator.NodeIteratorClosure;
+import jdk.graal.compiler.truffle.PerformanceInformationHandler;
+import jdk.graal.compiler.truffle.TruffleCompilerOptions.PerformanceWarningKind;
+import jdk.graal.compiler.truffle.TruffleTierContext;
 
 import com.oracle.truffle.compiler.TruffleCompilable;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/InliningAcrossTruffleBoundaryPhase.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/phases/InliningAcrossTruffleBoundaryPhase.java
similarity index 88%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/InliningAcrossTruffleBoundaryPhase.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/phases/InliningAcrossTruffleBoundaryPhase.java
index 04a5e7ff61cd..ad59f7301195 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/InliningAcrossTruffleBoundaryPhase.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/phases/InliningAcrossTruffleBoundaryPhase.java
@@ -22,12 +22,12 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.phases;
+package jdk.graal.compiler.truffle.phases;
 
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.java.MethodCallTargetNode;
-import jdk.compiler.graal.phases.BasePhase;
-import jdk.compiler.graal.truffle.TruffleTierContext;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.java.MethodCallTargetNode;
+import jdk.graal.compiler.phases.BasePhase;
+import jdk.graal.compiler.truffle.TruffleTierContext;
 
 import com.oracle.truffle.compiler.TruffleCompilerRuntime;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/InstrumentBranchesPhase.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/phases/InstrumentBranchesPhase.java
similarity index 92%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/InstrumentBranchesPhase.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/phases/InstrumentBranchesPhase.java
index c37fdefa8e8c..59360bfb8449 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/InstrumentBranchesPhase.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/phases/InstrumentBranchesPhase.java
@@ -22,17 +22,17 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.phases;
+package jdk.graal.compiler.truffle.phases;
 
-import jdk.compiler.graal.api.replacements.SnippetReflectionProvider;
-import jdk.compiler.graal.debug.MethodFilter;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeSourcePosition;
-import jdk.compiler.graal.nodes.IfNode;
-import jdk.compiler.graal.nodes.StructuredGraph;
+import jdk.graal.compiler.api.replacements.SnippetReflectionProvider;
+import jdk.graal.compiler.debug.MethodFilter;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeSourcePosition;
+import jdk.graal.compiler.nodes.IfNode;
+import jdk.graal.compiler.nodes.StructuredGraph;
 
 import jdk.vm.ci.meta.JavaConstant;
-import jdk.compiler.graal.truffle.TruffleTierContext;
+import jdk.graal.compiler.truffle.TruffleTierContext;
 
 /**
  * Instruments {@link IfNode}s in the graph, by adding execution counters to the true and the false
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/InstrumentPhase.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/phases/InstrumentPhase.java
similarity index 92%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/InstrumentPhase.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/phases/InstrumentPhase.java
index 7ccd718bd38b..27501306fc92 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/InstrumentPhase.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/phases/InstrumentPhase.java
@@ -22,13 +22,13 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.phases;
+package jdk.graal.compiler.truffle.phases;
 
-import static jdk.compiler.graal.truffle.TruffleCompilerOptions.InstrumentBoundaries;
-import static jdk.compiler.graal.truffle.TruffleCompilerOptions.InstrumentBoundariesPerInlineSite;
-import static jdk.compiler.graal.truffle.TruffleCompilerOptions.InstrumentBranches;
-import static jdk.compiler.graal.truffle.TruffleCompilerOptions.InstrumentBranchesPerInlineSite;
-import static jdk.compiler.graal.truffle.TruffleCompilerOptions.InstrumentationTableSize;
+import static jdk.graal.compiler.truffle.TruffleCompilerOptions.InstrumentBoundaries;
+import static jdk.graal.compiler.truffle.TruffleCompilerOptions.InstrumentBoundariesPerInlineSite;
+import static jdk.graal.compiler.truffle.TruffleCompilerOptions.InstrumentBranches;
+import static jdk.graal.compiler.truffle.TruffleCompilerOptions.InstrumentBranchesPerInlineSite;
+import static jdk.graal.compiler.truffle.TruffleCompilerOptions.InstrumentationTableSize;
 
 import java.util.AbstractMap;
 import java.util.ArrayList;
@@ -38,25 +38,25 @@
 import java.util.List;
 import java.util.Map;
 
-import jdk.compiler.graal.api.replacements.SnippetReflectionProvider;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.core.common.type.TypeReference;
-import jdk.compiler.graal.debug.MethodFilter;
-import jdk.compiler.graal.debug.TTY;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeSourcePosition;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.calc.AddNode;
-import jdk.compiler.graal.nodes.java.LoadIndexedNode;
-import jdk.compiler.graal.nodes.java.StoreIndexedNode;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.BasePhase;
-import jdk.compiler.graal.truffle.KnownTruffleTypes;
-import jdk.compiler.graal.truffle.TruffleCompilerOptions;
-import jdk.compiler.graal.truffle.TruffleTierContext;
+import jdk.graal.compiler.api.replacements.SnippetReflectionProvider;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.core.common.type.TypeReference;
+import jdk.graal.compiler.debug.MethodFilter;
+import jdk.graal.compiler.debug.TTY;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeSourcePosition;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.calc.AddNode;
+import jdk.graal.compiler.nodes.java.LoadIndexedNode;
+import jdk.graal.compiler.nodes.java.StoreIndexedNode;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.BasePhase;
+import jdk.graal.compiler.truffle.KnownTruffleTypes;
+import jdk.graal.compiler.truffle.TruffleCompilerOptions;
+import jdk.graal.compiler.truffle.TruffleTierContext;
 
 import jdk.vm.ci.code.CodeUtil;
 import jdk.vm.ci.meta.JavaConstant;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/InstrumentTruffleBoundariesPhase.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/phases/InstrumentTruffleBoundariesPhase.java
similarity index 90%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/InstrumentTruffleBoundariesPhase.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/phases/InstrumentTruffleBoundariesPhase.java
index 6b2c19f56fd3..ccd8b2c1134b 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/InstrumentTruffleBoundariesPhase.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/phases/InstrumentTruffleBoundariesPhase.java
@@ -22,16 +22,16 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.phases;
+package jdk.graal.compiler.truffle.phases;
 
-import jdk.compiler.graal.api.replacements.SnippetReflectionProvider;
-import jdk.compiler.graal.debug.MethodFilter;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeSourcePosition;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.Invoke;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.truffle.TruffleTierContext;
+import jdk.graal.compiler.api.replacements.SnippetReflectionProvider;
+import jdk.graal.compiler.debug.MethodFilter;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeSourcePosition;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.Invoke;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.truffle.TruffleTierContext;
 
 import com.oracle.truffle.compiler.TruffleCompilerRuntime.InlineKind;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/InstrumentationSuite.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/phases/InstrumentationSuite.java
similarity index 90%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/InstrumentationSuite.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/phases/InstrumentationSuite.java
index 33ac6802c178..96fbde04a995 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/InstrumentationSuite.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/phases/InstrumentationSuite.java
@@ -22,11 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.phases;
+package jdk.graal.compiler.truffle.phases;
 
-import jdk.compiler.graal.api.replacements.SnippetReflectionProvider;
-import jdk.compiler.graal.phases.PhaseSuite;
-import jdk.compiler.graal.truffle.TruffleTierContext;
+import jdk.graal.compiler.api.replacements.SnippetReflectionProvider;
+import jdk.graal.compiler.phases.PhaseSuite;
+import jdk.graal.compiler.truffle.TruffleTierContext;
 
 public class InstrumentationSuite extends PhaseSuite {
     @SuppressWarnings("this-escape")
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/MaterializeFramesPhase.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/phases/MaterializeFramesPhase.java
similarity index 86%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/MaterializeFramesPhase.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/phases/MaterializeFramesPhase.java
index f0242765ba84..e60064f1319b 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/MaterializeFramesPhase.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/phases/MaterializeFramesPhase.java
@@ -22,12 +22,12 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.phases;
+package jdk.graal.compiler.truffle.phases;
 
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.phases.BasePhase;
-import jdk.compiler.graal.truffle.TruffleTierContext;
-import jdk.compiler.graal.truffle.nodes.frame.AllowMaterializeNode;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.phases.BasePhase;
+import jdk.graal.compiler.truffle.TruffleTierContext;
+import jdk.graal.compiler.truffle.nodes.frame.AllowMaterializeNode;
 
 public final class MaterializeFramesPhase extends BasePhase {
     @Override
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/NeverPartOfCompilationPhase.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/phases/NeverPartOfCompilationPhase.java
similarity index 86%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/NeverPartOfCompilationPhase.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/phases/NeverPartOfCompilationPhase.java
index 4228ea3f5c71..52d2187f8f98 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/NeverPartOfCompilationPhase.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/phases/NeverPartOfCompilationPhase.java
@@ -22,14 +22,14 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.phases;
+package jdk.graal.compiler.truffle.phases;
 
-import jdk.compiler.graal.core.common.GraalBailoutException;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.util.GraphUtil;
-import jdk.compiler.graal.phases.BasePhase;
-import jdk.compiler.graal.truffle.nodes.asserts.NeverPartOfCompilationNode;
-import jdk.compiler.graal.truffle.TruffleTierContext;
+import jdk.graal.compiler.core.common.GraalBailoutException;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.util.GraphUtil;
+import jdk.graal.compiler.phases.BasePhase;
+import jdk.graal.compiler.truffle.nodes.asserts.NeverPartOfCompilationNode;
+import jdk.graal.compiler.truffle.TruffleTierContext;
 
 public final class NeverPartOfCompilationPhase extends BasePhase {
     @Override
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/PhiTransformPhase.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/phases/PhiTransformPhase.java
similarity index 92%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/PhiTransformPhase.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/phases/PhiTransformPhase.java
index 48898837e3ed..2a9192e99dfc 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/PhiTransformPhase.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/phases/PhiTransformPhase.java
@@ -23,35 +23,35 @@
  * questions.
  */
 
-package jdk.compiler.graal.truffle.phases;
+package jdk.graal.compiler.truffle.phases;
 
 import org.graalvm.collections.EconomicSet;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.Graph.NodeEvent;
-import jdk.compiler.graal.graph.Graph.NodeEventScope;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeInputList;
-import jdk.compiler.graal.nodes.GraphState.StageFlag;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.ValuePhiNode;
-import jdk.compiler.graal.nodes.ValueProxyNode;
-import jdk.compiler.graal.nodes.calc.IntegerConvertNode;
-import jdk.compiler.graal.nodes.calc.NarrowNode;
-import jdk.compiler.graal.nodes.calc.ReinterpretNode;
-import jdk.compiler.graal.nodes.calc.SignExtendNode;
-import jdk.compiler.graal.nodes.calc.UnaryNode;
-import jdk.compiler.graal.nodes.calc.ZeroExtendNode;
-import jdk.compiler.graal.nodes.spi.CoreProviders;
-import jdk.compiler.graal.nodes.virtual.VirtualArrayNode;
-import jdk.compiler.graal.nodes.virtual.VirtualObjectNode;
-import jdk.compiler.graal.nodes.virtual.VirtualObjectState;
-import jdk.compiler.graal.phases.BasePhase;
-import jdk.compiler.graal.phases.common.CanonicalizerPhase;
-import jdk.compiler.graal.phases.common.util.EconomicSetNodeEventListener;
-import jdk.compiler.graal.truffle.nodes.AnyExtendNode;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.Graph.NodeEvent;
+import jdk.graal.compiler.graph.Graph.NodeEventScope;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeInputList;
+import jdk.graal.compiler.nodes.GraphState.StageFlag;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.ValuePhiNode;
+import jdk.graal.compiler.nodes.ValueProxyNode;
+import jdk.graal.compiler.nodes.calc.IntegerConvertNode;
+import jdk.graal.compiler.nodes.calc.NarrowNode;
+import jdk.graal.compiler.nodes.calc.ReinterpretNode;
+import jdk.graal.compiler.nodes.calc.SignExtendNode;
+import jdk.graal.compiler.nodes.calc.UnaryNode;
+import jdk.graal.compiler.nodes.calc.ZeroExtendNode;
+import jdk.graal.compiler.nodes.spi.CoreProviders;
+import jdk.graal.compiler.nodes.virtual.VirtualArrayNode;
+import jdk.graal.compiler.nodes.virtual.VirtualObjectNode;
+import jdk.graal.compiler.nodes.virtual.VirtualObjectState;
+import jdk.graal.compiler.phases.BasePhase;
+import jdk.graal.compiler.phases.common.CanonicalizerPhase;
+import jdk.graal.compiler.phases.common.util.EconomicSetNodeEventListener;
+import jdk.graal.compiler.truffle.nodes.AnyExtendNode;
 
 import jdk.vm.ci.meta.ResolvedJavaType;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/ReportPerformanceWarningsPhase.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/phases/ReportPerformanceWarningsPhase.java
similarity index 88%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/ReportPerformanceWarningsPhase.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/phases/ReportPerformanceWarningsPhase.java
index 49882b758f94..44dcdc246105 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/ReportPerformanceWarningsPhase.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/phases/ReportPerformanceWarningsPhase.java
@@ -22,11 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.phases;
+package jdk.graal.compiler.truffle.phases;
 
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.phases.BasePhase;
-import jdk.compiler.graal.truffle.TruffleTierContext;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.phases.BasePhase;
+import jdk.graal.compiler.truffle.TruffleTierContext;
 
 public final class ReportPerformanceWarningsPhase extends BasePhase {
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/SetIdentityForValueTypesPhase.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/phases/SetIdentityForValueTypesPhase.java
similarity index 86%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/SetIdentityForValueTypesPhase.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/phases/SetIdentityForValueTypesPhase.java
index 4e1d3fbea665..8e4e87901234 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/SetIdentityForValueTypesPhase.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/phases/SetIdentityForValueTypesPhase.java
@@ -22,13 +22,13 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.phases;
+package jdk.graal.compiler.truffle.phases;
 
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.virtual.VirtualInstanceNode;
-import jdk.compiler.graal.nodes.virtual.VirtualObjectNode;
-import jdk.compiler.graal.phases.BasePhase;
-import jdk.compiler.graal.truffle.TruffleTierContext;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.virtual.VirtualInstanceNode;
+import jdk.graal.compiler.nodes.virtual.VirtualObjectNode;
+import jdk.graal.compiler.phases.BasePhase;
+import jdk.graal.compiler.truffle.TruffleTierContext;
 
 import com.oracle.truffle.compiler.TruffleCompilerRuntime;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/TruffleCompilerPhases.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/phases/TruffleCompilerPhases.java
similarity index 84%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/TruffleCompilerPhases.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/phases/TruffleCompilerPhases.java
index f61e48bc02e2..3605367bbfff 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/TruffleCompilerPhases.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/phases/TruffleCompilerPhases.java
@@ -22,17 +22,17 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.phases;
+package jdk.graal.compiler.truffle.phases;
 
 import java.util.ListIterator;
 
-import jdk.compiler.graal.loop.phases.LoopSafepointEliminationPhase;
-import jdk.compiler.graal.phases.BasePhase;
-import jdk.compiler.graal.phases.common.LoopSafepointInsertionPhase;
-import jdk.compiler.graal.phases.tiers.MidTierContext;
-import jdk.compiler.graal.phases.tiers.Suites;
-import jdk.compiler.graal.phases.util.Providers;
-import jdk.compiler.graal.truffle.KnownTruffleTypes;
+import jdk.graal.compiler.loop.phases.LoopSafepointEliminationPhase;
+import jdk.graal.compiler.phases.BasePhase;
+import jdk.graal.compiler.phases.common.LoopSafepointInsertionPhase;
+import jdk.graal.compiler.phases.tiers.MidTierContext;
+import jdk.graal.compiler.phases.tiers.Suites;
+import jdk.graal.compiler.phases.util.Providers;
+import jdk.graal.compiler.truffle.KnownTruffleTypes;
 
 public final class TruffleCompilerPhases {
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/TruffleLoopSafepointEliminationPhase.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/phases/TruffleLoopSafepointEliminationPhase.java
similarity index 85%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/TruffleLoopSafepointEliminationPhase.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/phases/TruffleLoopSafepointEliminationPhase.java
index 91cbf7c34c18..9391d3cc0421 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/TruffleLoopSafepointEliminationPhase.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/phases/TruffleLoopSafepointEliminationPhase.java
@@ -22,18 +22,18 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.phases;
+package jdk.graal.compiler.truffle.phases;
 
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.loop.phases.LoopSafepointEliminationPhase;
-import jdk.compiler.graal.nodes.CallTargetNode;
-import jdk.compiler.graal.nodes.FixedNode;
-import jdk.compiler.graal.nodes.Invoke;
-import jdk.compiler.graal.nodes.LoopEndNode;
-import jdk.compiler.graal.nodes.java.AbstractNewObjectNode;
-import jdk.compiler.graal.nodes.loop.LoopEx;
-import jdk.compiler.graal.nodes.virtual.CommitAllocationNode;
-import jdk.compiler.graal.truffle.KnownTruffleTypes;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.loop.phases.LoopSafepointEliminationPhase;
+import jdk.graal.compiler.nodes.CallTargetNode;
+import jdk.graal.compiler.nodes.FixedNode;
+import jdk.graal.compiler.nodes.Invoke;
+import jdk.graal.compiler.nodes.LoopEndNode;
+import jdk.graal.compiler.nodes.java.AbstractNewObjectNode;
+import jdk.graal.compiler.nodes.loop.LoopEx;
+import jdk.graal.compiler.nodes.virtual.CommitAllocationNode;
+import jdk.graal.compiler.truffle.KnownTruffleTypes;
 
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/TruffleSafepointInsertionPhase.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/phases/TruffleSafepointInsertionPhase.java
similarity index 90%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/TruffleSafepointInsertionPhase.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/phases/TruffleSafepointInsertionPhase.java
index 2eb46fe91aa2..90edaf90a879 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/TruffleSafepointInsertionPhase.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/phases/TruffleSafepointInsertionPhase.java
@@ -22,30 +22,30 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.phases;
+package jdk.graal.compiler.truffle.phases;
 
-import jdk.compiler.graal.core.common.type.ObjectStamp;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.core.common.type.TypeReference;
-import jdk.compiler.graal.debug.DebugCloseable;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.FixedNode;
-import jdk.compiler.graal.nodes.FrameState;
-import jdk.compiler.graal.nodes.LoopBeginNode;
-import jdk.compiler.graal.nodes.LoopEndNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ReturnNode;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.java.MethodCallTargetNode;
-import jdk.compiler.graal.nodes.spi.NodeWithState;
-import jdk.compiler.graal.phases.Phase;
-import jdk.compiler.graal.phases.util.Providers;
-import jdk.compiler.graal.truffle.KnownTruffleTypes;
-import jdk.compiler.graal.truffle.TruffleCompilation;
-import jdk.compiler.graal.truffle.nodes.TruffleSafepointNode;
+import jdk.graal.compiler.core.common.type.ObjectStamp;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.core.common.type.TypeReference;
+import jdk.graal.compiler.debug.DebugCloseable;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.FixedNode;
+import jdk.graal.compiler.nodes.FrameState;
+import jdk.graal.compiler.nodes.LoopBeginNode;
+import jdk.graal.compiler.nodes.LoopEndNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ReturnNode;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.java.MethodCallTargetNode;
+import jdk.graal.compiler.nodes.spi.NodeWithState;
+import jdk.graal.compiler.phases.Phase;
+import jdk.graal.compiler.phases.util.Providers;
+import jdk.graal.compiler.truffle.KnownTruffleTypes;
+import jdk.graal.compiler.truffle.TruffleCompilation;
+import jdk.graal.compiler.truffle.nodes.TruffleSafepointNode;
 
 import jdk.vm.ci.meta.JavaConstant;
 import jdk.vm.ci.meta.ResolvedJavaField;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/TruffleTier.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/phases/TruffleTier.java
similarity index 83%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/TruffleTier.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/phases/TruffleTier.java
index 8b5d4f4c216e..70d8b426a061 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/TruffleTier.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/phases/TruffleTier.java
@@ -22,15 +22,15 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.phases;
+package jdk.graal.compiler.truffle.phases;
 
-import jdk.compiler.graal.core.phases.BaseTier;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.truffle.PartialEvaluator;
-import jdk.compiler.graal.truffle.PostPartialEvaluationSuite;
-import jdk.compiler.graal.truffle.TruffleCompilerOptions;
-import jdk.compiler.graal.truffle.TruffleTierContext;
-import jdk.compiler.graal.truffle.phases.inlining.AgnosticInliningPhase;
+import jdk.graal.compiler.core.phases.BaseTier;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.truffle.PartialEvaluator;
+import jdk.graal.compiler.truffle.PostPartialEvaluationSuite;
+import jdk.graal.compiler.truffle.TruffleCompilerOptions;
+import jdk.graal.compiler.truffle.TruffleTierContext;
+import jdk.graal.compiler.truffle.phases.inlining.AgnosticInliningPhase;
 
 public class TruffleTier extends BaseTier {
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/VerifyFrameDoesNotEscapePhase.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/phases/VerifyFrameDoesNotEscapePhase.java
similarity index 84%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/VerifyFrameDoesNotEscapePhase.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/phases/VerifyFrameDoesNotEscapePhase.java
index 3459924f81cd..cd6ee1c03f2f 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/VerifyFrameDoesNotEscapePhase.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/phases/VerifyFrameDoesNotEscapePhase.java
@@ -22,15 +22,15 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.phases;
+package jdk.graal.compiler.truffle.phases;
 
-import jdk.compiler.graal.graph.GraalGraphError;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.java.MethodCallTargetNode;
-import jdk.compiler.graal.nodes.util.GraphUtil;
-import jdk.compiler.graal.phases.BasePhase;
-import jdk.compiler.graal.truffle.TruffleTierContext;
-import jdk.compiler.graal.truffle.nodes.frame.NewFrameNode;
+import jdk.graal.compiler.graph.GraalGraphError;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.java.MethodCallTargetNode;
+import jdk.graal.compiler.nodes.util.GraphUtil;
+import jdk.graal.compiler.phases.BasePhase;
+import jdk.graal.compiler.truffle.TruffleTierContext;
+import jdk.graal.compiler.truffle.nodes.frame.NewFrameNode;
 
 /**
  * Compiler phase for verifying that the Truffle virtual frame does not escape and can therefore be
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/inlining/AgnosticInliningPhase.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/phases/inlining/AgnosticInliningPhase.java
similarity index 89%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/inlining/AgnosticInliningPhase.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/phases/inlining/AgnosticInliningPhase.java
index d008dc114b83..04e4e3b4b086 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/inlining/AgnosticInliningPhase.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/phases/inlining/AgnosticInliningPhase.java
@@ -22,21 +22,21 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.phases.inlining;
+package jdk.graal.compiler.truffle.phases.inlining;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Objects;
 
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.phases.BasePhase;
-import jdk.compiler.graal.phases.util.GraphOrder;
-import jdk.compiler.graal.serviceprovider.GraalServices;
-import jdk.compiler.graal.truffle.PartialEvaluator;
-import jdk.compiler.graal.truffle.PostPartialEvaluationSuite;
-import jdk.compiler.graal.truffle.TruffleCompilerOptions;
-import jdk.compiler.graal.truffle.TruffleInliningScope;
-import jdk.compiler.graal.truffle.TruffleTierContext;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.phases.BasePhase;
+import jdk.graal.compiler.phases.util.GraphOrder;
+import jdk.graal.compiler.serviceprovider.GraalServices;
+import jdk.graal.compiler.truffle.PartialEvaluator;
+import jdk.graal.compiler.truffle.PostPartialEvaluationSuite;
+import jdk.graal.compiler.truffle.TruffleCompilerOptions;
+import jdk.graal.compiler.truffle.TruffleInliningScope;
+import jdk.graal.compiler.truffle.TruffleTierContext;
 
 public final class AgnosticInliningPhase extends BasePhase {
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/inlining/CallNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/phases/inlining/CallNode.java
similarity index 94%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/inlining/CallNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/phases/inlining/CallNode.java
index f63f078579a9..5a9fbc288c50 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/inlining/CallNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/phases/inlining/CallNode.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.phases.inlining;
+package jdk.graal.compiler.truffle.phases.inlining;
 
 import java.util.Collections;
 import java.util.HashMap;
@@ -33,28 +33,28 @@
 
 import org.graalvm.collections.EconomicSet;
 import org.graalvm.collections.UnmodifiableEconomicMap;
-import jdk.compiler.graal.core.common.PermanentBailoutException;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.graph.NodeSuccessorList;
-import jdk.compiler.graal.nodeinfo.NodeCycles;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodeinfo.NodeSize;
-import jdk.compiler.graal.nodeinfo.Verbosity;
-import jdk.compiler.graal.nodes.Invoke;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.phases.common.inlining.InliningUtil;
-import jdk.compiler.graal.phases.common.inlining.InliningUtil.InlineeReturnAction;
-import jdk.compiler.graal.phases.contract.NodeCostUtil;
-import jdk.compiler.graal.truffle.PerformanceInformationHandler;
-import jdk.compiler.graal.truffle.TruffleCompilerOptions.PerformanceWarningKind;
+import jdk.graal.compiler.core.common.PermanentBailoutException;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.graph.NodeSuccessorList;
+import jdk.graal.compiler.nodeinfo.NodeCycles;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodeinfo.NodeSize;
+import jdk.graal.compiler.nodeinfo.Verbosity;
+import jdk.graal.compiler.nodes.Invoke;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.phases.common.inlining.InliningUtil;
+import jdk.graal.compiler.phases.common.inlining.InliningUtil.InlineeReturnAction;
+import jdk.graal.compiler.phases.contract.NodeCostUtil;
+import jdk.graal.compiler.truffle.PerformanceInformationHandler;
+import jdk.graal.compiler.truffle.TruffleCompilerOptions.PerformanceWarningKind;
 
 import com.oracle.truffle.compiler.TruffleCompilable;
 import com.oracle.truffle.compiler.TruffleCompilationTask;
 
-import jdk.compiler.graal.truffle.TruffleTierContext;
+import jdk.graal.compiler.truffle.TruffleTierContext;
 
 import jdk.vm.ci.meta.JavaConstant;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/inlining/CallTree.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/phases/inlining/CallTree.java
similarity index 93%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/inlining/CallTree.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/phases/inlining/CallTree.java
index 73bf339b968a..b1c8dc321799 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/inlining/CallTree.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/phases/inlining/CallTree.java
@@ -22,14 +22,14 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.phases.inlining;
-
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.graph.Graph;
-import jdk.compiler.graal.truffle.PartialEvaluator;
-import jdk.compiler.graal.truffle.PostPartialEvaluationSuite;
-import jdk.compiler.graal.truffle.TruffleCompilerOptions;
-import jdk.compiler.graal.truffle.TruffleTierContext;
+package jdk.graal.compiler.truffle.phases.inlining;
+
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.graph.Graph;
+import jdk.graal.compiler.truffle.PartialEvaluator;
+import jdk.graal.compiler.truffle.PostPartialEvaluationSuite;
+import jdk.graal.compiler.truffle.TruffleCompilerOptions;
+import jdk.graal.compiler.truffle.TruffleTierContext;
 
 import com.oracle.truffle.compiler.TruffleCompilationTask;
 import com.oracle.truffle.compiler.TruffleCompilerRuntime;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/inlining/DefaultInliningPolicy.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/phases/inlining/DefaultInliningPolicy.java
similarity index 97%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/inlining/DefaultInliningPolicy.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/phases/inlining/DefaultInliningPolicy.java
index 5fbd26953851..827cce0da71d 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/inlining/DefaultInliningPolicy.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/phases/inlining/DefaultInliningPolicy.java
@@ -22,14 +22,14 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.phases.inlining;
+package jdk.graal.compiler.truffle.phases.inlining;
 
 import java.util.Comparator;
 import java.util.Map;
 import java.util.PriorityQueue;
 
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.truffle.TruffleCompilerOptions;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.truffle.TruffleCompilerOptions;
 
 final class DefaultInliningPolicy implements InliningPolicy {
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/inlining/DefaultInliningPolicyProvider.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/phases/inlining/DefaultInliningPolicyProvider.java
similarity index 88%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/inlining/DefaultInliningPolicyProvider.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/phases/inlining/DefaultInliningPolicyProvider.java
index 56c741fcd8ec..24ae75e17cf3 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/inlining/DefaultInliningPolicyProvider.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/phases/inlining/DefaultInliningPolicyProvider.java
@@ -22,11 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.phases.inlining;
+package jdk.graal.compiler.truffle.phases.inlining;
 
-import jdk.compiler.graal.nodes.spi.CoreProviders;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.serviceprovider.ServiceProvider;
+import jdk.graal.compiler.nodes.spi.CoreProviders;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.serviceprovider.ServiceProvider;
 
 @ServiceProvider(InliningPolicyProvider.class)
 public class DefaultInliningPolicyProvider extends InliningPolicyProvider {
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/inlining/GraphManager.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/phases/inlining/GraphManager.java
similarity index 87%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/inlining/GraphManager.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/phases/inlining/GraphManager.java
index 8b2f83c0b6b3..a4be6ccd1efc 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/inlining/GraphManager.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/phases/inlining/GraphManager.java
@@ -22,33 +22,33 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.phases.inlining;
+package jdk.graal.compiler.truffle.phases.inlining;
 
 import java.util.List;
 
-import jdk.compiler.graal.truffle.nodes.TruffleAssumption;
+import jdk.graal.compiler.truffle.nodes.TruffleAssumption;
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.EconomicSet;
 import org.graalvm.collections.UnmodifiableEconomicMap;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.debug.DebugContext.Scope;
-import jdk.compiler.graal.debug.Indent;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.nodes.EncodedGraph;
-import jdk.compiler.graal.nodes.Invoke;
-import jdk.compiler.graal.nodes.LoopBeginNode;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext;
-import jdk.compiler.graal.nodes.graphbuilderconf.InlineInvokePlugin;
-import jdk.compiler.graal.phases.common.inlining.InliningUtil;
-import jdk.compiler.graal.phases.contract.NodeCostUtil;
-import jdk.compiler.graal.truffle.PEAgnosticInlineInvokePlugin;
-import jdk.compiler.graal.truffle.PartialEvaluator;
-import jdk.compiler.graal.truffle.PostPartialEvaluationSuite;
-import jdk.compiler.graal.truffle.TruffleCompilerOptions;
-import jdk.compiler.graal.truffle.TruffleDebugJavaMethod;
-import jdk.compiler.graal.truffle.TruffleTierContext;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.debug.DebugContext.Scope;
+import jdk.graal.compiler.debug.Indent;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.nodes.EncodedGraph;
+import jdk.graal.compiler.nodes.Invoke;
+import jdk.graal.compiler.nodes.LoopBeginNode;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext;
+import jdk.graal.compiler.nodes.graphbuilderconf.InlineInvokePlugin;
+import jdk.graal.compiler.phases.common.inlining.InliningUtil;
+import jdk.graal.compiler.phases.contract.NodeCostUtil;
+import jdk.graal.compiler.truffle.PEAgnosticInlineInvokePlugin;
+import jdk.graal.compiler.truffle.PartialEvaluator;
+import jdk.graal.compiler.truffle.PostPartialEvaluationSuite;
+import jdk.graal.compiler.truffle.TruffleCompilerOptions;
+import jdk.graal.compiler.truffle.TruffleDebugJavaMethod;
+import jdk.graal.compiler.truffle.TruffleTierContext;
 
 import com.oracle.truffle.compiler.TruffleCompilable;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/inlining/InliningPolicy.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/phases/inlining/InliningPolicy.java
similarity index 97%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/inlining/InliningPolicy.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/phases/inlining/InliningPolicy.java
index 78e6a64db083..a3f7a453d920 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/inlining/InliningPolicy.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/phases/inlining/InliningPolicy.java
@@ -22,14 +22,14 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.phases.inlining;
+package jdk.graal.compiler.truffle.phases.inlining;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
 import org.graalvm.collections.Pair;
-import jdk.compiler.graal.truffle.TruffleCompilerOptions;
+import jdk.graal.compiler.truffle.TruffleCompilerOptions;
 
 @SuppressWarnings("unused")
 public interface InliningPolicy {
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/inlining/InliningPolicyProvider.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/phases/inlining/InliningPolicyProvider.java
similarity index 92%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/inlining/InliningPolicyProvider.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/phases/inlining/InliningPolicyProvider.java
index 3538e541967b..6926f6329a07 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/inlining/InliningPolicyProvider.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/phases/inlining/InliningPolicyProvider.java
@@ -22,10 +22,10 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.phases.inlining;
+package jdk.graal.compiler.truffle.phases.inlining;
 
-import jdk.compiler.graal.nodes.spi.CoreProviders;
-import jdk.compiler.graal.options.OptionValues;
+import jdk.graal.compiler.nodes.spi.CoreProviders;
+import jdk.graal.compiler.options.OptionValues;
 
 public abstract class InliningPolicyProvider implements Comparable {
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/inlining/NoInliningPolicy.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/phases/inlining/NoInliningPolicy.java
similarity index 96%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/inlining/NoInliningPolicy.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/phases/inlining/NoInliningPolicy.java
index aa531d04265b..bcab5dfde06a 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/inlining/NoInliningPolicy.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/phases/inlining/NoInliningPolicy.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.phases.inlining;
+package jdk.graal.compiler.truffle.phases.inlining;
 
 final class NoInliningPolicy implements InliningPolicy {
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/inlining/NoInliningPolicyProvider.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/phases/inlining/NoInliningPolicyProvider.java
similarity index 88%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/inlining/NoInliningPolicyProvider.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/phases/inlining/NoInliningPolicyProvider.java
index 83f0cd8083e3..a4e71e674797 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/inlining/NoInliningPolicyProvider.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/phases/inlining/NoInliningPolicyProvider.java
@@ -22,11 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.phases.inlining;
+package jdk.graal.compiler.truffle.phases.inlining;
 
-import jdk.compiler.graal.nodes.spi.CoreProviders;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.serviceprovider.ServiceProvider;
+import jdk.graal.compiler.nodes.spi.CoreProviders;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.serviceprovider.ServiceProvider;
 
 @ServiceProvider(InliningPolicyProvider.class)
 public class NoInliningPolicyProvider extends InliningPolicyProvider {
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/inlining/TrivialOnlyInliningPolicy.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/phases/inlining/TrivialOnlyInliningPolicy.java
similarity index 92%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/inlining/TrivialOnlyInliningPolicy.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/phases/inlining/TrivialOnlyInliningPolicy.java
index 824ae68f7165..fa2346297f2c 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/inlining/TrivialOnlyInliningPolicy.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/phases/inlining/TrivialOnlyInliningPolicy.java
@@ -22,10 +22,10 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.phases.inlining;
+package jdk.graal.compiler.truffle.phases.inlining;
 
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.truffle.TruffleCompilerOptions;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.truffle.TruffleCompilerOptions;
 
 final class TrivialOnlyInliningPolicy implements InliningPolicy {
     private final OptionValues options;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/inlining/TrivialOnlyPolicyProvider.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/phases/inlining/TrivialOnlyPolicyProvider.java
similarity index 88%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/inlining/TrivialOnlyPolicyProvider.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/phases/inlining/TrivialOnlyPolicyProvider.java
index 40af0be596f8..4dc3e4674b9f 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/inlining/TrivialOnlyPolicyProvider.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/phases/inlining/TrivialOnlyPolicyProvider.java
@@ -22,11 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.phases.inlining;
+package jdk.graal.compiler.truffle.phases.inlining;
 
-import jdk.compiler.graal.nodes.spi.CoreProviders;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.serviceprovider.ServiceProvider;
+import jdk.graal.compiler.nodes.spi.CoreProviders;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.serviceprovider.ServiceProvider;
 
 @ServiceProvider(InliningPolicyProvider.class)
 public class TrivialOnlyPolicyProvider extends InliningPolicyProvider {
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/substitutions/GraphBuilderInvocationPluginProvider.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/substitutions/GraphBuilderInvocationPluginProvider.java
similarity index 89%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/substitutions/GraphBuilderInvocationPluginProvider.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/substitutions/GraphBuilderInvocationPluginProvider.java
index 1af4014777fb..4444303d0dc9 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/substitutions/GraphBuilderInvocationPluginProvider.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/substitutions/GraphBuilderInvocationPluginProvider.java
@@ -22,11 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.substitutions;
+package jdk.graal.compiler.truffle.substitutions;
 
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins;
-import jdk.compiler.graal.phases.util.Providers;
-import jdk.compiler.graal.truffle.KnownTruffleTypes;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins;
+import jdk.graal.compiler.phases.util.Providers;
+import jdk.graal.compiler.truffle.KnownTruffleTypes;
 
 import jdk.vm.ci.code.Architecture;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/substitutions/GraphDecoderInvocationPluginProvider.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/substitutions/GraphDecoderInvocationPluginProvider.java
similarity index 92%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/substitutions/GraphDecoderInvocationPluginProvider.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/substitutions/GraphDecoderInvocationPluginProvider.java
index f834f6ff2943..4d982c2ce59b 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/substitutions/GraphDecoderInvocationPluginProvider.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/substitutions/GraphDecoderInvocationPluginProvider.java
@@ -22,10 +22,10 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.substitutions;
+package jdk.graal.compiler.truffle.substitutions;
 
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins;
-import jdk.compiler.graal.phases.util.Providers;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins;
+import jdk.graal.compiler.phases.util.Providers;
 
 import jdk.vm.ci.code.Architecture;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/substitutions/TruffleGraphBuilderPlugins.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/substitutions/TruffleGraphBuilderPlugins.java
similarity index 93%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/substitutions/TruffleGraphBuilderPlugins.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/substitutions/TruffleGraphBuilderPlugins.java
index e5ef4103ce7d..01a4c25a29f9 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/substitutions/TruffleGraphBuilderPlugins.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/substitutions/TruffleGraphBuilderPlugins.java
@@ -22,10 +22,10 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.substitutions;
+package jdk.graal.compiler.truffle.substitutions;
 
 import static java.lang.Character.toUpperCase;
-import static jdk.compiler.graal.replacements.PEGraphDecoder.Options.MaximumLoopExplosionCount;
+import static jdk.graal.compiler.replacements.PEGraphDecoder.Options.MaximumLoopExplosionCount;
 
 import java.lang.reflect.Type;
 import java.util.ArrayList;
@@ -36,90 +36,90 @@
 import java.util.concurrent.Callable;
 import java.util.function.Supplier;
 
-import jdk.compiler.graal.core.common.calc.CanonicalCondition;
-import jdk.compiler.graal.core.common.memory.MemoryOrderMode;
-import jdk.compiler.graal.core.common.type.ObjectStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.core.common.type.StampPair;
-import jdk.compiler.graal.core.common.type.TypeReference;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.lir.gen.ArithmeticLIRGeneratorTool.RoundingMode;
-import jdk.compiler.graal.nodes.CallTargetNode;
-import jdk.compiler.graal.nodes.CallTargetNode.InvokeKind;
-import jdk.compiler.graal.nodes.ConditionAnchorNode;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.DeoptimizeNode;
-import jdk.compiler.graal.nodes.DynamicPiNode;
-import jdk.compiler.graal.nodes.FixedGuardNode;
-import jdk.compiler.graal.nodes.FrameState;
-import jdk.compiler.graal.nodes.InvokeNode;
-import jdk.compiler.graal.nodes.LogicConstantNode;
-import jdk.compiler.graal.nodes.LogicNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.PiArrayNode;
-import jdk.compiler.graal.nodes.PiNode;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.ValuePhiNode;
-import jdk.compiler.graal.nodes.calc.CompareNode;
-import jdk.compiler.graal.nodes.calc.ConditionalNode;
-import jdk.compiler.graal.nodes.calc.IntegerMulHighNode;
-import jdk.compiler.graal.nodes.calc.RoundNode;
-import jdk.compiler.graal.nodes.debug.BlackholeNode;
-import jdk.compiler.graal.nodes.extended.BoxNode;
-import jdk.compiler.graal.nodes.extended.BranchProbabilityNode;
-import jdk.compiler.graal.nodes.extended.GuardedUnsafeLoadNode;
-import jdk.compiler.graal.nodes.extended.RawLoadNode;
-import jdk.compiler.graal.nodes.extended.RawStoreNode;
-import jdk.compiler.graal.nodes.extended.UnsafeAccessNode;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin.OptionalInvocationPlugin;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin.Receiver;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin.RequiredInlineOnlyInvocationPlugin;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin.RequiredInvocationPlugin;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins.Registration;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins.ResolvedJavaSymbol;
-import jdk.compiler.graal.nodes.java.InstanceOfDynamicNode;
-import jdk.compiler.graal.nodes.java.LoadFieldNode;
-import jdk.compiler.graal.nodes.java.MethodCallTargetNode;
-import jdk.compiler.graal.nodes.spi.LoweringProvider;
-import jdk.compiler.graal.nodes.spi.Replacements;
-import jdk.compiler.graal.nodes.type.StampTool;
-import jdk.compiler.graal.nodes.util.GraphUtil;
-import jdk.compiler.graal.nodes.virtual.EnsureVirtualizedNode;
-import jdk.compiler.graal.options.Option;
-import jdk.compiler.graal.options.OptionKey;
-import jdk.compiler.graal.options.OptionType;
-import jdk.compiler.graal.phases.util.Providers;
-import jdk.compiler.graal.replacements.nodes.arithmetic.UnsignedMulHighNode;
-import jdk.compiler.graal.serviceprovider.SpeculationReasonGroup;
-import jdk.compiler.graal.truffle.nodes.asserts.NeverPartOfCompilationNode;
-import jdk.compiler.graal.truffle.KnownTruffleTypes;
-import jdk.compiler.graal.truffle.PerformanceInformationHandler;
-import jdk.compiler.graal.truffle.TruffleCompilation;
-import jdk.compiler.graal.truffle.TruffleCompilerOptions.PerformanceWarningKind;
-import jdk.compiler.graal.truffle.TruffleDebugJavaMethod;
-import jdk.compiler.graal.truffle.nodes.AnyExtendNode;
-import jdk.compiler.graal.truffle.nodes.IsCompilationConstantNode;
-import jdk.compiler.graal.truffle.nodes.ObjectLocationIdentity;
-import jdk.compiler.graal.truffle.nodes.TruffleAssumption;
-import jdk.compiler.graal.truffle.nodes.frame.AllowMaterializeNode;
-import jdk.compiler.graal.truffle.nodes.frame.ForceMaterializeNode;
-import jdk.compiler.graal.truffle.nodes.frame.NewFrameNode;
-import jdk.compiler.graal.truffle.nodes.frame.VirtualFrameAccessFlags;
-import jdk.compiler.graal.truffle.nodes.frame.VirtualFrameAccessType;
-import jdk.compiler.graal.truffle.nodes.frame.VirtualFrameClearNode;
-import jdk.compiler.graal.truffle.nodes.frame.VirtualFrameCopyNode;
-import jdk.compiler.graal.truffle.nodes.frame.VirtualFrameGetNode;
-import jdk.compiler.graal.truffle.nodes.frame.VirtualFrameGetTagNode;
-import jdk.compiler.graal.truffle.nodes.frame.VirtualFrameIsNode;
-import jdk.compiler.graal.truffle.nodes.frame.VirtualFrameSetNode;
-import jdk.compiler.graal.truffle.nodes.frame.VirtualFrameSwapNode;
-import jdk.compiler.graal.truffle.phases.TruffleSafepointInsertionPhase;
+import jdk.graal.compiler.core.common.calc.CanonicalCondition;
+import jdk.graal.compiler.core.common.memory.MemoryOrderMode;
+import jdk.graal.compiler.core.common.type.ObjectStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.core.common.type.StampPair;
+import jdk.graal.compiler.core.common.type.TypeReference;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.lir.gen.ArithmeticLIRGeneratorTool.RoundingMode;
+import jdk.graal.compiler.nodes.CallTargetNode;
+import jdk.graal.compiler.nodes.CallTargetNode.InvokeKind;
+import jdk.graal.compiler.nodes.ConditionAnchorNode;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.DeoptimizeNode;
+import jdk.graal.compiler.nodes.DynamicPiNode;
+import jdk.graal.compiler.nodes.FixedGuardNode;
+import jdk.graal.compiler.nodes.FrameState;
+import jdk.graal.compiler.nodes.InvokeNode;
+import jdk.graal.compiler.nodes.LogicConstantNode;
+import jdk.graal.compiler.nodes.LogicNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.PiArrayNode;
+import jdk.graal.compiler.nodes.PiNode;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.ValuePhiNode;
+import jdk.graal.compiler.nodes.calc.CompareNode;
+import jdk.graal.compiler.nodes.calc.ConditionalNode;
+import jdk.graal.compiler.nodes.calc.IntegerMulHighNode;
+import jdk.graal.compiler.nodes.calc.RoundNode;
+import jdk.graal.compiler.nodes.debug.BlackholeNode;
+import jdk.graal.compiler.nodes.extended.BoxNode;
+import jdk.graal.compiler.nodes.extended.BranchProbabilityNode;
+import jdk.graal.compiler.nodes.extended.GuardedUnsafeLoadNode;
+import jdk.graal.compiler.nodes.extended.RawLoadNode;
+import jdk.graal.compiler.nodes.extended.RawStoreNode;
+import jdk.graal.compiler.nodes.extended.UnsafeAccessNode;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin.OptionalInvocationPlugin;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin.Receiver;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin.RequiredInlineOnlyInvocationPlugin;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin.RequiredInvocationPlugin;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins.Registration;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins.ResolvedJavaSymbol;
+import jdk.graal.compiler.nodes.java.InstanceOfDynamicNode;
+import jdk.graal.compiler.nodes.java.LoadFieldNode;
+import jdk.graal.compiler.nodes.java.MethodCallTargetNode;
+import jdk.graal.compiler.nodes.spi.LoweringProvider;
+import jdk.graal.compiler.nodes.spi.Replacements;
+import jdk.graal.compiler.nodes.type.StampTool;
+import jdk.graal.compiler.nodes.util.GraphUtil;
+import jdk.graal.compiler.nodes.virtual.EnsureVirtualizedNode;
+import jdk.graal.compiler.options.Option;
+import jdk.graal.compiler.options.OptionKey;
+import jdk.graal.compiler.options.OptionType;
+import jdk.graal.compiler.phases.util.Providers;
+import jdk.graal.compiler.replacements.nodes.arithmetic.UnsignedMulHighNode;
+import jdk.graal.compiler.serviceprovider.SpeculationReasonGroup;
+import jdk.graal.compiler.truffle.nodes.asserts.NeverPartOfCompilationNode;
+import jdk.graal.compiler.truffle.KnownTruffleTypes;
+import jdk.graal.compiler.truffle.PerformanceInformationHandler;
+import jdk.graal.compiler.truffle.TruffleCompilation;
+import jdk.graal.compiler.truffle.TruffleCompilerOptions.PerformanceWarningKind;
+import jdk.graal.compiler.truffle.TruffleDebugJavaMethod;
+import jdk.graal.compiler.truffle.nodes.AnyExtendNode;
+import jdk.graal.compiler.truffle.nodes.IsCompilationConstantNode;
+import jdk.graal.compiler.truffle.nodes.ObjectLocationIdentity;
+import jdk.graal.compiler.truffle.nodes.TruffleAssumption;
+import jdk.graal.compiler.truffle.nodes.frame.AllowMaterializeNode;
+import jdk.graal.compiler.truffle.nodes.frame.ForceMaterializeNode;
+import jdk.graal.compiler.truffle.nodes.frame.NewFrameNode;
+import jdk.graal.compiler.truffle.nodes.frame.VirtualFrameAccessFlags;
+import jdk.graal.compiler.truffle.nodes.frame.VirtualFrameAccessType;
+import jdk.graal.compiler.truffle.nodes.frame.VirtualFrameClearNode;
+import jdk.graal.compiler.truffle.nodes.frame.VirtualFrameCopyNode;
+import jdk.graal.compiler.truffle.nodes.frame.VirtualFrameGetNode;
+import jdk.graal.compiler.truffle.nodes.frame.VirtualFrameGetTagNode;
+import jdk.graal.compiler.truffle.nodes.frame.VirtualFrameIsNode;
+import jdk.graal.compiler.truffle.nodes.frame.VirtualFrameSetNode;
+import jdk.graal.compiler.truffle.nodes.frame.VirtualFrameSwapNode;
+import jdk.graal.compiler.truffle.phases.TruffleSafepointInsertionPhase;
 import org.graalvm.word.LocationIdentity;
 
 import com.oracle.truffle.compiler.TruffleCompilationTask;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/substitutions/TruffleInvocationPlugins.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/substitutions/TruffleInvocationPlugins.java
similarity index 95%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/substitutions/TruffleInvocationPlugins.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/substitutions/TruffleInvocationPlugins.java
index 4ac42d929779..1ec3775dfd9f 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/substitutions/TruffleInvocationPlugins.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/substitutions/TruffleInvocationPlugins.java
@@ -22,38 +22,38 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.substitutions;
+package jdk.graal.compiler.truffle.substitutions;
 
-import static jdk.compiler.graal.lir.gen.LIRGeneratorTool.CalcStringAttributesEncoding.BMP;
-import static jdk.compiler.graal.lir.gen.LIRGeneratorTool.CalcStringAttributesEncoding.LATIN1;
-import static jdk.compiler.graal.lir.gen.LIRGeneratorTool.CalcStringAttributesEncoding.UTF_16;
-import static jdk.compiler.graal.lir.gen.LIRGeneratorTool.CalcStringAttributesEncoding.UTF_32;
-import static jdk.compiler.graal.lir.gen.LIRGeneratorTool.CalcStringAttributesEncoding.UTF_8;
-import static jdk.compiler.graal.nodes.NamedLocationIdentity.getArrayLocation;
+import static jdk.graal.compiler.lir.gen.LIRGeneratorTool.CalcStringAttributesEncoding.BMP;
+import static jdk.graal.compiler.lir.gen.LIRGeneratorTool.CalcStringAttributesEncoding.LATIN1;
+import static jdk.graal.compiler.lir.gen.LIRGeneratorTool.CalcStringAttributesEncoding.UTF_16;
+import static jdk.graal.compiler.lir.gen.LIRGeneratorTool.CalcStringAttributesEncoding.UTF_32;
+import static jdk.graal.compiler.lir.gen.LIRGeneratorTool.CalcStringAttributesEncoding.UTF_8;
+import static jdk.graal.compiler.nodes.NamedLocationIdentity.getArrayLocation;
 
-import jdk.compiler.graal.core.common.Stride;
-import jdk.compiler.graal.core.common.StrideUtil;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.lir.gen.LIRGeneratorTool.ArrayIndexOfVariant;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.NamedLocationIdentity;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.calc.AddNode;
-import jdk.compiler.graal.nodes.calc.LeftShiftNode;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin.InlineOnlyInvocationPlugin;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins.OptionalLazySymbol;
-import jdk.compiler.graal.nodes.spi.Replacements;
-import jdk.compiler.graal.replacements.nodes.ArrayCopyWithConversionsNode;
-import jdk.compiler.graal.replacements.nodes.ArrayIndexOfMacroNode;
-import jdk.compiler.graal.replacements.nodes.ArrayIndexOfNode;
-import jdk.compiler.graal.replacements.nodes.ArrayRegionCompareToNode;
-import jdk.compiler.graal.replacements.nodes.ArrayRegionEqualsNode;
-import jdk.compiler.graal.replacements.nodes.CalcStringAttributesMacroNode;
-import jdk.compiler.graal.replacements.nodes.MacroNode;
+import jdk.graal.compiler.core.common.Stride;
+import jdk.graal.compiler.core.common.StrideUtil;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.lir.gen.LIRGeneratorTool.ArrayIndexOfVariant;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.NamedLocationIdentity;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.calc.AddNode;
+import jdk.graal.compiler.nodes.calc.LeftShiftNode;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin.InlineOnlyInvocationPlugin;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins.OptionalLazySymbol;
+import jdk.graal.compiler.nodes.spi.Replacements;
+import jdk.graal.compiler.replacements.nodes.ArrayCopyWithConversionsNode;
+import jdk.graal.compiler.replacements.nodes.ArrayIndexOfMacroNode;
+import jdk.graal.compiler.replacements.nodes.ArrayIndexOfNode;
+import jdk.graal.compiler.replacements.nodes.ArrayRegionCompareToNode;
+import jdk.graal.compiler.replacements.nodes.ArrayRegionEqualsNode;
+import jdk.graal.compiler.replacements.nodes.CalcStringAttributesMacroNode;
+import jdk.graal.compiler.replacements.nodes.MacroNode;
 import org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.aarch64.AArch64;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/util/CollectionsUtil.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/util/CollectionsUtil.java
similarity index 99%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/util/CollectionsUtil.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/util/CollectionsUtil.java
index 0f73a6d3ef75..09f4baf36c8f 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/util/CollectionsUtil.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/util/CollectionsUtil.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.util;
+package jdk.graal.compiler.util;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/util/OptionsEncoder.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/util/OptionsEncoder.java
similarity index 99%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/util/OptionsEncoder.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/util/OptionsEncoder.java
index ac981273cfdf..3166b982c167 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/util/OptionsEncoder.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/util/OptionsEncoder.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.util;
+package jdk.graal.compiler.util;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/util/TypedDataInputStream.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/util/TypedDataInputStream.java
similarity index 98%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/util/TypedDataInputStream.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/util/TypedDataInputStream.java
index 2f5e49aefafc..a9db7dd3afd4 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/util/TypedDataInputStream.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/util/TypedDataInputStream.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.util;
+package jdk.graal.compiler.util;
 
 import java.io.DataInputStream;
 import java.io.IOException;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/util/TypedDataOutputStream.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/util/TypedDataOutputStream.java
similarity index 99%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/util/TypedDataOutputStream.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/util/TypedDataOutputStream.java
index d6b607bf4162..2756885007f4 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/util/TypedDataOutputStream.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/util/TypedDataOutputStream.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.util;
+package jdk.graal.compiler.util;
 
 import java.io.DataOutputStream;
 import java.io.IOException;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/util/json/JSONFormatter.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/util/json/JSONFormatter.java
similarity index 99%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/util/json/JSONFormatter.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/util/json/JSONFormatter.java
index 04e4747418db..0fc4b4284989 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/util/json/JSONFormatter.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/util/json/JSONFormatter.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.util.json;
+package jdk.graal.compiler.util.json;
 
 import java.util.List;
 import java.util.Map;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/util/json/JSONParser.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/util/json/JSONParser.java
similarity index 99%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/util/json/JSONParser.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/util/json/JSONParser.java
index 54506784734c..ce060c4d6263 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/util/json/JSONParser.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/util/json/JSONParser.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.util.json;
+package jdk.graal.compiler.util.json;
 
 import java.io.IOException;
 import java.io.Reader;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/util/json/JSONParserException.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/util/json/JSONParserException.java
similarity index 97%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/util/json/JSONParserException.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/util/json/JSONParserException.java
index 65782e97b41d..35829011f91a 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/util/json/JSONParserException.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/util/json/JSONParserException.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.util.json;
+package jdk.graal.compiler.util.json;
 
 @SuppressWarnings("serial")
 public final class JSONParserException extends RuntimeException {
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/virtual/phases/ea/EffectList.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/virtual/phases/ea/EffectList.java
similarity index 96%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/virtual/phases/ea/EffectList.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/virtual/phases/ea/EffectList.java
index 8597fd444dd6..7081a74a8d81 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/virtual/phases/ea/EffectList.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/virtual/phases/ea/EffectList.java
@@ -22,18 +22,18 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.virtual.phases.ea;
+package jdk.graal.compiler.virtual.phases.ea;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Iterator;
 import java.util.function.Consumer;
 
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.nodes.OptimizationLog;
-import jdk.compiler.graal.nodes.StructuredGraph;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.nodes.OptimizationLog;
+import jdk.graal.compiler.nodes.StructuredGraph;
 
 /**
  * An {@link EffectList} can be used to maintain a list of {@link Effect}s and backtrack to a
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/virtual/phases/ea/EffectsBlockState.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/virtual/phases/ea/EffectsBlockState.java
similarity index 95%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/virtual/phases/ea/EffectsBlockState.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/virtual/phases/ea/EffectsBlockState.java
index 74bc808e3afe..c4c40535ce2b 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/virtual/phases/ea/EffectsBlockState.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/virtual/phases/ea/EffectsBlockState.java
@@ -22,13 +22,13 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.virtual.phases.ea;
+package jdk.graal.compiler.virtual.phases.ea;
 
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.EconomicSet;
 import org.graalvm.collections.UnmodifiableMapCursor;
-import jdk.compiler.graal.nodes.WithExceptionNode;
-import jdk.compiler.graal.nodes.cfg.HIRBlock;
+import jdk.graal.compiler.nodes.WithExceptionNode;
+import jdk.graal.compiler.nodes.cfg.HIRBlock;
 
 public abstract class EffectsBlockState> {
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/virtual/phases/ea/EffectsClosure.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/virtual/phases/ea/EffectsClosure.java
similarity index 94%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/virtual/phases/ea/EffectsClosure.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/virtual/phases/ea/EffectsClosure.java
index d6afccb4de5f..cb62b36ed17c 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/virtual/phases/ea/EffectsClosure.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/virtual/phases/ea/EffectsClosure.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.virtual.phases.ea;
+package jdk.graal.compiler.virtual.phases.ea;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -30,44 +30,44 @@
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.EconomicSet;
 import org.graalvm.collections.Equivalence;
-import jdk.compiler.graal.core.common.GraalOptions;
-import jdk.compiler.graal.core.common.cfg.BlockMap;
-import jdk.compiler.graal.core.common.cfg.Loop;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.core.common.util.CompilationAlarm;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.debug.Indent;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeBitMap;
-import jdk.compiler.graal.graph.NodeMap;
-import jdk.compiler.graal.graph.iterators.NodeIterable;
-import jdk.compiler.graal.nodes.AbstractMergeNode;
-import jdk.compiler.graal.nodes.FixedNode;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.IfNode;
-import jdk.compiler.graal.nodes.LogicConstantNode;
-import jdk.compiler.graal.nodes.LogicNode;
-import jdk.compiler.graal.nodes.LoopBeginNode;
-import jdk.compiler.graal.nodes.LoopExitNode;
-import jdk.compiler.graal.nodes.PhiNode;
-import jdk.compiler.graal.nodes.ProxyNode;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.StructuredGraph.ScheduleResult;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.ValuePhiNode;
-import jdk.compiler.graal.nodes.WithExceptionNode;
-import jdk.compiler.graal.nodes.cfg.ControlFlowGraph;
-import jdk.compiler.graal.nodes.cfg.HIRBlock;
-import jdk.compiler.graal.nodes.extended.BoxNode;
-import jdk.compiler.graal.nodes.util.GraphUtil;
-import jdk.compiler.graal.nodes.virtual.AllocatedObjectNode;
-import jdk.compiler.graal.nodes.virtual.CommitAllocationNode;
-import jdk.compiler.graal.nodes.virtual.VirtualObjectNode;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.graph.ReentrantBlockIterator;
-import jdk.compiler.graal.phases.graph.ReentrantBlockIterator.BlockIteratorClosure;
-import jdk.compiler.graal.phases.graph.ReentrantBlockIterator.LoopInfo;
+import jdk.graal.compiler.core.common.GraalOptions;
+import jdk.graal.compiler.core.common.cfg.BlockMap;
+import jdk.graal.compiler.core.common.cfg.Loop;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.core.common.util.CompilationAlarm;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.debug.Indent;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeBitMap;
+import jdk.graal.compiler.graph.NodeMap;
+import jdk.graal.compiler.graph.iterators.NodeIterable;
+import jdk.graal.compiler.nodes.AbstractMergeNode;
+import jdk.graal.compiler.nodes.FixedNode;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.IfNode;
+import jdk.graal.compiler.nodes.LogicConstantNode;
+import jdk.graal.compiler.nodes.LogicNode;
+import jdk.graal.compiler.nodes.LoopBeginNode;
+import jdk.graal.compiler.nodes.LoopExitNode;
+import jdk.graal.compiler.nodes.PhiNode;
+import jdk.graal.compiler.nodes.ProxyNode;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.StructuredGraph.ScheduleResult;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.ValuePhiNode;
+import jdk.graal.compiler.nodes.WithExceptionNode;
+import jdk.graal.compiler.nodes.cfg.ControlFlowGraph;
+import jdk.graal.compiler.nodes.cfg.HIRBlock;
+import jdk.graal.compiler.nodes.extended.BoxNode;
+import jdk.graal.compiler.nodes.util.GraphUtil;
+import jdk.graal.compiler.nodes.virtual.AllocatedObjectNode;
+import jdk.graal.compiler.nodes.virtual.CommitAllocationNode;
+import jdk.graal.compiler.nodes.virtual.VirtualObjectNode;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.graph.ReentrantBlockIterator;
+import jdk.graal.compiler.phases.graph.ReentrantBlockIterator.BlockIteratorClosure;
+import jdk.graal.compiler.phases.graph.ReentrantBlockIterator.LoopInfo;
 import org.graalvm.word.LocationIdentity;
 
 public abstract class EffectsClosure> extends EffectsPhase.Closure {
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/virtual/phases/ea/EffectsPhase.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/virtual/phases/ea/EffectsPhase.java
similarity index 84%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/virtual/phases/ea/EffectsPhase.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/virtual/phases/ea/EffectsPhase.java
index 6e62e08eb500..dc16bfbf30e9 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/virtual/phases/ea/EffectsPhase.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/virtual/phases/ea/EffectsPhase.java
@@ -22,32 +22,32 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.virtual.phases.ea;
+package jdk.graal.compiler.virtual.phases.ea;
 
-import static jdk.compiler.graal.phases.common.DeadCodeEliminationPhase.Optionality.Required;
+import static jdk.graal.compiler.phases.common.DeadCodeEliminationPhase.Optionality.Required;
 
 import java.util.Optional;
 
 import org.graalvm.collections.EconomicSet;
-import jdk.compiler.graal.core.common.util.CompilationAlarm;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.graph.Graph.NodeEventScope;
-import jdk.compiler.graal.graph.Graph;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.nodes.GraphState;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.StructuredGraph.ScheduleResult;
-import jdk.compiler.graal.nodes.cfg.ControlFlowGraph;
-import jdk.compiler.graal.nodes.spi.CoreProviders;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.BasePhase;
-import jdk.compiler.graal.phases.common.CanonicalizerPhase;
-import jdk.compiler.graal.phases.common.DeadCodeEliminationPhase;
-import jdk.compiler.graal.phases.common.util.EconomicSetNodeEventListener;
-import jdk.compiler.graal.phases.common.util.LoopUtility;
-import jdk.compiler.graal.phases.graph.ReentrantBlockIterator;
-import jdk.compiler.graal.phases.schedule.SchedulePhase;
-import jdk.compiler.graal.phases.schedule.SchedulePhase.SchedulingStrategy;
+import jdk.graal.compiler.core.common.util.CompilationAlarm;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.graph.Graph.NodeEventScope;
+import jdk.graal.compiler.graph.Graph;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.nodes.GraphState;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.StructuredGraph.ScheduleResult;
+import jdk.graal.compiler.nodes.cfg.ControlFlowGraph;
+import jdk.graal.compiler.nodes.spi.CoreProviders;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.BasePhase;
+import jdk.graal.compiler.phases.common.CanonicalizerPhase;
+import jdk.graal.compiler.phases.common.DeadCodeEliminationPhase;
+import jdk.graal.compiler.phases.common.util.EconomicSetNodeEventListener;
+import jdk.graal.compiler.phases.common.util.LoopUtility;
+import jdk.graal.compiler.phases.graph.ReentrantBlockIterator;
+import jdk.graal.compiler.phases.schedule.SchedulePhase;
+import jdk.graal.compiler.phases.schedule.SchedulePhase.SchedulingStrategy;
 
 public abstract class EffectsPhase extends BasePhase {
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/virtual/phases/ea/FinalPartialEscapePhase.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/virtual/phases/ea/FinalPartialEscapePhase.java
similarity index 85%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/virtual/phases/ea/FinalPartialEscapePhase.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/virtual/phases/ea/FinalPartialEscapePhase.java
index eee0da3b089c..2ef70f9a7a7a 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/virtual/phases/ea/FinalPartialEscapePhase.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/virtual/phases/ea/FinalPartialEscapePhase.java
@@ -22,19 +22,19 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.virtual.phases.ea;
+package jdk.graal.compiler.virtual.phases.ea;
 
-import static jdk.compiler.graal.core.common.GraalOptions.EscapeAnalyzeOnly;
+import static jdk.graal.compiler.core.common.GraalOptions.EscapeAnalyzeOnly;
 
 import java.util.Optional;
 
-import jdk.compiler.graal.nodes.GraphState;
-import jdk.compiler.graal.nodes.GraphState.StageFlag;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.spi.CoreProviders;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.BasePhase;
-import jdk.compiler.graal.phases.common.CanonicalizerPhase;
+import jdk.graal.compiler.nodes.GraphState;
+import jdk.graal.compiler.nodes.GraphState.StageFlag;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.spi.CoreProviders;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.BasePhase;
+import jdk.graal.compiler.phases.common.CanonicalizerPhase;
 
 /**
  * Performs the final {@link PartialEscapePhase}.
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/virtual/phases/ea/GraphEffectList.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/virtual/phases/ea/GraphEffectList.java
similarity index 93%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/virtual/phases/ea/GraphEffectList.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/virtual/phases/ea/GraphEffectList.java
index 0e70251e6ec0..96569a8ec8c1 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/virtual/phases/ea/GraphEffectList.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/virtual/phases/ea/GraphEffectList.java
@@ -22,33 +22,33 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.virtual.phases.ea;
+package jdk.graal.compiler.virtual.phases.ea;
 
 import java.util.ArrayList;
 
-import jdk.compiler.graal.debug.DebugCloseable;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.nodes.AbstractBeginNode;
-import jdk.compiler.graal.nodes.BeginNode;
-import jdk.compiler.graal.nodes.ControlSinkNode;
-import jdk.compiler.graal.nodes.FixedNode;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.FrameState;
-import jdk.compiler.graal.nodes.IfNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.PhiNode;
-import jdk.compiler.graal.nodes.PiNode;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.WithExceptionNode;
-import jdk.compiler.graal.nodes.calc.FloatingNode;
-import jdk.compiler.graal.nodes.memory.MemoryKill;
-import jdk.compiler.graal.nodes.util.GraphUtil;
-import jdk.compiler.graal.nodes.virtual.EscapeObjectState;
-import jdk.compiler.graal.nodes.virtual.VirtualObjectState;
-import jdk.compiler.graal.phases.common.DeadCodeEliminationPhase;
+import jdk.graal.compiler.debug.DebugCloseable;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.nodes.AbstractBeginNode;
+import jdk.graal.compiler.nodes.BeginNode;
+import jdk.graal.compiler.nodes.ControlSinkNode;
+import jdk.graal.compiler.nodes.FixedNode;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.FrameState;
+import jdk.graal.compiler.nodes.IfNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.PhiNode;
+import jdk.graal.compiler.nodes.PiNode;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.WithExceptionNode;
+import jdk.graal.compiler.nodes.calc.FloatingNode;
+import jdk.graal.compiler.nodes.memory.MemoryKill;
+import jdk.graal.compiler.nodes.util.GraphUtil;
+import jdk.graal.compiler.nodes.virtual.EscapeObjectState;
+import jdk.graal.compiler.nodes.virtual.VirtualObjectState;
+import jdk.graal.compiler.phases.common.DeadCodeEliminationPhase;
 
 public final class GraphEffectList extends EffectList {
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/virtual/phases/ea/ObjectState.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/virtual/phases/ea/ObjectState.java
similarity index 94%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/virtual/phases/ea/ObjectState.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/virtual/phases/ea/ObjectState.java
index c3c7a0381f56..8bbd647e513c 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/virtual/phases/ea/ObjectState.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/virtual/phases/ea/ObjectState.java
@@ -22,21 +22,21 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.virtual.phases.ea;
+package jdk.graal.compiler.virtual.phases.ea;
 
 import java.util.Arrays;
 import java.util.List;
 
-import jdk.compiler.graal.core.common.spi.MetaAccessExtensionProvider;
-import jdk.compiler.graal.debug.CounterKey;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.java.MonitorIdNode;
-import jdk.compiler.graal.nodes.virtual.EscapeObjectState;
-import jdk.compiler.graal.nodes.virtual.LockState;
-import jdk.compiler.graal.nodes.virtual.MaterializedObjectState;
-import jdk.compiler.graal.nodes.virtual.VirtualObjectNode;
-import jdk.compiler.graal.nodes.virtual.VirtualObjectState;
+import jdk.graal.compiler.core.common.spi.MetaAccessExtensionProvider;
+import jdk.graal.compiler.debug.CounterKey;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.java.MonitorIdNode;
+import jdk.graal.compiler.nodes.virtual.EscapeObjectState;
+import jdk.graal.compiler.nodes.virtual.LockState;
+import jdk.graal.compiler.nodes.virtual.MaterializedObjectState;
+import jdk.graal.compiler.nodes.virtual.VirtualObjectNode;
+import jdk.graal.compiler.nodes.virtual.VirtualObjectState;
 
 import jdk.vm.ci.meta.JavaConstant;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/virtual/phases/ea/PEReadEliminationBlockState.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/virtual/phases/ea/PEReadEliminationBlockState.java
similarity index 92%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/virtual/phases/ea/PEReadEliminationBlockState.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/virtual/phases/ea/PEReadEliminationBlockState.java
index 514558dd5998..aa41b1056087 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/virtual/phases/ea/PEReadEliminationBlockState.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/virtual/phases/ea/PEReadEliminationBlockState.java
@@ -22,23 +22,23 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.virtual.phases.ea;
+package jdk.graal.compiler.virtual.phases.ea;
 
 import java.util.Iterator;
 import java.util.List;
 
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.Equivalence;
-import jdk.compiler.graal.core.common.type.IntegerStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.nodes.FieldLocationIdentity;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.virtual.AllocatedObjectNode;
-import jdk.compiler.graal.nodes.virtual.VirtualInstanceNode;
-import jdk.compiler.graal.nodes.virtual.VirtualObjectNode;
-import jdk.compiler.graal.options.OptionValues;
+import jdk.graal.compiler.core.common.type.IntegerStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.nodes.FieldLocationIdentity;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.virtual.AllocatedObjectNode;
+import jdk.graal.compiler.nodes.virtual.VirtualInstanceNode;
+import jdk.graal.compiler.nodes.virtual.VirtualObjectNode;
+import jdk.graal.compiler.options.OptionValues;
 import org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/virtual/phases/ea/PEReadEliminationClosure.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/virtual/phases/ea/PEReadEliminationClosure.java
similarity index 92%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/virtual/phases/ea/PEReadEliminationClosure.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/virtual/phases/ea/PEReadEliminationClosure.java
index 08ffe0c15f44..f0b685d32869 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/virtual/phases/ea/PEReadEliminationClosure.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/virtual/phases/ea/PEReadEliminationClosure.java
@@ -22,10 +22,10 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.virtual.phases.ea;
+package jdk.graal.compiler.virtual.phases.ea;
 
-import static jdk.compiler.graal.core.common.GraalOptions.ReadEliminationMaxLoopVisits;
-import static jdk.compiler.graal.nodes.NamedLocationIdentity.ARRAY_LENGTH_LOCATION;
+import static jdk.graal.compiler.core.common.GraalOptions.ReadEliminationMaxLoopVisits;
+import static jdk.graal.compiler.nodes.NamedLocationIdentity.ARRAY_LENGTH_LOCATION;
 
 import java.util.EnumMap;
 import java.util.Iterator;
@@ -36,40 +36,40 @@
 import org.graalvm.collections.Equivalence;
 import org.graalvm.collections.MapCursor;
 import org.graalvm.collections.Pair;
-import jdk.compiler.graal.core.common.cfg.Loop;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.nodes.AbstractBeginNode;
-import jdk.compiler.graal.nodes.FieldLocationIdentity;
-import jdk.compiler.graal.nodes.FixedNode;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.GraphState.StageFlag;
-import jdk.compiler.graal.nodes.LoopBeginNode;
-import jdk.compiler.graal.nodes.LoopExitNode;
-import jdk.compiler.graal.nodes.NamedLocationIdentity;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.PhiNode;
-import jdk.compiler.graal.nodes.ProxyNode;
-import jdk.compiler.graal.nodes.StructuredGraph.ScheduleResult;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.ValueProxyNode;
-import jdk.compiler.graal.nodes.cfg.HIRBlock;
-import jdk.compiler.graal.nodes.extended.RawLoadNode;
-import jdk.compiler.graal.nodes.extended.RawStoreNode;
-import jdk.compiler.graal.nodes.extended.UnboxNode;
-import jdk.compiler.graal.nodes.java.ArrayLengthNode;
-import jdk.compiler.graal.nodes.java.LoadFieldNode;
-import jdk.compiler.graal.nodes.java.LoadIndexedNode;
-import jdk.compiler.graal.nodes.java.StoreFieldNode;
-import jdk.compiler.graal.nodes.java.StoreIndexedNode;
-import jdk.compiler.graal.nodes.memory.MemoryKill;
-import jdk.compiler.graal.nodes.memory.MultiMemoryKill;
-import jdk.compiler.graal.nodes.memory.SingleMemoryKill;
-import jdk.compiler.graal.nodes.spi.CoreProviders;
-import jdk.compiler.graal.nodes.type.StampTool;
-import jdk.compiler.graal.nodes.util.GraphUtil;
-import jdk.compiler.graal.nodes.virtual.VirtualArrayNode;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.virtual.phases.ea.PEReadEliminationBlockState.ReadCacheEntry;
+import jdk.graal.compiler.core.common.cfg.Loop;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.nodes.AbstractBeginNode;
+import jdk.graal.compiler.nodes.FieldLocationIdentity;
+import jdk.graal.compiler.nodes.FixedNode;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.GraphState.StageFlag;
+import jdk.graal.compiler.nodes.LoopBeginNode;
+import jdk.graal.compiler.nodes.LoopExitNode;
+import jdk.graal.compiler.nodes.NamedLocationIdentity;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.PhiNode;
+import jdk.graal.compiler.nodes.ProxyNode;
+import jdk.graal.compiler.nodes.StructuredGraph.ScheduleResult;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.ValueProxyNode;
+import jdk.graal.compiler.nodes.cfg.HIRBlock;
+import jdk.graal.compiler.nodes.extended.RawLoadNode;
+import jdk.graal.compiler.nodes.extended.RawStoreNode;
+import jdk.graal.compiler.nodes.extended.UnboxNode;
+import jdk.graal.compiler.nodes.java.ArrayLengthNode;
+import jdk.graal.compiler.nodes.java.LoadFieldNode;
+import jdk.graal.compiler.nodes.java.LoadIndexedNode;
+import jdk.graal.compiler.nodes.java.StoreFieldNode;
+import jdk.graal.compiler.nodes.java.StoreIndexedNode;
+import jdk.graal.compiler.nodes.memory.MemoryKill;
+import jdk.graal.compiler.nodes.memory.MultiMemoryKill;
+import jdk.graal.compiler.nodes.memory.SingleMemoryKill;
+import jdk.graal.compiler.nodes.spi.CoreProviders;
+import jdk.graal.compiler.nodes.type.StampTool;
+import jdk.graal.compiler.nodes.util.GraphUtil;
+import jdk.graal.compiler.nodes.virtual.VirtualArrayNode;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.virtual.phases.ea.PEReadEliminationBlockState.ReadCacheEntry;
 import org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.meta.JavaConstant;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/virtual/phases/ea/PartialEscapeBlockState.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/virtual/phases/ea/PartialEscapeBlockState.java
similarity index 94%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/virtual/phases/ea/PartialEscapeBlockState.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/virtual/phases/ea/PartialEscapeBlockState.java
index d28bf5e073ab..e96a4dff0e0f 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/virtual/phases/ea/PartialEscapeBlockState.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/virtual/phases/ea/PartialEscapeBlockState.java
@@ -22,28 +22,28 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.virtual.phases.ea;
+package jdk.graal.compiler.virtual.phases.ea;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import jdk.compiler.graal.debug.DebugCloseable;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeSourcePosition;
-import jdk.compiler.graal.nodes.FixedNode;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.calc.FloatingNode;
-import jdk.compiler.graal.nodes.java.MonitorIdNode;
-import jdk.compiler.graal.nodes.virtual.AllocatedObjectNode;
-import jdk.compiler.graal.nodes.virtual.CommitAllocationNode;
-import jdk.compiler.graal.nodes.virtual.LockState;
-import jdk.compiler.graal.nodes.virtual.VirtualObjectNode;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.virtual.phases.ea.EffectList.Effect;
+import jdk.graal.compiler.debug.DebugCloseable;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeSourcePosition;
+import jdk.graal.compiler.nodes.FixedNode;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.calc.FloatingNode;
+import jdk.graal.compiler.nodes.java.MonitorIdNode;
+import jdk.graal.compiler.nodes.virtual.AllocatedObjectNode;
+import jdk.graal.compiler.nodes.virtual.CommitAllocationNode;
+import jdk.graal.compiler.nodes.virtual.LockState;
+import jdk.graal.compiler.nodes.virtual.VirtualObjectNode;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.virtual.phases.ea.EffectList.Effect;
 
 public abstract class PartialEscapeBlockState> extends EffectsBlockState {
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/virtual/phases/ea/PartialEscapeClosure.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/virtual/phases/ea/PartialEscapeClosure.java
similarity index 96%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/virtual/phases/ea/PartialEscapeClosure.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/virtual/phases/ea/PartialEscapeClosure.java
index 29441a36d58e..c16ed289831c 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/virtual/phases/ea/PartialEscapeClosure.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/virtual/phases/ea/PartialEscapeClosure.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.virtual.phases.ea;
+package jdk.graal.compiler.virtual.phases.ea;
 
 import java.util.ArrayList;
 import java.util.BitSet;
@@ -33,53 +33,53 @@
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.EconomicSet;
 import org.graalvm.collections.Equivalence;
-import jdk.compiler.graal.core.common.GraalOptions;
-import jdk.compiler.graal.core.common.RetryableBailoutException;
-import jdk.compiler.graal.core.common.cfg.Loop;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.debug.CounterKey;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeBitMap;
-import jdk.compiler.graal.graph.NodeInputList;
-import jdk.compiler.graal.graph.Position;
-import jdk.compiler.graal.nodes.AbstractEndNode;
-import jdk.compiler.graal.nodes.CallTargetNode;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.ControlSinkNode;
-import jdk.compiler.graal.nodes.FixedNode;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.FrameState;
-import jdk.compiler.graal.nodes.GraphState.StageFlag;
-import jdk.compiler.graal.nodes.Invoke;
-import jdk.compiler.graal.nodes.LoopBeginNode;
-import jdk.compiler.graal.nodes.LoopExitNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.PhiNode;
-import jdk.compiler.graal.nodes.ProxyNode;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.StructuredGraph.ScheduleResult;
-import jdk.compiler.graal.nodes.UnwindNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.ValuePhiNode;
-import jdk.compiler.graal.nodes.ValueProxyNode;
-import jdk.compiler.graal.nodes.VirtualState;
-import jdk.compiler.graal.nodes.cfg.HIRBlock;
-import jdk.compiler.graal.nodes.java.AbstractNewObjectNode;
-import jdk.compiler.graal.nodes.spi.Canonicalizable;
-import jdk.compiler.graal.nodes.spi.CoreProviders;
-import jdk.compiler.graal.nodes.spi.NodeWithState;
-import jdk.compiler.graal.nodes.spi.Virtualizable;
-import jdk.compiler.graal.nodes.spi.VirtualizableAllocation;
-import jdk.compiler.graal.nodes.spi.VirtualizerTool;
-import jdk.compiler.graal.nodes.virtual.AllocatedObjectNode;
-import jdk.compiler.graal.nodes.virtual.CommitAllocationNode;
-import jdk.compiler.graal.nodes.virtual.EnsureVirtualizedNode;
-import jdk.compiler.graal.nodes.virtual.EscapeObjectState;
-import jdk.compiler.graal.nodes.virtual.VirtualObjectNode;
-import jdk.compiler.graal.nodes.virtual.VirtualObjectState;
+import jdk.graal.compiler.core.common.GraalOptions;
+import jdk.graal.compiler.core.common.RetryableBailoutException;
+import jdk.graal.compiler.core.common.cfg.Loop;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.debug.CounterKey;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeBitMap;
+import jdk.graal.compiler.graph.NodeInputList;
+import jdk.graal.compiler.graph.Position;
+import jdk.graal.compiler.nodes.AbstractEndNode;
+import jdk.graal.compiler.nodes.CallTargetNode;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.ControlSinkNode;
+import jdk.graal.compiler.nodes.FixedNode;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.FrameState;
+import jdk.graal.compiler.nodes.GraphState.StageFlag;
+import jdk.graal.compiler.nodes.Invoke;
+import jdk.graal.compiler.nodes.LoopBeginNode;
+import jdk.graal.compiler.nodes.LoopExitNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.PhiNode;
+import jdk.graal.compiler.nodes.ProxyNode;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.StructuredGraph.ScheduleResult;
+import jdk.graal.compiler.nodes.UnwindNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.ValuePhiNode;
+import jdk.graal.compiler.nodes.ValueProxyNode;
+import jdk.graal.compiler.nodes.VirtualState;
+import jdk.graal.compiler.nodes.cfg.HIRBlock;
+import jdk.graal.compiler.nodes.java.AbstractNewObjectNode;
+import jdk.graal.compiler.nodes.spi.Canonicalizable;
+import jdk.graal.compiler.nodes.spi.CoreProviders;
+import jdk.graal.compiler.nodes.spi.NodeWithState;
+import jdk.graal.compiler.nodes.spi.Virtualizable;
+import jdk.graal.compiler.nodes.spi.VirtualizableAllocation;
+import jdk.graal.compiler.nodes.spi.VirtualizerTool;
+import jdk.graal.compiler.nodes.virtual.AllocatedObjectNode;
+import jdk.graal.compiler.nodes.virtual.CommitAllocationNode;
+import jdk.graal.compiler.nodes.virtual.EnsureVirtualizedNode;
+import jdk.graal.compiler.nodes.virtual.EscapeObjectState;
+import jdk.graal.compiler.nodes.virtual.VirtualObjectNode;
+import jdk.graal.compiler.nodes.virtual.VirtualObjectState;
 
 import jdk.vm.ci.meta.JavaConstant;
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/virtual/phases/ea/PartialEscapePhase.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/virtual/phases/ea/PartialEscapePhase.java
similarity index 85%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/virtual/phases/ea/PartialEscapePhase.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/virtual/phases/ea/PartialEscapePhase.java
index 469fe2af33bd..a6744bdef741 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/virtual/phases/ea/PartialEscapePhase.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/virtual/phases/ea/PartialEscapePhase.java
@@ -22,33 +22,33 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.virtual.phases.ea;
+package jdk.graal.compiler.virtual.phases.ea;
 
-import static jdk.compiler.graal.core.common.GraalOptions.EscapeAnalysisIterations;
-import static jdk.compiler.graal.core.common.GraalOptions.EscapeAnalyzeOnly;
+import static jdk.graal.compiler.core.common.GraalOptions.EscapeAnalysisIterations;
+import static jdk.graal.compiler.core.common.GraalOptions.EscapeAnalyzeOnly;
 
 import java.util.Optional;
 
 import org.graalvm.collections.EconomicSet;
-import jdk.compiler.graal.debug.DebugCloseable;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.nodes.GraphState;
-import jdk.compiler.graal.nodes.GraphState.StageFlag;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.StructuredGraph.ScheduleResult;
-import jdk.compiler.graal.nodes.cfg.ControlFlowGraph;
-import jdk.compiler.graal.nodes.spi.CoreProviders;
-import jdk.compiler.graal.nodes.spi.VirtualizableAllocation;
-import jdk.compiler.graal.nodes.virtual.VirtualInstanceNode;
-import jdk.compiler.graal.nodes.virtual.VirtualObjectNode;
-import jdk.compiler.graal.options.Option;
-import jdk.compiler.graal.options.OptionKey;
-import jdk.compiler.graal.options.OptionType;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.BasePhase;
-import jdk.compiler.graal.phases.common.CanonicalizerPhase;
-import jdk.compiler.graal.phases.graph.ReentrantBlockIterator;
-import jdk.compiler.graal.phases.schedule.SchedulePhase;
+import jdk.graal.compiler.debug.DebugCloseable;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.nodes.GraphState;
+import jdk.graal.compiler.nodes.GraphState.StageFlag;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.StructuredGraph.ScheduleResult;
+import jdk.graal.compiler.nodes.cfg.ControlFlowGraph;
+import jdk.graal.compiler.nodes.spi.CoreProviders;
+import jdk.graal.compiler.nodes.spi.VirtualizableAllocation;
+import jdk.graal.compiler.nodes.virtual.VirtualInstanceNode;
+import jdk.graal.compiler.nodes.virtual.VirtualObjectNode;
+import jdk.graal.compiler.options.Option;
+import jdk.graal.compiler.options.OptionKey;
+import jdk.graal.compiler.options.OptionType;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.BasePhase;
+import jdk.graal.compiler.phases.common.CanonicalizerPhase;
+import jdk.graal.compiler.phases.graph.ReentrantBlockIterator;
+import jdk.graal.compiler.phases.schedule.SchedulePhase;
 
 /**
  * Performs Partial Escape analysis on a
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/virtual/phases/ea/ReadEliminationBlockState.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/virtual/phases/ea/ReadEliminationBlockState.java
similarity index 98%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/virtual/phases/ea/ReadEliminationBlockState.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/virtual/phases/ea/ReadEliminationBlockState.java
index 3ce53c04f7ec..a72c6259a071 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/virtual/phases/ea/ReadEliminationBlockState.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/virtual/phases/ea/ReadEliminationBlockState.java
@@ -22,13 +22,13 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.virtual.phases.ea;
+package jdk.graal.compiler.virtual.phases.ea;
 
 import java.util.Iterator;
 
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.Equivalence;
-import jdk.compiler.graal.nodes.ValueNode;
+import jdk.graal.compiler.nodes.ValueNode;
 import org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/virtual/phases/ea/ReadEliminationClosure.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/virtual/phases/ea/ReadEliminationClosure.java
similarity index 90%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/virtual/phases/ea/ReadEliminationClosure.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/virtual/phases/ea/ReadEliminationClosure.java
index 1f734db7f565..83ce4a2abce8 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/virtual/phases/ea/ReadEliminationClosure.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/virtual/phases/ea/ReadEliminationClosure.java
@@ -22,9 +22,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.virtual.phases.ea;
+package jdk.graal.compiler.virtual.phases.ea;
 
-import static jdk.compiler.graal.core.common.GraalOptions.ReadEliminationMaxLoopVisits;
+import static jdk.graal.compiler.core.common.GraalOptions.ReadEliminationMaxLoopVisits;
 
 import java.util.Iterator;
 import java.util.List;
@@ -33,43 +33,43 @@
 import org.graalvm.collections.EconomicSet;
 import org.graalvm.collections.Equivalence;
 import org.graalvm.collections.MapCursor;
-import jdk.compiler.graal.core.common.cfg.Loop;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.FixedNode;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.GraphState.StageFlag;
-import jdk.compiler.graal.nodes.LogicNode;
-import jdk.compiler.graal.nodes.LoopExitNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.PhiNode;
-import jdk.compiler.graal.nodes.ProxyNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.ValuePhiNode;
-import jdk.compiler.graal.nodes.ValueProxyNode;
-import jdk.compiler.graal.nodes.calc.ConditionalNode;
-import jdk.compiler.graal.nodes.calc.IntegerEqualsNode;
-import jdk.compiler.graal.nodes.cfg.HIRBlock;
-import jdk.compiler.graal.nodes.cfg.ControlFlowGraph;
-import jdk.compiler.graal.nodes.extended.GuardedNode;
-import jdk.compiler.graal.nodes.extended.GuardingNode;
-import jdk.compiler.graal.nodes.extended.RawLoadNode;
-import jdk.compiler.graal.nodes.extended.RawStoreNode;
-import jdk.compiler.graal.nodes.java.LoadFieldNode;
-import jdk.compiler.graal.nodes.java.StoreFieldNode;
-import jdk.compiler.graal.nodes.memory.MemoryAccess;
-import jdk.compiler.graal.nodes.memory.MemoryKill;
-import jdk.compiler.graal.nodes.memory.MultiMemoryKill;
-import jdk.compiler.graal.nodes.memory.ReadNode;
-import jdk.compiler.graal.nodes.memory.SingleMemoryKill;
-import jdk.compiler.graal.nodes.memory.WriteNode;
-import jdk.compiler.graal.nodes.util.GraphUtil;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.virtual.phases.ea.ReadEliminationBlockState.CacheEntry;
-import jdk.compiler.graal.virtual.phases.ea.ReadEliminationBlockState.LoadCacheEntry;
-import jdk.compiler.graal.virtual.phases.ea.ReadEliminationBlockState.UnsafeLoadCacheEntry;
+import jdk.graal.compiler.core.common.cfg.Loop;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.FixedNode;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.GraphState.StageFlag;
+import jdk.graal.compiler.nodes.LogicNode;
+import jdk.graal.compiler.nodes.LoopExitNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.PhiNode;
+import jdk.graal.compiler.nodes.ProxyNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.ValuePhiNode;
+import jdk.graal.compiler.nodes.ValueProxyNode;
+import jdk.graal.compiler.nodes.calc.ConditionalNode;
+import jdk.graal.compiler.nodes.calc.IntegerEqualsNode;
+import jdk.graal.compiler.nodes.cfg.HIRBlock;
+import jdk.graal.compiler.nodes.cfg.ControlFlowGraph;
+import jdk.graal.compiler.nodes.extended.GuardedNode;
+import jdk.graal.compiler.nodes.extended.GuardingNode;
+import jdk.graal.compiler.nodes.extended.RawLoadNode;
+import jdk.graal.compiler.nodes.extended.RawStoreNode;
+import jdk.graal.compiler.nodes.java.LoadFieldNode;
+import jdk.graal.compiler.nodes.java.StoreFieldNode;
+import jdk.graal.compiler.nodes.memory.MemoryAccess;
+import jdk.graal.compiler.nodes.memory.MemoryKill;
+import jdk.graal.compiler.nodes.memory.MultiMemoryKill;
+import jdk.graal.compiler.nodes.memory.ReadNode;
+import jdk.graal.compiler.nodes.memory.SingleMemoryKill;
+import jdk.graal.compiler.nodes.memory.WriteNode;
+import jdk.graal.compiler.nodes.util.GraphUtil;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.virtual.phases.ea.ReadEliminationBlockState.CacheEntry;
+import jdk.graal.compiler.virtual.phases.ea.ReadEliminationBlockState.LoadCacheEntry;
+import jdk.graal.compiler.virtual.phases.ea.ReadEliminationBlockState.UnsafeLoadCacheEntry;
 import org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/virtual/phases/ea/ReadEliminationPhase.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/virtual/phases/ea/ReadEliminationPhase.java
similarity index 86%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/virtual/phases/ea/ReadEliminationPhase.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/virtual/phases/ea/ReadEliminationPhase.java
index 3f53252e851e..2b655e140440 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/virtual/phases/ea/ReadEliminationPhase.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/virtual/phases/ea/ReadEliminationPhase.java
@@ -22,21 +22,21 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.virtual.phases.ea;
+package jdk.graal.compiler.virtual.phases.ea;
 
-import static jdk.compiler.graal.core.common.GraalOptions.EscapeAnalyzeOnly;
+import static jdk.graal.compiler.core.common.GraalOptions.EscapeAnalyzeOnly;
 
 import java.util.Optional;
 
-import jdk.compiler.graal.nodes.GraphState;
-import jdk.compiler.graal.nodes.GraphState.StageFlag;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.StructuredGraph.ScheduleResult;
-import jdk.compiler.graal.nodes.cfg.ControlFlowGraph;
-import jdk.compiler.graal.nodes.spi.CoreProviders;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.common.CanonicalizerPhase;
-import jdk.compiler.graal.phases.graph.ReentrantBlockIterator;
+import jdk.graal.compiler.nodes.GraphState;
+import jdk.graal.compiler.nodes.GraphState.StageFlag;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.StructuredGraph.ScheduleResult;
+import jdk.graal.compiler.nodes.cfg.ControlFlowGraph;
+import jdk.graal.compiler.nodes.spi.CoreProviders;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.common.CanonicalizerPhase;
+import jdk.graal.compiler.phases.graph.ReentrantBlockIterator;
 import org.graalvm.word.LocationIdentity;
 
 /**
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/virtual/phases/ea/VirtualUtil.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/virtual/phases/ea/VirtualUtil.java
similarity index 92%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/virtual/phases/ea/VirtualUtil.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/virtual/phases/ea/VirtualUtil.java
index 0255602ba3fc..b2dd5b704b40 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/virtual/phases/ea/VirtualUtil.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/virtual/phases/ea/VirtualUtil.java
@@ -22,23 +22,23 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.virtual.phases.ea;
+package jdk.graal.compiler.virtual.phases.ea;
 
-import static jdk.compiler.graal.core.common.GraalOptions.TraceEscapeAnalysis;
+import static jdk.graal.compiler.core.common.GraalOptions.TraceEscapeAnalysis;
 
 import java.util.List;
 
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.Equivalence;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.debug.TTY;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeFlood;
-import jdk.compiler.graal.nodes.AbstractEndNode;
-import jdk.compiler.graal.nodes.FixedNode;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.options.OptionValues;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.debug.TTY;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeFlood;
+import jdk.graal.compiler.nodes.AbstractEndNode;
+import jdk.graal.compiler.nodes.FixedNode;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.options.OptionValues;
 
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/virtual/phases/ea/VirtualizerToolImpl.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/virtual/phases/ea/VirtualizerToolImpl.java
similarity index 94%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/virtual/phases/ea/VirtualizerToolImpl.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/virtual/phases/ea/VirtualizerToolImpl.java
index f3cb52ebf973..80ff6fdfc279 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/virtual/phases/ea/VirtualizerToolImpl.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/virtual/phases/ea/VirtualizerToolImpl.java
@@ -22,32 +22,32 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.virtual.phases.ea;
+package jdk.graal.compiler.virtual.phases.ea;
 
-import static jdk.compiler.graal.core.common.GraalOptions.MaximumEscapeAnalysisArrayLength;
+import static jdk.graal.compiler.core.common.GraalOptions.MaximumEscapeAnalysisArrayLength;
 
 import java.util.List;
 
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeSourcePosition;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.FixedNode;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.calc.FloatingNode;
-import jdk.compiler.graal.nodes.calc.UnpackEndianHalfNode;
-import jdk.compiler.graal.nodes.java.MonitorIdNode;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodes.spi.CoreProviders;
-import jdk.compiler.graal.nodes.spi.CoreProvidersDelegate;
-import jdk.compiler.graal.nodes.spi.VirtualizerTool;
-import jdk.compiler.graal.nodes.virtual.VirtualArrayNode;
-import jdk.compiler.graal.nodes.virtual.VirtualInstanceNode;
-import jdk.compiler.graal.nodes.virtual.VirtualObjectNode;
-import jdk.compiler.graal.options.OptionValues;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeSourcePosition;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.FixedNode;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.calc.FloatingNode;
+import jdk.graal.compiler.nodes.calc.UnpackEndianHalfNode;
+import jdk.graal.compiler.nodes.java.MonitorIdNode;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodes.spi.CoreProviders;
+import jdk.graal.compiler.nodes.spi.CoreProvidersDelegate;
+import jdk.graal.compiler.nodes.spi.VirtualizerTool;
+import jdk.graal.compiler.nodes.virtual.VirtualArrayNode;
+import jdk.graal.compiler.nodes.virtual.VirtualInstanceNode;
+import jdk.graal.compiler.nodes.virtual.VirtualObjectNode;
+import jdk.graal.compiler.options.OptionValues;
 
 import jdk.vm.ci.meta.Assumptions;
 import jdk.vm.ci.meta.JavaConstant;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/word/BarrieredAccess.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/word/BarrieredAccess.java
similarity index 99%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/word/BarrieredAccess.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/word/BarrieredAccess.java
index caebc55fff22..ce6bfe91ab20 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/word/BarrieredAccess.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/word/BarrieredAccess.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.word;
+package jdk.graal.compiler.word;
 
 import org.graalvm.word.LocationIdentity;
 import org.graalvm.word.Pointer;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/word/ObjectAccess.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/word/ObjectAccess.java
similarity index 99%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/word/ObjectAccess.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/word/ObjectAccess.java
index 3fea430f81d6..254c1491067f 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/word/ObjectAccess.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/word/ObjectAccess.java
@@ -22,10 +22,10 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.word;
+package jdk.graal.compiler.word;
 
-import jdk.compiler.graal.word.Word.Opcode;
-import jdk.compiler.graal.word.Word.Operation;
+import jdk.graal.compiler.word.Word.Opcode;
+import jdk.graal.compiler.word.Word.Operation;
 import org.graalvm.word.LocationIdentity;
 import org.graalvm.word.Pointer;
 import org.graalvm.word.SignedWord;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/word/Word.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/word/Word.java
similarity index 97%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/word/Word.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/word/Word.java
index cb552c73c7cc..d642a41d8d10 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/word/Word.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/word/Word.java
@@ -22,33 +22,33 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.word;
+package jdk.graal.compiler.word;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import jdk.compiler.graal.core.common.calc.Condition;
-import jdk.compiler.graal.core.common.calc.UnsignedMath;
-import jdk.compiler.graal.core.common.memory.BarrierType;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.calc.AddNode;
-import jdk.compiler.graal.nodes.calc.AndNode;
-import jdk.compiler.graal.nodes.calc.LeftShiftNode;
-import jdk.compiler.graal.nodes.calc.MulNode;
-import jdk.compiler.graal.nodes.calc.OrNode;
-import jdk.compiler.graal.nodes.calc.RightShiftNode;
-import jdk.compiler.graal.nodes.calc.SignedDivNode;
-import jdk.compiler.graal.nodes.calc.SignedRemNode;
-import jdk.compiler.graal.nodes.calc.SubNode;
-import jdk.compiler.graal.nodes.calc.UnsignedDivNode;
-import jdk.compiler.graal.nodes.calc.UnsignedRemNode;
-import jdk.compiler.graal.nodes.calc.UnsignedRightShiftNode;
-import jdk.compiler.graal.nodes.calc.XorNode;
-import jdk.compiler.graal.nodes.memory.address.AddressNode.Address;
-import jdk.compiler.graal.serviceprovider.GraalUnsafeAccess;
+import jdk.graal.compiler.core.common.calc.Condition;
+import jdk.graal.compiler.core.common.calc.UnsignedMath;
+import jdk.graal.compiler.core.common.memory.BarrierType;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.calc.AddNode;
+import jdk.graal.compiler.nodes.calc.AndNode;
+import jdk.graal.compiler.nodes.calc.LeftShiftNode;
+import jdk.graal.compiler.nodes.calc.MulNode;
+import jdk.graal.compiler.nodes.calc.OrNode;
+import jdk.graal.compiler.nodes.calc.RightShiftNode;
+import jdk.graal.compiler.nodes.calc.SignedDivNode;
+import jdk.graal.compiler.nodes.calc.SignedRemNode;
+import jdk.graal.compiler.nodes.calc.SubNode;
+import jdk.graal.compiler.nodes.calc.UnsignedDivNode;
+import jdk.graal.compiler.nodes.calc.UnsignedRemNode;
+import jdk.graal.compiler.nodes.calc.UnsignedRightShiftNode;
+import jdk.graal.compiler.nodes.calc.XorNode;
+import jdk.graal.compiler.nodes.memory.address.AddressNode.Address;
+import jdk.graal.compiler.serviceprovider.GraalUnsafeAccess;
 import org.graalvm.word.ComparableWord;
 import org.graalvm.word.LocationIdentity;
 import org.graalvm.word.Pointer;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/word/WordCastNode.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/word/WordCastNode.java
similarity index 88%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/word/WordCastNode.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/word/WordCastNode.java
index 0d0aa730969a..e552bfcdc8a6 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/word/WordCastNode.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/word/WordCastNode.java
@@ -22,30 +22,30 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.word;
-
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_1;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1;
-
-import jdk.compiler.graal.core.common.LIRKind;
-import jdk.compiler.graal.core.common.type.AbstractPointerStamp;
-import jdk.compiler.graal.core.common.type.IntegerStamp;
-import jdk.compiler.graal.core.common.type.ObjectStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.lir.ConstantValue;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.Canonicalizable;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodes.spi.LIRLowerable;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
-import jdk.compiler.graal.nodes.type.NarrowOopStamp;
+package jdk.graal.compiler.word;
+
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_1;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_1;
+
+import jdk.graal.compiler.core.common.LIRKind;
+import jdk.graal.compiler.core.common.type.AbstractPointerStamp;
+import jdk.graal.compiler.core.common.type.IntegerStamp;
+import jdk.graal.compiler.core.common.type.ObjectStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.lir.ConstantValue;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.Canonicalizable;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodes.spi.LIRLowerable;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.nodes.type.NarrowOopStamp;
 
 import jdk.vm.ci.meta.AllocatableValue;
 import jdk.vm.ci.meta.JavaConstant;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/word/WordOperationPlugin.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/word/WordOperationPlugin.java
similarity index 91%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/word/WordOperationPlugin.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/word/WordOperationPlugin.java
index e29740d688e5..9209e730572f 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/word/WordOperationPlugin.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/word/WordOperationPlugin.java
@@ -22,58 +22,58 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.word;
+package jdk.graal.compiler.word;
 
-import static jdk.compiler.graal.nodes.ConstantNode.forInt;
-import static jdk.compiler.graal.nodes.ConstantNode.forIntegerKind;
+import static jdk.graal.compiler.nodes.ConstantNode.forInt;
+import static jdk.graal.compiler.nodes.ConstantNode.forIntegerKind;
 import static org.graalvm.word.LocationIdentity.any;
 
 import java.lang.reflect.Constructor;
 import java.util.Arrays;
 
-import jdk.compiler.graal.api.replacements.SnippetReflectionProvider;
-import jdk.compiler.graal.bytecode.BridgeMethodUtils;
-import jdk.compiler.graal.core.common.calc.CanonicalCondition;
-import jdk.compiler.graal.core.common.calc.Condition;
-import jdk.compiler.graal.core.common.calc.Condition.CanonicalizedCondition;
-import jdk.compiler.graal.core.common.memory.BarrierType;
-import jdk.compiler.graal.core.common.memory.MemoryOrderMode;
-import jdk.compiler.graal.core.common.type.ObjectStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.core.common.type.StampPair;
-import jdk.compiler.graal.core.common.type.TypeReference;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.Invoke;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.calc.CompareNode;
-import jdk.compiler.graal.nodes.calc.ConditionalNode;
-import jdk.compiler.graal.nodes.calc.IntegerBelowNode;
-import jdk.compiler.graal.nodes.calc.IntegerEqualsNode;
-import jdk.compiler.graal.nodes.calc.IntegerLessThanNode;
-import jdk.compiler.graal.nodes.calc.NarrowNode;
-import jdk.compiler.graal.nodes.calc.SignExtendNode;
-import jdk.compiler.graal.nodes.calc.XorNode;
-import jdk.compiler.graal.nodes.calc.ZeroExtendNode;
-import jdk.compiler.graal.nodes.extended.GuardingNode;
-import jdk.compiler.graal.nodes.extended.JavaReadNode;
-import jdk.compiler.graal.nodes.extended.JavaWriteNode;
-import jdk.compiler.graal.nodes.gc.BarrierSet;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderTool;
-import jdk.compiler.graal.nodes.graphbuilderconf.InlineInvokePlugin;
-import jdk.compiler.graal.nodes.graphbuilderconf.NodePlugin;
-import jdk.compiler.graal.nodes.graphbuilderconf.TypePlugin;
-import jdk.compiler.graal.nodes.java.AbstractCompareAndSwapNode;
-import jdk.compiler.graal.nodes.java.LoadFieldNode;
-import jdk.compiler.graal.nodes.java.LoadIndexedNode;
-import jdk.compiler.graal.nodes.java.LogicCompareAndSwapNode;
-import jdk.compiler.graal.nodes.java.StoreIndexedNode;
-import jdk.compiler.graal.nodes.java.ValueCompareAndSwapNode;
-import jdk.compiler.graal.nodes.memory.address.AddressNode;
-import jdk.compiler.graal.nodes.memory.address.OffsetAddressNode;
-import jdk.compiler.graal.nodes.type.StampTool;
+import jdk.graal.compiler.api.replacements.SnippetReflectionProvider;
+import jdk.graal.compiler.bytecode.BridgeMethodUtils;
+import jdk.graal.compiler.core.common.calc.CanonicalCondition;
+import jdk.graal.compiler.core.common.calc.Condition;
+import jdk.graal.compiler.core.common.calc.Condition.CanonicalizedCondition;
+import jdk.graal.compiler.core.common.memory.BarrierType;
+import jdk.graal.compiler.core.common.memory.MemoryOrderMode;
+import jdk.graal.compiler.core.common.type.ObjectStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.core.common.type.StampPair;
+import jdk.graal.compiler.core.common.type.TypeReference;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.Invoke;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.calc.CompareNode;
+import jdk.graal.compiler.nodes.calc.ConditionalNode;
+import jdk.graal.compiler.nodes.calc.IntegerBelowNode;
+import jdk.graal.compiler.nodes.calc.IntegerEqualsNode;
+import jdk.graal.compiler.nodes.calc.IntegerLessThanNode;
+import jdk.graal.compiler.nodes.calc.NarrowNode;
+import jdk.graal.compiler.nodes.calc.SignExtendNode;
+import jdk.graal.compiler.nodes.calc.XorNode;
+import jdk.graal.compiler.nodes.calc.ZeroExtendNode;
+import jdk.graal.compiler.nodes.extended.GuardingNode;
+import jdk.graal.compiler.nodes.extended.JavaReadNode;
+import jdk.graal.compiler.nodes.extended.JavaWriteNode;
+import jdk.graal.compiler.nodes.gc.BarrierSet;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderTool;
+import jdk.graal.compiler.nodes.graphbuilderconf.InlineInvokePlugin;
+import jdk.graal.compiler.nodes.graphbuilderconf.NodePlugin;
+import jdk.graal.compiler.nodes.graphbuilderconf.TypePlugin;
+import jdk.graal.compiler.nodes.java.AbstractCompareAndSwapNode;
+import jdk.graal.compiler.nodes.java.LoadFieldNode;
+import jdk.graal.compiler.nodes.java.LoadIndexedNode;
+import jdk.graal.compiler.nodes.java.LogicCompareAndSwapNode;
+import jdk.graal.compiler.nodes.java.StoreIndexedNode;
+import jdk.graal.compiler.nodes.java.ValueCompareAndSwapNode;
+import jdk.graal.compiler.nodes.memory.address.AddressNode;
+import jdk.graal.compiler.nodes.memory.address.OffsetAddressNode;
+import jdk.graal.compiler.nodes.type.StampTool;
 import org.graalvm.word.LocationIdentity;
 import org.graalvm.word.impl.WordFactoryOperation;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/word/WordTypes.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/word/WordTypes.java
similarity index 94%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/word/WordTypes.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/word/WordTypes.java
index e10e02034991..2ffecaac23f1 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/word/WordTypes.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/word/WordTypes.java
@@ -22,18 +22,18 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.word;
+package jdk.graal.compiler.word;
 
 import static jdk.vm.ci.services.Services.IS_BUILDING_NATIVE_IMAGE;
 
-import jdk.compiler.graal.core.common.Fields;
-import jdk.compiler.graal.core.common.type.AbstractObjectStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.type.StampTool;
+import jdk.graal.compiler.core.common.Fields;
+import jdk.graal.compiler.core.common.type.AbstractObjectStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.type.StampTool;
 import org.graalvm.word.WordBase;
 import org.graalvm.word.WordFactory;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/word/WordVerificationImpl.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/word/WordVerificationImpl.java
similarity index 93%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/word/WordVerificationImpl.java
rename to compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/word/WordVerificationImpl.java
index ef160e15d117..94d1109ac56d 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/word/WordVerificationImpl.java
+++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/word/WordVerificationImpl.java
@@ -22,10 +22,10 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.word;
+package jdk.graal.compiler.word;
 
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.nodes.spi.WordVerification;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.nodes.spi.WordVerification;
 
 import jdk.vm.ci.meta.JavaType;
 
diff --git a/compiler/src/org.graalvm.micro.benchmarks/src/micro/benchmarks/package-info.java b/compiler/src/org.graalvm.micro.benchmarks/src/micro/benchmarks/package-info.java
index 8f8fc7883654..4ffe6de57959 100644
--- a/compiler/src/org.graalvm.micro.benchmarks/src/micro/benchmarks/package-info.java
+++ b/compiler/src/org.graalvm.micro.benchmarks/src/micro/benchmarks/package-info.java
@@ -23,7 +23,7 @@
  * questions.
  */
 /**
- * This package contains micro benchmarks outside the jdk.compiler.graal namespace so that they will
+ * This package contains micro benchmarks outside the jdk.graal.compiler namespace so that they will
  * be subject to Graal compilation even if {@code -Dgraal.CompileGraalWithC1Only=true}.
  */
 package micro.benchmarks;
diff --git a/compiler/src/org.graalvm.profdiff.test/src/org/graalvm/profdiff/test/DeltaTreeTest.java b/compiler/src/org.graalvm.profdiff.test/src/org/graalvm/profdiff/test/DeltaTreeTest.java
index 11ea77302ade..69c85876d61a 100644
--- a/compiler/src/org.graalvm.profdiff.test/src/org/graalvm/profdiff/test/DeltaTreeTest.java
+++ b/compiler/src/org.graalvm.profdiff.test/src/org/graalvm/profdiff/test/DeltaTreeTest.java
@@ -29,7 +29,7 @@
 import java.util.function.Supplier;
 
 import org.graalvm.collections.EconomicMap;
-import jdk.compiler.graal.nodes.OptimizationLogImpl;
+import jdk.graal.compiler.nodes.OptimizationLogImpl;
 import org.graalvm.profdiff.core.OptimizationContextTree;
 import org.graalvm.profdiff.core.OptimizationContextTreeNode;
 import org.graalvm.profdiff.core.OptionValues;
diff --git a/compiler/src/org.graalvm.profdiff.test/src/org/graalvm/profdiff/test/ExperimentPairTest.java b/compiler/src/org.graalvm.profdiff.test/src/org/graalvm/profdiff/test/ExperimentPairTest.java
index ff3cad5204dc..a43cb1582f5e 100644
--- a/compiler/src/org.graalvm.profdiff.test/src/org/graalvm/profdiff/test/ExperimentPairTest.java
+++ b/compiler/src/org.graalvm.profdiff.test/src/org/graalvm/profdiff/test/ExperimentPairTest.java
@@ -30,7 +30,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import jdk.compiler.graal.nodes.OptimizationLogImpl;
+import jdk.graal.compiler.nodes.OptimizationLogImpl;
 import org.graalvm.profdiff.command.ExperimentMatcher;
 import org.graalvm.profdiff.core.CompilationFragment;
 import org.graalvm.profdiff.core.CompilationUnit;
diff --git a/compiler/src/org.graalvm.profdiff.test/src/org/graalvm/profdiff/test/MainTest.java b/compiler/src/org.graalvm.profdiff.test/src/org/graalvm/profdiff/test/MainTest.java
index 5b65dfb12a9e..28e30a5b92a6 100644
--- a/compiler/src/org.graalvm.profdiff.test/src/org/graalvm/profdiff/test/MainTest.java
+++ b/compiler/src/org.graalvm.profdiff.test/src/org/graalvm/profdiff/test/MainTest.java
@@ -41,7 +41,7 @@
 
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.profdiff.Profdiff;
-import jdk.compiler.graal.util.json.JSONFormatter;
+import jdk.graal.compiler.util.json.JSONFormatter;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
diff --git a/compiler/src/org.graalvm.profdiff/src/org/graalvm/profdiff/core/Method.java b/compiler/src/org.graalvm.profdiff/src/org/graalvm/profdiff/core/Method.java
index cddddd59575c..ee42bc7aae27 100644
--- a/compiler/src/org.graalvm.profdiff/src/org/graalvm/profdiff/core/Method.java
+++ b/compiler/src/org.graalvm.profdiff/src/org/graalvm/profdiff/core/Method.java
@@ -29,7 +29,7 @@
 import java.util.List;
 
 import org.graalvm.collections.Pair;
-import jdk.compiler.graal.java.StableMethodNameFormatter;
+import jdk.graal.compiler.java.StableMethodNameFormatter;
 import org.graalvm.profdiff.core.inlining.InliningPath;
 import org.graalvm.profdiff.core.inlining.InliningTreeNode;
 import org.graalvm.profdiff.core.optimization.Optimization;
diff --git a/compiler/src/org.graalvm.profdiff/src/org/graalvm/profdiff/core/pair/MethodPair.java b/compiler/src/org.graalvm.profdiff/src/org/graalvm/profdiff/core/pair/MethodPair.java
index 94685414d583..146c25c42755 100644
--- a/compiler/src/org.graalvm.profdiff/src/org/graalvm/profdiff/core/pair/MethodPair.java
+++ b/compiler/src/org.graalvm.profdiff/src/org/graalvm/profdiff/core/pair/MethodPair.java
@@ -33,7 +33,7 @@
 import org.graalvm.profdiff.core.ExperimentId;
 import org.graalvm.profdiff.core.Method;
 import org.graalvm.profdiff.core.Writer;
-import jdk.compiler.graal.util.CollectionsUtil;
+import jdk.graal.compiler.util.CollectionsUtil;
 
 /**
  * A pair of methods from two experiments with equal method names.
diff --git a/compiler/src/org.graalvm.profdiff/src/org/graalvm/profdiff/parser/CompilationUnitTreeParser.java b/compiler/src/org.graalvm.profdiff/src/org/graalvm/profdiff/parser/CompilationUnitTreeParser.java
index 2009f0577faa..df59661c6752 100644
--- a/compiler/src/org.graalvm.profdiff/src/org/graalvm/profdiff/parser/CompilationUnitTreeParser.java
+++ b/compiler/src/org.graalvm.profdiff/src/org/graalvm/profdiff/parser/CompilationUnitTreeParser.java
@@ -30,7 +30,7 @@
 
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.MapCursor;
-import jdk.compiler.graal.nodes.OptimizationLogImpl;
+import jdk.graal.compiler.nodes.OptimizationLogImpl;
 import org.graalvm.profdiff.core.CompilationUnit;
 import org.graalvm.profdiff.core.ExperimentId;
 import org.graalvm.profdiff.core.Method;
diff --git a/compiler/src/org.graalvm.profdiff/src/org/graalvm/profdiff/parser/ExperimentJSONParser.java b/compiler/src/org.graalvm.profdiff/src/org/graalvm/profdiff/parser/ExperimentJSONParser.java
index 923fb89c4c67..b25488bdd151 100644
--- a/compiler/src/org.graalvm.profdiff/src/org/graalvm/profdiff/parser/ExperimentJSONParser.java
+++ b/compiler/src/org.graalvm.profdiff/src/org/graalvm/profdiff/parser/ExperimentJSONParser.java
@@ -29,8 +29,8 @@
 
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.profdiff.core.ExperimentId;
-import jdk.compiler.graal.util.json.JSONParser;
-import jdk.compiler.graal.util.json.JSONParserException;
+import jdk.graal.compiler.util.json.JSONParser;
+import jdk.graal.compiler.util.json.JSONParserException;
 
 /**
  * A wrapper around {@link JSONParser}, which aids the parsing of the Java representation of a JSON
diff --git a/compiler/src/org.graalvm.profdiff/src/org/graalvm/profdiff/parser/ExperimentParser.java b/compiler/src/org.graalvm.profdiff/src/org/graalvm/profdiff/parser/ExperimentParser.java
index 3ddd67571974..fd0a97a77cba 100644
--- a/compiler/src/org.graalvm.profdiff/src/org/graalvm/profdiff/parser/ExperimentParser.java
+++ b/compiler/src/org.graalvm.profdiff/src/org/graalvm/profdiff/parser/ExperimentParser.java
@@ -30,7 +30,7 @@
 import java.util.Optional;
 
 import org.graalvm.collections.EconomicMap;
-import jdk.compiler.graal.nodes.OptimizationLogImpl;
+import jdk.graal.compiler.nodes.OptimizationLogImpl;
 import org.graalvm.profdiff.core.Experiment;
 import org.graalvm.profdiff.core.ExperimentId;
 import org.graalvm.profdiff.core.ProftoolMethod;
diff --git a/docs/reference-manual/java/Operations.md b/docs/reference-manual/java/Operations.md
index f552ec9e48c2..24e3a780b1d5 100644
--- a/docs/reference-manual/java/Operations.md
+++ b/docs/reference-manual/java/Operations.md
@@ -78,22 +78,22 @@ In most cases, there is a section in the file that shows the stack at the time o
 ```shell
 Stack: [0x00007000020b1000,0x00007000021b1000],  sp=0x00007000021af7a0,  free space=1017k
 Native frames: (J=compiled Java code, j=interpreted, Vv=VM code, C=native code)
-J 761 JVMCI jdk.compiler.graal.core.gen.NodeLIRBuilder.matchComplexExpressions(Ljava/util/List;)V (299 bytes) @ 0x0000000108a2fc01 [0x0000000108a2fac0+0x141] (null)
-j  jdk.compiler.graal.core.gen.NodeLIRBuilder.doBlock(Ljdk.compiler.graal/nodes/cfg/Block;Ljdk.compiler.graal/nodes/StructuredGraph;Ljdk.compiler.graal/core/common/cfg/BlockMap;)V+211
-j  jdk.compiler.graal.core.LIRGenerationPhase.emitBlock(Ljdk.compiler.graal/nodes/spi/NodeLIRBuilderTool;Ljdk.compiler.graal/lir/gen/LIRGenerationResult;Ljdk.compiler.graal/nodes/cfg/Block;Ljdk.compiler.graal/nodes/StructuredGraph;Ljdk.compiler.graal/core/common/cfg/BlockMap;)V+65
+J 761 JVMCI jdk.graal.compiler.core.gen.NodeLIRBuilder.matchComplexExpressions(Ljava/util/List;)V (299 bytes) @ 0x0000000108a2fc01 [0x0000000108a2fac0+0x141] (null)
+j  jdk.graal.compiler.core.gen.NodeLIRBuilder.doBlock(Ljdk.graal.compiler/nodes/cfg/Block;Ljdk.graal.compiler/nodes/StructuredGraph;Ljdk.graal.compiler/core/common/cfg/BlockMap;)V+211
+j  jdk.graal.compiler.core.LIRGenerationPhase.emitBlock(Ljdk.graal.compiler/nodes/spi/NodeLIRBuilderTool;Ljdk.graal.compiler/lir/gen/LIRGenerationResult;Ljdk.graal.compiler/nodes/cfg/Block;Ljdk.graal.compiler/nodes/StructuredGraph;Ljdk.graal.compiler/core/common/cfg/BlockMap;)V+65
 ```
 
 This example shows that the top frame was compiled (J) by the JVMCI compiler, which is the Graal compiler.
 The crash occurred at offset 0x141 in the machine code produced for:
 ```shell
-jdk.compiler.graal.core.gen.NodeLIRBuilder.matchComplexExpressions(Ljava/util/List;)V
+jdk.graal.compiler.core.gen.NodeLIRBuilder.matchComplexExpressions(Ljava/util/List;)V
 ```
 
 The next two frames in the stack were executed in the interpreter (`j`).
 The location of the crash is also often indicated near the top of the file with something like this:
 ```shell
 # Problematic frame:
-# J 761 JVMCI jdk.compiler.graal.core.gen.NodeLIRBuilder.matchComplexExpressions(Ljava/util/List;)V (299 bytes) @ 0x0000000108a2fc01 [0x0000000108a2fac0+0x141] (null)
+# J 761 JVMCI jdk.graal.compiler.core.gen.NodeLIRBuilder.matchComplexExpressions(Ljava/util/List;)V (299 bytes) @ 0x0000000108a2fc01 [0x0000000108a2fac0+0x141] (null)
 ```
 
 In this example, there is likely an error in the code produced by the Graal compiler for `NodeLIRBuilder.matchComplexExpressions`.
@@ -117,9 +117,9 @@ To guide this, add `-Dgraal.PrintCompilation=true` when trying to reproduce the
 
 The following shows sample output from the console:
 ```shell
-HotSpotCompilation-1218        Ljdk.compiler.graal/core/amd64/AMD64NodeLIRBuilder;                  peephole                                      (Ljdk.compiler.graal/nodes/ValueNode;)Z           |   87ms   428B   447B  1834kB
-HotSpotCompilation-1212        Ljdk.compiler.graal/lir/LIRInstructionClass;                         forEachState                                  (Ljdk.compiler.graal/lir/LIRInstruction;Ljdk.compiler.graal/lir/InstructionValueProcedure;)V  |  359ms    92B   309B  6609kB
-HotSpotCompilation-1221        Ljdk.compiler.graal/hotspot/amd64/AMD64HotSpotLIRGenerator;          getResult                                     ()Ljdk.compiler.graal/hotspot/HotSpotLIRGenerationResult;  |   54ms    18B   142B  1025kB
+HotSpotCompilation-1218        Ljdk.graal.compiler/core/amd64/AMD64NodeLIRBuilder;                  peephole                                      (Ljdk.graal.compiler/nodes/ValueNode;)Z           |   87ms   428B   447B  1834kB
+HotSpotCompilation-1212        Ljdk.graal.compiler/lir/LIRInstructionClass;                         forEachState                                  (Ljdk.graal.compiler/lir/LIRInstruction;Ljdk.graal.compiler/lir/InstructionValueProcedure;)V  |  359ms    92B   309B  6609kB
+HotSpotCompilation-1221        Ljdk.graal.compiler/hotspot/amd64/AMD64HotSpotLIRGenerator;          getResult                                     ()Ljdk.graal.compiler/hotspot/HotSpotLIRGenerationResult;  |   54ms    18B   142B  1025kB
 #
 # A fatal error has been detected by the Java Runtime Environment:
 #
@@ -128,7 +128,7 @@ HotSpotCompilation-1221        Ljdk.compiler.graal/hotspot/amd64/AMD64HotSpotLIR
 # JRE version: OpenJDK Runtime Environment (8.0_121-b13) (build 1.8.0_121-graalvm-olabs-b13)
 # Java VM: OpenJDK 64-Bit GraalVM (25.71-b01-internal-jvmci-0.30 mixed mode bsd-amd64 compressed oops)
 # Problematic frame:
-# J 1221 JVMCI jdk.compiler.graal.hotspot.amd64.AMD64HotSpotLIRGenerator.getResult()Ljdk.compiler.graal/hotspot/HotSpotLIRGenerationResult; (18 bytes) @ 0x000000010a6cafb1 [0x000000010a6caf60+0x51] (null)
+# J 1221 JVMCI jdk.graal.compiler.hotspot.amd64.AMD64HotSpotLIRGenerator.getResult()Ljdk.graal.compiler/hotspot/HotSpotLIRGenerationResult; (18 bytes) @ 0x000000010a6cafb1 [0x000000010a6caf60+0x51] (null)
 #
 # Failed to write core dump. Core dumps have been disabled. To enable core dumping, try "ulimit -c unlimited" before starting Java again
 ```
diff --git a/docs/reference-manual/java/compiler.md b/docs/reference-manual/java/compiler.md
index b1b2b769bd0f..280dddd61607 100644
--- a/docs/reference-manual/java/compiler.md
+++ b/docs/reference-manual/java/compiler.md
@@ -24,9 +24,9 @@ GraalVM includes a version of the HotSpot JVM that supports JVMCI.
 
 The Graal compiler provides optimized performance for programs running on the JVM through unique approaches to code analysis and optimization.
 It includes multiple optimization algorithms (called “Phases”), like aggressive inlining, polymorphic inlining, and others. 
-Find some of the platform-independent compiler optimizations in GraalVM Community Edition [here](../../../compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/phases/CEOptimization.java).
+Find some of the platform-independent compiler optimizations in GraalVM Community Edition [here](../../../compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/phases/CEOptimization.java).
 
-The Graal compiler can bring performance advantages for highly-abstracted programs. For example, it includes a [partial-escape-analysis optimization](../../../compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/phases/CEOptimization.java) that can remove costly allocations of certain objects. 
+The Graal compiler can bring performance advantages for highly-abstracted programs. For example, it includes a [partial-escape-analysis optimization](../../../compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/phases/CEOptimization.java) that can remove costly allocations of certain objects. 
 This optimization determines when a new object is accessible outside a compilation unit and only allocates it on paths that "escape" the compilation unit (e.g. the object is passed as a parameter, stored in a field, or returned from a method). This can greatly improve performance of an application by reducing the number of heap allocations. 
 Code using more modern Java features like Streams or Lambdas will see greater speedups as this type of code involves a significant number of such non- or partially-escaping objects. Code that is bound by things like I/O or memory allocations that cannot be removed by the compiler will see less improvement. 
 For more information on performance tuning, refer to [Compiler Configuration on JVM](Options.md).
diff --git a/docs/reference-manual/native-image/BuildOutput.md b/docs/reference-manual/native-image/BuildOutput.md
index 65b4734fdafa..39c8fc43a2c1 100644
--- a/docs/reference-manual/native-image/BuildOutput.md
+++ b/docs/reference-manual/native-image/BuildOutput.md
@@ -57,7 +57,7 @@ Top 10 origins of code area:            Top 10 object types in image heap:
   27.06kB jdk.internal.vm.ci             250.83kB java.util.HashMap$Node
   23.44kB org.graalvm.sdk                196.52kB java.lang.Object[]
   11.42kB jdk.proxy2                     182.77kB java.lang.String[]
-   8.07kB jdk.compiler.graal             154.26kB byte[] for embedded resources
+   8.07kB jdk.graal.compiler             154.26kB byte[] for embedded resources
    1.39kB for 2 more packages              1.38MB for 884 more object types
 --------------------------------------------------------------------------------
 Recommendations:
diff --git a/docs/reference-manual/native-image/DebugInfo.md b/docs/reference-manual/native-image/DebugInfo.md
index d170eb9aead5..1d2d84454ca8 100644
--- a/docs/reference-manual/native-image/DebugInfo.md
+++ b/docs/reference-manual/native-image/DebugInfo.md
@@ -638,7 +638,7 @@ If the sources cache is not located in the directory in which you run GDB, you c
 
 The argument to the set directories command should identify the location of the sources cache as an absolute path or a relative path from the working directory of the `gdb` session.
 
-Note that the current implementation does not yet find some sources for the GraalVM JIT compiler in the _jdk.compiler.graal*_ package subspace.
+Note that the current implementation does not yet find some sources for the GraalVM JIT compiler in the _jdk.graal.compiler*_ package subspace.
 
 You can supplement the files cached in `sources` by unzipping application source JAR files or copying application source trees into the cache.
 You will need to ensure that any new subdirectory you add to `sources` corresponds to the top level package for the classes whose sources are being included.
diff --git a/sdk/mx.sdk/mx_sdk_vm.py b/sdk/mx.sdk/mx_sdk_vm.py
index 52f2c1c6c37c..03b7f9367019 100644
--- a/sdk/mx.sdk/mx_sdk_vm.py
+++ b/sdk/mx.sdk/mx_sdk_vm.py
@@ -820,7 +820,7 @@ def _get_image_vm_options(jdk, use_upgrade_module_path, modules, synthetic_modul
 
         if jdk_supports_enablejvmciproduct(jdk):
             non_synthetic_modules = [m.name for m in modules if m not in synthetic_modules]
-            if default_to_jvmci or 'jdk.compiler.graal' in non_synthetic_modules:
+            if default_to_jvmci or 'jdk.graal.compiler' in non_synthetic_modules:
                 threads = get_JVMCIThreadsPerNativeLibraryRuntime(jdk)
                 vm_options.extend(['-XX:+UnlockExperimentalVMOptions', '-XX:+EnableJVMCIProduct'])
                 if threads is not None and threads != 1:
diff --git a/sdk/mx.sdk/mx_sdk_vm_impl.py b/sdk/mx.sdk/mx_sdk_vm_impl.py
index 4546f94a5aca..34ae5bd1da80 100644
--- a/sdk/mx.sdk/mx_sdk_vm_impl.py
+++ b/sdk/mx.sdk/mx_sdk_vm_impl.py
@@ -2247,7 +2247,7 @@ def _get_option_vars():
 
         def _get_launcher_args():
             if not _jlink_libraries():
-                return '-J--add-exports=jdk.internal.vm.ci/jdk.vm.ci.code=jdk.compiler.graal'
+                return '-J--add-exports=jdk.internal.vm.ci/jdk.vm.ci.code=jdk.graal.compiler'
             return ''
 
         def _get_add_exports():
diff --git a/sdk/mx.sdk/suite.py b/sdk/mx.sdk/suite.py
index b58ada9bfbfb..7485b70ed686 100644
--- a/sdk/mx.sdk/suite.py
+++ b/sdk/mx.sdk/suite.py
@@ -757,7 +757,7 @@ class UniversalDetector {
         "requires" : [],
         "exports" : [
             "org.graalvm.word",
-            "org.graalvm.word.impl to jdk.compiler.graal",
+            "org.graalvm.word.impl to jdk.graal.compiler",
         ],
         "uses" : [],
         "opens" : [],
diff --git a/substratevm/docs/module-system/ModuleSystemSupportHosted.md b/substratevm/docs/module-system/ModuleSystemSupportHosted.md
index 7f0616d64387..d5a561e22c49 100644
--- a/substratevm/docs/module-system/ModuleSystemSupportHosted.md
+++ b/substratevm/docs/module-system/ModuleSystemSupportHosted.md
@@ -216,7 +216,7 @@ We are close to removing it:
 
 ⚠️ If an image-build uses builder-internal classes (e.g. as part of one of its NI `Feature` implementations) removing
 `USE_NATIVE_IMAGE_JAVA_PLATFORM_MODULE_SYSTEM=false` often requires adding `--add-exports=...` to the arguments of the VM
-that runs the image builder. E.g. often `--add-exports=jdk.compiler.graal/jdk.compiler.graal.options=ALL-UNNAMED`
+that runs the image builder. E.g. often `--add-exports=jdk.graal.compiler/jdk.graal.compiler.options=ALL-UNNAMED`
 needs to be added because a NI Feature defines/uses something like
 ```text
 @Option //
diff --git a/substratevm/mx.substratevm/mx_substratevm.py b/substratevm/mx.substratevm/mx_substratevm.py
index 5d75df69d081..a2013afb94e5 100644
--- a/substratevm/mx.substratevm/mx_substratevm.py
+++ b/substratevm/mx.substratevm/mx_substratevm.py
@@ -68,7 +68,7 @@ def graal_compiler_flags():
     def adjusted_exports(line):
         """
         Turns e.g.
-        --add-exports=jdk.internal.vm.ci/jdk.vm.ci.code.stack=jdk.compiler.graal,org.graalvm.nativeimage.builder
+        --add-exports=jdk.internal.vm.ci/jdk.vm.ci.code.stack=jdk.graal.compiler,org.graalvm.nativeimage.builder
         into:
         --add-exports=jdk.internal.vm.ci/jdk.vm.ci.code.stack=ALL-UNNAMED
         """
@@ -366,7 +366,7 @@ def truffle_unittest_task(extra_build_args=None):
     # White Box Truffle compilation tests that need access to compiler graphs.
     if '-Ob' not in extra_build_args:
         # GR-44492
-        native_unittest(['jdk.compiler.graal.truffle.test.ContextLookupCompilationTest'] + truffle_args(extra_build_args + svm_experimental_options(['-H:-SupportCompileInIsolates'])))
+        native_unittest(['jdk.graal.compiler.truffle.test.ContextLookupCompilationTest'] + truffle_args(extra_build_args + svm_experimental_options(['-H:-SupportCompileInIsolates'])))
 
 
 def truffle_context_pre_init_unittest_task(extra_build_args):
@@ -1279,10 +1279,10 @@ def _native_image_launcher_extra_jvm_args():
 
 libgraal_build_args = [
     ## Pass via JVM args opening up of packages needed for image builder early on
-    '-J--add-exports=jdk.compiler.graal/jdk.compiler.graal.hotspot=ALL-UNNAMED',
-    '-J--add-exports=jdk.compiler.graal/jdk.compiler.graal.options=ALL-UNNAMED',
-    '-J--add-exports=jdk.compiler.graal/jdk.compiler.graal.truffle=ALL-UNNAMED',
-    '-J--add-exports=jdk.compiler.graal/jdk.compiler.graal.truffle.hotspot=ALL-UNNAMED',
+    '-J--add-exports=jdk.graal.compiler/jdk.graal.compiler.hotspot=ALL-UNNAMED',
+    '-J--add-exports=jdk.graal.compiler/jdk.graal.compiler.options=ALL-UNNAMED',
+    '-J--add-exports=jdk.graal.compiler/jdk.graal.compiler.truffle=ALL-UNNAMED',
+    '-J--add-exports=jdk.graal.compiler/jdk.graal.compiler.truffle.hotspot=ALL-UNNAMED',
     '-J--add-exports=org.graalvm.jniutils/org.graalvm.jniutils=ALL-UNNAMED',
     '-J--add-exports=org.graalvm.truffle.compiler/com.oracle.truffle.compiler.hotspot.libgraal=ALL-UNNAMED',
     '-J--add-exports=org.graalvm.truffle.compiler/com.oracle.truffle.compiler.hotspot=ALL-UNNAMED',
@@ -1297,7 +1297,7 @@ def _native_image_launcher_extra_jvm_args():
     # TruffleLibGraalJVMCIServiceLocator needs access to JVMCIServiceLocator
     '--add-exports=jdk.internal.vm.ci/jdk.vm.ci.services=ALL-UNNAMED',
 
-    '--initialize-at-build-time=jdk.compiler.graal,org.graalvm.libgraal,com.oracle.truffle',
+    '--initialize-at-build-time=jdk.graal.compiler,org.graalvm.libgraal,com.oracle.truffle',
 
     '-H:+ReportExceptionStackTraces',
 
@@ -1369,7 +1369,7 @@ def _native_image_launcher_extra_jvm_args():
 mx_sdk_vm.register_graalvm_component(libgraal)
 
 def _native_image_configure_extra_jvm_args():
-    packages = ['jdk.compiler.graal/jdk.compiler.graal.phases.common', 'jdk.internal.vm.ci/jdk.vm.ci.meta', 'jdk.internal.vm.ci/jdk.vm.ci.services', 'jdk.compiler.graal/jdk.compiler.graal.core.common.util']
+    packages = ['jdk.graal.compiler/jdk.graal.compiler.phases.common', 'jdk.internal.vm.ci/jdk.vm.ci.meta', 'jdk.internal.vm.ci/jdk.vm.ci.services', 'jdk.graal.compiler/jdk.graal.compiler.core.common.util']
     args = ['--add-exports=' + packageName + '=ALL-UNNAMED' for packageName in packages]
     if not mx_sdk_vm.jdk_enables_jvmci_by_default(get_jdk()):
         args.extend(['-XX:+UnlockExperimentalVMOptions', '-XX:+EnableJVMCI'])
diff --git a/substratevm/mx.substratevm/suite.py b/substratevm/mx.substratevm/suite.py
index 317857af9e0f..8e6ac153e19d 100644
--- a/substratevm/mx.substratevm/suite.py
+++ b/substratevm/mx.substratevm/suite.py
@@ -1413,7 +1413,7 @@
                 "exports" : [
                     "com.oracle.svm.hosted                        to java.base",
                     """* to org.graalvm.nativeimage.base,
-                            jdk.compiler.graal,
+                            jdk.graal.compiler,
                             org.graalvm.nativeimage.driver,
                             org.graalvm.nativeimage.configure,
                             org.graalvm.nativeimage.librarysupport,
@@ -1433,13 +1433,13 @@
                             com.oracle.truffle.enterprise.svm""",
                 ],
                 "opens" : [
-                    "com.oracle.svm.core                          to jdk.compiler.graal",
-                    "com.oracle.svm.core.nodes                    to jdk.compiler.graal",
-                    "com.oracle.svm.core.graal.nodes              to jdk.compiler.graal",
-                    "com.oracle.svm.core.graal.snippets           to jdk.compiler.graal",
-                    "com.oracle.svm.hosted.fieldfolding           to jdk.compiler.graal",
-                    "com.oracle.svm.hosted.phases                 to jdk.compiler.graal",
-                    "com.oracle.svm.hosted.reflect                to jdk.compiler.graal",
+                    "com.oracle.svm.core                          to jdk.graal.compiler",
+                    "com.oracle.svm.core.nodes                    to jdk.graal.compiler",
+                    "com.oracle.svm.core.graal.nodes              to jdk.graal.compiler",
+                    "com.oracle.svm.core.graal.snippets           to jdk.graal.compiler",
+                    "com.oracle.svm.hosted.fieldfolding           to jdk.graal.compiler",
+                    "com.oracle.svm.hosted.phases                 to jdk.graal.compiler",
+                    "com.oracle.svm.hosted.reflect                to jdk.graal.compiler",
                 ],
                 "requires": [
                     "java.management",
@@ -1447,7 +1447,7 @@
                 ],
                 "uses" : [
                     "org.graalvm.nativeimage.Platform",
-                    "jdk.compiler.graal.options.OptionDescriptors",
+                    "jdk.graal.compiler.options.OptionDescriptors",
                     "com.oracle.svm.hosted.NativeImageClassLoaderPostProcessing",
                     "java.util.spi.ResourceBundleControlProvider",
                     "com.oracle.svm.core.feature.AutomaticallyRegisteredFeatureServiceRegistration",
@@ -1621,12 +1621,12 @@
                     "* to org.graalvm.truffle.runtime.svm,com.oracle.truffle.enterprise.svm",
                 ],
                 "opens" : [
-                    "com.oracle.svm.truffle to org.graalvm.nativeimage.builder,jdk.compiler.graal",
-                    "com.oracle.svm.truffle.nfi to org.graalvm.nativeimage.builder,jdk.compiler.graal",
-                    "com.oracle.svm.truffle.nfi.windows to org.graalvm.nativeimage.builder,jdk.compiler.graal",
-                    "com.oracle.svm.truffle.nfi.posix to org.graalvm.nativeimage.builder,jdk.compiler.graal",
-                    "com.oracle.svm.truffle.api to org.graalvm.nativeimage.builder,jdk.compiler.graal",
-                    "com.oracle.svm.truffle.isolated to org.graalvm.nativeimage.builder,jdk.compiler.graal",
+                    "com.oracle.svm.truffle to org.graalvm.nativeimage.builder,jdk.graal.compiler",
+                    "com.oracle.svm.truffle.nfi to org.graalvm.nativeimage.builder,jdk.graal.compiler",
+                    "com.oracle.svm.truffle.nfi.windows to org.graalvm.nativeimage.builder,jdk.graal.compiler",
+                    "com.oracle.svm.truffle.nfi.posix to org.graalvm.nativeimage.builder,jdk.graal.compiler",
+                    "com.oracle.svm.truffle.api to org.graalvm.nativeimage.builder,jdk.graal.compiler",
+                    "com.oracle.svm.truffle.isolated to org.graalvm.nativeimage.builder,jdk.graal.compiler",
                 ],
                 "requires": [
                     "java.management",
@@ -1751,7 +1751,7 @@
                 "com.oracle.svm.driver.metainf",
               ],
               "uses" : [
-                "jdk.compiler.graal.options.OptionDescriptors",
+                "jdk.graal.compiler.options.OptionDescriptors",
               ],
               "requires" : [
                 "org.graalvm.nativeimage.builder",
@@ -1946,8 +1946,8 @@
                         "jdk.vm.ci.code",
                         "jdk.vm.ci.runtime",
                     ],
-                    "jdk.compiler.graal" : [
-                        "jdk.compiler.graal.options"
+                    "jdk.graal.compiler" : [
+                        "jdk.graal.compiler.options"
                     ]
                 }
             },
diff --git a/substratevm/src/com.oracle.graal.pointsto.standalone.test/src/com/oracle/graal/pointsto/standalone/test/ArrayNewInstancePluginCase.java b/substratevm/src/com.oracle.graal.pointsto.standalone.test/src/com/oracle/graal/pointsto/standalone/test/ArrayNewInstancePluginCase.java
index 58b42c2e9d94..2ce2f82eaf56 100644
--- a/substratevm/src/com.oracle.graal.pointsto.standalone.test/src/com/oracle/graal/pointsto/standalone/test/ArrayNewInstancePluginCase.java
+++ b/substratevm/src/com.oracle.graal.pointsto.standalone.test/src/com/oracle/graal/pointsto/standalone/test/ArrayNewInstancePluginCase.java
@@ -26,14 +26,14 @@
 
 package com.oracle.graal.pointsto.standalone.test;
 
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins;
-import jdk.compiler.graal.nodes.spi.Replacements;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins;
+import jdk.graal.compiler.nodes.spi.Replacements;
 
 import java.lang.reflect.Array;
 
 /**
  * This case is for
- * {@link jdk.compiler.graal.replacements.StandardGraphBuilderPlugins#registerArrayPlugins(InvocationPlugins, Replacements)}.
+ * {@link jdk.graal.compiler.replacements.StandardGraphBuilderPlugins#registerArrayPlugins(InvocationPlugins, Replacements)}.
  */
 public class ArrayNewInstancePluginCase {
     public static void main(String[] args) {
diff --git a/substratevm/src/com.oracle.graal.pointsto.standalone.test/src/com/oracle/graal/pointsto/standalone/test/StandaloneConstantScanDynamicTest.java b/substratevm/src/com.oracle.graal.pointsto.standalone.test/src/com/oracle/graal/pointsto/standalone/test/StandaloneConstantScanDynamicTest.java
index 8d8b1ed82454..09ac8070d752 100644
--- a/substratevm/src/com.oracle.graal.pointsto.standalone.test/src/com/oracle/graal/pointsto/standalone/test/StandaloneConstantScanDynamicTest.java
+++ b/substratevm/src/com.oracle.graal.pointsto.standalone.test/src/com/oracle/graal/pointsto/standalone/test/StandaloneConstantScanDynamicTest.java
@@ -73,7 +73,7 @@
  *         at org.junit.runner.JUnitCore.run(JUnitCore.java:115)
  *         at com.oracle.mxtool.junit.MxJUnitWrapper.runRequest(MxJUnitWrapper.java:375)
  *         at com.oracle.mxtool.junit.MxJUnitWrapper.main(MxJUnitWrapper.java:230)
- * cause 0jdk.compiler.graal.debug.GraalError: jdk.compiler.graal.debug.GraalError: jdk.compiler.graal.debug.GraalError:
+ * cause 0jdk.graal.compiler.debug.GraalError: jdk.graal.compiler.debug.GraalError: jdk.graal.compiler.debug.GraalError:
  * should not reach here: Double wrapping of constant. Most likely, the reachability analysis code itself is seen as reachable. java.lang.Object[]
  *         at com.oracle.graal.pointsto.util.AnalysisFuture.setException(AnalysisFuture.java:49)
  *         at java.base/java.util.concurrent.FutureTask.run(FutureTask.java:269)
@@ -90,7 +90,7 @@
  *         at java.base/java.util.concurrent.ForkJoinPool.scan(ForkJoinPool.java:1655)
  *         at java.base/java.util.concurrent.ForkJoinPool.runWorker(ForkJoinPool.java:1622)
  *         at java.base/java.util.concurrent.ForkJoinWorkerThread.run(ForkJoinWorkerThread.java:165)
- * Caused by: jdk.compiler.graal.debug.GraalError: jdk.compiler.graal.debug.GraalError: should not reach here: Double wrapping of constant. Most likely, the reachability analysis code itself is seen as reachable. java.lang.Object[]
+ * Caused by: jdk.graal.compiler.debug.GraalError: jdk.graal.compiler.debug.GraalError: should not reach here: Double wrapping of constant. Most likely, the reachability analysis code itself is seen as reachable. java.lang.Object[]
  *         at com.oracle.graal.pointsto.util.AnalysisFuture.setException(AnalysisFuture.java:49)
  *         at java.base/java.util.concurrent.FutureTask.run(FutureTask.java:269)
  *         at com.oracle.graal.pointsto.util.AnalysisFuture.ensureDone(AnalysisFuture.java:63)
@@ -99,8 +99,8 @@
  *         at com.oracle.graal.pointsto.heap.ImageHeapScanner.lambda$createImageHeapObjectArray$3(ImageHeapScanner.java:270)
  *         at java.base/java.util.concurrent.FutureTask.run(FutureTask.java:264)
  *         ... 13 more
- * Caused by: jdk.compiler.graal.debug.GraalError: should not reach here: Double wrapping of constant. Most likely, the reachability analysis code itself is seen as reachable. java.lang.Object[]
- *         at jdk.compiler.graal/jdk.compiler.graal.debug.GraalError.shouldNotReachHere(GraalError.java:57)
+ * Caused by: jdk.graal.compiler.debug.GraalError: should not reach here: Double wrapping of constant. Most likely, the reachability analysis code itself is seen as reachable. java.lang.Object[]
+ *         at jdk.graal.compiler/jdk.graal.compiler.debug.GraalError.shouldNotReachHere(GraalError.java:57)
  *         at com.oracle.graal.pointsto.heap.ImageHeapScanner.maybeReplace(ImageHeapScanner.java:307)
  *         at com.oracle.graal.pointsto.heap.ImageHeapScanner.createImageHeapObject(ImageHeapScanner.java:225)
  *         at com.oracle.graal.pointsto.heap.ImageHeapScanner.lambda$getOrCreateImageHeapConstant$2(ImageHeapScanner.java:205)
diff --git a/substratevm/src/com.oracle.graal.pointsto.standalone.test/src/com/oracle/graal/pointsto/standalone/test/StandardGraphPluginTest.java b/substratevm/src/com.oracle.graal.pointsto.standalone.test/src/com/oracle/graal/pointsto/standalone/test/StandardGraphPluginTest.java
index e6421a3f9c5a..0d447b544a04 100644
--- a/substratevm/src/com.oracle.graal.pointsto.standalone.test/src/com/oracle/graal/pointsto/standalone/test/StandardGraphPluginTest.java
+++ b/substratevm/src/com.oracle.graal.pointsto.standalone.test/src/com/oracle/graal/pointsto/standalone/test/StandardGraphPluginTest.java
@@ -26,8 +26,8 @@
 
 package com.oracle.graal.pointsto.standalone.test;
 
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin;
-import jdk.compiler.graal.replacements.StandardGraphBuilderPlugins;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin;
+import jdk.graal.compiler.replacements.StandardGraphBuilderPlugins;
 import org.junit.Test;
 
 import java.lang.reflect.Array;
diff --git a/substratevm/src/com.oracle.graal.pointsto.standalone/src/com/oracle/graal/pointsto/standalone/MethodConfigReader.java b/substratevm/src/com.oracle.graal.pointsto.standalone/src/com/oracle/graal/pointsto/standalone/MethodConfigReader.java
index 17551eec9f7e..a69052f0bad5 100644
--- a/substratevm/src/com.oracle.graal.pointsto.standalone/src/com/oracle/graal/pointsto/standalone/MethodConfigReader.java
+++ b/substratevm/src/com.oracle.graal.pointsto.standalone/src/com/oracle/graal/pointsto/standalone/MethodConfigReader.java
@@ -32,9 +32,9 @@
 import jdk.vm.ci.meta.MetaAccessProvider;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 import jdk.vm.ci.meta.ResolvedJavaType;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.debug.DebugOptions;
-import jdk.compiler.graal.debug.MethodFilter;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.debug.DebugOptions;
+import jdk.graal.compiler.debug.MethodFilter;
 
 import java.io.BufferedReader;
 import java.io.File;
diff --git a/substratevm/src/com.oracle.graal.pointsto.standalone/src/com/oracle/graal/pointsto/standalone/PointsToAnalyzer.java b/substratevm/src/com.oracle.graal.pointsto.standalone/src/com/oracle/graal/pointsto/standalone/PointsToAnalyzer.java
index f52da55eaceb..5e5b4dad7517 100644
--- a/substratevm/src/com.oracle.graal.pointsto.standalone/src/com/oracle/graal/pointsto/standalone/PointsToAnalyzer.java
+++ b/substratevm/src/com.oracle.graal.pointsto.standalone/src/com/oracle/graal/pointsto/standalone/PointsToAnalyzer.java
@@ -26,7 +26,7 @@
 
 package com.oracle.graal.pointsto.standalone;
 
-import static jdk.compiler.graal.replacements.StandardGraphBuilderPlugins.registerInvocationPlugins;
+import static jdk.graal.compiler.replacements.StandardGraphBuilderPlugins.registerInvocationPlugins;
 
 import java.io.File;
 import java.lang.reflect.Method;
@@ -39,15 +39,15 @@
 import java.util.List;
 import java.util.concurrent.ForkJoinPool;
 
-import jdk.compiler.graal.api.replacements.SnippetReflectionProvider;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.debug.Indent;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.util.Providers;
-import jdk.compiler.graal.printer.GraalDebugHandlersFactory;
-import jdk.compiler.graal.word.WordTypes;
+import jdk.graal.compiler.api.replacements.SnippetReflectionProvider;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.debug.Indent;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.util.Providers;
+import jdk.graal.compiler.printer.GraalDebugHandlersFactory;
+import jdk.graal.compiler.word.WordTypes;
 import org.graalvm.nativeimage.hosted.Feature;
 
 import com.oracle.graal.pointsto.AnalysisObjectScanningObserver;
@@ -90,8 +90,8 @@ public final class PointsToAnalyzer {
 
     static {
         ModuleSupport.accessPackagesToClass(ModuleSupport.Access.OPEN, null, false, "jdk.internal.vm.ci");
-        ModuleSupport.accessPackagesToClass(ModuleSupport.Access.OPEN, null, false, "jdk.compiler.graal");
-        ModuleSupport.accessPackagesToClass(ModuleSupport.Access.OPEN, null, false, "jdk.compiler.graal.management");
+        ModuleSupport.accessPackagesToClass(ModuleSupport.Access.OPEN, null, false, "jdk.graal.compiler");
+        ModuleSupport.accessPackagesToClass(ModuleSupport.Access.OPEN, null, false, "jdk.graal.compiler.management");
         ModuleSupport.accessPackagesToClass(ModuleSupport.Access.OPEN, null, false, "java.base", "jdk.internal.loader");
         ModuleSupport.accessPackagesToClass(ModuleSupport.Access.OPEN, null, false, "java.base", "jdk.internal.misc");
         ModuleSupport.accessPackagesToClass(ModuleSupport.Access.OPEN, null, false, "java.base", "sun.text.spi");
diff --git a/substratevm/src/com.oracle.graal.pointsto.standalone/src/com/oracle/graal/pointsto/standalone/StandaloneHost.java b/substratevm/src/com.oracle.graal.pointsto.standalone/src/com/oracle/graal/pointsto/standalone/StandaloneHost.java
index 085128972170..26ac64d8a6a1 100644
--- a/substratevm/src/com.oracle.graal.pointsto.standalone/src/com/oracle/graal/pointsto/standalone/StandaloneHost.java
+++ b/substratevm/src/com.oracle.graal.pointsto.standalone/src/com/oracle/graal/pointsto/standalone/StandaloneHost.java
@@ -29,11 +29,11 @@
 import java.util.Comparator;
 import java.util.concurrent.ConcurrentHashMap;
 
-import jdk.compiler.graal.java.GraphBuilderPhase;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration;
-import jdk.compiler.graal.nodes.graphbuilderconf.IntrinsicContext;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.OptimisticOptimizations;
+import jdk.graal.compiler.java.GraphBuilderPhase;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
+import jdk.graal.compiler.nodes.graphbuilderconf.IntrinsicContext;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.OptimisticOptimizations;
 
 import com.oracle.graal.pointsto.api.HostVM;
 import com.oracle.graal.pointsto.meta.AnalysisType;
diff --git a/substratevm/src/com.oracle.graal.pointsto.standalone/src/com/oracle/graal/pointsto/standalone/StandaloneOptions.java b/substratevm/src/com.oracle.graal.pointsto.standalone/src/com/oracle/graal/pointsto/standalone/StandaloneOptions.java
index a1ebfc1a2a06..f3b9da916a29 100644
--- a/substratevm/src/com.oracle.graal.pointsto.standalone/src/com/oracle/graal/pointsto/standalone/StandaloneOptions.java
+++ b/substratevm/src/com.oracle.graal.pointsto.standalone/src/com/oracle/graal/pointsto/standalone/StandaloneOptions.java
@@ -26,10 +26,10 @@
 
 package com.oracle.graal.pointsto.standalone;
 
-import jdk.compiler.graal.options.Option;
-import jdk.compiler.graal.options.OptionKey;
-import jdk.compiler.graal.options.OptionType;
-import jdk.compiler.graal.options.OptionValues;
+import jdk.graal.compiler.options.Option;
+import jdk.graal.compiler.options.OptionKey;
+import jdk.graal.compiler.options.OptionType;
+import jdk.graal.compiler.options.OptionValues;
 
 import java.nio.file.Path;
 import java.nio.file.Paths;
diff --git a/substratevm/src/com.oracle.graal.pointsto.standalone/src/com/oracle/graal/pointsto/standalone/StandalonePointsToAnalysis.java b/substratevm/src/com.oracle.graal.pointsto.standalone/src/com/oracle/graal/pointsto/standalone/StandalonePointsToAnalysis.java
index 9819e622ddaf..439ada3ef91a 100644
--- a/substratevm/src/com.oracle.graal.pointsto.standalone/src/com/oracle/graal/pointsto/standalone/StandalonePointsToAnalysis.java
+++ b/substratevm/src/com.oracle.graal.pointsto.standalone/src/com/oracle/graal/pointsto/standalone/StandalonePointsToAnalysis.java
@@ -30,9 +30,9 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ForkJoinPool;
 
-import jdk.compiler.graal.api.replacements.SnippetReflectionProvider;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.word.WordTypes;
+import jdk.graal.compiler.api.replacements.SnippetReflectionProvider;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.word.WordTypes;
 
 import com.oracle.graal.pointsto.PointsToAnalysis;
 import com.oracle.graal.pointsto.api.HostVM;
diff --git a/substratevm/src/com.oracle.graal.pointsto.standalone/src/com/oracle/graal/pointsto/standalone/features/StandaloneAnalysisFeatureImpl.java b/substratevm/src/com.oracle.graal.pointsto.standalone/src/com/oracle/graal/pointsto/standalone/features/StandaloneAnalysisFeatureImpl.java
index 014d4a0f096d..c4edb1cec953 100644
--- a/substratevm/src/com.oracle.graal.pointsto.standalone/src/com/oracle/graal/pointsto/standalone/features/StandaloneAnalysisFeatureImpl.java
+++ b/substratevm/src/com.oracle.graal.pointsto.standalone/src/com/oracle/graal/pointsto/standalone/features/StandaloneAnalysisFeatureImpl.java
@@ -38,7 +38,7 @@
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
-import jdk.compiler.graal.debug.DebugContext;
+import jdk.graal.compiler.debug.DebugContext;
 import org.graalvm.nativeimage.hosted.Feature;
 import org.graalvm.nativeimage.hosted.FieldValueTransformer;
 
diff --git a/substratevm/src/com.oracle.graal.pointsto.standalone/src/com/oracle/graal/pointsto/standalone/features/StandaloneAnalysisFeatureManager.java b/substratevm/src/com.oracle.graal.pointsto.standalone/src/com/oracle/graal/pointsto/standalone/features/StandaloneAnalysisFeatureManager.java
index edf9fc2bc604..67461392de2e 100644
--- a/substratevm/src/com.oracle.graal.pointsto.standalone/src/com/oracle/graal/pointsto/standalone/features/StandaloneAnalysisFeatureManager.java
+++ b/substratevm/src/com.oracle.graal.pointsto.standalone/src/com/oracle/graal/pointsto/standalone/features/StandaloneAnalysisFeatureManager.java
@@ -28,10 +28,10 @@
 
 import com.oracle.graal.pointsto.util.AnalysisError;
 import com.oracle.svm.util.ReflectionUtil;
-import jdk.compiler.graal.options.Option;
-import jdk.compiler.graal.options.OptionKey;
-import jdk.compiler.graal.options.OptionType;
-import jdk.compiler.graal.options.OptionValues;
+import jdk.graal.compiler.options.Option;
+import jdk.graal.compiler.options.OptionKey;
+import jdk.graal.compiler.options.OptionType;
+import jdk.graal.compiler.options.OptionValues;
 import org.graalvm.nativeimage.hosted.Feature;
 
 import java.util.ArrayList;
diff --git a/substratevm/src/com.oracle.graal.pointsto.standalone/src/com/oracle/graal/pointsto/standalone/heap/StandaloneImageHeapScanner.java b/substratevm/src/com.oracle.graal.pointsto.standalone/src/com/oracle/graal/pointsto/standalone/heap/StandaloneImageHeapScanner.java
index c1b774074599..64ffb1accd50 100644
--- a/substratevm/src/com.oracle.graal.pointsto.standalone/src/com/oracle/graal/pointsto/standalone/heap/StandaloneImageHeapScanner.java
+++ b/substratevm/src/com.oracle.graal.pointsto.standalone/src/com/oracle/graal/pointsto/standalone/heap/StandaloneImageHeapScanner.java
@@ -26,7 +26,7 @@
 
 package com.oracle.graal.pointsto.standalone.heap;
 
-import jdk.compiler.graal.api.replacements.SnippetReflectionProvider;
+import jdk.graal.compiler.api.replacements.SnippetReflectionProvider;
 
 import com.oracle.graal.pointsto.BigBang;
 import com.oracle.graal.pointsto.ObjectScanningObserver;
diff --git a/substratevm/src/com.oracle.graal.pointsto.standalone/src/com/oracle/graal/pointsto/standalone/meta/StandaloneConstantFieldProvider.java b/substratevm/src/com.oracle.graal.pointsto.standalone/src/com/oracle/graal/pointsto/standalone/meta/StandaloneConstantFieldProvider.java
index a811da8393c6..a2730dc001a6 100644
--- a/substratevm/src/com.oracle.graal.pointsto.standalone/src/com/oracle/graal/pointsto/standalone/meta/StandaloneConstantFieldProvider.java
+++ b/substratevm/src/com.oracle.graal.pointsto.standalone/src/com/oracle/graal/pointsto/standalone/meta/StandaloneConstantFieldProvider.java
@@ -28,7 +28,7 @@
 
 import jdk.vm.ci.meta.MetaAccessProvider;
 import jdk.vm.ci.meta.ResolvedJavaField;
-import jdk.compiler.graal.core.common.spi.JavaConstantFieldProvider;
+import jdk.graal.compiler.core.common.spi.JavaConstantFieldProvider;
 
 public class StandaloneConstantFieldProvider extends JavaConstantFieldProvider {
 
diff --git a/substratevm/src/com.oracle.graal.pointsto.standalone/src/com/oracle/graal/pointsto/standalone/plugins/StandaloneGraphBuilderPhase.java b/substratevm/src/com.oracle.graal.pointsto.standalone/src/com/oracle/graal/pointsto/standalone/plugins/StandaloneGraphBuilderPhase.java
index 5e1b7777215b..4b941e94f50e 100644
--- a/substratevm/src/com.oracle.graal.pointsto.standalone/src/com/oracle/graal/pointsto/standalone/plugins/StandaloneGraphBuilderPhase.java
+++ b/substratevm/src/com.oracle.graal.pointsto.standalone/src/com/oracle/graal/pointsto/standalone/plugins/StandaloneGraphBuilderPhase.java
@@ -26,11 +26,11 @@
 
 package com.oracle.graal.pointsto.standalone.plugins;
 
-import jdk.compiler.graal.java.GraphBuilderPhase;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration;
-import jdk.compiler.graal.nodes.graphbuilderconf.IntrinsicContext;
-import jdk.compiler.graal.nodes.spi.CoreProviders;
-import jdk.compiler.graal.phases.OptimisticOptimizations;
+import jdk.graal.compiler.java.GraphBuilderPhase;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
+import jdk.graal.compiler.nodes.graphbuilderconf.IntrinsicContext;
+import jdk.graal.compiler.nodes.spi.CoreProviders;
+import jdk.graal.compiler.phases.OptimisticOptimizations;
 
 public class StandaloneGraphBuilderPhase extends GraphBuilderPhase.Instance {
     public StandaloneGraphBuilderPhase(CoreProviders providers, GraphBuilderConfiguration graphBuilderConfig, OptimisticOptimizations optimisticOpts, IntrinsicContext initialIntrinsicContext) {
diff --git a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/AbstractAnalysisEngine.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/AbstractAnalysisEngine.java
index 47abe9377d77..5bad5d06986f 100644
--- a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/AbstractAnalysisEngine.java
+++ b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/AbstractAnalysisEngine.java
@@ -30,18 +30,18 @@
 import java.util.concurrent.ForkJoinPool;
 import java.util.function.Function;
 
-import jdk.compiler.graal.api.replacements.SnippetReflectionProvider;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.debug.DebugContext.Builder;
-import jdk.compiler.graal.debug.DebugHandlersFactory;
-import jdk.compiler.graal.debug.Indent;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.nodes.DeoptBciSupplier;
-import jdk.compiler.graal.nodes.StateSplit;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.printer.GraalDebugHandlersFactory;
-import jdk.compiler.graal.word.WordTypes;
+import jdk.graal.compiler.api.replacements.SnippetReflectionProvider;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.debug.DebugContext.Builder;
+import jdk.graal.compiler.debug.DebugHandlersFactory;
+import jdk.graal.compiler.debug.Indent;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.nodes.DeoptBciSupplier;
+import jdk.graal.compiler.nodes.StateSplit;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.printer.GraalDebugHandlersFactory;
+import jdk.graal.compiler.word.WordTypes;
 import org.graalvm.nativeimage.hosted.Feature;
 
 import com.oracle.graal.pointsto.api.HostVM;
diff --git a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/AnalysisPolicy.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/AnalysisPolicy.java
index cd89f7e39150..e92936508e62 100644
--- a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/AnalysisPolicy.java
+++ b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/AnalysisPolicy.java
@@ -26,8 +26,8 @@
 
 import java.util.BitSet;
 
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.replacements.nodes.BasicArrayCopyNode;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.replacements.nodes.BasicArrayCopyNode;
 
 import com.oracle.graal.pointsto.api.PointstoOptions;
 import com.oracle.graal.pointsto.flow.AbstractSpecialInvokeTypeFlow;
diff --git a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/BigBang.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/BigBang.java
index 03759167e2c6..c89363f7f860 100644
--- a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/BigBang.java
+++ b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/BigBang.java
@@ -28,11 +28,11 @@
 import java.util.List;
 import java.util.function.Function;
 
-import jdk.compiler.graal.api.replacements.SnippetReflectionProvider;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.debug.DebugHandlersFactory;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.word.WordTypes;
+import jdk.graal.compiler.api.replacements.SnippetReflectionProvider;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.debug.DebugHandlersFactory;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.word.WordTypes;
 
 import com.oracle.graal.pointsto.api.HostVM;
 import com.oracle.graal.pointsto.constraints.UnsupportedFeatures;
diff --git a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/PointsToAnalysis.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/PointsToAnalysis.java
index e8c972d2d8ad..9b782a19ea96 100644
--- a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/PointsToAnalysis.java
+++ b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/PointsToAnalysis.java
@@ -44,14 +44,14 @@
 import java.util.function.Consumer;
 import java.util.stream.StreamSupport;
 
-import jdk.compiler.graal.api.replacements.SnippetReflectionProvider;
-import jdk.compiler.graal.core.common.SuppressFBWarnings;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.debug.Indent;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeList;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.word.WordTypes;
+import jdk.graal.compiler.api.replacements.SnippetReflectionProvider;
+import jdk.graal.compiler.core.common.SuppressFBWarnings;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.debug.Indent;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeList;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.word.WordTypes;
 
 import com.oracle.graal.pointsto.api.HostVM;
 import com.oracle.graal.pointsto.api.PointstoOptions;
diff --git a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/api/HostVM.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/api/HostVM.java
index 127d7412cee0..f13a3a6af331 100644
--- a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/api/HostVM.java
+++ b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/api/HostVM.java
@@ -36,15 +36,15 @@
 import java.util.function.BiConsumer;
 import java.util.function.Function;
 
-import jdk.compiler.graal.core.common.spi.ForeignCallDescriptor;
-import jdk.compiler.graal.core.common.spi.ForeignCallsProvider;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.java.GraphBuilderPhase.Instance;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration;
-import jdk.compiler.graal.nodes.graphbuilderconf.IntrinsicContext;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.OptimisticOptimizations;
+import jdk.graal.compiler.core.common.spi.ForeignCallDescriptor;
+import jdk.graal.compiler.core.common.spi.ForeignCallsProvider;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.java.GraphBuilderPhase.Instance;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
+import jdk.graal.compiler.nodes.graphbuilderconf.IntrinsicContext;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.OptimisticOptimizations;
 import org.graalvm.nativeimage.hosted.Feature.DuringAnalysisAccess;
 
 import com.oracle.graal.pointsto.BigBang;
diff --git a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/api/PointstoOptions.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/api/PointstoOptions.java
index 9a0104597fc3..4c74fc6abb18 100644
--- a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/api/PointstoOptions.java
+++ b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/api/PointstoOptions.java
@@ -25,11 +25,11 @@
 package com.oracle.graal.pointsto.api;
 
 import static jdk.vm.ci.common.JVMCIError.shouldNotReachHere;
-import static jdk.compiler.graal.options.OptionType.Expert;
+import static jdk.graal.compiler.options.OptionType.Expert;
 
 import org.graalvm.collections.EconomicMap;
-import jdk.compiler.graal.options.Option;
-import jdk.compiler.graal.options.OptionKey;
+import jdk.graal.compiler.options.Option;
+import jdk.graal.compiler.options.OptionKey;
 
 public class PointstoOptions {
 
diff --git a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/ActualParameterTypeFlow.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/ActualParameterTypeFlow.java
index f82448e16e5a..9d82a31907c3 100644
--- a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/ActualParameterTypeFlow.java
+++ b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/ActualParameterTypeFlow.java
@@ -24,7 +24,7 @@
  */
 package com.oracle.graal.pointsto.flow;
 
-import jdk.compiler.graal.nodes.ValueNode;
+import jdk.graal.compiler.nodes.ValueNode;
 
 import com.oracle.graal.pointsto.meta.AnalysisType;
 
diff --git a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/AnalysisParsedGraph.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/AnalysisParsedGraph.java
index 2ac6bedef0c4..63ad0b9861f2 100644
--- a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/AnalysisParsedGraph.java
+++ b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/AnalysisParsedGraph.java
@@ -24,24 +24,24 @@
  */
 package com.oracle.graal.pointsto.flow;
 
-import jdk.compiler.graal.api.runtime.GraalJVMCICompiler;
-import jdk.compiler.graal.bytecode.Bytecode;
-import jdk.compiler.graal.bytecode.ResolvedJavaMethodBytecode;
-import jdk.compiler.graal.core.common.PermanentBailoutException;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.debug.DebugContext.Builder;
-import jdk.compiler.graal.debug.DebugContext.Description;
-import jdk.compiler.graal.debug.Indent;
-import jdk.compiler.graal.nodes.EncodedGraph;
-import jdk.compiler.graal.nodes.GraphEncoder;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration.BytecodeExceptionMode;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.OptimisticOptimizations;
-import jdk.compiler.graal.printer.GraalDebugHandlersFactory;
-import jdk.compiler.graal.runtime.RuntimeProvider;
+import jdk.graal.compiler.api.runtime.GraalJVMCICompiler;
+import jdk.graal.compiler.bytecode.Bytecode;
+import jdk.graal.compiler.bytecode.ResolvedJavaMethodBytecode;
+import jdk.graal.compiler.core.common.PermanentBailoutException;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.debug.DebugContext.Builder;
+import jdk.graal.compiler.debug.DebugContext.Description;
+import jdk.graal.compiler.debug.Indent;
+import jdk.graal.compiler.nodes.EncodedGraph;
+import jdk.graal.compiler.nodes.GraphEncoder;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.BytecodeExceptionMode;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.OptimisticOptimizations;
+import jdk.graal.compiler.printer.GraalDebugHandlersFactory;
+import jdk.graal.compiler.runtime.RuntimeProvider;
 
 import com.oracle.graal.pointsto.BigBang;
 import com.oracle.graal.pointsto.api.HostVM;
diff --git a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/ArrayCopyTypeFlow.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/ArrayCopyTypeFlow.java
index da3df0219722..59eec8415a9b 100644
--- a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/ArrayCopyTypeFlow.java
+++ b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/ArrayCopyTypeFlow.java
@@ -29,7 +29,7 @@
 import com.oracle.graal.pointsto.typestate.TypeState;
 import com.oracle.graal.pointsto.util.AnalysisError;
 
-import jdk.compiler.graal.replacements.nodes.BasicArrayCopyNode;
+import jdk.graal.compiler.replacements.nodes.BasicArrayCopyNode;
 import jdk.vm.ci.code.BytecodePosition;
 
 /**
diff --git a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/CallSiteSensitiveMethodTypeFlow.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/CallSiteSensitiveMethodTypeFlow.java
index 17403c5a5a14..2b4f62ca7f29 100644
--- a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/CallSiteSensitiveMethodTypeFlow.java
+++ b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/CallSiteSensitiveMethodTypeFlow.java
@@ -29,7 +29,7 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
-import jdk.compiler.graal.options.OptionValues;
+import jdk.graal.compiler.options.OptionValues;
 
 import com.oracle.graal.pointsto.PointsToAnalysis;
 import com.oracle.graal.pointsto.api.PointstoOptions;
diff --git a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/MethodFlowsGraph.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/MethodFlowsGraph.java
index 2d9945fa462b..a94c33ce89e3 100644
--- a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/MethodFlowsGraph.java
+++ b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/MethodFlowsGraph.java
@@ -37,8 +37,8 @@
 
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.EconomicSet;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.nodes.EncodedGraph.EncodedNodeReference;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.nodes.EncodedGraph.EncodedNodeReference;
 
 import com.oracle.graal.pointsto.PointsToAnalysis;
 import com.oracle.graal.pointsto.meta.AnalysisMethod;
diff --git a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/MethodTypeFlow.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/MethodTypeFlow.java
index 1604daaf04bf..b97cb3cbc6c1 100644
--- a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/MethodTypeFlow.java
+++ b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/MethodTypeFlow.java
@@ -31,11 +31,11 @@
 import java.util.List;
 
 import org.graalvm.collections.EconomicMap;
-import jdk.compiler.graal.debug.Assertions;
-import jdk.compiler.graal.nodes.ParameterNode;
-import jdk.compiler.graal.nodes.ReturnNode;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
+import jdk.graal.compiler.debug.Assertions;
+import jdk.graal.compiler.nodes.ParameterNode;
+import jdk.graal.compiler.nodes.ReturnNode;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
 
 import com.oracle.graal.pointsto.PointsToAnalysis;
 import com.oracle.graal.pointsto.constraints.UnsupportedFeatureException;
diff --git a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/MethodTypeFlowBuilder.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/MethodTypeFlowBuilder.java
index e9dc80ad1065..609b4de64ea3 100644
--- a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/MethodTypeFlowBuilder.java
+++ b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/MethodTypeFlowBuilder.java
@@ -67,83 +67,83 @@
 import com.oracle.graal.pointsto.util.AnalysisError;
 import com.oracle.svm.common.meta.MultiMethod;
 
-import jdk.compiler.graal.core.common.spi.ForeignCallDescriptor;
-import jdk.compiler.graal.core.common.spi.ForeignCallsProvider;
-import jdk.compiler.graal.core.common.type.AbstractObjectStamp;
-import jdk.compiler.graal.core.common.type.ObjectStamp;
-import jdk.compiler.graal.core.common.type.TypeReference;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.Node.NodeIntrinsic;
-import jdk.compiler.graal.graph.NodeBitMap;
-import jdk.compiler.graal.graph.NodeInputList;
-import jdk.compiler.graal.graph.NodeSourcePosition;
-import jdk.compiler.graal.nodes.AbstractEndNode;
-import jdk.compiler.graal.nodes.AbstractMergeNode;
-import jdk.compiler.graal.nodes.BeginNode;
-import jdk.compiler.graal.nodes.CallTargetNode.InvokeKind;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.EndNode;
-import jdk.compiler.graal.nodes.FixedGuardNode;
-import jdk.compiler.graal.nodes.FixedNode;
-import jdk.compiler.graal.nodes.FrameState;
-import jdk.compiler.graal.nodes.GraphEncoder;
-import jdk.compiler.graal.nodes.IfNode;
-import jdk.compiler.graal.nodes.Invoke;
-import jdk.compiler.graal.nodes.InvokeNode;
-import jdk.compiler.graal.nodes.InvokeWithExceptionNode;
-import jdk.compiler.graal.nodes.LogicNode;
-import jdk.compiler.graal.nodes.LoopBeginNode;
-import jdk.compiler.graal.nodes.LoopEndNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ParameterNode;
-import jdk.compiler.graal.nodes.PhiNode;
-import jdk.compiler.graal.nodes.ReturnNode;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.calc.IsNullNode;
-import jdk.compiler.graal.nodes.extended.BoxNode;
-import jdk.compiler.graal.nodes.extended.BytecodeExceptionNode;
-import jdk.compiler.graal.nodes.extended.BytecodeExceptionNode.BytecodeExceptionKind;
-import jdk.compiler.graal.nodes.extended.ForeignCall;
-import jdk.compiler.graal.nodes.extended.GetClassNode;
-import jdk.compiler.graal.nodes.extended.RawLoadNode;
-import jdk.compiler.graal.nodes.extended.RawStoreNode;
-import jdk.compiler.graal.nodes.java.AtomicReadAndWriteNode;
-import jdk.compiler.graal.nodes.java.ClassIsAssignableFromNode;
-import jdk.compiler.graal.nodes.java.DynamicNewArrayNode;
-import jdk.compiler.graal.nodes.java.DynamicNewInstanceNode;
-import jdk.compiler.graal.nodes.java.ExceptionObjectNode;
-import jdk.compiler.graal.nodes.java.InstanceOfNode;
-import jdk.compiler.graal.nodes.java.LoadFieldNode;
-import jdk.compiler.graal.nodes.java.LoadIndexedNode;
-import jdk.compiler.graal.nodes.java.MethodCallTargetNode;
-import jdk.compiler.graal.nodes.java.MonitorEnterNode;
-import jdk.compiler.graal.nodes.java.NewArrayNode;
-import jdk.compiler.graal.nodes.java.NewInstanceNode;
-import jdk.compiler.graal.nodes.java.NewMultiArrayNode;
-import jdk.compiler.graal.nodes.java.StoreFieldNode;
-import jdk.compiler.graal.nodes.java.StoreIndexedNode;
-import jdk.compiler.graal.nodes.java.UnsafeCompareAndExchangeNode;
-import jdk.compiler.graal.nodes.java.UnsafeCompareAndSwapNode;
-import jdk.compiler.graal.nodes.spi.LimitedValueProxy;
-import jdk.compiler.graal.nodes.spi.ValueProxy;
-import jdk.compiler.graal.nodes.type.StampTool;
-import jdk.compiler.graal.nodes.virtual.AllocatedObjectNode;
-import jdk.compiler.graal.nodes.virtual.CommitAllocationNode;
-import jdk.compiler.graal.nodes.virtual.VirtualInstanceNode;
-import jdk.compiler.graal.nodes.virtual.VirtualObjectNode;
-import jdk.compiler.graal.phases.common.BoxNodeIdentityPhase;
-import jdk.compiler.graal.phases.common.CanonicalizerPhase;
-import jdk.compiler.graal.phases.common.IterativeConditionalEliminationPhase;
-import jdk.compiler.graal.phases.graph.MergeableState;
-import jdk.compiler.graal.phases.graph.PostOrderNodeIterator;
-import jdk.compiler.graal.replacements.nodes.BasicArrayCopyNode;
-import jdk.compiler.graal.replacements.nodes.BinaryMathIntrinsicNode;
-import jdk.compiler.graal.replacements.nodes.MacroInvokable;
-import jdk.compiler.graal.replacements.nodes.ObjectClone;
-import jdk.compiler.graal.replacements.nodes.UnaryMathIntrinsicNode;
-import jdk.compiler.graal.virtual.phases.ea.PartialEscapePhase;
+import jdk.graal.compiler.core.common.spi.ForeignCallDescriptor;
+import jdk.graal.compiler.core.common.spi.ForeignCallsProvider;
+import jdk.graal.compiler.core.common.type.AbstractObjectStamp;
+import jdk.graal.compiler.core.common.type.ObjectStamp;
+import jdk.graal.compiler.core.common.type.TypeReference;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.Node.NodeIntrinsic;
+import jdk.graal.compiler.graph.NodeBitMap;
+import jdk.graal.compiler.graph.NodeInputList;
+import jdk.graal.compiler.graph.NodeSourcePosition;
+import jdk.graal.compiler.nodes.AbstractEndNode;
+import jdk.graal.compiler.nodes.AbstractMergeNode;
+import jdk.graal.compiler.nodes.BeginNode;
+import jdk.graal.compiler.nodes.CallTargetNode.InvokeKind;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.EndNode;
+import jdk.graal.compiler.nodes.FixedGuardNode;
+import jdk.graal.compiler.nodes.FixedNode;
+import jdk.graal.compiler.nodes.FrameState;
+import jdk.graal.compiler.nodes.GraphEncoder;
+import jdk.graal.compiler.nodes.IfNode;
+import jdk.graal.compiler.nodes.Invoke;
+import jdk.graal.compiler.nodes.InvokeNode;
+import jdk.graal.compiler.nodes.InvokeWithExceptionNode;
+import jdk.graal.compiler.nodes.LogicNode;
+import jdk.graal.compiler.nodes.LoopBeginNode;
+import jdk.graal.compiler.nodes.LoopEndNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ParameterNode;
+import jdk.graal.compiler.nodes.PhiNode;
+import jdk.graal.compiler.nodes.ReturnNode;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.calc.IsNullNode;
+import jdk.graal.compiler.nodes.extended.BoxNode;
+import jdk.graal.compiler.nodes.extended.BytecodeExceptionNode;
+import jdk.graal.compiler.nodes.extended.BytecodeExceptionNode.BytecodeExceptionKind;
+import jdk.graal.compiler.nodes.extended.ForeignCall;
+import jdk.graal.compiler.nodes.extended.GetClassNode;
+import jdk.graal.compiler.nodes.extended.RawLoadNode;
+import jdk.graal.compiler.nodes.extended.RawStoreNode;
+import jdk.graal.compiler.nodes.java.AtomicReadAndWriteNode;
+import jdk.graal.compiler.nodes.java.ClassIsAssignableFromNode;
+import jdk.graal.compiler.nodes.java.DynamicNewArrayNode;
+import jdk.graal.compiler.nodes.java.DynamicNewInstanceNode;
+import jdk.graal.compiler.nodes.java.ExceptionObjectNode;
+import jdk.graal.compiler.nodes.java.InstanceOfNode;
+import jdk.graal.compiler.nodes.java.LoadFieldNode;
+import jdk.graal.compiler.nodes.java.LoadIndexedNode;
+import jdk.graal.compiler.nodes.java.MethodCallTargetNode;
+import jdk.graal.compiler.nodes.java.MonitorEnterNode;
+import jdk.graal.compiler.nodes.java.NewArrayNode;
+import jdk.graal.compiler.nodes.java.NewInstanceNode;
+import jdk.graal.compiler.nodes.java.NewMultiArrayNode;
+import jdk.graal.compiler.nodes.java.StoreFieldNode;
+import jdk.graal.compiler.nodes.java.StoreIndexedNode;
+import jdk.graal.compiler.nodes.java.UnsafeCompareAndExchangeNode;
+import jdk.graal.compiler.nodes.java.UnsafeCompareAndSwapNode;
+import jdk.graal.compiler.nodes.spi.LimitedValueProxy;
+import jdk.graal.compiler.nodes.spi.ValueProxy;
+import jdk.graal.compiler.nodes.type.StampTool;
+import jdk.graal.compiler.nodes.virtual.AllocatedObjectNode;
+import jdk.graal.compiler.nodes.virtual.CommitAllocationNode;
+import jdk.graal.compiler.nodes.virtual.VirtualInstanceNode;
+import jdk.graal.compiler.nodes.virtual.VirtualObjectNode;
+import jdk.graal.compiler.phases.common.BoxNodeIdentityPhase;
+import jdk.graal.compiler.phases.common.CanonicalizerPhase;
+import jdk.graal.compiler.phases.common.IterativeConditionalEliminationPhase;
+import jdk.graal.compiler.phases.graph.MergeableState;
+import jdk.graal.compiler.phases.graph.PostOrderNodeIterator;
+import jdk.graal.compiler.replacements.nodes.BasicArrayCopyNode;
+import jdk.graal.compiler.replacements.nodes.BinaryMathIntrinsicNode;
+import jdk.graal.compiler.replacements.nodes.MacroInvokable;
+import jdk.graal.compiler.replacements.nodes.ObjectClone;
+import jdk.graal.compiler.replacements.nodes.UnaryMathIntrinsicNode;
+import jdk.graal.compiler.virtual.phases.ea.PartialEscapePhase;
 import jdk.vm.ci.code.BytecodePosition;
 import jdk.vm.ci.meta.Constant;
 import jdk.vm.ci.meta.JavaConstant;
diff --git a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/SourceTypeFlow.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/SourceTypeFlow.java
index 11d0a64bedcc..8a20c867cd8b 100644
--- a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/SourceTypeFlow.java
+++ b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/SourceTypeFlow.java
@@ -24,8 +24,8 @@
  */
 package com.oracle.graal.pointsto.flow;
 
-import jdk.compiler.graal.nodes.extended.BytecodeExceptionNode;
-import jdk.compiler.graal.nodes.extended.JavaReadNode;
+import jdk.graal.compiler.nodes.extended.BytecodeExceptionNode;
+import jdk.graal.compiler.nodes.extended.JavaReadNode;
 
 import com.oracle.graal.pointsto.PointsToAnalysis;
 import com.oracle.graal.pointsto.meta.AnalysisType;
diff --git a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/TypeFlow.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/TypeFlow.java
index ea501a1a59bb..a9bea2414183 100644
--- a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/TypeFlow.java
+++ b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/TypeFlow.java
@@ -28,7 +28,7 @@
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
 
-import jdk.compiler.graal.graph.Node;
+import jdk.graal.compiler.graph.Node;
 
 import com.oracle.graal.pointsto.PointsToAnalysis;
 import com.oracle.graal.pointsto.api.PointstoOptions;
diff --git a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/builder/TypeFlowBuilder.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/builder/TypeFlowBuilder.java
index 388286f8aee8..72770a8a3346 100644
--- a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/builder/TypeFlowBuilder.java
+++ b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/builder/TypeFlowBuilder.java
@@ -29,7 +29,7 @@
 import java.util.Set;
 import java.util.function.Supplier;
 
-import jdk.compiler.graal.phases.common.LazyValue;
+import jdk.graal.compiler.phases.common.LazyValue;
 
 import com.oracle.graal.pointsto.PointsToAnalysis;
 import com.oracle.graal.pointsto.flow.TypeFlow;
diff --git a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/builder/TypeFlowGraphBuilder.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/builder/TypeFlowGraphBuilder.java
index 9be905256b6f..8c565b13d75d 100644
--- a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/builder/TypeFlowGraphBuilder.java
+++ b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/builder/TypeFlowGraphBuilder.java
@@ -32,7 +32,7 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
-import jdk.compiler.graal.nodes.ParameterNode;
+import jdk.graal.compiler.nodes.ParameterNode;
 
 import com.oracle.graal.pointsto.PointsToAnalysis;
 import com.oracle.graal.pointsto.flow.TypeFlow;
diff --git a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/context/bytecode/BytecodeSensitiveAnalysisPolicy.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/context/bytecode/BytecodeSensitiveAnalysisPolicy.java
index 8107e7ac116b..54a2931c0fc6 100644
--- a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/context/bytecode/BytecodeSensitiveAnalysisPolicy.java
+++ b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/context/bytecode/BytecodeSensitiveAnalysisPolicy.java
@@ -30,7 +30,7 @@
 import java.util.Arrays;
 import java.util.BitSet;
 
-import jdk.compiler.graal.options.OptionValues;
+import jdk.graal.compiler.options.OptionValues;
 
 import com.oracle.graal.pointsto.AnalysisPolicy;
 import com.oracle.graal.pointsto.BigBang;
diff --git a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/heap/HeapSnapshotVerifier.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/heap/HeapSnapshotVerifier.java
index a33c83138b39..13f22c94df56 100644
--- a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/heap/HeapSnapshotVerifier.java
+++ b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/heap/HeapSnapshotVerifier.java
@@ -30,9 +30,9 @@
 import java.util.concurrent.ForkJoinPool;
 import java.util.function.Consumer;
 
-import jdk.compiler.graal.options.Option;
-import jdk.compiler.graal.options.OptionKey;
-import jdk.compiler.graal.options.OptionType;
+import jdk.graal.compiler.options.Option;
+import jdk.graal.compiler.options.OptionKey;
+import jdk.graal.compiler.options.OptionType;
 
 import com.oracle.graal.pointsto.BigBang;
 import com.oracle.graal.pointsto.ObjectScanner;
diff --git a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/heap/ImageHeapConstant.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/heap/ImageHeapConstant.java
index 46e4dd248ffe..81c3c741dcfe 100644
--- a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/heap/ImageHeapConstant.java
+++ b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/heap/ImageHeapConstant.java
@@ -27,8 +27,8 @@
 import java.util.Objects;
 import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
 
-import jdk.compiler.graal.core.common.type.CompressibleConstant;
-import jdk.compiler.graal.core.common.type.TypedConstant;
+import jdk.graal.compiler.core.common.type.CompressibleConstant;
+import jdk.graal.compiler.core.common.type.TypedConstant;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
 
diff --git a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/heap/ImageHeapScanner.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/heap/ImageHeapScanner.java
index 2702ca316e01..e602a70397e6 100644
--- a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/heap/ImageHeapScanner.java
+++ b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/heap/ImageHeapScanner.java
@@ -33,10 +33,10 @@
 
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.MapCursor;
-import jdk.compiler.graal.api.replacements.SnippetReflectionProvider;
-import jdk.compiler.graal.core.common.SuppressFBWarnings;
-import jdk.compiler.graal.core.common.type.TypedConstant;
-import jdk.compiler.graal.debug.GraalError;
+import jdk.graal.compiler.api.replacements.SnippetReflectionProvider;
+import jdk.graal.compiler.core.common.SuppressFBWarnings;
+import jdk.graal.compiler.core.common.type.TypedConstant;
+import jdk.graal.compiler.debug.GraalError;
 
 import com.oracle.graal.pointsto.BigBang;
 import com.oracle.graal.pointsto.ObjectScanner;
diff --git a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/infrastructure/GraphProvider.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/infrastructure/GraphProvider.java
index 62f9ff41fb8e..2452b980511b 100644
--- a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/infrastructure/GraphProvider.java
+++ b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/infrastructure/GraphProvider.java
@@ -24,8 +24,8 @@
  */
 package com.oracle.graal.pointsto.infrastructure;
 
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.nodes.StructuredGraph;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.nodes.StructuredGraph;
 
 import com.oracle.graal.pointsto.meta.HostedProviders;
 
diff --git a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/infrastructure/Universe.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/infrastructure/Universe.java
index 938bde7763e8..a19362f0ff8c 100644
--- a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/infrastructure/Universe.java
+++ b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/infrastructure/Universe.java
@@ -24,7 +24,7 @@
  */
 package com.oracle.graal.pointsto.infrastructure;
 
-import jdk.compiler.graal.api.replacements.SnippetReflectionProvider;
+import jdk.graal.compiler.api.replacements.SnippetReflectionProvider;
 
 import com.oracle.graal.pointsto.api.HostVM;
 import com.oracle.graal.pointsto.heap.ImageHeap;
diff --git a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/infrastructure/UniverseMetaAccess.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/infrastructure/UniverseMetaAccess.java
index da409bbc2ab0..c5a3626dd761 100644
--- a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/infrastructure/UniverseMetaAccess.java
+++ b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/infrastructure/UniverseMetaAccess.java
@@ -31,7 +31,7 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Function;
 
-import jdk.compiler.graal.core.common.type.TypedConstant;
+import jdk.graal.compiler.core.common.type.TypedConstant;
 
 import com.oracle.graal.pointsto.meta.AnalysisUniverse;
 
diff --git a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/infrastructure/WrappedConstantPool.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/infrastructure/WrappedConstantPool.java
index 05d0c58856dc..bfecdd052b7b 100644
--- a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/infrastructure/WrappedConstantPool.java
+++ b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/infrastructure/WrappedConstantPool.java
@@ -31,9 +31,9 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
-import jdk.compiler.graal.core.common.BootstrapMethodIntrospection;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.serviceprovider.GraalServices;
+import jdk.graal.compiler.core.common.BootstrapMethodIntrospection;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.serviceprovider.GraalServices;
 
 import com.oracle.graal.pointsto.constraints.UnresolvedElementException;
 import com.oracle.svm.util.ReflectionUtil;
diff --git a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/meta/AnalysisElement.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/meta/AnalysisElement.java
index da0a6247cc64..f6673aa5c50b 100644
--- a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/meta/AnalysisElement.java
+++ b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/meta/AnalysisElement.java
@@ -38,7 +38,7 @@
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
 
-import jdk.compiler.graal.debug.GraalError;
+import jdk.graal.compiler.debug.GraalError;
 import org.graalvm.nativeimage.hosted.Feature.DuringAnalysisAccess;
 
 import com.oracle.graal.pointsto.BigBang;
diff --git a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/meta/AnalysisField.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/meta/AnalysisField.java
index 92aee73695ca..6dbf73c56ae1 100644
--- a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/meta/AnalysisField.java
+++ b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/meta/AnalysisField.java
@@ -32,7 +32,7 @@
 import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
 import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
 
-import jdk.compiler.graal.debug.GraalError;
+import jdk.graal.compiler.debug.GraalError;
 
 import com.oracle.graal.pointsto.api.DefaultUnsafePartition;
 import com.oracle.graal.pointsto.api.HostVM;
diff --git a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/meta/AnalysisMetaAccessExtensionProvider.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/meta/AnalysisMetaAccessExtensionProvider.java
index 1b2c48b7bee2..b651d5592286 100644
--- a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/meta/AnalysisMetaAccessExtensionProvider.java
+++ b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/meta/AnalysisMetaAccessExtensionProvider.java
@@ -25,8 +25,8 @@
 
 package com.oracle.graal.pointsto.meta;
 
-import jdk.compiler.graal.core.common.spi.MetaAccessExtensionProvider;
-import jdk.compiler.graal.debug.GraalError;
+import jdk.graal.compiler.core.common.spi.MetaAccessExtensionProvider;
+import jdk.graal.compiler.debug.GraalError;
 
 import jdk.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.JavaType;
diff --git a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/meta/AnalysisMethod.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/meta/AnalysisMethod.java
index 84891e456e4d..a9268a680894 100644
--- a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/meta/AnalysisMethod.java
+++ b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/meta/AnalysisMethod.java
@@ -44,15 +44,15 @@
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.graph.NodeSourcePosition;
-import jdk.compiler.graal.java.BytecodeParser.BytecodeParserError;
-import jdk.compiler.graal.java.StableMethodNameFormatter;
-import jdk.compiler.graal.nodes.EncodedGraph;
-import jdk.compiler.graal.nodes.EncodedGraph.EncodedNodeReference;
-import jdk.compiler.graal.nodes.GraphDecoder;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.graph.NodeSourcePosition;
+import jdk.graal.compiler.java.BytecodeParser.BytecodeParserError;
+import jdk.graal.compiler.java.StableMethodNameFormatter;
+import jdk.graal.compiler.nodes.EncodedGraph;
+import jdk.graal.compiler.nodes.EncodedGraph.EncodedNodeReference;
+import jdk.graal.compiler.nodes.GraphDecoder;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin;
 import org.graalvm.nativeimage.hosted.Feature.DuringAnalysisAccess;
 
 import com.oracle.graal.pointsto.BigBang;
diff --git a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/meta/AnalysisType.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/meta/AnalysisType.java
index b399171702e7..8af3da270f50 100644
--- a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/meta/AnalysisType.java
+++ b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/meta/AnalysisType.java
@@ -40,7 +40,7 @@
 import java.util.function.Consumer;
 import java.util.function.Function;
 
-import jdk.compiler.graal.debug.GraalError;
+import jdk.graal.compiler.debug.GraalError;
 import org.graalvm.nativeimage.hosted.Feature.DuringAnalysisAccess;
 import org.graalvm.word.WordBase;
 
diff --git a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/meta/AnalysisUniverse.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/meta/AnalysisUniverse.java
index 602ad7bb72d5..f7945793caab 100644
--- a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/meta/AnalysisUniverse.java
+++ b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/meta/AnalysisUniverse.java
@@ -37,8 +37,8 @@
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Function;
 
-import jdk.compiler.graal.api.replacements.SnippetReflectionProvider;
-import jdk.compiler.graal.core.common.SuppressFBWarnings;
+import jdk.graal.compiler.api.replacements.SnippetReflectionProvider;
+import jdk.graal.compiler.core.common.SuppressFBWarnings;
 import org.graalvm.nativeimage.hosted.Feature.DuringAnalysisAccess;
 import org.graalvm.nativeimage.impl.AnnotationExtractor;
 import org.graalvm.word.WordBase;
diff --git a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/meta/HostedProviders.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/meta/HostedProviders.java
index 4ec055a81f4e..6c85fa051ed4 100644
--- a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/meta/HostedProviders.java
+++ b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/meta/HostedProviders.java
@@ -24,18 +24,18 @@
  */
 package com.oracle.graal.pointsto.meta;
 
-import jdk.compiler.graal.api.replacements.SnippetReflectionProvider;
-import jdk.compiler.graal.core.common.spi.ConstantFieldProvider;
-import jdk.compiler.graal.core.common.spi.ForeignCallsProvider;
-import jdk.compiler.graal.core.common.spi.MetaAccessExtensionProvider;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration;
-import jdk.compiler.graal.nodes.spi.LoopsDataProvider;
-import jdk.compiler.graal.nodes.spi.LoweringProvider;
-import jdk.compiler.graal.nodes.spi.PlatformConfigurationProvider;
-import jdk.compiler.graal.nodes.spi.Replacements;
-import jdk.compiler.graal.nodes.spi.StampProvider;
-import jdk.compiler.graal.phases.util.Providers;
-import jdk.compiler.graal.word.WordTypes;
+import jdk.graal.compiler.api.replacements.SnippetReflectionProvider;
+import jdk.graal.compiler.core.common.spi.ConstantFieldProvider;
+import jdk.graal.compiler.core.common.spi.ForeignCallsProvider;
+import jdk.graal.compiler.core.common.spi.MetaAccessExtensionProvider;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
+import jdk.graal.compiler.nodes.spi.LoopsDataProvider;
+import jdk.graal.compiler.nodes.spi.LoweringProvider;
+import jdk.graal.compiler.nodes.spi.PlatformConfigurationProvider;
+import jdk.graal.compiler.nodes.spi.Replacements;
+import jdk.graal.compiler.nodes.spi.StampProvider;
+import jdk.graal.compiler.phases.util.Providers;
+import jdk.graal.compiler.word.WordTypes;
 
 import jdk.vm.ci.code.CodeCacheProvider;
 import jdk.vm.ci.meta.ConstantReflectionProvider;
diff --git a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/nodes/AnalysisObjectCloneNode.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/nodes/AnalysisObjectCloneNode.java
index 2c3bd22d0303..bfe4e18aff83 100644
--- a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/nodes/AnalysisObjectCloneNode.java
+++ b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/nodes/AnalysisObjectCloneNode.java
@@ -24,11 +24,11 @@
  */
 package com.oracle.graal.pointsto.nodes;
 
-import jdk.compiler.graal.core.common.type.ObjectStamp;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.FrameState;
-import jdk.compiler.graal.replacements.nodes.BasicObjectCloneNode;
+import jdk.graal.compiler.core.common.type.ObjectStamp;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.FrameState;
+import jdk.graal.compiler.replacements.nodes.BasicObjectCloneNode;
 
 @NodeInfo
 public class AnalysisObjectCloneNode extends BasicObjectCloneNode {
diff --git a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/nodes/UnsafePartitionLoadNode.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/nodes/UnsafePartitionLoadNode.java
index 8ddaafb810e5..0083df9f9dbe 100644
--- a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/nodes/UnsafePartitionLoadNode.java
+++ b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/nodes/UnsafePartitionLoadNode.java
@@ -24,10 +24,10 @@
  */
 package com.oracle.graal.pointsto.nodes;
 
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.extended.RawLoadNode;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.extended.RawLoadNode;
 import org.graalvm.word.LocationIdentity;
 
 import com.oracle.svm.util.UnsafePartitionKind;
diff --git a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/nodes/UnsafePartitionStoreNode.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/nodes/UnsafePartitionStoreNode.java
index 564dddf40dd4..8f359c872821 100644
--- a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/nodes/UnsafePartitionStoreNode.java
+++ b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/nodes/UnsafePartitionStoreNode.java
@@ -24,11 +24,11 @@
  */
 package com.oracle.graal.pointsto.nodes;
 
-import jdk.compiler.graal.core.common.memory.MemoryOrderMode;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.extended.RawStoreNode;
+import jdk.graal.compiler.core.common.memory.MemoryOrderMode;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.extended.RawStoreNode;
 import org.graalvm.word.LocationIdentity;
 
 import com.oracle.svm.util.UnsafePartitionKind;
diff --git a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/phases/InlineBeforeAnalysis.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/phases/InlineBeforeAnalysis.java
index a38f15a5562c..16c3a4676d6d 100644
--- a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/phases/InlineBeforeAnalysis.java
+++ b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/phases/InlineBeforeAnalysis.java
@@ -29,12 +29,12 @@
 import com.oracle.graal.pointsto.meta.AnalysisMethod;
 import com.oracle.svm.util.ClassUtil;
 
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.nodes.GraphDecoder;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.options.Option;
-import jdk.compiler.graal.options.OptionKey;
-import jdk.compiler.graal.printer.GraalDebugHandlersFactory;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.nodes.GraphDecoder;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.options.Option;
+import jdk.graal.compiler.options.OptionKey;
+import jdk.graal.compiler.printer.GraalDebugHandlersFactory;
 
 /**
  * Inlining before the static analysis improves the precision of the analysis especially when
diff --git a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/phases/InlineBeforeAnalysisGraphDecoder.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/phases/InlineBeforeAnalysisGraphDecoder.java
index 932d2e309755..17cfc981e4db 100644
--- a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/phases/InlineBeforeAnalysisGraphDecoder.java
+++ b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/phases/InlineBeforeAnalysisGraphDecoder.java
@@ -32,33 +32,33 @@
 import java.util.concurrent.ConcurrentHashMap;
 
 import org.graalvm.collections.EconomicSet;
-import jdk.compiler.graal.bytecode.BytecodeProvider;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeSourcePosition;
-import jdk.compiler.graal.nodes.AbstractEndNode;
-import jdk.compiler.graal.nodes.AbstractMergeNode;
-import jdk.compiler.graal.nodes.CallTargetNode;
-import jdk.compiler.graal.nodes.ControlSinkNode;
-import jdk.compiler.graal.nodes.ControlSplitNode;
-import jdk.compiler.graal.nodes.EncodedGraph;
-import jdk.compiler.graal.nodes.FixedNode;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.InvokeWithExceptionNode;
-import jdk.compiler.graal.nodes.LogicConstantNode;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.calc.IsNullNode;
-import jdk.compiler.graal.nodes.extended.UnsafeAccessNode;
-import jdk.compiler.graal.nodes.graphbuilderconf.InlineInvokePlugin;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin;
-import jdk.compiler.graal.nodes.graphbuilderconf.LoopExplosionPlugin;
-import jdk.compiler.graal.nodes.java.LoadFieldNode;
-import jdk.compiler.graal.nodes.java.MethodCallTargetNode;
-import jdk.compiler.graal.nodes.util.GraphUtil;
-import jdk.compiler.graal.replacements.PEGraphDecoder;
-import jdk.compiler.graal.replacements.nodes.MethodHandleWithExceptionNode;
-import jdk.compiler.graal.replacements.nodes.ResolvedMethodHandleCallTargetNode;
+import jdk.graal.compiler.bytecode.BytecodeProvider;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeSourcePosition;
+import jdk.graal.compiler.nodes.AbstractEndNode;
+import jdk.graal.compiler.nodes.AbstractMergeNode;
+import jdk.graal.compiler.nodes.CallTargetNode;
+import jdk.graal.compiler.nodes.ControlSinkNode;
+import jdk.graal.compiler.nodes.ControlSplitNode;
+import jdk.graal.compiler.nodes.EncodedGraph;
+import jdk.graal.compiler.nodes.FixedNode;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.InvokeWithExceptionNode;
+import jdk.graal.compiler.nodes.LogicConstantNode;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.calc.IsNullNode;
+import jdk.graal.compiler.nodes.extended.UnsafeAccessNode;
+import jdk.graal.compiler.nodes.graphbuilderconf.InlineInvokePlugin;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin;
+import jdk.graal.compiler.nodes.graphbuilderconf.LoopExplosionPlugin;
+import jdk.graal.compiler.nodes.java.LoadFieldNode;
+import jdk.graal.compiler.nodes.java.MethodCallTargetNode;
+import jdk.graal.compiler.nodes.util.GraphUtil;
+import jdk.graal.compiler.replacements.PEGraphDecoder;
+import jdk.graal.compiler.replacements.nodes.MethodHandleWithExceptionNode;
+import jdk.graal.compiler.replacements.nodes.ResolvedMethodHandleCallTargetNode;
 
 import com.oracle.graal.pointsto.BigBang;
 import com.oracle.graal.pointsto.flow.AnalysisParsedGraph;
diff --git a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/phases/InlineBeforeAnalysisInlineInvokePlugin.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/phases/InlineBeforeAnalysisInlineInvokePlugin.java
index b992ee0f1ab9..a4cbd9a2ea3b 100644
--- a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/phases/InlineBeforeAnalysisInlineInvokePlugin.java
+++ b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/phases/InlineBeforeAnalysisInlineInvokePlugin.java
@@ -24,9 +24,9 @@
  */
 package com.oracle.graal.pointsto.phases;
 
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext;
-import jdk.compiler.graal.nodes.graphbuilderconf.InlineInvokePlugin;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext;
+import jdk.graal.compiler.nodes.graphbuilderconf.InlineInvokePlugin;
 
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 
diff --git a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/phases/InlineBeforeAnalysisPolicy.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/phases/InlineBeforeAnalysisPolicy.java
index b845bc5b9d4d..0f9af9a140d2 100644
--- a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/phases/InlineBeforeAnalysisPolicy.java
+++ b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/phases/InlineBeforeAnalysisPolicy.java
@@ -24,13 +24,13 @@
  */
 package com.oracle.graal.pointsto.phases;
 
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeSourcePosition;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext;
-import jdk.compiler.graal.nodes.graphbuilderconf.InlineInvokePlugin.InlineInfo;
-import jdk.compiler.graal.nodes.graphbuilderconf.NodePlugin;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeSourcePosition;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext;
+import jdk.graal.compiler.nodes.graphbuilderconf.InlineInvokePlugin.InlineInfo;
+import jdk.graal.compiler.nodes.graphbuilderconf.NodePlugin;
 
 import com.oracle.graal.pointsto.meta.AnalysisMetaAccess;
 import com.oracle.graal.pointsto.util.AnalysisError;
diff --git a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/phases/NoClassInitializationPlugin.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/phases/NoClassInitializationPlugin.java
index 88799f9b744c..06b94e69428d 100644
--- a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/phases/NoClassInitializationPlugin.java
+++ b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/phases/NoClassInitializationPlugin.java
@@ -26,9 +26,9 @@
 
 import java.util.function.Supplier;
 
-import jdk.compiler.graal.nodes.FrameState;
-import jdk.compiler.graal.nodes.graphbuilderconf.ClassInitializationPlugin;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext;
+import jdk.graal.compiler.nodes.FrameState;
+import jdk.graal.compiler.nodes.graphbuilderconf.ClassInitializationPlugin;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext;
 
 import jdk.vm.ci.meta.ConstantPool;
 import jdk.vm.ci.meta.ResolvedJavaType;
diff --git a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/phases/SubstrateIntrinsicGraphBuilder.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/phases/SubstrateIntrinsicGraphBuilder.java
index e554f1290bc9..24625ebbda39 100644
--- a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/phases/SubstrateIntrinsicGraphBuilder.java
+++ b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/phases/SubstrateIntrinsicGraphBuilder.java
@@ -27,21 +27,21 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import jdk.compiler.graal.bytecode.Bytecode;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.nodes.FrameState;
-import jdk.compiler.graal.nodes.MergeNode;
-import jdk.compiler.graal.nodes.StateSplit;
-import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions;
-import jdk.compiler.graal.nodes.UnwindNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.graphbuilderconf.GeneratedInvocationPlugin;
-import jdk.compiler.graal.nodes.java.MonitorIdNode;
-import jdk.compiler.graal.nodes.spi.CoreProviders;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.common.inlining.InliningUtil;
-import jdk.compiler.graal.replacements.IntrinsicGraphBuilder;
+import jdk.graal.compiler.bytecode.Bytecode;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.nodes.FrameState;
+import jdk.graal.compiler.nodes.MergeNode;
+import jdk.graal.compiler.nodes.StateSplit;
+import jdk.graal.compiler.nodes.StructuredGraph.AllowAssumptions;
+import jdk.graal.compiler.nodes.UnwindNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.graphbuilderconf.GeneratedInvocationPlugin;
+import jdk.graal.compiler.nodes.java.MonitorIdNode;
+import jdk.graal.compiler.nodes.spi.CoreProviders;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.common.inlining.InliningUtil;
+import jdk.graal.compiler.replacements.IntrinsicGraphBuilder;
 
 import jdk.vm.ci.meta.JavaKind;
 
diff --git a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/plugins/PointstoGraphBuilderPlugins.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/plugins/PointstoGraphBuilderPlugins.java
index 15701572b078..8f650311866c 100644
--- a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/plugins/PointstoGraphBuilderPlugins.java
+++ b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/plugins/PointstoGraphBuilderPlugins.java
@@ -24,14 +24,14 @@
  */
 package com.oracle.graal.pointsto.plugins;
 
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin.Receiver;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin.RequiredInvocationPlugin;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins.Registration;
-import jdk.compiler.graal.replacements.arraycopy.ArrayCopySnippets;
-import jdk.compiler.graal.replacements.nodes.MacroNode.MacroParams;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin.Receiver;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin.RequiredInvocationPlugin;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins.Registration;
+import jdk.graal.compiler.replacements.arraycopy.ArrayCopySnippets;
+import jdk.graal.compiler.replacements.nodes.MacroNode.MacroParams;
 
 import com.oracle.graal.pointsto.nodes.AnalysisObjectCloneNode;
 
diff --git a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/reports/AnalysisReporter.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/reports/AnalysisReporter.java
index 1f835bac7a5d..70743938e8de 100644
--- a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/reports/AnalysisReporter.java
+++ b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/reports/AnalysisReporter.java
@@ -29,7 +29,7 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
-import jdk.compiler.graal.options.OptionValues;
+import jdk.graal.compiler.options.OptionValues;
 
 import com.oracle.graal.pointsto.BigBang;
 import com.oracle.graal.pointsto.api.PointstoOptions;
diff --git a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/reports/AnalysisReportsOptions.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/reports/AnalysisReportsOptions.java
index d3748c5381be..b84f80429e36 100644
--- a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/reports/AnalysisReportsOptions.java
+++ b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/reports/AnalysisReportsOptions.java
@@ -27,9 +27,9 @@
 import static com.oracle.graal.pointsto.api.PointstoOptions.TrackAccessChain;
 
 import org.graalvm.collections.EconomicMap;
-import jdk.compiler.graal.options.EnumOptionKey;
-import jdk.compiler.graal.options.Option;
-import jdk.compiler.graal.options.OptionKey;
+import jdk.graal.compiler.options.EnumOptionKey;
+import jdk.graal.compiler.options.Option;
+import jdk.graal.compiler.options.OptionKey;
 
 public class AnalysisReportsOptions {
 
diff --git a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/reports/CallTreePrinter.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/reports/CallTreePrinter.java
index 42fc620d909c..74a1a0cedf72 100644
--- a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/reports/CallTreePrinter.java
+++ b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/reports/CallTreePrinter.java
@@ -57,7 +57,7 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import jdk.compiler.graal.java.LambdaUtils;
+import jdk.graal.compiler.java.LambdaUtils;
 
 import com.oracle.graal.pointsto.BigBang;
 import com.oracle.graal.pointsto.meta.AnalysisMethod;
diff --git a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/reports/ObjectTreePrinter.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/reports/ObjectTreePrinter.java
index 8a53ab260c49..75e0645b4350 100644
--- a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/reports/ObjectTreePrinter.java
+++ b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/reports/ObjectTreePrinter.java
@@ -41,7 +41,7 @@
 import java.util.Map;
 import java.util.Set;
 
-import jdk.compiler.graal.options.OptionValues;
+import jdk.graal.compiler.options.OptionValues;
 
 import com.oracle.graal.pointsto.BigBang;
 import com.oracle.graal.pointsto.ObjectScanner;
diff --git a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/results/StaticAnalysisResultsBuilder.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/results/StaticAnalysisResultsBuilder.java
index 1584ed505e30..34ce34d045bf 100644
--- a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/results/StaticAnalysisResultsBuilder.java
+++ b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/results/StaticAnalysisResultsBuilder.java
@@ -29,8 +29,8 @@
 import java.util.stream.Collectors;
 import java.util.stream.StreamSupport;
 
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeSourcePosition;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeSourcePosition;
 
 import com.oracle.graal.pointsto.PointsToAnalysis;
 import com.oracle.graal.pointsto.api.PointstoOptions;
diff --git a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/results/StrengthenGraphs.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/results/StrengthenGraphs.java
index e349b118b622..3a6805f553fc 100644
--- a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/results/StrengthenGraphs.java
+++ b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/results/StrengthenGraphs.java
@@ -33,60 +33,60 @@
 import java.util.function.Supplier;
 
 import org.graalvm.collections.EconomicSet;
-import jdk.compiler.graal.core.common.type.AbstractObjectStamp;
-import jdk.compiler.graal.core.common.type.ObjectStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.core.common.type.TypeReference;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeBitMap;
-import jdk.compiler.graal.graph.NodeInputList;
-import jdk.compiler.graal.graph.NodeMap;
-import jdk.compiler.graal.nodeinfo.InputType;
-import jdk.compiler.graal.nodes.AbstractBeginNode;
-import jdk.compiler.graal.nodes.CallTargetNode;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.FixedGuardNode;
-import jdk.compiler.graal.nodes.FixedNode;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.FrameState;
-import jdk.compiler.graal.nodes.GraphEncoder;
-import jdk.compiler.graal.nodes.GraphState;
-import jdk.compiler.graal.nodes.IfNode;
-import jdk.compiler.graal.nodes.Invoke;
-import jdk.compiler.graal.nodes.InvokeWithExceptionNode;
-import jdk.compiler.graal.nodes.LogicConstantNode;
-import jdk.compiler.graal.nodes.LogicNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ParameterNode;
-import jdk.compiler.graal.nodes.PhiNode;
-import jdk.compiler.graal.nodes.PiNode;
-import jdk.compiler.graal.nodes.StartNode;
-import jdk.compiler.graal.nodes.StateSplit;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.calc.ConditionalNode;
-import jdk.compiler.graal.nodes.calc.IsNullNode;
-import jdk.compiler.graal.nodes.extended.BytecodeExceptionNode;
-import jdk.compiler.graal.nodes.extended.ValueAnchorNode;
-import jdk.compiler.graal.nodes.java.ClassIsAssignableFromNode;
-import jdk.compiler.graal.nodes.java.InstanceOfNode;
-import jdk.compiler.graal.nodes.java.LoadFieldNode;
-import jdk.compiler.graal.nodes.java.LoadIndexedNode;
-import jdk.compiler.graal.nodes.java.MethodCallTargetNode;
-import jdk.compiler.graal.nodes.spi.CoreProviders;
-import jdk.compiler.graal.nodes.spi.LimitedValueProxy;
-import jdk.compiler.graal.nodes.spi.SimplifierTool;
-import jdk.compiler.graal.nodes.util.GraphUtil;
-import jdk.compiler.graal.options.Option;
-import jdk.compiler.graal.options.OptionKey;
-import jdk.compiler.graal.phases.BasePhase;
-import jdk.compiler.graal.phases.common.CanonicalizerPhase;
-import jdk.compiler.graal.phases.common.CanonicalizerPhase.CustomSimplification;
-import jdk.compiler.graal.phases.common.inlining.InliningUtil;
-import jdk.compiler.graal.printer.GraalDebugHandlersFactory;
+import jdk.graal.compiler.core.common.type.AbstractObjectStamp;
+import jdk.graal.compiler.core.common.type.ObjectStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.core.common.type.TypeReference;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeBitMap;
+import jdk.graal.compiler.graph.NodeInputList;
+import jdk.graal.compiler.graph.NodeMap;
+import jdk.graal.compiler.nodeinfo.InputType;
+import jdk.graal.compiler.nodes.AbstractBeginNode;
+import jdk.graal.compiler.nodes.CallTargetNode;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.FixedGuardNode;
+import jdk.graal.compiler.nodes.FixedNode;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.FrameState;
+import jdk.graal.compiler.nodes.GraphEncoder;
+import jdk.graal.compiler.nodes.GraphState;
+import jdk.graal.compiler.nodes.IfNode;
+import jdk.graal.compiler.nodes.Invoke;
+import jdk.graal.compiler.nodes.InvokeWithExceptionNode;
+import jdk.graal.compiler.nodes.LogicConstantNode;
+import jdk.graal.compiler.nodes.LogicNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ParameterNode;
+import jdk.graal.compiler.nodes.PhiNode;
+import jdk.graal.compiler.nodes.PiNode;
+import jdk.graal.compiler.nodes.StartNode;
+import jdk.graal.compiler.nodes.StateSplit;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.calc.ConditionalNode;
+import jdk.graal.compiler.nodes.calc.IsNullNode;
+import jdk.graal.compiler.nodes.extended.BytecodeExceptionNode;
+import jdk.graal.compiler.nodes.extended.ValueAnchorNode;
+import jdk.graal.compiler.nodes.java.ClassIsAssignableFromNode;
+import jdk.graal.compiler.nodes.java.InstanceOfNode;
+import jdk.graal.compiler.nodes.java.LoadFieldNode;
+import jdk.graal.compiler.nodes.java.LoadIndexedNode;
+import jdk.graal.compiler.nodes.java.MethodCallTargetNode;
+import jdk.graal.compiler.nodes.spi.CoreProviders;
+import jdk.graal.compiler.nodes.spi.LimitedValueProxy;
+import jdk.graal.compiler.nodes.spi.SimplifierTool;
+import jdk.graal.compiler.nodes.util.GraphUtil;
+import jdk.graal.compiler.options.Option;
+import jdk.graal.compiler.options.OptionKey;
+import jdk.graal.compiler.phases.BasePhase;
+import jdk.graal.compiler.phases.common.CanonicalizerPhase;
+import jdk.graal.compiler.phases.common.CanonicalizerPhase.CustomSimplification;
+import jdk.graal.compiler.phases.common.inlining.InliningUtil;
+import jdk.graal.compiler.printer.GraalDebugHandlersFactory;
 
 import com.oracle.graal.pointsto.PointsToAnalysis;
 import com.oracle.graal.pointsto.flow.AnalysisParsedGraph;
diff --git a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/typestate/DefaultAnalysisPolicy.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/typestate/DefaultAnalysisPolicy.java
index 8ecde6b94363..25253ab90c42 100644
--- a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/typestate/DefaultAnalysisPolicy.java
+++ b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/typestate/DefaultAnalysisPolicy.java
@@ -27,7 +27,7 @@
 import java.util.BitSet;
 import java.util.Objects;
 
-import jdk.compiler.graal.options.OptionValues;
+import jdk.graal.compiler.options.OptionValues;
 
 import com.oracle.graal.pointsto.AnalysisPolicy;
 import com.oracle.graal.pointsto.PointsToAnalysis;
diff --git a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/typestate/PointsToStats.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/typestate/PointsToStats.java
index b2fd5dac9f4f..b6f6b82f9779 100644
--- a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/typestate/PointsToStats.java
+++ b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/typestate/PointsToStats.java
@@ -43,8 +43,8 @@
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
-import jdk.compiler.graal.graph.NodeSourcePosition;
-import jdk.compiler.graal.nodes.ValueNode;
+import jdk.graal.compiler.graph.NodeSourcePosition;
+import jdk.graal.compiler.nodes.ValueNode;
 
 import com.oracle.graal.pointsto.BigBang;
 import com.oracle.graal.pointsto.PointsToAnalysis;
diff --git a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/util/AnalysisFuture.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/util/AnalysisFuture.java
index f968c845ab14..9188cf9493fc 100644
--- a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/util/AnalysisFuture.java
+++ b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/util/AnalysisFuture.java
@@ -28,7 +28,7 @@
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.FutureTask;
 
-import jdk.compiler.graal.debug.GraalError;
+import jdk.graal.compiler.debug.GraalError;
 
 /** Extend FutureTask for custom error reporting. */
 public class AnalysisFuture extends FutureTask {
diff --git a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/util/CompletionExecutor.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/util/CompletionExecutor.java
index bdd10af1d5f3..bfbecae57b10 100644
--- a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/util/CompletionExecutor.java
+++ b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/util/CompletionExecutor.java
@@ -35,12 +35,12 @@
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.concurrent.atomic.LongAdder;
 
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.debug.DebugContext.Activation;
-import jdk.compiler.graal.debug.DebugContext.Description;
-import jdk.compiler.graal.debug.DebugContext.Scope;
-import jdk.compiler.graal.debug.DebugHandlersFactory;
-import jdk.compiler.graal.options.OptionValues;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.debug.DebugContext.Activation;
+import jdk.graal.compiler.debug.DebugContext.Description;
+import jdk.graal.compiler.debug.DebugContext.Scope;
+import jdk.graal.compiler.debug.DebugHandlersFactory;
+import jdk.graal.compiler.options.OptionValues;
 
 import com.oracle.graal.pointsto.BigBang;
 
diff --git a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/util/GraalAccess.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/util/GraalAccess.java
index 3030509db556..384a8e3b7568 100644
--- a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/util/GraalAccess.java
+++ b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/util/GraalAccess.java
@@ -26,12 +26,12 @@
 
 import java.util.Objects;
 
-import jdk.compiler.graal.api.replacements.SnippetReflectionProvider;
-import jdk.compiler.graal.api.runtime.GraalJVMCICompiler;
-import jdk.compiler.graal.api.runtime.GraalRuntime;
-import jdk.compiler.graal.core.target.Backend;
-import jdk.compiler.graal.phases.util.Providers;
-import jdk.compiler.graal.runtime.RuntimeProvider;
+import jdk.graal.compiler.api.replacements.SnippetReflectionProvider;
+import jdk.graal.compiler.api.runtime.GraalJVMCICompiler;
+import jdk.graal.compiler.api.runtime.GraalRuntime;
+import jdk.graal.compiler.core.target.Backend;
+import jdk.graal.compiler.phases.util.Providers;
+import jdk.graal.compiler.runtime.RuntimeProvider;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
 
diff --git a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/util/PointsToOptionParser.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/util/PointsToOptionParser.java
index c49a74a899b4..d49daef85e8b 100644
--- a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/util/PointsToOptionParser.java
+++ b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/util/PointsToOptionParser.java
@@ -38,10 +38,10 @@
 import java.util.function.Predicate;
 
 import org.graalvm.collections.EconomicMap;
-import jdk.compiler.graal.options.OptionDescriptor;
-import jdk.compiler.graal.options.OptionDescriptors;
-import jdk.compiler.graal.options.OptionKey;
-import jdk.compiler.graal.options.OptionValues;
+import jdk.graal.compiler.options.OptionDescriptor;
+import jdk.graal.compiler.options.OptionDescriptors;
+import jdk.graal.compiler.options.OptionKey;
+import jdk.graal.compiler.options.OptionValues;
 
 import com.oracle.svm.common.option.CommonOptionParser;
 import com.oracle.svm.common.option.CommonOptionParser.BooleanOptionFormat;
diff --git a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/util/TimerCollection.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/util/TimerCollection.java
index 5cc175d1c195..b653e0cafea7 100644
--- a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/util/TimerCollection.java
+++ b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/util/TimerCollection.java
@@ -26,7 +26,7 @@
 
 import com.oracle.graal.pointsto.reports.StatisticsPrinter;
 import com.oracle.svm.util.ImageBuildStatistics;
-import jdk.compiler.graal.debug.GraalError;
+import jdk.graal.compiler.debug.GraalError;
 import org.graalvm.nativeimage.ImageSingletons;
 
 import java.io.PrintWriter;
diff --git a/substratevm/src/com.oracle.graal.reachability/src/com/oracle/graal/reachability/DirectMethodProcessingHandler.java b/substratevm/src/com.oracle.graal.reachability/src/com/oracle/graal/reachability/DirectMethodProcessingHandler.java
index 087c7ffabe1a..e168faffdea1 100644
--- a/substratevm/src/com.oracle.graal.reachability/src/com/oracle/graal/reachability/DirectMethodProcessingHandler.java
+++ b/substratevm/src/com.oracle.graal.reachability/src/com/oracle/graal/reachability/DirectMethodProcessingHandler.java
@@ -27,27 +27,27 @@
 import java.lang.reflect.Modifier;
 import java.util.Optional;
 
-import jdk.compiler.graal.core.common.spi.ForeignCallDescriptor;
-import jdk.compiler.graal.core.common.spi.ForeignCallSignature;
-import jdk.compiler.graal.core.common.spi.ForeignCallsProvider;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.nodes.CallTargetNode;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.FrameState;
-import jdk.compiler.graal.nodes.Invoke;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.extended.ForeignCall;
-import jdk.compiler.graal.nodes.java.InstanceOfNode;
-import jdk.compiler.graal.nodes.java.LoadFieldNode;
-import jdk.compiler.graal.nodes.java.NewArrayNode;
-import jdk.compiler.graal.nodes.java.NewInstanceNode;
-import jdk.compiler.graal.nodes.java.NewMultiArrayNode;
-import jdk.compiler.graal.nodes.java.StoreFieldNode;
-import jdk.compiler.graal.nodes.virtual.VirtualArrayNode;
-import jdk.compiler.graal.nodes.virtual.VirtualInstanceNode;
-import jdk.compiler.graal.replacements.nodes.BinaryMathIntrinsicNode;
-import jdk.compiler.graal.replacements.nodes.MacroInvokable;
-import jdk.compiler.graal.replacements.nodes.UnaryMathIntrinsicNode;
+import jdk.graal.compiler.core.common.spi.ForeignCallDescriptor;
+import jdk.graal.compiler.core.common.spi.ForeignCallSignature;
+import jdk.graal.compiler.core.common.spi.ForeignCallsProvider;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.nodes.CallTargetNode;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.FrameState;
+import jdk.graal.compiler.nodes.Invoke;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.extended.ForeignCall;
+import jdk.graal.compiler.nodes.java.InstanceOfNode;
+import jdk.graal.compiler.nodes.java.LoadFieldNode;
+import jdk.graal.compiler.nodes.java.NewArrayNode;
+import jdk.graal.compiler.nodes.java.NewInstanceNode;
+import jdk.graal.compiler.nodes.java.NewMultiArrayNode;
+import jdk.graal.compiler.nodes.java.StoreFieldNode;
+import jdk.graal.compiler.nodes.virtual.VirtualArrayNode;
+import jdk.graal.compiler.nodes.virtual.VirtualInstanceNode;
+import jdk.graal.compiler.replacements.nodes.BinaryMathIntrinsicNode;
+import jdk.graal.compiler.replacements.nodes.MacroInvokable;
+import jdk.graal.compiler.replacements.nodes.UnaryMathIntrinsicNode;
 import org.graalvm.nativeimage.AnnotationAccess;
 
 import com.oracle.graal.pointsto.AbstractAnalysisEngine;
diff --git a/substratevm/src/com.oracle.graal.reachability/src/com/oracle/graal/reachability/MethodSummaryBasedHandler.java b/substratevm/src/com.oracle.graal.reachability/src/com/oracle/graal/reachability/MethodSummaryBasedHandler.java
index d28bf8753ead..d1b3fea4f751 100644
--- a/substratevm/src/com.oracle.graal.reachability/src/com/oracle/graal/reachability/MethodSummaryBasedHandler.java
+++ b/substratevm/src/com.oracle.graal.reachability/src/com/oracle/graal/reachability/MethodSummaryBasedHandler.java
@@ -24,7 +24,7 @@
  */
 package com.oracle.graal.reachability;
 
-import jdk.compiler.graal.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.StructuredGraph;
 
 import com.oracle.graal.pointsto.meta.AnalysisField;
 import com.oracle.graal.pointsto.meta.AnalysisMethod;
diff --git a/substratevm/src/com.oracle.graal.reachability/src/com/oracle/graal/reachability/MethodSummaryProvider.java b/substratevm/src/com.oracle.graal.reachability/src/com/oracle/graal/reachability/MethodSummaryProvider.java
index d7cc818d89c2..cb691977c66b 100644
--- a/substratevm/src/com.oracle.graal.reachability/src/com/oracle/graal/reachability/MethodSummaryProvider.java
+++ b/substratevm/src/com.oracle.graal.reachability/src/com/oracle/graal/reachability/MethodSummaryProvider.java
@@ -24,7 +24,7 @@
  */
 package com.oracle.graal.reachability;
 
-import jdk.compiler.graal.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.StructuredGraph;
 
 /**
  * This abstraction encapsulates the process of getting a summary for a given method/graph.
diff --git a/substratevm/src/com.oracle.graal.reachability/src/com/oracle/graal/reachability/ReachabilityAnalysisEngine.java b/substratevm/src/com.oracle.graal.reachability/src/com/oracle/graal/reachability/ReachabilityAnalysisEngine.java
index 54feb7b1d6a3..ea0912b41eef 100644
--- a/substratevm/src/com.oracle.graal.reachability/src/com/oracle/graal/reachability/ReachabilityAnalysisEngine.java
+++ b/substratevm/src/com.oracle.graal.reachability/src/com/oracle/graal/reachability/ReachabilityAnalysisEngine.java
@@ -32,11 +32,11 @@
 import java.util.Set;
 import java.util.concurrent.ForkJoinPool;
 
-import jdk.compiler.graal.api.replacements.SnippetReflectionProvider;
-import jdk.compiler.graal.core.common.type.TypedConstant;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.word.WordTypes;
+import jdk.graal.compiler.api.replacements.SnippetReflectionProvider;
+import jdk.graal.compiler.core.common.type.TypedConstant;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.word.WordTypes;
 
 import com.oracle.graal.pointsto.AbstractAnalysisEngine;
 import com.oracle.graal.pointsto.api.HostVM;
diff --git a/substratevm/src/com.oracle.graal.reachability/src/com/oracle/graal/reachability/ReachabilityAnalysisMethod.java b/substratevm/src/com.oracle.graal.reachability/src/com/oracle/graal/reachability/ReachabilityAnalysisMethod.java
index a9c7046ceaf2..c073a3cbf2c6 100644
--- a/substratevm/src/com.oracle.graal.reachability/src/com/oracle/graal/reachability/ReachabilityAnalysisMethod.java
+++ b/substratevm/src/com.oracle.graal.reachability/src/com/oracle/graal/reachability/ReachabilityAnalysisMethod.java
@@ -29,10 +29,10 @@
 import java.util.Collections;
 import java.util.List;
 
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.nodes.GraphEncoder;
-import jdk.compiler.graal.nodes.Invoke;
-import jdk.compiler.graal.nodes.StructuredGraph;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.nodes.GraphEncoder;
+import jdk.graal.compiler.nodes.Invoke;
+import jdk.graal.compiler.nodes.StructuredGraph;
 
 import com.oracle.graal.pointsto.flow.AnalysisParsedGraph;
 import com.oracle.graal.pointsto.meta.AnalysisMethod;
diff --git a/substratevm/src/com.oracle.graal.reachability/src/com/oracle/graal/reachability/ReachabilityMethodProcessingHandler.java b/substratevm/src/com.oracle.graal.reachability/src/com/oracle/graal/reachability/ReachabilityMethodProcessingHandler.java
index 253de7aca7ef..5d24c8d66eb5 100644
--- a/substratevm/src/com.oracle.graal.reachability/src/com/oracle/graal/reachability/ReachabilityMethodProcessingHandler.java
+++ b/substratevm/src/com.oracle.graal.reachability/src/com/oracle/graal/reachability/ReachabilityMethodProcessingHandler.java
@@ -24,7 +24,7 @@
  */
 package com.oracle.graal.reachability;
 
-import jdk.compiler.graal.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.StructuredGraph;
 
 /**
  * A handler which is called when a given method or a structured graph should be analyzed. It
diff --git a/substratevm/src/com.oracle.graal.reachability/src/com/oracle/graal/reachability/SimpleInMemoryMethodSummaryProvider.java b/substratevm/src/com.oracle.graal.reachability/src/com/oracle/graal/reachability/SimpleInMemoryMethodSummaryProvider.java
index 18861e4c4606..2009522063ea 100644
--- a/substratevm/src/com.oracle.graal.reachability/src/com/oracle/graal/reachability/SimpleInMemoryMethodSummaryProvider.java
+++ b/substratevm/src/com.oracle.graal.reachability/src/com/oracle/graal/reachability/SimpleInMemoryMethodSummaryProvider.java
@@ -28,27 +28,27 @@
 import java.util.Optional;
 
 import org.graalvm.collections.EconomicSet;
-import jdk.compiler.graal.core.common.spi.ForeignCallDescriptor;
-import jdk.compiler.graal.core.common.spi.ForeignCallSignature;
-import jdk.compiler.graal.core.common.spi.ForeignCallsProvider;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.nodes.CallTargetNode;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.FrameState;
-import jdk.compiler.graal.nodes.Invoke;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.extended.ForeignCall;
-import jdk.compiler.graal.nodes.java.InstanceOfNode;
-import jdk.compiler.graal.nodes.java.LoadFieldNode;
-import jdk.compiler.graal.nodes.java.NewArrayNode;
-import jdk.compiler.graal.nodes.java.NewInstanceNode;
-import jdk.compiler.graal.nodes.java.NewMultiArrayNode;
-import jdk.compiler.graal.nodes.java.StoreFieldNode;
-import jdk.compiler.graal.nodes.virtual.VirtualArrayNode;
-import jdk.compiler.graal.nodes.virtual.VirtualInstanceNode;
-import jdk.compiler.graal.replacements.nodes.BinaryMathIntrinsicNode;
-import jdk.compiler.graal.replacements.nodes.MacroInvokable;
-import jdk.compiler.graal.replacements.nodes.UnaryMathIntrinsicNode;
+import jdk.graal.compiler.core.common.spi.ForeignCallDescriptor;
+import jdk.graal.compiler.core.common.spi.ForeignCallSignature;
+import jdk.graal.compiler.core.common.spi.ForeignCallsProvider;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.nodes.CallTargetNode;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.FrameState;
+import jdk.graal.compiler.nodes.Invoke;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.extended.ForeignCall;
+import jdk.graal.compiler.nodes.java.InstanceOfNode;
+import jdk.graal.compiler.nodes.java.LoadFieldNode;
+import jdk.graal.compiler.nodes.java.NewArrayNode;
+import jdk.graal.compiler.nodes.java.NewInstanceNode;
+import jdk.graal.compiler.nodes.java.NewMultiArrayNode;
+import jdk.graal.compiler.nodes.java.StoreFieldNode;
+import jdk.graal.compiler.nodes.virtual.VirtualArrayNode;
+import jdk.graal.compiler.nodes.virtual.VirtualInstanceNode;
+import jdk.graal.compiler.replacements.nodes.BinaryMathIntrinsicNode;
+import jdk.graal.compiler.replacements.nodes.MacroInvokable;
+import jdk.graal.compiler.replacements.nodes.UnaryMathIntrinsicNode;
 import org.graalvm.nativeimage.AnnotationAccess;
 
 import com.oracle.graal.pointsto.AbstractAnalysisEngine;
diff --git a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/ObjectFile.java b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/ObjectFile.java
index ecfdf9582527..519fa8734266 100644
--- a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/ObjectFile.java
+++ b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/ObjectFile.java
@@ -47,7 +47,7 @@
 import java.util.function.Consumer;
 import java.util.stream.StreamSupport;
 
-import jdk.compiler.graal.debug.DebugContext;
+import jdk.graal.compiler.debug.DebugContext;
 
 import com.oracle.objectfile.debuginfo.DebugInfoProvider;
 import com.oracle.objectfile.elf.ELFObjectFile;
diff --git a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/debugentry/ArrayTypeEntry.java b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/debugentry/ArrayTypeEntry.java
index c9edba870e7f..2df914597394 100644
--- a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/debugentry/ArrayTypeEntry.java
+++ b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/debugentry/ArrayTypeEntry.java
@@ -30,7 +30,7 @@
 import com.oracle.objectfile.debuginfo.DebugInfoProvider.DebugTypeInfo;
 import com.oracle.objectfile.debuginfo.DebugInfoProvider.DebugTypeInfo.DebugTypeKind;
 import jdk.vm.ci.meta.ResolvedJavaType;
-import jdk.compiler.graal.debug.DebugContext;
+import jdk.graal.compiler.debug.DebugContext;
 
 public class ArrayTypeEntry extends StructureTypeEntry {
     private TypeEntry elementType;
diff --git a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/debugentry/ClassEntry.java b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/debugentry/ClassEntry.java
index eae1bef3f827..a840414838f6 100644
--- a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/debugentry/ClassEntry.java
+++ b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/debugentry/ClassEntry.java
@@ -36,7 +36,7 @@
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 import jdk.vm.ci.meta.ResolvedJavaType;
 import org.graalvm.collections.EconomicMap;
-import jdk.compiler.graal.debug.DebugContext;
+import jdk.graal.compiler.debug.DebugContext;
 
 import com.oracle.objectfile.debuginfo.DebugInfoProvider.DebugFieldInfo;
 import com.oracle.objectfile.debuginfo.DebugInfoProvider.DebugFrameSizeChange;
diff --git a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/debugentry/DebugInfoBase.java b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/debugentry/DebugInfoBase.java
index dea13a4886ed..20eb9894eacd 100644
--- a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/debugentry/DebugInfoBase.java
+++ b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/debugentry/DebugInfoBase.java
@@ -36,7 +36,7 @@
 
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.EconomicSet;
-import jdk.compiler.graal.debug.DebugContext;
+import jdk.graal.compiler.debug.DebugContext;
 
 import com.oracle.objectfile.debugentry.range.PrimaryRange;
 import com.oracle.objectfile.debugentry.range.Range;
diff --git a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/debugentry/EnumClassEntry.java b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/debugentry/EnumClassEntry.java
index d81e586d7f7a..9511fd54ca9e 100644
--- a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/debugentry/EnumClassEntry.java
+++ b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/debugentry/EnumClassEntry.java
@@ -29,7 +29,7 @@
 import com.oracle.objectfile.debuginfo.DebugInfoProvider.DebugTypeInfo;
 import com.oracle.objectfile.debuginfo.DebugInfoProvider.DebugEnumTypeInfo;
 import com.oracle.objectfile.debuginfo.DebugInfoProvider.DebugTypeInfo.DebugTypeKind;
-import jdk.compiler.graal.debug.DebugContext;
+import jdk.graal.compiler.debug.DebugContext;
 
 public class EnumClassEntry extends ClassEntry {
     public EnumClassEntry(String typeName, FileEntry fileEntry, int size) {
diff --git a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/debugentry/ForeignTypeEntry.java b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/debugentry/ForeignTypeEntry.java
index 530230aabaf4..349b755edebf 100644
--- a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/debugentry/ForeignTypeEntry.java
+++ b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/debugentry/ForeignTypeEntry.java
@@ -30,7 +30,7 @@
 import com.oracle.objectfile.debuginfo.DebugInfoProvider.DebugTypeInfo;
 import com.oracle.objectfile.debuginfo.DebugInfoProvider.DebugForeignTypeInfo;
 import jdk.vm.ci.meta.ResolvedJavaType;
-import jdk.compiler.graal.debug.DebugContext;
+import jdk.graal.compiler.debug.DebugContext;
 
 public class ForeignTypeEntry extends ClassEntry {
     private static final int FLAG_WORD = 1 << 0;
diff --git a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/debugentry/HeaderTypeEntry.java b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/debugentry/HeaderTypeEntry.java
index e9dc44a89080..b1836039a441 100644
--- a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/debugentry/HeaderTypeEntry.java
+++ b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/debugentry/HeaderTypeEntry.java
@@ -26,7 +26,7 @@
 
 package com.oracle.objectfile.debugentry;
 
-import jdk.compiler.graal.debug.DebugContext;
+import jdk.graal.compiler.debug.DebugContext;
 
 import com.oracle.objectfile.debuginfo.DebugInfoProvider.DebugHeaderTypeInfo;
 import com.oracle.objectfile.debuginfo.DebugInfoProvider.DebugTypeInfo;
diff --git a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/debugentry/InterfaceClassEntry.java b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/debugentry/InterfaceClassEntry.java
index 7414af9929b6..cb87c014c44c 100644
--- a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/debugentry/InterfaceClassEntry.java
+++ b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/debugentry/InterfaceClassEntry.java
@@ -29,7 +29,7 @@
 import com.oracle.objectfile.debuginfo.DebugInfoProvider.DebugInterfaceTypeInfo;
 import com.oracle.objectfile.debuginfo.DebugInfoProvider.DebugTypeInfo;
 import com.oracle.objectfile.debuginfo.DebugInfoProvider.DebugTypeInfo.DebugTypeKind;
-import jdk.compiler.graal.debug.DebugContext;
+import jdk.graal.compiler.debug.DebugContext;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/debugentry/PrimitiveTypeEntry.java b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/debugentry/PrimitiveTypeEntry.java
index f2c87812ecf1..d663ac552099 100644
--- a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/debugentry/PrimitiveTypeEntry.java
+++ b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/debugentry/PrimitiveTypeEntry.java
@@ -29,7 +29,7 @@
 import com.oracle.objectfile.debuginfo.DebugInfoProvider.DebugPrimitiveTypeInfo;
 import com.oracle.objectfile.debuginfo.DebugInfoProvider.DebugTypeInfo;
 import com.oracle.objectfile.debuginfo.DebugInfoProvider.DebugTypeInfo.DebugTypeKind;
-import jdk.compiler.graal.debug.DebugContext;
+import jdk.graal.compiler.debug.DebugContext;
 
 import static com.oracle.objectfile.debuginfo.DebugInfoProvider.DebugPrimitiveTypeInfo.FLAG_INTEGRAL;
 import static com.oracle.objectfile.debuginfo.DebugInfoProvider.DebugPrimitiveTypeInfo.FLAG_NUMERIC;
diff --git a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/debugentry/StructureTypeEntry.java b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/debugentry/StructureTypeEntry.java
index 5f314e666a24..7556cf759a5f 100644
--- a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/debugentry/StructureTypeEntry.java
+++ b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/debugentry/StructureTypeEntry.java
@@ -28,7 +28,7 @@
 
 import com.oracle.objectfile.debuginfo.DebugInfoProvider.DebugFieldInfo;
 import jdk.vm.ci.meta.ResolvedJavaType;
-import jdk.compiler.graal.debug.DebugContext;
+import jdk.graal.compiler.debug.DebugContext;
 
 import java.lang.reflect.Modifier;
 import java.util.ArrayList;
diff --git a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/debugentry/TypeEntry.java b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/debugentry/TypeEntry.java
index d6558926bb30..b6e870ee3d69 100644
--- a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/debugentry/TypeEntry.java
+++ b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/debugentry/TypeEntry.java
@@ -28,7 +28,7 @@
 
 import com.oracle.objectfile.debuginfo.DebugInfoProvider.DebugTypeInfo;
 import com.oracle.objectfile.debuginfo.DebugInfoProvider.DebugTypeInfo.DebugTypeKind;
-import jdk.compiler.graal.debug.DebugContext;
+import jdk.graal.compiler.debug.DebugContext;
 
 import static com.oracle.objectfile.debuginfo.DebugInfoProvider.DebugTypeInfo.DebugTypeKind.ARRAY;
 import static com.oracle.objectfile.debuginfo.DebugInfoProvider.DebugTypeInfo.DebugTypeKind.ENUM;
diff --git a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/debuginfo/DebugInfoProvider.java b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/debuginfo/DebugInfoProvider.java
index d5fd656e11d8..1c7908fa0a67 100644
--- a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/debuginfo/DebugInfoProvider.java
+++ b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/debuginfo/DebugInfoProvider.java
@@ -35,7 +35,7 @@
 import jdk.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 import jdk.vm.ci.meta.ResolvedJavaType;
-import jdk.compiler.graal.debug.DebugContext;
+import jdk.graal.compiler.debug.DebugContext;
 
 /**
  * Interfaces used to allow a native image to communicate details of types, code and data to the
diff --git a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/elf/dwarf/DwarfARangesSectionImpl.java b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/elf/dwarf/DwarfARangesSectionImpl.java
index 760acd0afb70..91ba489360c5 100644
--- a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/elf/dwarf/DwarfARangesSectionImpl.java
+++ b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/elf/dwarf/DwarfARangesSectionImpl.java
@@ -31,7 +31,7 @@
 import com.oracle.objectfile.debugentry.ClassEntry;
 import com.oracle.objectfile.elf.dwarf.constants.DwarfSectionName;
 import com.oracle.objectfile.elf.dwarf.constants.DwarfVersion;
-import jdk.compiler.graal.debug.DebugContext;
+import jdk.graal.compiler.debug.DebugContext;
 
 import com.oracle.objectfile.LayoutDecision;
 import com.oracle.objectfile.LayoutDecisionMap;
diff --git a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/elf/dwarf/DwarfAbbrevSectionImpl.java b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/elf/dwarf/DwarfAbbrevSectionImpl.java
index 583d2034a1a2..d6ba23b7f019 100644
--- a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/elf/dwarf/DwarfAbbrevSectionImpl.java
+++ b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/elf/dwarf/DwarfAbbrevSectionImpl.java
@@ -31,7 +31,7 @@
 import com.oracle.objectfile.elf.dwarf.constants.DwarfHasChildren;
 import com.oracle.objectfile.elf.dwarf.constants.DwarfSectionName;
 import com.oracle.objectfile.elf.dwarf.constants.DwarfTag;
-import jdk.compiler.graal.debug.DebugContext;
+import jdk.graal.compiler.debug.DebugContext;
 import com.oracle.objectfile.elf.dwarf.DwarfDebugInfo.AbbrevCode;
 
 /**
diff --git a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/elf/dwarf/DwarfFrameSectionImpl.java b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/elf/dwarf/DwarfFrameSectionImpl.java
index af0cd7812ba8..ea0c269521f1 100644
--- a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/elf/dwarf/DwarfFrameSectionImpl.java
+++ b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/elf/dwarf/DwarfFrameSectionImpl.java
@@ -31,7 +31,7 @@
 import com.oracle.objectfile.debuginfo.DebugInfoProvider;
 import com.oracle.objectfile.elf.dwarf.constants.DwarfFrameValue;
 import com.oracle.objectfile.elf.dwarf.constants.DwarfSectionName;
-import jdk.compiler.graal.debug.DebugContext;
+import jdk.graal.compiler.debug.DebugContext;
 
 import java.util.List;
 
diff --git a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/elf/dwarf/DwarfInfoSectionImpl.java b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/elf/dwarf/DwarfInfoSectionImpl.java
index 7eac04feba36..db54fa034656 100644
--- a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/elf/dwarf/DwarfInfoSectionImpl.java
+++ b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/elf/dwarf/DwarfInfoSectionImpl.java
@@ -42,7 +42,7 @@
 import com.oracle.objectfile.elf.dwarf.constants.DwarfSectionName;
 import com.oracle.objectfile.elf.dwarf.constants.DwarfVersion;
 import org.graalvm.collections.EconomicSet;
-import jdk.compiler.graal.debug.DebugContext;
+import jdk.graal.compiler.debug.DebugContext;
 
 import com.oracle.objectfile.debugentry.ArrayTypeEntry;
 import com.oracle.objectfile.debugentry.ClassEntry;
diff --git a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/elf/dwarf/DwarfLineSectionImpl.java b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/elf/dwarf/DwarfLineSectionImpl.java
index ea498543effd..ae1071c2e700 100644
--- a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/elf/dwarf/DwarfLineSectionImpl.java
+++ b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/elf/dwarf/DwarfLineSectionImpl.java
@@ -33,7 +33,7 @@
 import com.oracle.objectfile.elf.dwarf.constants.DwarfLineOpcode;
 import com.oracle.objectfile.elf.dwarf.constants.DwarfSectionName;
 import com.oracle.objectfile.elf.dwarf.constants.DwarfVersion;
-import jdk.compiler.graal.debug.DebugContext;
+import jdk.graal.compiler.debug.DebugContext;
 
 import com.oracle.objectfile.LayoutDecision;
 import com.oracle.objectfile.LayoutDecisionMap;
diff --git a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/elf/dwarf/DwarfLocSectionImpl.java b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/elf/dwarf/DwarfLocSectionImpl.java
index 79e729c73f42..be9a426418a3 100644
--- a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/elf/dwarf/DwarfLocSectionImpl.java
+++ b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/elf/dwarf/DwarfLocSectionImpl.java
@@ -38,7 +38,7 @@
 import com.oracle.objectfile.debugentry.range.SubRange;
 import com.oracle.objectfile.elf.dwarf.constants.DwarfExpressionOpcode;
 import com.oracle.objectfile.elf.dwarf.constants.DwarfSectionName;
-import jdk.compiler.graal.debug.DebugContext;
+import jdk.graal.compiler.debug.DebugContext;
 
 import com.oracle.objectfile.BuildDependency;
 import com.oracle.objectfile.LayoutDecision;
diff --git a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/elf/dwarf/DwarfRangesSectionImpl.java b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/elf/dwarf/DwarfRangesSectionImpl.java
index 84476b7e4fdc..155efe12feba 100644
--- a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/elf/dwarf/DwarfRangesSectionImpl.java
+++ b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/elf/dwarf/DwarfRangesSectionImpl.java
@@ -31,7 +31,7 @@
 import com.oracle.objectfile.ObjectFile;
 import com.oracle.objectfile.debugentry.ClassEntry;
 import com.oracle.objectfile.elf.dwarf.constants.DwarfSectionName;
-import jdk.compiler.graal.debug.DebugContext;
+import jdk.graal.compiler.debug.DebugContext;
 
 import java.util.Map;
 
diff --git a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/elf/dwarf/DwarfSectionImpl.java b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/elf/dwarf/DwarfSectionImpl.java
index 25e1861a5658..0c7c8e497c5a 100644
--- a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/elf/dwarf/DwarfSectionImpl.java
+++ b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/elf/dwarf/DwarfSectionImpl.java
@@ -53,7 +53,7 @@
 import com.oracle.objectfile.elf.dwarf.constants.DwarfTag;
 import com.oracle.objectfile.elf.dwarf.constants.DwarfVersion;
 import jdk.vm.ci.meta.ResolvedJavaType;
-import jdk.compiler.graal.debug.DebugContext;
+import jdk.graal.compiler.debug.DebugContext;
 
 import java.nio.ByteOrder;
 import java.nio.charset.StandardCharsets;
diff --git a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/elf/dwarf/DwarfStrSectionImpl.java b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/elf/dwarf/DwarfStrSectionImpl.java
index ddc648c1c9ef..34cddd22e18f 100644
--- a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/elf/dwarf/DwarfStrSectionImpl.java
+++ b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/elf/dwarf/DwarfStrSectionImpl.java
@@ -28,7 +28,7 @@
 
 import com.oracle.objectfile.debugentry.StringEntry;
 import com.oracle.objectfile.elf.dwarf.constants.DwarfSectionName;
-import jdk.compiler.graal.debug.DebugContext;
+import jdk.graal.compiler.debug.DebugContext;
 
 /**
  * Generator for debug_str section.
diff --git a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/macho/MachORelocationElement.java b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/macho/MachORelocationElement.java
index 28bb5178138a..18da38605ce5 100644
--- a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/macho/MachORelocationElement.java
+++ b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/macho/MachORelocationElement.java
@@ -30,7 +30,7 @@
 import java.util.Set;
 import java.util.TreeMap;
 
-import jdk.compiler.graal.core.common.NumUtil;
+import jdk.graal.compiler.core.common.NumUtil;
 
 import com.oracle.objectfile.BuildDependency;
 import com.oracle.objectfile.LayoutDecisionMap;
@@ -45,7 +45,7 @@
 import com.oracle.objectfile.io.OutputAssembler;
 import com.oracle.objectfile.macho.MachOObjectFile.MachOSection;
 import com.oracle.objectfile.macho.MachOObjectFile.Segment64Command;
-import jdk.compiler.graal.debug.GraalError;
+import jdk.graal.compiler.debug.GraalError;
 
 class MachORelocationElement extends MachOObjectFile.LinkEditElement {
     /*
diff --git a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/pecoff/cv/CVDebugInfo.java b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/pecoff/cv/CVDebugInfo.java
index da1383afb0e5..27e0efc5cf04 100644
--- a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/pecoff/cv/CVDebugInfo.java
+++ b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/pecoff/cv/CVDebugInfo.java
@@ -28,8 +28,8 @@
 
 import com.oracle.objectfile.debugentry.DebugInfoBase;
 import com.oracle.objectfile.pecoff.PECoffMachine;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.debug.GraalError;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.debug.GraalError;
 
 import java.nio.ByteOrder;
 
diff --git a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/pecoff/cv/CVFileTableRecord.java b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/pecoff/cv/CVFileTableRecord.java
index 455d3f393e32..c58f003b35fd 100644
--- a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/pecoff/cv/CVFileTableRecord.java
+++ b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/pecoff/cv/CVFileTableRecord.java
@@ -27,7 +27,7 @@
 package com.oracle.objectfile.pecoff.cv;
 
 import com.oracle.objectfile.debugentry.FileEntry;
-import jdk.compiler.graal.debug.GraalError;
+import jdk.graal.compiler.debug.GraalError;
 
 import java.io.IOException;
 import java.nio.file.Files;
diff --git a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/pecoff/cv/CVSectionImpl.java b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/pecoff/cv/CVSectionImpl.java
index b3f0e58af86b..73a23ec78163 100644
--- a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/pecoff/cv/CVSectionImpl.java
+++ b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/pecoff/cv/CVSectionImpl.java
@@ -31,7 +31,7 @@
 import com.oracle.objectfile.LayoutDecision;
 import com.oracle.objectfile.LayoutDecisionMap;
 import com.oracle.objectfile.ObjectFile;
-import jdk.compiler.graal.debug.DebugContext;
+import jdk.graal.compiler.debug.DebugContext;
 
 import java.util.Map;
 import java.util.Set;
diff --git a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/pecoff/cv/CVSymbolSectionImpl.java b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/pecoff/cv/CVSymbolSectionImpl.java
index 1ce72f4ec251..61fe251eac9e 100644
--- a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/pecoff/cv/CVSymbolSectionImpl.java
+++ b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/pecoff/cv/CVSymbolSectionImpl.java
@@ -27,7 +27,7 @@
 package com.oracle.objectfile.pecoff.cv;
 
 import com.oracle.objectfile.ObjectFile.RelocationKind;
-import jdk.compiler.graal.debug.DebugContext;
+import jdk.graal.compiler.debug.DebugContext;
 
 import com.oracle.objectfile.io.Utf8;
 
diff --git a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/pecoff/cv/CVTypeRecord.java b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/pecoff/cv/CVTypeRecord.java
index 42caeea666a4..2558800efc5e 100644
--- a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/pecoff/cv/CVTypeRecord.java
+++ b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/pecoff/cv/CVTypeRecord.java
@@ -60,7 +60,7 @@
 
 import java.util.ArrayList;
 
-import jdk.compiler.graal.debug.GraalError;
+import jdk.graal.compiler.debug.GraalError;
 
 /*
  * CV Type Record format (little-endian):
diff --git a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/pecoff/cv/CVTypeSectionBuilder.java b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/pecoff/cv/CVTypeSectionBuilder.java
index 45ed70d28ca4..6ebd0088c30b 100644
--- a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/pecoff/cv/CVTypeSectionBuilder.java
+++ b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/pecoff/cv/CVTypeSectionBuilder.java
@@ -35,7 +35,7 @@
 import com.oracle.objectfile.debugentry.StructureTypeEntry;
 import com.oracle.objectfile.debugentry.TypeEntry;
 
-import jdk.compiler.graal.debug.GraalError;
+import jdk.graal.compiler.debug.GraalError;
 
 import java.lang.reflect.Modifier;
 import java.util.ArrayList;
diff --git a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/pecoff/cv/CVTypeSectionImpl.java b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/pecoff/cv/CVTypeSectionImpl.java
index 5305bb70939a..ecccbc961d03 100644
--- a/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/pecoff/cv/CVTypeSectionImpl.java
+++ b/substratevm/src/com.oracle.objectfile/src/com/oracle/objectfile/pecoff/cv/CVTypeSectionImpl.java
@@ -33,7 +33,7 @@
 import com.oracle.objectfile.debugentry.CompiledMethodEntry;
 import com.oracle.objectfile.debugentry.TypeEntry;
 import com.oracle.objectfile.pecoff.PECoffObjectFile;
-import jdk.compiler.graal.debug.DebugContext;
+import jdk.graal.compiler.debug.DebugContext;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
diff --git a/substratevm/src/com.oracle.svm.agent/src/com/oracle/svm/agent/BreakpointInterceptor.java b/substratevm/src/com.oracle.svm.agent/src/com/oracle/svm/agent/BreakpointInterceptor.java
index 7075acf5d9a7..c875efe773a2 100644
--- a/substratevm/src/com.oracle.svm.agent/src/com/oracle/svm/agent/BreakpointInterceptor.java
+++ b/substratevm/src/com.oracle.svm.agent/src/com/oracle/svm/agent/BreakpointInterceptor.java
@@ -61,7 +61,7 @@
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.function.Supplier;
 
-import jdk.compiler.graal.core.common.NumUtil;
+import jdk.graal.compiler.core.common.NumUtil;
 import org.graalvm.nativeimage.StackValue;
 import org.graalvm.nativeimage.UnmanagedMemory;
 import org.graalvm.nativeimage.c.function.CEntryPoint;
diff --git a/substratevm/src/com.oracle.svm.common/src/com/oracle/svm/common/option/CommonOptionParser.java b/substratevm/src/com.oracle.svm.common/src/com/oracle/svm/common/option/CommonOptionParser.java
index 468170b5fec2..6fbe0e4c27f9 100644
--- a/substratevm/src/com.oracle.svm.common/src/com/oracle/svm/common/option/CommonOptionParser.java
+++ b/substratevm/src/com.oracle.svm.common/src/com/oracle/svm/common/option/CommonOptionParser.java
@@ -41,12 +41,12 @@
 
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.EconomicSet;
-import jdk.compiler.graal.options.EnumMultiOptionKey;
-import jdk.compiler.graal.options.OptionDescriptor;
-import jdk.compiler.graal.options.OptionDescriptors;
-import jdk.compiler.graal.options.OptionKey;
-import jdk.compiler.graal.options.OptionType;
-import jdk.compiler.graal.options.OptionsParser;
+import jdk.graal.compiler.options.EnumMultiOptionKey;
+import jdk.graal.compiler.options.OptionDescriptor;
+import jdk.graal.compiler.options.OptionDescriptors;
+import jdk.graal.compiler.options.OptionKey;
+import jdk.graal.compiler.options.OptionType;
+import jdk.graal.compiler.options.OptionsParser;
 
 import com.oracle.svm.util.ClassUtil;
 import com.oracle.svm.util.StringUtil;
diff --git a/substratevm/src/com.oracle.svm.common/src/com/oracle/svm/common/option/CommonOptions.java b/substratevm/src/com.oracle.svm.common/src/com/oracle/svm/common/option/CommonOptions.java
index 118a6d0630e3..9a68e8aa51dc 100644
--- a/substratevm/src/com.oracle.svm.common/src/com/oracle/svm/common/option/CommonOptions.java
+++ b/substratevm/src/com.oracle.svm.common/src/com/oracle/svm/common/option/CommonOptions.java
@@ -26,8 +26,8 @@
 
 package com.oracle.svm.common.option;
 
-import jdk.compiler.graal.options.Option;
-import jdk.compiler.graal.options.OptionKey;
+import jdk.graal.compiler.options.Option;
+import jdk.graal.compiler.options.OptionKey;
 
 public class CommonOptions {
 
diff --git a/substratevm/src/com.oracle.svm.configure/src/com/oracle/svm/configure/config/SerializationConfiguration.java b/substratevm/src/com.oracle.svm.configure/src/com/oracle/svm/configure/config/SerializationConfiguration.java
index 823291674c50..cf8403034572 100644
--- a/substratevm/src/com.oracle.svm.configure/src/com/oracle/svm/configure/config/SerializationConfiguration.java
+++ b/substratevm/src/com.oracle.svm.configure/src/com/oracle/svm/configure/config/SerializationConfiguration.java
@@ -32,7 +32,7 @@
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
-import jdk.compiler.graal.java.LambdaUtils;
+import jdk.graal.compiler.java.LambdaUtils;
 import org.graalvm.nativeimage.impl.ConfigurationCondition;
 import org.graalvm.nativeimage.impl.RuntimeSerializationSupport;
 
diff --git a/substratevm/src/com.oracle.svm.configure/src/com/oracle/svm/configure/config/conditional/PartialConfigurationWithOrigins.java b/substratevm/src/com.oracle.svm.configure/src/com/oracle/svm/configure/config/conditional/PartialConfigurationWithOrigins.java
index e441acedd0d0..fa1b01b9c6c7 100644
--- a/substratevm/src/com.oracle.svm.configure/src/com/oracle/svm/configure/config/conditional/PartialConfigurationWithOrigins.java
+++ b/substratevm/src/com.oracle.svm.configure/src/com/oracle/svm/configure/config/conditional/PartialConfigurationWithOrigins.java
@@ -30,7 +30,7 @@
 
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.MapCursor;
-import jdk.compiler.graal.util.json.JSONParserException;
+import jdk.graal.compiler.util.json.JSONParserException;
 
 import com.oracle.svm.configure.config.ConfigurationSet;
 import com.oracle.svm.core.util.json.JsonPrintable;
diff --git a/substratevm/src/com.oracle.svm.configure/src/com/oracle/svm/configure/filters/FilterConfigurationParser.java b/substratevm/src/com.oracle.svm.configure/src/com/oracle/svm/configure/filters/FilterConfigurationParser.java
index cc7bdb87110c..d0d60fd6aeb7 100644
--- a/substratevm/src/com.oracle.svm.configure/src/com/oracle/svm/configure/filters/FilterConfigurationParser.java
+++ b/substratevm/src/com.oracle.svm.configure/src/com/oracle/svm/configure/filters/FilterConfigurationParser.java
@@ -30,7 +30,7 @@
 
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.MapCursor;
-import jdk.compiler.graal.util.json.JSONParserException;
+import jdk.graal.compiler.util.json.JSONParserException;
 
 import com.oracle.svm.core.util.json.JsonWriter;
 import com.oracle.svm.core.configure.ConfigurationParser;
diff --git a/substratevm/src/com.oracle.svm.configure/src/com/oracle/svm/configure/trace/AccessAdvisor.java b/substratevm/src/com.oracle.svm.configure/src/com/oracle/svm/configure/trace/AccessAdvisor.java
index 201f9022961e..58603c34e2b8 100644
--- a/substratevm/src/com.oracle.svm.configure/src/com/oracle/svm/configure/trace/AccessAdvisor.java
+++ b/substratevm/src/com.oracle.svm.configure/src/com/oracle/svm/configure/trace/AccessAdvisor.java
@@ -26,8 +26,8 @@
 
 import java.util.regex.Pattern;
 
-import jdk.compiler.graal.java.LambdaUtils;
-import jdk.compiler.graal.phases.common.LazyValue;
+import jdk.graal.compiler.java.LambdaUtils;
+import jdk.graal.compiler.phases.common.LazyValue;
 
 import com.oracle.svm.configure.filters.ConfigurationFilter;
 import com.oracle.svm.configure.filters.HierarchyFilterNode;
@@ -127,7 +127,7 @@ public final class AccessAdvisor {
     private static void excludeInaccessiblePackages(HierarchyFilterNode rootNode) {
         rootNode.addOrGetChildren("com.oracle.graal.**", ConfigurationFilter.Inclusion.Exclude);
         rootNode.addOrGetChildren("com.oracle.truffle.**", ConfigurationFilter.Inclusion.Exclude);
-        rootNode.addOrGetChildren("jdk.compiler.graal.**", ConfigurationFilter.Inclusion.Exclude);
+        rootNode.addOrGetChildren("jdk.graal.compiler.**", ConfigurationFilter.Inclusion.Exclude);
         rootNode.addOrGetChildren("org.graalvm.compiler.**", ConfigurationFilter.Inclusion.Exclude);
         rootNode.addOrGetChildren("org.graalvm.libgraal.**", ConfigurationFilter.Inclusion.Exclude);
     }
diff --git a/substratevm/src/com.oracle.svm.configure/src/com/oracle/svm/configure/trace/JniProcessor.java b/substratevm/src/com.oracle.svm.configure/src/com/oracle/svm/configure/trace/JniProcessor.java
index a3f361eab758..a65863b76e98 100644
--- a/substratevm/src/com.oracle.svm.configure/src/com/oracle/svm/configure/trace/JniProcessor.java
+++ b/substratevm/src/com.oracle.svm.configure/src/com/oracle/svm/configure/trace/JniProcessor.java
@@ -29,7 +29,7 @@
 import java.util.List;
 
 import org.graalvm.collections.EconomicMap;
-import jdk.compiler.graal.phases.common.LazyValue;
+import jdk.graal.compiler.phases.common.LazyValue;
 import org.graalvm.nativeimage.impl.ConfigurationCondition;
 
 import com.oracle.svm.configure.config.ConfigurationMemberInfo.ConfigurationMemberDeclaration;
diff --git a/substratevm/src/com.oracle.svm.configure/src/com/oracle/svm/configure/trace/LazyValueUtils.java b/substratevm/src/com.oracle.svm.configure/src/com/oracle/svm/configure/trace/LazyValueUtils.java
index effa8b74fffc..7e4f2edd5d9d 100644
--- a/substratevm/src/com.oracle.svm.configure/src/com/oracle/svm/configure/trace/LazyValueUtils.java
+++ b/substratevm/src/com.oracle.svm.configure/src/com/oracle/svm/configure/trace/LazyValueUtils.java
@@ -26,7 +26,7 @@
 
 import java.util.function.Supplier;
 
-import jdk.compiler.graal.phases.common.LazyValue;
+import jdk.graal.compiler.phases.common.LazyValue;
 
 public class LazyValueUtils {
     static final LazyValue NULL_VALUE = new LazyValue<>(() -> null);
diff --git a/substratevm/src/com.oracle.svm.configure/src/com/oracle/svm/configure/trace/ReflectionProcessor.java b/substratevm/src/com.oracle.svm.configure/src/com/oracle/svm/configure/trace/ReflectionProcessor.java
index 6be609754882..2790c4846396 100644
--- a/substratevm/src/com.oracle.svm.configure/src/com/oracle/svm/configure/trace/ReflectionProcessor.java
+++ b/substratevm/src/com.oracle.svm.configure/src/com/oracle/svm/configure/trace/ReflectionProcessor.java
@@ -32,7 +32,7 @@
 import java.util.regex.Pattern;
 
 import org.graalvm.collections.EconomicMap;
-import jdk.compiler.graal.phases.common.LazyValue;
+import jdk.graal.compiler.phases.common.LazyValue;
 import org.graalvm.nativeimage.impl.ConfigurationCondition;
 
 import com.oracle.svm.configure.config.ConfigurationMemberInfo.ConfigurationMemberAccessibility;
diff --git a/substratevm/src/com.oracle.svm.configure/src/com/oracle/svm/configure/trace/SerializationProcessor.java b/substratevm/src/com.oracle.svm.configure/src/com/oracle/svm/configure/trace/SerializationProcessor.java
index 81af7be68c4e..98a5710775e9 100644
--- a/substratevm/src/com.oracle.svm.configure/src/com/oracle/svm/configure/trace/SerializationProcessor.java
+++ b/substratevm/src/com.oracle.svm.configure/src/com/oracle/svm/configure/trace/SerializationProcessor.java
@@ -30,7 +30,7 @@
 import java.util.List;
 
 import org.graalvm.collections.EconomicMap;
-import jdk.compiler.graal.java.LambdaUtils;
+import jdk.graal.compiler.java.LambdaUtils;
 import org.graalvm.nativeimage.impl.ConfigurationCondition;
 
 import com.oracle.svm.configure.config.ConfigurationSet;
diff --git a/substratevm/src/com.oracle.svm.configure/src/com/oracle/svm/configure/trace/TraceProcessor.java b/substratevm/src/com.oracle.svm.configure/src/com/oracle/svm/configure/trace/TraceProcessor.java
index 49bdb18557f2..ee9435688e1a 100644
--- a/substratevm/src/com.oracle.svm.configure/src/com/oracle/svm/configure/trace/TraceProcessor.java
+++ b/substratevm/src/com.oracle.svm.configure/src/com/oracle/svm/configure/trace/TraceProcessor.java
@@ -31,7 +31,7 @@
 import java.util.List;
 
 import org.graalvm.collections.EconomicMap;
-import jdk.compiler.graal.util.json.JSONParser;
+import jdk.graal.compiler.util.json.JSONParser;
 
 import com.oracle.svm.configure.config.ConfigurationSet;
 import com.oracle.svm.util.LogUtils;
diff --git a/substratevm/src/com.oracle.svm.core.foreign/src/com/oracle/svm/core/foreign/AbiUtils.java b/substratevm/src/com.oracle.svm.core.foreign/src/com/oracle/svm/core/foreign/AbiUtils.java
index 2da740e172c1..a0a3fd8565e1 100644
--- a/substratevm/src/com.oracle.svm.core.foreign/src/com/oracle/svm/core/foreign/AbiUtils.java
+++ b/substratevm/src/com.oracle.svm.core.foreign/src/com/oracle/svm/core/foreign/AbiUtils.java
@@ -40,9 +40,9 @@
 import java.util.Objects;
 import java.util.stream.Stream;
 
-import jdk.compiler.graal.api.replacements.Fold;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.calc.ReinterpretNode;
+import jdk.graal.compiler.api.replacements.Fold;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.calc.ReinterpretNode;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
diff --git a/substratevm/src/com.oracle.svm.core.foreign/src/com/oracle/svm/core/foreign/ForeignFunctionsRuntime.java b/substratevm/src/com.oracle.svm.core.foreign/src/com/oracle/svm/core/foreign/ForeignFunctionsRuntime.java
index 00b4f37baab0..02ce19de696e 100644
--- a/substratevm/src/com.oracle.svm.core.foreign/src/com/oracle/svm/core/foreign/ForeignFunctionsRuntime.java
+++ b/substratevm/src/com.oracle.svm.core.foreign/src/com/oracle/svm/core/foreign/ForeignFunctionsRuntime.java
@@ -25,7 +25,7 @@
 package com.oracle.svm.core.foreign;
 
 import org.graalvm.collections.EconomicMap;
-import jdk.compiler.graal.api.replacements.Fold;
+import jdk.graal.compiler.api.replacements.Fold;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/AbstractCollectionPolicy.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/AbstractCollectionPolicy.java
index 6f59aeb3e9d5..5648d997142f 100644
--- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/AbstractCollectionPolicy.java
+++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/AbstractCollectionPolicy.java
@@ -26,8 +26,8 @@
 
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import jdk.compiler.graal.api.replacements.Fold;
-import jdk.compiler.graal.nodes.PauseNode;
+import jdk.graal.compiler.api.replacements.Fold;
+import jdk.graal.compiler.nodes.PauseNode;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
 import org.graalvm.word.UnsignedWord;
diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/AlignedHeapChunk.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/AlignedHeapChunk.java
index 71ed77ebd531..9745a24a5f98 100644
--- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/AlignedHeapChunk.java
+++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/AlignedHeapChunk.java
@@ -24,8 +24,8 @@
  */
 package com.oracle.svm.core.genscavenge;
 
-import jdk.compiler.graal.api.replacements.Fold;
-import jdk.compiler.graal.word.Word;
+import jdk.graal.compiler.api.replacements.Fold;
+import jdk.graal.compiler.word.Word;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/AuxiliaryImageHeap.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/AuxiliaryImageHeap.java
index 012899c1fc12..9079a1134ec6 100644
--- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/AuxiliaryImageHeap.java
+++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/AuxiliaryImageHeap.java
@@ -24,7 +24,7 @@
  */
 package com.oracle.svm.core.genscavenge;
 
-import jdk.compiler.graal.api.replacements.Fold;
+import jdk.graal.compiler.api.replacements.Fold;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.word.Pointer;
 
diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/ChunkedImageHeapAllocator.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/ChunkedImageHeapAllocator.java
index 48f4bb983730..d5f2502686ef 100644
--- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/ChunkedImageHeapAllocator.java
+++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/ChunkedImageHeapAllocator.java
@@ -27,7 +27,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import jdk.compiler.graal.core.common.NumUtil;
+import jdk.graal.compiler.core.common.NumUtil;
 import org.graalvm.word.UnsignedWord;
 import org.graalvm.word.WordFactory;
 
diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/ChunkedImageHeapLayouter.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/ChunkedImageHeapLayouter.java
index e319e5380708..001775088ae8 100644
--- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/ChunkedImageHeapLayouter.java
+++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/ChunkedImageHeapLayouter.java
@@ -27,7 +27,7 @@
 import java.nio.ByteBuffer;
 import java.util.List;
 
-import jdk.compiler.graal.core.common.NumUtil;
+import jdk.graal.compiler.core.common.NumUtil;
 import org.graalvm.word.UnsignedWord;
 
 import com.oracle.svm.core.SubstrateUtil;
diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/GCImpl.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/GCImpl.java
index 93e086ec5d81..3ff352baf538 100644
--- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/GCImpl.java
+++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/GCImpl.java
@@ -29,7 +29,7 @@
 
 import java.lang.ref.Reference;
 
-import jdk.compiler.graal.api.replacements.Fold;
+import jdk.graal.compiler.api.replacements.Fold;
 import org.graalvm.nativeimage.CurrentIsolate;
 import org.graalvm.nativeimage.IsolateThread;
 import org.graalvm.nativeimage.Platform;
diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/GreyToBlackObjRefVisitor.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/GreyToBlackObjRefVisitor.java
index 63724fb0e038..bad7d773496d 100644
--- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/GreyToBlackObjRefVisitor.java
+++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/GreyToBlackObjRefVisitor.java
@@ -24,7 +24,7 @@
  */
 package com.oracle.svm.core.genscavenge;
 
-import jdk.compiler.graal.word.Word;
+import jdk.graal.compiler.word.Word;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
 import org.graalvm.word.Pointer;
diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/HeapChunk.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/HeapChunk.java
index d6defb9762e7..44b7dcc2db9a 100644
--- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/HeapChunk.java
+++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/HeapChunk.java
@@ -26,8 +26,8 @@
 
 import java.util.function.IntUnaryOperator;
 
-import jdk.compiler.graal.api.directives.GraalDirectives;
-import jdk.compiler.graal.word.Word;
+import jdk.graal.compiler.api.directives.GraalDirectives;
+import jdk.graal.compiler.word.Word;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
 import org.graalvm.nativeimage.c.struct.RawField;
diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/HeapImpl.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/HeapImpl.java
index 64e0f9eb3749..a40439af6920 100644
--- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/HeapImpl.java
+++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/HeapImpl.java
@@ -28,13 +28,13 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import jdk.compiler.graal.api.directives.GraalDirectives;
-import jdk.compiler.graal.api.replacements.Fold;
-import jdk.compiler.graal.core.common.NumUtil;
-import jdk.compiler.graal.core.common.SuppressFBWarnings;
-import jdk.compiler.graal.nodes.extended.MembarNode;
-import jdk.compiler.graal.nodes.memory.address.OffsetAddressNode;
-import jdk.compiler.graal.word.Word;
+import jdk.graal.compiler.api.directives.GraalDirectives;
+import jdk.graal.compiler.api.replacements.Fold;
+import jdk.graal.compiler.core.common.NumUtil;
+import jdk.graal.compiler.core.common.SuppressFBWarnings;
+import jdk.graal.compiler.nodes.extended.MembarNode;
+import jdk.graal.compiler.nodes.memory.address.OffsetAddressNode;
+import jdk.graal.compiler.word.Word;
 import org.graalvm.nativeimage.CurrentIsolate;
 import org.graalvm.nativeimage.IsolateThread;
 import org.graalvm.nativeimage.Platform;
diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/HeapParameters.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/HeapParameters.java
index 25db5200a47f..665f5f0aca59 100644
--- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/HeapParameters.java
+++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/HeapParameters.java
@@ -24,8 +24,8 @@
  */
 package com.oracle.svm.core.genscavenge;
 
-import jdk.compiler.graal.api.replacements.Fold;
-import jdk.compiler.graal.word.Word;
+import jdk.graal.compiler.api.replacements.Fold;
+import jdk.graal.compiler.word.Word;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
 import org.graalvm.word.UnsignedWord;
diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/HeapVerifier.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/HeapVerifier.java
index ff1377dafd41..48054b4d9b04 100644
--- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/HeapVerifier.java
+++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/HeapVerifier.java
@@ -26,7 +26,7 @@
 
 import java.lang.ref.Reference;
 
-import jdk.compiler.graal.word.Word;
+import jdk.graal.compiler.word.Word;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
 import org.graalvm.word.Pointer;
diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/HostedImageHeapChunkWriter.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/HostedImageHeapChunkWriter.java
index 6e173aebe80f..a8fddc36aba3 100644
--- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/HostedImageHeapChunkWriter.java
+++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/HostedImageHeapChunkWriter.java
@@ -27,7 +27,7 @@
 import java.nio.ByteBuffer;
 import java.util.List;
 
-import jdk.compiler.graal.core.common.NumUtil;
+import jdk.graal.compiler.core.common.NumUtil;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
 import org.graalvm.nativeimage.c.struct.SizeOf;
diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/ImageHeapInfo.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/ImageHeapInfo.java
index 009a8a03de36..e7dddf3ed31f 100644
--- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/ImageHeapInfo.java
+++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/ImageHeapInfo.java
@@ -24,7 +24,7 @@
  */
 package com.oracle.svm.core.genscavenge;
 
-import jdk.compiler.graal.word.Word;
+import jdk.graal.compiler.word.Word;
 import org.graalvm.word.Pointer;
 import org.graalvm.word.UnsignedWord;
 import org.graalvm.word.WordFactory;
diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/ImageHeapWalker.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/ImageHeapWalker.java
index 9744efe8a434..ec12e0b1e200 100644
--- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/ImageHeapWalker.java
+++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/ImageHeapWalker.java
@@ -24,7 +24,7 @@
  */
 package com.oracle.svm.core.genscavenge;
 
-import jdk.compiler.graal.word.Word;
+import jdk.graal.compiler.word.Word;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
 import org.graalvm.word.Pointer;
diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/JfrGCEvents.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/JfrGCEvents.java
index 6de7c9c9597f..ebe6d8a2afd8 100644
--- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/JfrGCEvents.java
+++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/JfrGCEvents.java
@@ -24,7 +24,7 @@
  */
 package com.oracle.svm.core.genscavenge;
 
-import jdk.compiler.graal.api.replacements.Fold;
+import jdk.graal.compiler.api.replacements.Fold;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.word.UnsignedWord;
 
diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/LibGraalCollectionPolicy.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/LibGraalCollectionPolicy.java
index 2f02e5c16562..2f6e24b44093 100644
--- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/LibGraalCollectionPolicy.java
+++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/LibGraalCollectionPolicy.java
@@ -24,7 +24,7 @@
  */
 package com.oracle.svm.core.genscavenge;
 
-import jdk.compiler.graal.options.Option;
+import jdk.graal.compiler.options.Option;
 import org.graalvm.word.UnsignedWord;
 import org.graalvm.word.WordFactory;
 
diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/ObjectHeaderImpl.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/ObjectHeaderImpl.java
index dd4c071b59e3..0582a8a18509 100644
--- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/ObjectHeaderImpl.java
+++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/ObjectHeaderImpl.java
@@ -24,11 +24,11 @@
  */
 package com.oracle.svm.core.genscavenge;
 
-import jdk.compiler.graal.api.directives.GraalDirectives;
-import jdk.compiler.graal.api.replacements.Fold;
-import jdk.compiler.graal.replacements.ReplacementsUtil;
-import jdk.compiler.graal.word.ObjectAccess;
-import jdk.compiler.graal.word.Word;
+import jdk.graal.compiler.api.directives.GraalDirectives;
+import jdk.graal.compiler.api.replacements.Fold;
+import jdk.graal.compiler.replacements.ReplacementsUtil;
+import jdk.graal.compiler.word.ObjectAccess;
+import jdk.graal.compiler.word.Word;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
 import org.graalvm.word.LocationIdentity;
diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/OldGeneration.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/OldGeneration.java
index 1b14e6b368a6..5f6d0deb6fa2 100644
--- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/OldGeneration.java
+++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/OldGeneration.java
@@ -24,8 +24,8 @@
  */
 package com.oracle.svm.core.genscavenge;
 
-import static jdk.compiler.graal.nodes.extended.BranchProbabilityNode.EXTREMELY_SLOW_PATH_PROBABILITY;
-import static jdk.compiler.graal.nodes.extended.BranchProbabilityNode.probability;
+import static jdk.graal.compiler.nodes.extended.BranchProbabilityNode.EXTREMELY_SLOW_PATH_PROBABILITY;
+import static jdk.graal.compiler.nodes.extended.BranchProbabilityNode.probability;
 
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/PathExhibitor.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/PathExhibitor.java
index 61c0beb8f420..42135284d72c 100644
--- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/PathExhibitor.java
+++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/PathExhibitor.java
@@ -28,7 +28,7 @@
 import java.util.ArrayList;
 
 import com.oracle.svm.core.heap.VMOperationInfos;
-import jdk.compiler.graal.word.Word;
+import jdk.graal.compiler.word.Word;
 import org.graalvm.nativeimage.CurrentIsolate;
 import org.graalvm.nativeimage.IsolateThread;
 import org.graalvm.nativeimage.c.function.CodePointer;
diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/PinnedObjectImpl.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/PinnedObjectImpl.java
index 607194f96139..c7f887109577 100644
--- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/PinnedObjectImpl.java
+++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/PinnedObjectImpl.java
@@ -24,7 +24,7 @@
  */
 package com.oracle.svm.core.genscavenge;
 
-import jdk.compiler.graal.word.Word;
+import jdk.graal.compiler.word.Word;
 import org.graalvm.nativeimage.PinnedObject;
 import org.graalvm.nativeimage.impl.PinnedObjectSupport;
 import org.graalvm.word.Pointer;
diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/ReferenceObjectProcessing.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/ReferenceObjectProcessing.java
index 51951d37bb49..ad326c6c4d78 100644
--- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/ReferenceObjectProcessing.java
+++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/ReferenceObjectProcessing.java
@@ -24,8 +24,8 @@
  */
 package com.oracle.svm.core.genscavenge;
 
-import static jdk.compiler.graal.nodes.extended.BranchProbabilityNode.SLOW_PATH_PROBABILITY;
-import static jdk.compiler.graal.nodes.extended.BranchProbabilityNode.probability;
+import static jdk.graal.compiler.nodes.extended.BranchProbabilityNode.SLOW_PATH_PROBABILITY;
+import static jdk.graal.compiler.nodes.extended.BranchProbabilityNode.probability;
 
 import java.lang.ref.Reference;
 import java.lang.ref.ReferenceQueue;
diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/RuntimeCodeCacheReachabilityAnalyzer.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/RuntimeCodeCacheReachabilityAnalyzer.java
index 12b7dc5c1055..8c1b27a372e9 100644
--- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/RuntimeCodeCacheReachabilityAnalyzer.java
+++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/RuntimeCodeCacheReachabilityAnalyzer.java
@@ -24,7 +24,7 @@
  */
 package com.oracle.svm.core.genscavenge;
 
-import jdk.compiler.graal.word.Word;
+import jdk.graal.compiler.word.Word;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
 import org.graalvm.word.Pointer;
diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/RuntimeCodeCacheWalker.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/RuntimeCodeCacheWalker.java
index b3b298b4bc03..fda60443dca2 100644
--- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/RuntimeCodeCacheWalker.java
+++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/RuntimeCodeCacheWalker.java
@@ -24,7 +24,7 @@
  */
 package com.oracle.svm.core.genscavenge;
 
-import jdk.compiler.graal.word.Word;
+import jdk.graal.compiler.word.Word;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
 
diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/RuntimeImageHeapChunkWriter.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/RuntimeImageHeapChunkWriter.java
index 3e740aca3739..dc357687a6b3 100644
--- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/RuntimeImageHeapChunkWriter.java
+++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/RuntimeImageHeapChunkWriter.java
@@ -27,7 +27,7 @@
 import java.nio.ByteBuffer;
 import java.util.List;
 
-import jdk.compiler.graal.word.Word;
+import jdk.graal.compiler.word.Word;
 import org.graalvm.word.Pointer;
 import org.graalvm.word.WordFactory;
 
diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/SerialAndEpsilonGCOptions.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/SerialAndEpsilonGCOptions.java
index 51f31a71a2ee..baca15acf971 100644
--- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/SerialAndEpsilonGCOptions.java
+++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/SerialAndEpsilonGCOptions.java
@@ -25,9 +25,9 @@
 package com.oracle.svm.core.genscavenge;
 
 import org.graalvm.collections.EconomicMap;
-import jdk.compiler.graal.options.Option;
-import jdk.compiler.graal.options.OptionKey;
-import jdk.compiler.graal.options.OptionType;
+import jdk.graal.compiler.options.Option;
+import jdk.graal.compiler.options.OptionKey;
+import jdk.graal.compiler.options.OptionType;
 
 import com.oracle.svm.core.SubstrateOptions;
 import com.oracle.svm.core.option.HostedOptionKey;
diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/SerialGCOptions.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/SerialGCOptions.java
index 6af81127734e..ba7656719bc9 100644
--- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/SerialGCOptions.java
+++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/SerialGCOptions.java
@@ -25,10 +25,10 @@
 package com.oracle.svm.core.genscavenge;
 
 import org.graalvm.collections.UnmodifiableEconomicMap;
-import jdk.compiler.graal.options.Option;
-import jdk.compiler.graal.options.OptionKey;
-import jdk.compiler.graal.options.OptionType;
-import jdk.compiler.graal.options.OptionValues;
+import jdk.graal.compiler.options.Option;
+import jdk.graal.compiler.options.OptionKey;
+import jdk.graal.compiler.options.OptionType;
+import jdk.graal.compiler.options.OptionValues;
 
 import com.oracle.svm.core.SubstrateOptions;
 import com.oracle.svm.core.option.HostedOptionKey;
diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/Space.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/Space.java
index da112a63257c..aacaac71df6c 100644
--- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/Space.java
+++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/Space.java
@@ -24,12 +24,12 @@
  */
 package com.oracle.svm.core.genscavenge;
 
-import static jdk.compiler.graal.nodes.extended.BranchProbabilityNode.SLOW_PATH_PROBABILITY;
-import static jdk.compiler.graal.nodes.extended.BranchProbabilityNode.VERY_SLOW_PATH_PROBABILITY;
-import static jdk.compiler.graal.nodes.extended.BranchProbabilityNode.probability;
+import static jdk.graal.compiler.nodes.extended.BranchProbabilityNode.SLOW_PATH_PROBABILITY;
+import static jdk.graal.compiler.nodes.extended.BranchProbabilityNode.VERY_SLOW_PATH_PROBABILITY;
+import static jdk.graal.compiler.nodes.extended.BranchProbabilityNode.probability;
 
-import jdk.compiler.graal.word.ObjectAccess;
-import jdk.compiler.graal.word.Word;
+import jdk.graal.compiler.word.ObjectAccess;
+import jdk.graal.compiler.word.Word;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
 import org.graalvm.word.Pointer;
diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/ThreadLocalAllocation.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/ThreadLocalAllocation.java
index 2c123a36acd3..dda62aa072cb 100644
--- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/ThreadLocalAllocation.java
+++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/ThreadLocalAllocation.java
@@ -27,9 +27,9 @@
 import static com.oracle.svm.core.graal.snippets.SubstrateAllocationSnippets.TLAB_END_IDENTITY;
 import static com.oracle.svm.core.graal.snippets.SubstrateAllocationSnippets.TLAB_TOP_IDENTITY;
 
-import jdk.compiler.graal.api.replacements.Fold;
-import jdk.compiler.graal.replacements.AllocationSnippets.FillContent;
-import jdk.compiler.graal.word.Word;
+import jdk.graal.compiler.api.replacements.Fold;
+import jdk.graal.compiler.replacements.AllocationSnippets.FillContent;
+import jdk.graal.compiler.word.Word;
 import org.graalvm.nativeimage.CurrentIsolate;
 import org.graalvm.nativeimage.IsolateThread;
 import org.graalvm.nativeimage.Platform;
diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/UnalignedHeapChunk.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/UnalignedHeapChunk.java
index 65daa566de53..7841fc6e0b34 100644
--- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/UnalignedHeapChunk.java
+++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/UnalignedHeapChunk.java
@@ -24,8 +24,8 @@
  */
 package com.oracle.svm.core.genscavenge;
 
-import jdk.compiler.graal.api.replacements.Fold;
-import jdk.compiler.graal.word.Word;
+import jdk.graal.compiler.api.replacements.Fold;
+import jdk.graal.compiler.word.Word;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/graal/BarrierSnippets.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/graal/BarrierSnippets.java
index bb39a463f968..8541c58bdfb2 100644
--- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/graal/BarrierSnippets.java
+++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/graal/BarrierSnippets.java
@@ -28,26 +28,26 @@
 import java.util.List;
 import java.util.Map;
 
-import jdk.compiler.graal.api.replacements.Fold;
-import jdk.compiler.graal.api.replacements.Snippet;
-import jdk.compiler.graal.api.replacements.Snippet.ConstantParameter;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.nodes.BreakpointNode;
-import jdk.compiler.graal.nodes.NamedLocationIdentity;
-import jdk.compiler.graal.nodes.extended.BranchProbabilityNode;
-import jdk.compiler.graal.nodes.extended.FixedValueAnchorNode;
-import jdk.compiler.graal.nodes.gc.SerialArrayRangeWriteBarrier;
-import jdk.compiler.graal.nodes.gc.SerialWriteBarrier;
-import jdk.compiler.graal.nodes.gc.WriteBarrier;
-import jdk.compiler.graal.nodes.memory.address.OffsetAddressNode;
-import jdk.compiler.graal.nodes.spi.LoweringTool;
-import jdk.compiler.graal.nodes.type.StampTool;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.util.Providers;
-import jdk.compiler.graal.replacements.SnippetTemplate;
-import jdk.compiler.graal.replacements.SnippetTemplate.Arguments;
-import jdk.compiler.graal.replacements.SnippetTemplate.SnippetInfo;
-import jdk.compiler.graal.replacements.Snippets;
+import jdk.graal.compiler.api.replacements.Fold;
+import jdk.graal.compiler.api.replacements.Snippet;
+import jdk.graal.compiler.api.replacements.Snippet.ConstantParameter;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.nodes.BreakpointNode;
+import jdk.graal.compiler.nodes.NamedLocationIdentity;
+import jdk.graal.compiler.nodes.extended.BranchProbabilityNode;
+import jdk.graal.compiler.nodes.extended.FixedValueAnchorNode;
+import jdk.graal.compiler.nodes.gc.SerialArrayRangeWriteBarrier;
+import jdk.graal.compiler.nodes.gc.SerialWriteBarrier;
+import jdk.graal.compiler.nodes.gc.WriteBarrier;
+import jdk.graal.compiler.nodes.memory.address.OffsetAddressNode;
+import jdk.graal.compiler.nodes.spi.LoweringTool;
+import jdk.graal.compiler.nodes.type.StampTool;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.util.Providers;
+import jdk.graal.compiler.replacements.SnippetTemplate;
+import jdk.graal.compiler.replacements.SnippetTemplate.Arguments;
+import jdk.graal.compiler.replacements.SnippetTemplate.SnippetInfo;
+import jdk.graal.compiler.replacements.Snippets;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.hosted.Feature;
 import org.graalvm.word.LocationIdentity;
diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/graal/ForcedSerialPostWriteBarrier.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/graal/ForcedSerialPostWriteBarrier.java
index 929209b092d0..5b23f3e8ef85 100644
--- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/graal/ForcedSerialPostWriteBarrier.java
+++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/graal/ForcedSerialPostWriteBarrier.java
@@ -24,21 +24,21 @@
  */
 package com.oracle.svm.core.genscavenge.graal;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_8;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_4;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_8;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_4;
 
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.InputType;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.gc.BarrierSet;
-import jdk.compiler.graal.nodes.gc.SerialWriteBarrier;
-import jdk.compiler.graal.nodes.memory.address.AddressNode;
-import jdk.compiler.graal.nodes.memory.address.AddressNode.Address;
-import jdk.compiler.graal.nodes.spi.Lowerable;
-import jdk.compiler.graal.nodes.spi.LoweringTool;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.InputType;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.gc.BarrierSet;
+import jdk.graal.compiler.nodes.gc.SerialWriteBarrier;
+import jdk.graal.compiler.nodes.memory.address.AddressNode;
+import jdk.graal.compiler.nodes.memory.address.AddressNode.Address;
+import jdk.graal.compiler.nodes.spi.Lowerable;
+import jdk.graal.compiler.nodes.spi.LoweringTool;
 
 /**
  * Post-write barrier that is injected manually and not via {@link BarrierSet}. This needs to be a
diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/graal/GenScavengeAllocationSnippets.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/graal/GenScavengeAllocationSnippets.java
index 000c85080d58..05ace6f20f39 100644
--- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/graal/GenScavengeAllocationSnippets.java
+++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/graal/GenScavengeAllocationSnippets.java
@@ -26,24 +26,24 @@
 
 import java.util.Map;
 
-import jdk.compiler.graal.api.replacements.Fold;
-import jdk.compiler.graal.api.replacements.Snippet;
-import jdk.compiler.graal.api.replacements.Snippet.ConstantParameter;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.nodes.GraphState;
-import jdk.compiler.graal.nodes.NamedLocationIdentity;
-import jdk.compiler.graal.nodes.PiNode;
-import jdk.compiler.graal.nodes.SnippetAnchorNode;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.spi.LoweringTool;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.util.Providers;
-import jdk.compiler.graal.replacements.AllocationSnippets;
-import jdk.compiler.graal.replacements.SnippetTemplate;
-import jdk.compiler.graal.replacements.SnippetTemplate.Arguments;
-import jdk.compiler.graal.replacements.SnippetTemplate.SnippetInfo;
-import jdk.compiler.graal.replacements.Snippets;
-import jdk.compiler.graal.word.Word;
+import jdk.graal.compiler.api.replacements.Fold;
+import jdk.graal.compiler.api.replacements.Snippet;
+import jdk.graal.compiler.api.replacements.Snippet.ConstantParameter;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.nodes.GraphState;
+import jdk.graal.compiler.nodes.NamedLocationIdentity;
+import jdk.graal.compiler.nodes.PiNode;
+import jdk.graal.compiler.nodes.SnippetAnchorNode;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.spi.LoweringTool;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.util.Providers;
+import jdk.graal.compiler.replacements.AllocationSnippets;
+import jdk.graal.compiler.replacements.SnippetTemplate;
+import jdk.graal.compiler.replacements.SnippetTemplate.Arguments;
+import jdk.graal.compiler.replacements.SnippetTemplate.SnippetInfo;
+import jdk.graal.compiler.replacements.Snippets;
+import jdk.graal.compiler.word.Word;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.word.UnsignedWord;
 
diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/graal/GenScavengeAllocationSupport.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/graal/GenScavengeAllocationSupport.java
index f99a080c56a8..45a9337520f1 100644
--- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/graal/GenScavengeAllocationSupport.java
+++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/graal/GenScavengeAllocationSupport.java
@@ -35,8 +35,8 @@
 import com.oracle.svm.core.snippets.SnippetRuntime.SubstrateForeignCallDescriptor;
 import com.oracle.svm.core.thread.ContinuationSupport;
 
-import jdk.compiler.graal.core.common.spi.ForeignCallDescriptor;
-import jdk.compiler.graal.word.Word;
+import jdk.graal.compiler.core.common.spi.ForeignCallDescriptor;
+import jdk.graal.compiler.word.Word;
 
 public class GenScavengeAllocationSupport implements GCAllocationSupport {
     private static final SubstrateForeignCallDescriptor SLOW_NEW_INSTANCE = SnippetRuntime.findForeignCall(ThreadLocalAllocation.class, "slowPathNewInstance", true);
diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/graal/GenScavengeGCFeature.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/graal/GenScavengeGCFeature.java
index 482ee322a296..6d3abab9a557 100644
--- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/graal/GenScavengeGCFeature.java
+++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/graal/GenScavengeGCFeature.java
@@ -30,9 +30,9 @@
 import java.util.List;
 import java.util.Map;
 
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.util.Providers;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.util.Providers;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.hosted.Feature;
 
diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/graal/SubstrateCardTableBarrierSet.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/graal/SubstrateCardTableBarrierSet.java
index 09d07971d415..79d916b9bcfc 100644
--- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/graal/SubstrateCardTableBarrierSet.java
+++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/graal/SubstrateCardTableBarrierSet.java
@@ -24,8 +24,8 @@
  */
 package com.oracle.svm.core.genscavenge.graal;
 
-import jdk.compiler.graal.core.common.memory.BarrierType;
-import jdk.compiler.graal.nodes.gc.CardTableBarrierSet;
+import jdk.graal.compiler.core.common.memory.BarrierType;
+import jdk.graal.compiler.nodes.gc.CardTableBarrierSet;
 
 import com.oracle.svm.core.StaticFieldsSupport;
 
diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/graal/SubstrateNoBarrierSet.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/graal/SubstrateNoBarrierSet.java
index 8c095ba7bae0..4e22c38ada72 100644
--- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/graal/SubstrateNoBarrierSet.java
+++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/graal/SubstrateNoBarrierSet.java
@@ -24,12 +24,12 @@
  */
 package com.oracle.svm.core.genscavenge.graal;
 
-import jdk.compiler.graal.core.common.memory.BarrierType;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.extended.RawStoreNode;
-import jdk.compiler.graal.nodes.gc.BarrierSet;
-import jdk.compiler.graal.nodes.memory.FixedAccessNode;
+import jdk.graal.compiler.core.common.memory.BarrierType;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.extended.RawStoreNode;
+import jdk.graal.compiler.nodes.gc.BarrierSet;
+import jdk.graal.compiler.nodes.memory.FixedAccessNode;
 import org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.meta.JavaKind;
diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/graal/nodes/FormatArrayNode.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/graal/nodes/FormatArrayNode.java
index f49abdbe91a4..dde3aade2435 100644
--- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/graal/nodes/FormatArrayNode.java
+++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/graal/nodes/FormatArrayNode.java
@@ -24,16 +24,16 @@
  */
 package com.oracle.svm.core.genscavenge.graal.nodes;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_64;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_64;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_64;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_64;
 
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.Lowerable;
-import jdk.compiler.graal.replacements.AllocationSnippets;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.Lowerable;
+import jdk.graal.compiler.replacements.AllocationSnippets;
 import org.graalvm.word.Pointer;
 
 @NodeInfo(cycles = CYCLES_64, size = SIZE_64)
diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/graal/nodes/FormatObjectNode.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/graal/nodes/FormatObjectNode.java
index 14addda85712..3e726bfa955e 100644
--- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/graal/nodes/FormatObjectNode.java
+++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/graal/nodes/FormatObjectNode.java
@@ -24,16 +24,16 @@
  */
 package com.oracle.svm.core.genscavenge.graal.nodes;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_64;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_64;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_64;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_64;
 
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.Lowerable;
-import jdk.compiler.graal.replacements.AllocationSnippets.FillContent;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.Lowerable;
+import jdk.graal.compiler.replacements.AllocationSnippets.FillContent;
 import org.graalvm.word.Pointer;
 
 @NodeInfo(cycles = CYCLES_64, size = SIZE_64)
diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/graal/nodes/FormatPodNode.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/graal/nodes/FormatPodNode.java
index 104414331638..67e2a462ca48 100644
--- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/graal/nodes/FormatPodNode.java
+++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/graal/nodes/FormatPodNode.java
@@ -24,16 +24,16 @@
  */
 package com.oracle.svm.core.genscavenge.graal.nodes;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_64;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_64;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_64;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_64;
 
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.Lowerable;
-import jdk.compiler.graal.replacements.AllocationSnippets;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.Lowerable;
+import jdk.graal.compiler.replacements.AllocationSnippets;
 import org.graalvm.word.Pointer;
 
 @NodeInfo(cycles = CYCLES_64, size = SIZE_64)
diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/graal/nodes/FormatStoredContinuationNode.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/graal/nodes/FormatStoredContinuationNode.java
index 6303e09998f6..324778adb4b3 100644
--- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/graal/nodes/FormatStoredContinuationNode.java
+++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/graal/nodes/FormatStoredContinuationNode.java
@@ -24,15 +24,15 @@
  */
 package com.oracle.svm.core.genscavenge.graal.nodes;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_16;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_16;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_16;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_16;
 
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.Lowerable;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.Lowerable;
 import org.graalvm.word.Pointer;
 
 @NodeInfo(cycles = CYCLES_16, size = SIZE_16)
diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/remset/AlignedChunkRememberedSet.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/remset/AlignedChunkRememberedSet.java
index 16be4cf9014a..b2c038091a4e 100644
--- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/remset/AlignedChunkRememberedSet.java
+++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/remset/AlignedChunkRememberedSet.java
@@ -26,9 +26,9 @@
 
 import java.util.List;
 
-import jdk.compiler.graal.api.replacements.Fold;
-import jdk.compiler.graal.replacements.nodes.AssertionNode;
-import jdk.compiler.graal.word.Word;
+import jdk.graal.compiler.api.replacements.Fold;
+import jdk.graal.compiler.replacements.nodes.AssertionNode;
+import jdk.graal.compiler.word.Word;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
 import org.graalvm.nativeimage.c.struct.SizeOf;
diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/remset/CardTable.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/remset/CardTable.java
index 789525e7398a..ada7186fb4b5 100644
--- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/remset/CardTable.java
+++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/remset/CardTable.java
@@ -26,9 +26,9 @@
 
 import java.lang.ref.Reference;
 
-import jdk.compiler.graal.core.common.SuppressFBWarnings;
-import jdk.compiler.graal.nodes.extended.BranchProbabilityNode;
-import jdk.compiler.graal.word.Word;
+import jdk.graal.compiler.core.common.SuppressFBWarnings;
+import jdk.graal.compiler.nodes.extended.BranchProbabilityNode;
+import jdk.graal.compiler.word.Word;
 import org.graalvm.word.Pointer;
 import org.graalvm.word.UnsignedWord;
 import org.graalvm.word.WordFactory;
diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/remset/CardTableBasedRememberedSet.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/remset/CardTableBasedRememberedSet.java
index e036e5524063..ae7a82282459 100644
--- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/remset/CardTableBasedRememberedSet.java
+++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/remset/CardTableBasedRememberedSet.java
@@ -26,7 +26,7 @@
 
 import java.util.List;
 
-import jdk.compiler.graal.nodes.gc.BarrierSet;
+import jdk.graal.compiler.nodes.gc.BarrierSet;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
 import org.graalvm.word.UnsignedWord;
diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/remset/NoRememberedSet.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/remset/NoRememberedSet.java
index 7717fd8606d1..b0544608c316 100644
--- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/remset/NoRememberedSet.java
+++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/remset/NoRememberedSet.java
@@ -26,7 +26,7 @@
 
 import java.util.List;
 
-import jdk.compiler.graal.nodes.gc.BarrierSet;
+import jdk.graal.compiler.nodes.gc.BarrierSet;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
 import org.graalvm.nativeimage.c.struct.SizeOf;
diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/remset/RememberedSet.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/remset/RememberedSet.java
index 5a4b6de6894c..f04fb43788af 100644
--- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/remset/RememberedSet.java
+++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/remset/RememberedSet.java
@@ -26,7 +26,7 @@
 
 import java.util.List;
 
-import jdk.compiler.graal.api.replacements.Fold;
+import jdk.graal.compiler.api.replacements.Fold;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
diff --git a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/remset/UnalignedChunkRememberedSet.java b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/remset/UnalignedChunkRememberedSet.java
index 61971f14c253..4217107b9c26 100644
--- a/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/remset/UnalignedChunkRememberedSet.java
+++ b/substratevm/src/com.oracle.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/remset/UnalignedChunkRememberedSet.java
@@ -24,8 +24,8 @@
  */
 package com.oracle.svm.core.genscavenge.remset;
 
-import jdk.compiler.graal.api.replacements.Fold;
-import jdk.compiler.graal.replacements.nodes.AssertionNode;
+import jdk.graal.compiler.api.replacements.Fold;
+import jdk.graal.compiler.replacements.nodes.AssertionNode;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
 import org.graalvm.nativeimage.c.struct.SizeOf;
diff --git a/substratevm/src/com.oracle.svm.core.graal.aarch64/src/com/oracle/svm/core/graal/aarch64/AArch64CGlobalDataLoadAddressOp.java b/substratevm/src/com.oracle.svm.core.graal.aarch64/src/com/oracle/svm/core/graal/aarch64/AArch64CGlobalDataLoadAddressOp.java
index 8c2e7608cc3f..334da99646c7 100755
--- a/substratevm/src/com.oracle.svm.core.graal.aarch64/src/com/oracle/svm/core/graal/aarch64/AArch64CGlobalDataLoadAddressOp.java
+++ b/substratevm/src/com.oracle.svm.core.graal.aarch64/src/com/oracle/svm/core/graal/aarch64/AArch64CGlobalDataLoadAddressOp.java
@@ -25,13 +25,13 @@
 package com.oracle.svm.core.graal.aarch64;
 
 import static jdk.vm.ci.code.ValueUtil.asRegister;
-import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.REG;
+import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.REG;
 
-import jdk.compiler.graal.asm.aarch64.AArch64Address;
-import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler;
-import jdk.compiler.graal.lir.LIRInstructionClass;
-import jdk.compiler.graal.lir.aarch64.AArch64LIRInstruction;
-import jdk.compiler.graal.lir.asm.CompilationResultBuilder;
+import jdk.graal.compiler.asm.aarch64.AArch64Address;
+import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler;
+import jdk.graal.compiler.lir.LIRInstructionClass;
+import jdk.graal.compiler.lir.aarch64.AArch64LIRInstruction;
+import jdk.graal.compiler.lir.asm.CompilationResultBuilder;
 import org.graalvm.word.Pointer;
 
 import com.oracle.svm.core.SubstrateUtil;
diff --git a/substratevm/src/com.oracle.svm.core.graal.aarch64/src/com/oracle/svm/core/graal/aarch64/AArch64CalleeSavedRegisters.java b/substratevm/src/com.oracle.svm.core.graal.aarch64/src/com/oracle/svm/core/graal/aarch64/AArch64CalleeSavedRegisters.java
index affdbaf375b0..9d571518dad8 100644
--- a/substratevm/src/com.oracle.svm.core.graal.aarch64/src/com/oracle/svm/core/graal/aarch64/AArch64CalleeSavedRegisters.java
+++ b/substratevm/src/com.oracle.svm.core.graal.aarch64/src/com/oracle/svm/core/graal/aarch64/AArch64CalleeSavedRegisters.java
@@ -34,10 +34,10 @@
 import java.util.List;
 import java.util.Map;
 
-import jdk.compiler.graal.api.replacements.Fold;
-import jdk.compiler.graal.asm.aarch64.AArch64Address;
-import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler;
-import jdk.compiler.graal.core.common.NumUtil;
+import jdk.graal.compiler.api.replacements.Fold;
+import jdk.graal.compiler.asm.aarch64.AArch64Address;
+import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler;
+import jdk.graal.compiler.core.common.NumUtil;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
diff --git a/substratevm/src/com.oracle.svm.core.graal.aarch64/src/com/oracle/svm/core/graal/aarch64/AArch64FarReturnOp.java b/substratevm/src/com.oracle.svm.core.graal.aarch64/src/com/oracle/svm/core/graal/aarch64/AArch64FarReturnOp.java
index c82b6be3129a..200bd1cd2fee 100644
--- a/substratevm/src/com.oracle.svm.core.graal.aarch64/src/com/oracle/svm/core/graal/aarch64/AArch64FarReturnOp.java
+++ b/substratevm/src/com.oracle.svm.core.graal.aarch64/src/com/oracle/svm/core/graal/aarch64/AArch64FarReturnOp.java
@@ -26,17 +26,17 @@
 
 import static com.oracle.svm.core.graal.aarch64.SubstrateAArch64RegisterConfig.fp;
 import static jdk.vm.ci.code.ValueUtil.asRegister;
-import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.ILLEGAL;
-import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.REG;
+import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.ILLEGAL;
+import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.REG;
 
-import jdk.compiler.graal.asm.Label;
-import jdk.compiler.graal.asm.aarch64.AArch64Address;
-import jdk.compiler.graal.asm.aarch64.AArch64Assembler;
-import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler;
-import jdk.compiler.graal.lir.LIRInstructionClass;
-import jdk.compiler.graal.lir.Opcode;
-import jdk.compiler.graal.lir.aarch64.AArch64BlockEndOp;
-import jdk.compiler.graal.lir.asm.CompilationResultBuilder;
+import jdk.graal.compiler.asm.Label;
+import jdk.graal.compiler.asm.aarch64.AArch64Address;
+import jdk.graal.compiler.asm.aarch64.AArch64Assembler;
+import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler;
+import jdk.graal.compiler.lir.LIRInstructionClass;
+import jdk.graal.compiler.lir.Opcode;
+import jdk.graal.compiler.lir.aarch64.AArch64BlockEndOp;
+import jdk.graal.compiler.lir.asm.CompilationResultBuilder;
 
 import com.oracle.svm.core.FrameAccess;
 import com.oracle.svm.core.SubstrateOptions;
diff --git a/substratevm/src/com.oracle.svm.core.graal.aarch64/src/com/oracle/svm/core/graal/aarch64/AArch64InstructionSynchronizationBarrierOp.java b/substratevm/src/com.oracle.svm.core.graal.aarch64/src/com/oracle/svm/core/graal/aarch64/AArch64InstructionSynchronizationBarrierOp.java
index 5eff783dbc69..30c5810770a0 100644
--- a/substratevm/src/com.oracle.svm.core.graal.aarch64/src/com/oracle/svm/core/graal/aarch64/AArch64InstructionSynchronizationBarrierOp.java
+++ b/substratevm/src/com.oracle.svm.core.graal.aarch64/src/com/oracle/svm/core/graal/aarch64/AArch64InstructionSynchronizationBarrierOp.java
@@ -25,10 +25,10 @@
  */
 package com.oracle.svm.core.graal.aarch64;
 
-import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler;
-import jdk.compiler.graal.lir.LIRInstructionClass;
-import jdk.compiler.graal.lir.aarch64.AArch64LIRInstruction;
-import jdk.compiler.graal.lir.asm.CompilationResultBuilder;
+import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler;
+import jdk.graal.compiler.lir.LIRInstructionClass;
+import jdk.graal.compiler.lir.aarch64.AArch64LIRInstruction;
+import jdk.graal.compiler.lir.asm.CompilationResultBuilder;
 
 import com.oracle.svm.core.nodes.CodeSynchronizationNode;
 
diff --git a/substratevm/src/com.oracle.svm.core.graal.aarch64/src/com/oracle/svm/core/graal/aarch64/AArch64LoadMethodPointerConstantOp.java b/substratevm/src/com.oracle.svm.core.graal.aarch64/src/com/oracle/svm/core/graal/aarch64/AArch64LoadMethodPointerConstantOp.java
index 87a8f96b6803..2c0a96ffdf70 100644
--- a/substratevm/src/com.oracle.svm.core.graal.aarch64/src/com/oracle/svm/core/graal/aarch64/AArch64LoadMethodPointerConstantOp.java
+++ b/substratevm/src/com.oracle.svm.core.graal.aarch64/src/com/oracle/svm/core/graal/aarch64/AArch64LoadMethodPointerConstantOp.java
@@ -25,14 +25,14 @@
 package com.oracle.svm.core.graal.aarch64;
 
 import static jdk.vm.ci.code.ValueUtil.asRegister;
-import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.HINT;
-import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.REG;
+import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.HINT;
+import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.REG;
 
-import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler;
-import jdk.compiler.graal.lir.LIRInstructionClass;
-import jdk.compiler.graal.lir.StandardOp;
-import jdk.compiler.graal.lir.aarch64.AArch64LIRInstruction;
-import jdk.compiler.graal.lir.asm.CompilationResultBuilder;
+import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler;
+import jdk.graal.compiler.lir.LIRInstructionClass;
+import jdk.graal.compiler.lir.StandardOp;
+import jdk.graal.compiler.lir.aarch64.AArch64LIRInstruction;
+import jdk.graal.compiler.lir.asm.CompilationResultBuilder;
 
 import com.oracle.svm.core.meta.SubstrateMethodPointerConstant;
 
diff --git a/substratevm/src/com.oracle.svm.core.graal.aarch64/src/com/oracle/svm/core/graal/aarch64/AArch64NativePatchConsumerFactory.java b/substratevm/src/com.oracle.svm.core.graal.aarch64/src/com/oracle/svm/core/graal/aarch64/AArch64NativePatchConsumerFactory.java
index 3b5f8723c7b7..9dd44b34ccc6 100644
--- a/substratevm/src/com.oracle.svm.core.graal.aarch64/src/com/oracle/svm/core/graal/aarch64/AArch64NativePatchConsumerFactory.java
+++ b/substratevm/src/com.oracle.svm.core.graal.aarch64/src/com/oracle/svm/core/graal/aarch64/AArch64NativePatchConsumerFactory.java
@@ -26,10 +26,10 @@
 
 import java.util.function.Consumer;
 
-import jdk.compiler.graal.asm.Assembler;
-import jdk.compiler.graal.asm.aarch64.AArch64Assembler.SingleInstructionAnnotation;
-import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler;
-import jdk.compiler.graal.code.CompilationResult;
+import jdk.graal.compiler.asm.Assembler;
+import jdk.graal.compiler.asm.aarch64.AArch64Assembler.SingleInstructionAnnotation;
+import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler;
+import jdk.graal.compiler.code.CompilationResult;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
 
diff --git a/substratevm/src/com.oracle.svm.core.graal.aarch64/src/com/oracle/svm/core/graal/aarch64/AArch64SafepointCheckOp.java b/substratevm/src/com.oracle.svm.core.graal.aarch64/src/com/oracle/svm/core/graal/aarch64/AArch64SafepointCheckOp.java
index 41719636b49b..380ea2ec449d 100644
--- a/substratevm/src/com.oracle.svm.core.graal.aarch64/src/com/oracle/svm/core/graal/aarch64/AArch64SafepointCheckOp.java
+++ b/substratevm/src/com.oracle.svm.core.graal.aarch64/src/com/oracle/svm/core/graal/aarch64/AArch64SafepointCheckOp.java
@@ -24,13 +24,13 @@
  */
 package com.oracle.svm.core.graal.aarch64;
 
-import jdk.compiler.graal.asm.aarch64.AArch64Address;
-import jdk.compiler.graal.asm.aarch64.AArch64Assembler;
-import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler;
-import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler.ScratchRegister;
-import jdk.compiler.graal.lir.LIRInstructionClass;
-import jdk.compiler.graal.lir.aarch64.AArch64LIRInstruction;
-import jdk.compiler.graal.lir.asm.CompilationResultBuilder;
+import jdk.graal.compiler.asm.aarch64.AArch64Address;
+import jdk.graal.compiler.asm.aarch64.AArch64Assembler;
+import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler;
+import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler.ScratchRegister;
+import jdk.graal.compiler.lir.LIRInstructionClass;
+import jdk.graal.compiler.lir.aarch64.AArch64LIRInstruction;
+import jdk.graal.compiler.lir.asm.CompilationResultBuilder;
 
 import com.oracle.svm.core.ReservedRegisters;
 import com.oracle.svm.core.SubstrateOptions;
diff --git a/substratevm/src/com.oracle.svm.core.graal.aarch64/src/com/oracle/svm/core/graal/aarch64/AArch64SubstrateSuitesCreator.java b/substratevm/src/com.oracle.svm.core.graal.aarch64/src/com/oracle/svm/core/graal/aarch64/AArch64SubstrateSuitesCreator.java
index a126d94d48c5..d85fa5c9be5d 100644
--- a/substratevm/src/com.oracle.svm.core.graal.aarch64/src/com/oracle/svm/core/graal/aarch64/AArch64SubstrateSuitesCreator.java
+++ b/substratevm/src/com.oracle.svm.core.graal.aarch64/src/com/oracle/svm/core/graal/aarch64/AArch64SubstrateSuitesCreator.java
@@ -24,10 +24,10 @@
  */
 package com.oracle.svm.core.graal.aarch64;
 
-import jdk.compiler.graal.core.aarch64.AArch64SuitesCreator;
-import jdk.compiler.graal.java.GraphBuilderPhase;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration;
-import jdk.compiler.graal.phases.tiers.CompilerConfiguration;
+import jdk.graal.compiler.core.aarch64.AArch64SuitesCreator;
+import jdk.graal.compiler.java.GraphBuilderPhase;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
+import jdk.graal.compiler.phases.tiers.CompilerConfiguration;
 
 public class AArch64SubstrateSuitesCreator extends AArch64SuitesCreator {
 
diff --git a/substratevm/src/com.oracle.svm.core.graal.aarch64/src/com/oracle/svm/core/graal/aarch64/SubstrateAArch64Backend.java b/substratevm/src/com.oracle.svm.core.graal.aarch64/src/com/oracle/svm/core/graal/aarch64/SubstrateAArch64Backend.java
index cf21dc832e2c..95f02749a3b1 100755
--- a/substratevm/src/com.oracle.svm.core.graal.aarch64/src/com/oracle/svm/core/graal/aarch64/SubstrateAArch64Backend.java
+++ b/substratevm/src/com.oracle.svm.core.graal.aarch64/src/com/oracle/svm/core/graal/aarch64/SubstrateAArch64Backend.java
@@ -31,94 +31,94 @@
 import static jdk.vm.ci.aarch64.AArch64.lr;
 import static jdk.vm.ci.aarch64.AArch64.sp;
 import static jdk.vm.ci.code.ValueUtil.asRegister;
-import static jdk.compiler.graal.core.common.GraalOptions.ZapStackOnMethodEntry;
-import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.REG;
-import static jdk.compiler.graal.lir.LIRValueUtil.asConstantValue;
-import static jdk.compiler.graal.lir.LIRValueUtil.differentRegisters;
+import static jdk.graal.compiler.core.common.GraalOptions.ZapStackOnMethodEntry;
+import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.REG;
+import static jdk.graal.compiler.lir.LIRValueUtil.asConstantValue;
+import static jdk.graal.compiler.lir.LIRValueUtil.differentRegisters;
 
 import java.util.function.BiConsumer;
 
-import jdk.compiler.graal.asm.BranchTargetOutOfBoundsException;
-import jdk.compiler.graal.asm.Label;
-import jdk.compiler.graal.asm.aarch64.AArch64Address;
-import jdk.compiler.graal.asm.aarch64.AArch64Address.AddressingMode;
-import jdk.compiler.graal.asm.aarch64.AArch64Assembler.PrefetchMode;
-import jdk.compiler.graal.asm.aarch64.AArch64Assembler.ShiftType;
-import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler;
-import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler.ScratchRegister;
-import jdk.compiler.graal.code.CompilationResult;
-import jdk.compiler.graal.core.aarch64.AArch64AddressLoweringByUse;
-import jdk.compiler.graal.core.aarch64.AArch64ArithmeticLIRGenerator;
-import jdk.compiler.graal.core.aarch64.AArch64LIRGenerator;
-import jdk.compiler.graal.core.aarch64.AArch64LIRKindTool;
-import jdk.compiler.graal.core.aarch64.AArch64MoveFactory;
-import jdk.compiler.graal.core.aarch64.AArch64NodeLIRBuilder;
-import jdk.compiler.graal.core.aarch64.AArch64NodeMatchRules;
-import jdk.compiler.graal.core.common.CompilationIdentifier;
-import jdk.compiler.graal.core.common.CompressEncoding;
-import jdk.compiler.graal.core.common.LIRKind;
-import jdk.compiler.graal.core.common.alloc.RegisterAllocationConfig;
-import jdk.compiler.graal.core.common.memory.MemoryExtendKind;
-import jdk.compiler.graal.core.common.memory.MemoryOrderMode;
-import jdk.compiler.graal.core.common.spi.ForeignCallDescriptor;
-import jdk.compiler.graal.core.common.spi.ForeignCallLinkage;
-import jdk.compiler.graal.core.common.spi.LIRKindTool;
-import jdk.compiler.graal.core.common.type.CompressibleConstant;
-import jdk.compiler.graal.core.gen.DebugInfoBuilder;
-import jdk.compiler.graal.core.gen.LIRGenerationProvider;
-import jdk.compiler.graal.core.gen.NodeLIRBuilder;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.lir.ConstantValue;
-import jdk.compiler.graal.lir.LIR;
-import jdk.compiler.graal.lir.LIRFrameState;
-import jdk.compiler.graal.lir.LIRInstruction;
-import jdk.compiler.graal.lir.LIRInstructionClass;
-import jdk.compiler.graal.lir.LabelRef;
-import jdk.compiler.graal.lir.Opcode;
-import jdk.compiler.graal.lir.StandardOp.BlockEndOp;
-import jdk.compiler.graal.lir.StandardOp.LoadConstantOp;
-import jdk.compiler.graal.lir.Variable;
-import jdk.compiler.graal.lir.aarch64.AArch64AddressValue;
-import jdk.compiler.graal.lir.aarch64.AArch64BreakpointOp;
-import jdk.compiler.graal.lir.aarch64.AArch64Call;
-import jdk.compiler.graal.lir.aarch64.AArch64ControlFlow;
-import jdk.compiler.graal.lir.aarch64.AArch64FrameMap;
-import jdk.compiler.graal.lir.aarch64.AArch64FrameMapBuilder;
-import jdk.compiler.graal.lir.aarch64.AArch64LIRInstruction;
-import jdk.compiler.graal.lir.aarch64.AArch64Move;
-import jdk.compiler.graal.lir.aarch64.AArch64Move.PointerCompressionOp;
-import jdk.compiler.graal.lir.aarch64.AArch64PrefetchOp;
-import jdk.compiler.graal.lir.asm.CompilationResultBuilder;
-import jdk.compiler.graal.lir.asm.CompilationResultBuilderFactory;
-import jdk.compiler.graal.lir.asm.DataBuilder;
-import jdk.compiler.graal.lir.asm.EntryPointDecorator;
-import jdk.compiler.graal.lir.asm.FrameContext;
-import jdk.compiler.graal.lir.framemap.FrameMap;
-import jdk.compiler.graal.lir.framemap.FrameMapBuilder;
-import jdk.compiler.graal.lir.framemap.FrameMapBuilderTool;
-import jdk.compiler.graal.lir.framemap.ReferenceMapBuilder;
-import jdk.compiler.graal.lir.gen.LIRGenerationResult;
-import jdk.compiler.graal.lir.gen.LIRGeneratorTool;
-import jdk.compiler.graal.lir.gen.MoveFactory;
-import jdk.compiler.graal.nodes.BreakpointNode;
-import jdk.compiler.graal.nodes.CallTargetNode;
-import jdk.compiler.graal.nodes.DirectCallTargetNode;
-import jdk.compiler.graal.nodes.IndirectCallTargetNode;
-import jdk.compiler.graal.nodes.InvokeWithExceptionNode;
-import jdk.compiler.graal.nodes.LogicNode;
-import jdk.compiler.graal.nodes.LoweredCallTargetNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ParameterNode;
-import jdk.compiler.graal.nodes.SafepointNode;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.CoreProviders;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
-import jdk.compiler.graal.nodes.spi.NodeValueMap;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.BasePhase;
-import jdk.compiler.graal.phases.common.AddressLoweringByUsePhase;
-import jdk.compiler.graal.phases.util.Providers;
+import jdk.graal.compiler.asm.BranchTargetOutOfBoundsException;
+import jdk.graal.compiler.asm.Label;
+import jdk.graal.compiler.asm.aarch64.AArch64Address;
+import jdk.graal.compiler.asm.aarch64.AArch64Address.AddressingMode;
+import jdk.graal.compiler.asm.aarch64.AArch64Assembler.PrefetchMode;
+import jdk.graal.compiler.asm.aarch64.AArch64Assembler.ShiftType;
+import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler;
+import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler.ScratchRegister;
+import jdk.graal.compiler.code.CompilationResult;
+import jdk.graal.compiler.core.aarch64.AArch64AddressLoweringByUse;
+import jdk.graal.compiler.core.aarch64.AArch64ArithmeticLIRGenerator;
+import jdk.graal.compiler.core.aarch64.AArch64LIRGenerator;
+import jdk.graal.compiler.core.aarch64.AArch64LIRKindTool;
+import jdk.graal.compiler.core.aarch64.AArch64MoveFactory;
+import jdk.graal.compiler.core.aarch64.AArch64NodeLIRBuilder;
+import jdk.graal.compiler.core.aarch64.AArch64NodeMatchRules;
+import jdk.graal.compiler.core.common.CompilationIdentifier;
+import jdk.graal.compiler.core.common.CompressEncoding;
+import jdk.graal.compiler.core.common.LIRKind;
+import jdk.graal.compiler.core.common.alloc.RegisterAllocationConfig;
+import jdk.graal.compiler.core.common.memory.MemoryExtendKind;
+import jdk.graal.compiler.core.common.memory.MemoryOrderMode;
+import jdk.graal.compiler.core.common.spi.ForeignCallDescriptor;
+import jdk.graal.compiler.core.common.spi.ForeignCallLinkage;
+import jdk.graal.compiler.core.common.spi.LIRKindTool;
+import jdk.graal.compiler.core.common.type.CompressibleConstant;
+import jdk.graal.compiler.core.gen.DebugInfoBuilder;
+import jdk.graal.compiler.core.gen.LIRGenerationProvider;
+import jdk.graal.compiler.core.gen.NodeLIRBuilder;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.lir.ConstantValue;
+import jdk.graal.compiler.lir.LIR;
+import jdk.graal.compiler.lir.LIRFrameState;
+import jdk.graal.compiler.lir.LIRInstruction;
+import jdk.graal.compiler.lir.LIRInstructionClass;
+import jdk.graal.compiler.lir.LabelRef;
+import jdk.graal.compiler.lir.Opcode;
+import jdk.graal.compiler.lir.StandardOp.BlockEndOp;
+import jdk.graal.compiler.lir.StandardOp.LoadConstantOp;
+import jdk.graal.compiler.lir.Variable;
+import jdk.graal.compiler.lir.aarch64.AArch64AddressValue;
+import jdk.graal.compiler.lir.aarch64.AArch64BreakpointOp;
+import jdk.graal.compiler.lir.aarch64.AArch64Call;
+import jdk.graal.compiler.lir.aarch64.AArch64ControlFlow;
+import jdk.graal.compiler.lir.aarch64.AArch64FrameMap;
+import jdk.graal.compiler.lir.aarch64.AArch64FrameMapBuilder;
+import jdk.graal.compiler.lir.aarch64.AArch64LIRInstruction;
+import jdk.graal.compiler.lir.aarch64.AArch64Move;
+import jdk.graal.compiler.lir.aarch64.AArch64Move.PointerCompressionOp;
+import jdk.graal.compiler.lir.aarch64.AArch64PrefetchOp;
+import jdk.graal.compiler.lir.asm.CompilationResultBuilder;
+import jdk.graal.compiler.lir.asm.CompilationResultBuilderFactory;
+import jdk.graal.compiler.lir.asm.DataBuilder;
+import jdk.graal.compiler.lir.asm.EntryPointDecorator;
+import jdk.graal.compiler.lir.asm.FrameContext;
+import jdk.graal.compiler.lir.framemap.FrameMap;
+import jdk.graal.compiler.lir.framemap.FrameMapBuilder;
+import jdk.graal.compiler.lir.framemap.FrameMapBuilderTool;
+import jdk.graal.compiler.lir.framemap.ReferenceMapBuilder;
+import jdk.graal.compiler.lir.gen.LIRGenerationResult;
+import jdk.graal.compiler.lir.gen.LIRGeneratorTool;
+import jdk.graal.compiler.lir.gen.MoveFactory;
+import jdk.graal.compiler.nodes.BreakpointNode;
+import jdk.graal.compiler.nodes.CallTargetNode;
+import jdk.graal.compiler.nodes.DirectCallTargetNode;
+import jdk.graal.compiler.nodes.IndirectCallTargetNode;
+import jdk.graal.compiler.nodes.InvokeWithExceptionNode;
+import jdk.graal.compiler.nodes.LogicNode;
+import jdk.graal.compiler.nodes.LoweredCallTargetNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ParameterNode;
+import jdk.graal.compiler.nodes.SafepointNode;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.CoreProviders;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.nodes.spi.NodeValueMap;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.BasePhase;
+import jdk.graal.compiler.phases.common.AddressLoweringByUsePhase;
+import jdk.graal.compiler.phases.util.Providers;
 import org.graalvm.nativeimage.ImageSingletons;
 
 import com.oracle.svm.core.FrameAccess;
diff --git a/substratevm/src/com.oracle.svm.core.graal.aarch64/src/com/oracle/svm/core/graal/aarch64/SubstrateAArch64Feature.java b/substratevm/src/com.oracle.svm.core.graal.aarch64/src/com/oracle/svm/core/graal/aarch64/SubstrateAArch64Feature.java
index 6e14db6dbe8f..d50a3a2ff077 100644
--- a/substratevm/src/com.oracle.svm.core.graal.aarch64/src/com/oracle/svm/core/graal/aarch64/SubstrateAArch64Feature.java
+++ b/substratevm/src/com.oracle.svm.core.graal.aarch64/src/com/oracle/svm/core/graal/aarch64/SubstrateAArch64Feature.java
@@ -24,13 +24,13 @@
  */
 package com.oracle.svm.core.graal.aarch64;
 
-import jdk.compiler.graal.core.common.spi.ForeignCallsProvider;
-import jdk.compiler.graal.core.common.spi.MetaAccessExtensionProvider;
-import jdk.compiler.graal.nodes.spi.PlatformConfigurationProvider;
-import jdk.compiler.graal.phases.util.Providers;
-import jdk.compiler.graal.replacements.DefaultJavaLoweringProvider;
-import jdk.compiler.graal.replacements.TargetGraphBuilderPlugins;
-import jdk.compiler.graal.replacements.aarch64.AArch64GraphBuilderPlugins;
+import jdk.graal.compiler.core.common.spi.ForeignCallsProvider;
+import jdk.graal.compiler.core.common.spi.MetaAccessExtensionProvider;
+import jdk.graal.compiler.nodes.spi.PlatformConfigurationProvider;
+import jdk.graal.compiler.phases.util.Providers;
+import jdk.graal.compiler.replacements.DefaultJavaLoweringProvider;
+import jdk.graal.compiler.replacements.TargetGraphBuilderPlugins;
+import jdk.graal.compiler.replacements.aarch64.AArch64GraphBuilderPlugins;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
diff --git a/substratevm/src/com.oracle.svm.core.graal.aarch64/src/com/oracle/svm/core/graal/aarch64/SubstrateAArch64GraphBuilderPlugins.java b/substratevm/src/com.oracle.svm.core.graal.aarch64/src/com/oracle/svm/core/graal/aarch64/SubstrateAArch64GraphBuilderPlugins.java
index be3a6204f701..b9eb8b448280 100644
--- a/substratevm/src/com.oracle.svm.core.graal.aarch64/src/com/oracle/svm/core/graal/aarch64/SubstrateAArch64GraphBuilderPlugins.java
+++ b/substratevm/src/com.oracle.svm.core.graal.aarch64/src/com/oracle/svm/core/graal/aarch64/SubstrateAArch64GraphBuilderPlugins.java
@@ -24,16 +24,16 @@
  */
 package com.oracle.svm.core.graal.aarch64;
 
-import jdk.compiler.graal.api.replacements.SnippetReflectionProvider;
-import jdk.compiler.graal.nodes.ComputeObjectAddressNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins;
-import jdk.compiler.graal.nodes.spi.Replacements;
-import jdk.compiler.graal.phases.util.Providers;
-import jdk.compiler.graal.replacements.nodes.VectorizedMismatchNode;
+import jdk.graal.compiler.api.replacements.SnippetReflectionProvider;
+import jdk.graal.compiler.nodes.ComputeObjectAddressNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins;
+import jdk.graal.compiler.nodes.spi.Replacements;
+import jdk.graal.compiler.phases.util.Providers;
+import jdk.graal.compiler.replacements.nodes.VectorizedMismatchNode;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
 
diff --git a/substratevm/src/com.oracle.svm.core.graal.aarch64/src/com/oracle/svm/core/graal/aarch64/SubstrateAArch64LoweringProvider.java b/substratevm/src/com.oracle.svm.core.graal.aarch64/src/com/oracle/svm/core/graal/aarch64/SubstrateAArch64LoweringProvider.java
index 218214b7a242..334a112eda8c 100644
--- a/substratevm/src/com.oracle.svm.core.graal.aarch64/src/com/oracle/svm/core/graal/aarch64/SubstrateAArch64LoweringProvider.java
+++ b/substratevm/src/com.oracle.svm.core.graal.aarch64/src/com/oracle/svm/core/graal/aarch64/SubstrateAArch64LoweringProvider.java
@@ -24,15 +24,15 @@
  */
 package com.oracle.svm.core.graal.aarch64;
 
-import jdk.compiler.graal.core.aarch64.AArch64LoweringProviderMixin;
-import jdk.compiler.graal.core.common.spi.ForeignCallsProvider;
-import jdk.compiler.graal.core.common.spi.MetaAccessExtensionProvider;
-import jdk.compiler.graal.debug.DebugCloseable;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.calc.FloatConvertNode;
-import jdk.compiler.graal.nodes.spi.LoweringTool;
-import jdk.compiler.graal.nodes.spi.PlatformConfigurationProvider;
+import jdk.graal.compiler.core.aarch64.AArch64LoweringProviderMixin;
+import jdk.graal.compiler.core.common.spi.ForeignCallsProvider;
+import jdk.graal.compiler.core.common.spi.MetaAccessExtensionProvider;
+import jdk.graal.compiler.debug.DebugCloseable;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.calc.FloatConvertNode;
+import jdk.graal.compiler.nodes.spi.LoweringTool;
+import jdk.graal.compiler.nodes.spi.PlatformConfigurationProvider;
 
 import com.oracle.svm.core.graal.meta.SubstrateBasicLoweringProvider;
 import com.oracle.svm.core.graal.nodes.aarch64.AArch64ISBNode;
diff --git a/substratevm/src/com.oracle.svm.core.graal.aarch64/src/com/oracle/svm/core/graal/aarch64/SubstrateAArch64RegisterConfig.java b/substratevm/src/com.oracle.svm.core.graal.aarch64/src/com/oracle/svm/core/graal/aarch64/SubstrateAArch64RegisterConfig.java
index e985b15b0bca..71b9287c7dc8 100755
--- a/substratevm/src/com.oracle.svm.core.graal.aarch64/src/com/oracle/svm/core/graal/aarch64/SubstrateAArch64RegisterConfig.java
+++ b/substratevm/src/com.oracle.svm.core.graal.aarch64/src/com/oracle/svm/core/graal/aarch64/SubstrateAArch64RegisterConfig.java
@@ -70,7 +70,7 @@
 
 import java.util.ArrayList;
 
-import jdk.compiler.graal.core.common.NumUtil;
+import jdk.graal.compiler.core.common.NumUtil;
 import org.graalvm.nativeimage.Platform;
 
 import com.oracle.svm.core.ReservedRegisters;
diff --git a/substratevm/src/com.oracle.svm.core.graal.aarch64/src/com/oracle/svm/core/graal/aarch64/SubstrateAArch64SuitesCreatorProvider.java b/substratevm/src/com.oracle.svm.core.graal.aarch64/src/com/oracle/svm/core/graal/aarch64/SubstrateAArch64SuitesCreatorProvider.java
index 4ace5beff619..634e46e722a1 100644
--- a/substratevm/src/com.oracle.svm.core.graal.aarch64/src/com/oracle/svm/core/graal/aarch64/SubstrateAArch64SuitesCreatorProvider.java
+++ b/substratevm/src/com.oracle.svm.core.graal.aarch64/src/com/oracle/svm/core/graal/aarch64/SubstrateAArch64SuitesCreatorProvider.java
@@ -25,7 +25,7 @@
  */
 package com.oracle.svm.core.graal.aarch64;
 
-import jdk.compiler.graal.core.phases.EconomyCompilerConfiguration;
+import jdk.graal.compiler.core.phases.EconomyCompilerConfiguration;
 
 import com.oracle.svm.core.graal.code.SubstrateSuitesCreatorProvider;
 
diff --git a/substratevm/src/com.oracle.svm.core.graal.amd64/src/com/oracle/svm/core/graal/amd64/AMD64CGlobalDataLoadAddressOp.java b/substratevm/src/com.oracle.svm.core.graal.amd64/src/com/oracle/svm/core/graal/amd64/AMD64CGlobalDataLoadAddressOp.java
index 091556076c6c..2fc9bd89ff07 100644
--- a/substratevm/src/com.oracle.svm.core.graal.amd64/src/com/oracle/svm/core/graal/amd64/AMD64CGlobalDataLoadAddressOp.java
+++ b/substratevm/src/com.oracle.svm.core.graal.amd64/src/com/oracle/svm/core/graal/amd64/AMD64CGlobalDataLoadAddressOp.java
@@ -25,13 +25,13 @@
 package com.oracle.svm.core.graal.amd64;
 
 import static jdk.vm.ci.code.ValueUtil.asRegister;
-import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.REG;
+import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.REG;
 
-import jdk.compiler.graal.asm.amd64.AMD64Address;
-import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler;
-import jdk.compiler.graal.lir.LIRInstructionClass;
-import jdk.compiler.graal.lir.amd64.AMD64LIRInstruction;
-import jdk.compiler.graal.lir.asm.CompilationResultBuilder;
+import jdk.graal.compiler.asm.amd64.AMD64Address;
+import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler;
+import jdk.graal.compiler.lir.LIRInstructionClass;
+import jdk.graal.compiler.lir.amd64.AMD64LIRInstruction;
+import jdk.graal.compiler.lir.asm.CompilationResultBuilder;
 import org.graalvm.word.Pointer;
 
 import com.oracle.svm.core.SubstrateUtil;
diff --git a/substratevm/src/com.oracle.svm.core.graal.amd64/src/com/oracle/svm/core/graal/amd64/AMD64CalleeSavedRegisters.java b/substratevm/src/com.oracle.svm.core.graal.amd64/src/com/oracle/svm/core/graal/amd64/AMD64CalleeSavedRegisters.java
index f2a0ec0e6587..038bb8563d71 100644
--- a/substratevm/src/com.oracle.svm.core.graal.amd64/src/com/oracle/svm/core/graal/amd64/AMD64CalleeSavedRegisters.java
+++ b/substratevm/src/com.oracle.svm.core.graal.amd64/src/com/oracle/svm/core/graal/amd64/AMD64CalleeSavedRegisters.java
@@ -24,7 +24,7 @@
  */
 package com.oracle.svm.core.graal.amd64;
 
-import static jdk.compiler.graal.asm.amd64.AMD64BaseAssembler.OperandSize.DWORD;
+import static jdk.graal.compiler.asm.amd64.AMD64BaseAssembler.OperandSize.DWORD;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -34,18 +34,18 @@
 import java.util.Map;
 import java.util.function.BiConsumer;
 
-import jdk.compiler.graal.api.replacements.Fold;
-import jdk.compiler.graal.api.replacements.SnippetReflectionProvider;
-import jdk.compiler.graal.asm.Label;
-import jdk.compiler.graal.asm.amd64.AMD64Address;
-import jdk.compiler.graal.asm.amd64.AMD64Assembler;
-import jdk.compiler.graal.asm.amd64.AMD64BaseAssembler;
-import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler;
-import jdk.compiler.graal.core.common.NumUtil;
-import jdk.compiler.graal.core.common.Stride;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.lir.asm.CompilationResultBuilder;
-import jdk.compiler.graal.phases.util.Providers;
+import jdk.graal.compiler.api.replacements.Fold;
+import jdk.graal.compiler.api.replacements.SnippetReflectionProvider;
+import jdk.graal.compiler.asm.Label;
+import jdk.graal.compiler.asm.amd64.AMD64Address;
+import jdk.graal.compiler.asm.amd64.AMD64Assembler;
+import jdk.graal.compiler.asm.amd64.AMD64BaseAssembler;
+import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler;
+import jdk.graal.compiler.core.common.NumUtil;
+import jdk.graal.compiler.core.common.Stride;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.lir.asm.CompilationResultBuilder;
+import jdk.graal.compiler.phases.util.Providers;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
diff --git a/substratevm/src/com.oracle.svm.core.graal.amd64/src/com/oracle/svm/core/graal/amd64/AMD64FarReturnOp.java b/substratevm/src/com.oracle.svm.core.graal.amd64/src/com/oracle/svm/core/graal/amd64/AMD64FarReturnOp.java
index 4dede4978d0d..613ff0ff32a8 100644
--- a/substratevm/src/com.oracle.svm.core.graal.amd64/src/com/oracle/svm/core/graal/amd64/AMD64FarReturnOp.java
+++ b/substratevm/src/com.oracle.svm.core.graal.amd64/src/com/oracle/svm/core/graal/amd64/AMD64FarReturnOp.java
@@ -24,17 +24,17 @@
  */
 package com.oracle.svm.core.graal.amd64;
 
-import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.ILLEGAL;
-import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.REG;
+import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.ILLEGAL;
+import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.REG;
 
-import jdk.compiler.graal.asm.Label;
-import jdk.compiler.graal.asm.amd64.AMD64Address;
-import jdk.compiler.graal.asm.amd64.AMD64Assembler.ConditionFlag;
-import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler;
-import jdk.compiler.graal.lir.LIRInstructionClass;
-import jdk.compiler.graal.lir.Opcode;
-import jdk.compiler.graal.lir.amd64.AMD64BlockEndOp;
-import jdk.compiler.graal.lir.asm.CompilationResultBuilder;
+import jdk.graal.compiler.asm.Label;
+import jdk.graal.compiler.asm.amd64.AMD64Address;
+import jdk.graal.compiler.asm.amd64.AMD64Assembler.ConditionFlag;
+import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler;
+import jdk.graal.compiler.lir.LIRInstructionClass;
+import jdk.graal.compiler.lir.Opcode;
+import jdk.graal.compiler.lir.amd64.AMD64BlockEndOp;
+import jdk.graal.compiler.lir.asm.CompilationResultBuilder;
 
 import com.oracle.svm.core.FrameAccess;
 import com.oracle.svm.core.SubstrateOptions;
diff --git a/substratevm/src/com.oracle.svm.core.graal.amd64/src/com/oracle/svm/core/graal/amd64/AMD64LoadMethodPointerConstantOp.java b/substratevm/src/com.oracle.svm.core.graal.amd64/src/com/oracle/svm/core/graal/amd64/AMD64LoadMethodPointerConstantOp.java
index 7644436632de..e61e45e6c975 100644
--- a/substratevm/src/com.oracle.svm.core.graal.amd64/src/com/oracle/svm/core/graal/amd64/AMD64LoadMethodPointerConstantOp.java
+++ b/substratevm/src/com.oracle.svm.core.graal.amd64/src/com/oracle/svm/core/graal/amd64/AMD64LoadMethodPointerConstantOp.java
@@ -25,14 +25,14 @@
 package com.oracle.svm.core.graal.amd64;
 
 import static jdk.vm.ci.code.ValueUtil.asRegister;
-import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.HINT;
-import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.REG;
+import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.HINT;
+import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.REG;
 
-import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler;
-import jdk.compiler.graal.lir.LIRInstructionClass;
-import jdk.compiler.graal.lir.StandardOp;
-import jdk.compiler.graal.lir.amd64.AMD64LIRInstruction;
-import jdk.compiler.graal.lir.asm.CompilationResultBuilder;
+import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler;
+import jdk.graal.compiler.lir.LIRInstructionClass;
+import jdk.graal.compiler.lir.StandardOp;
+import jdk.graal.compiler.lir.amd64.AMD64LIRInstruction;
+import jdk.graal.compiler.lir.asm.CompilationResultBuilder;
 
 import com.oracle.svm.core.meta.SubstrateMethodPointerConstant;
 
diff --git a/substratevm/src/com.oracle.svm.core.graal.amd64/src/com/oracle/svm/core/graal/amd64/AMD64NativeImagePatcher.java b/substratevm/src/com.oracle.svm.core.graal.amd64/src/com/oracle/svm/core/graal/amd64/AMD64NativeImagePatcher.java
index 232f95408680..f6a19963f955 100644
--- a/substratevm/src/com.oracle.svm.core.graal.amd64/src/com/oracle/svm/core/graal/amd64/AMD64NativeImagePatcher.java
+++ b/substratevm/src/com.oracle.svm.core.graal.amd64/src/com/oracle/svm/core/graal/amd64/AMD64NativeImagePatcher.java
@@ -26,10 +26,10 @@
 
 import java.util.function.Consumer;
 
-import jdk.compiler.graal.asm.Assembler;
-import jdk.compiler.graal.asm.amd64.AMD64BaseAssembler.AddressDisplacementAnnotation;
-import jdk.compiler.graal.asm.amd64.AMD64BaseAssembler.OperandDataAnnotation;
-import jdk.compiler.graal.code.CompilationResult;
+import jdk.graal.compiler.asm.Assembler;
+import jdk.graal.compiler.asm.amd64.AMD64BaseAssembler.AddressDisplacementAnnotation;
+import jdk.graal.compiler.asm.amd64.AMD64BaseAssembler.OperandDataAnnotation;
+import jdk.graal.compiler.code.CompilationResult;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
 
diff --git a/substratevm/src/com.oracle.svm.core.graal.amd64/src/com/oracle/svm/core/graal/amd64/AMD64ReturnOp.java b/substratevm/src/com.oracle.svm.core.graal.amd64/src/com/oracle/svm/core/graal/amd64/AMD64ReturnOp.java
index 0e83a3199525..1ba14013f3c3 100644
--- a/substratevm/src/com.oracle.svm.core.graal.amd64/src/com/oracle/svm/core/graal/amd64/AMD64ReturnOp.java
+++ b/substratevm/src/com.oracle.svm.core.graal.amd64/src/com/oracle/svm/core/graal/amd64/AMD64ReturnOp.java
@@ -24,15 +24,15 @@
  */
 package com.oracle.svm.core.graal.amd64;
 
-import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.ILLEGAL;
-import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.REG;
+import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.ILLEGAL;
+import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.REG;
 
-import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler;
-import jdk.compiler.graal.lir.LIRInstructionClass;
-import jdk.compiler.graal.lir.Opcode;
-import jdk.compiler.graal.lir.StandardOp;
-import jdk.compiler.graal.lir.amd64.AMD64BlockEndOp;
-import jdk.compiler.graal.lir.asm.CompilationResultBuilder;
+import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler;
+import jdk.graal.compiler.lir.LIRInstructionClass;
+import jdk.graal.compiler.lir.Opcode;
+import jdk.graal.compiler.lir.StandardOp;
+import jdk.graal.compiler.lir.amd64.AMD64BlockEndOp;
+import jdk.graal.compiler.lir.asm.CompilationResultBuilder;
 
 import jdk.vm.ci.meta.Value;
 
diff --git a/substratevm/src/com.oracle.svm.core.graal.amd64/src/com/oracle/svm/core/graal/amd64/AMD64SafepointCheckOp.java b/substratevm/src/com.oracle.svm.core.graal.amd64/src/com/oracle/svm/core/graal/amd64/AMD64SafepointCheckOp.java
index f69294a303e1..de8589320648 100644
--- a/substratevm/src/com.oracle.svm.core.graal.amd64/src/com/oracle/svm/core/graal/amd64/AMD64SafepointCheckOp.java
+++ b/substratevm/src/com.oracle.svm.core.graal.amd64/src/com/oracle/svm/core/graal/amd64/AMD64SafepointCheckOp.java
@@ -24,13 +24,13 @@
  */
 package com.oracle.svm.core.graal.amd64;
 
-import jdk.compiler.graal.asm.amd64.AMD64Address;
-import jdk.compiler.graal.asm.amd64.AMD64Assembler;
-import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler;
-import jdk.compiler.graal.lir.LIRInstructionClass;
-import jdk.compiler.graal.lir.Opcode;
-import jdk.compiler.graal.lir.amd64.AMD64LIRInstruction;
-import jdk.compiler.graal.lir.asm.CompilationResultBuilder;
+import jdk.graal.compiler.asm.amd64.AMD64Address;
+import jdk.graal.compiler.asm.amd64.AMD64Assembler;
+import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler;
+import jdk.graal.compiler.lir.LIRInstructionClass;
+import jdk.graal.compiler.lir.Opcode;
+import jdk.graal.compiler.lir.amd64.AMD64LIRInstruction;
+import jdk.graal.compiler.lir.asm.CompilationResultBuilder;
 
 import com.oracle.svm.core.ReservedRegisters;
 import com.oracle.svm.core.SubstrateOptions;
diff --git a/substratevm/src/com.oracle.svm.core.graal.amd64/src/com/oracle/svm/core/graal/amd64/AMD64SubstrateSuitesCreator.java b/substratevm/src/com.oracle.svm.core.graal.amd64/src/com/oracle/svm/core/graal/amd64/AMD64SubstrateSuitesCreator.java
index e0b2e652cf67..9639b648d33f 100644
--- a/substratevm/src/com.oracle.svm.core.graal.amd64/src/com/oracle/svm/core/graal/amd64/AMD64SubstrateSuitesCreator.java
+++ b/substratevm/src/com.oracle.svm.core.graal.amd64/src/com/oracle/svm/core/graal/amd64/AMD64SubstrateSuitesCreator.java
@@ -24,10 +24,10 @@
  */
 package com.oracle.svm.core.graal.amd64;
 
-import jdk.compiler.graal.core.amd64.AMD64SuitesCreator;
-import jdk.compiler.graal.java.GraphBuilderPhase;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration;
-import jdk.compiler.graal.phases.tiers.CompilerConfiguration;
+import jdk.graal.compiler.core.amd64.AMD64SuitesCreator;
+import jdk.graal.compiler.java.GraphBuilderPhase;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
+import jdk.graal.compiler.phases.tiers.CompilerConfiguration;
 
 public class AMD64SubstrateSuitesCreator extends AMD64SuitesCreator {
 
diff --git a/substratevm/src/com.oracle.svm.core.graal.amd64/src/com/oracle/svm/core/graal/amd64/SubstrateAMD64AddressLowering.java b/substratevm/src/com.oracle.svm.core.graal.amd64/src/com/oracle/svm/core/graal/amd64/SubstrateAMD64AddressLowering.java
index 218c15e7147a..ab061984e4c9 100644
--- a/substratevm/src/com.oracle.svm.core.graal.amd64/src/com/oracle/svm/core/graal/amd64/SubstrateAMD64AddressLowering.java
+++ b/substratevm/src/com.oracle.svm.core.graal.amd64/src/com/oracle/svm/core/graal/amd64/SubstrateAMD64AddressLowering.java
@@ -24,13 +24,13 @@
  */
 package com.oracle.svm.core.graal.amd64;
 
-import jdk.compiler.graal.asm.amd64.AMD64Address;
-import jdk.compiler.graal.core.common.Stride;
-import jdk.compiler.graal.core.amd64.AMD64AddressNode;
-import jdk.compiler.graal.core.amd64.AMD64CompressAddressLowering;
-import jdk.compiler.graal.core.common.CompressEncoding;
-import jdk.compiler.graal.nodes.CompressionNode;
-import jdk.compiler.graal.nodes.ValueNode;
+import jdk.graal.compiler.asm.amd64.AMD64Address;
+import jdk.graal.compiler.core.common.Stride;
+import jdk.graal.compiler.core.amd64.AMD64AddressNode;
+import jdk.graal.compiler.core.amd64.AMD64CompressAddressLowering;
+import jdk.graal.compiler.core.common.CompressEncoding;
+import jdk.graal.compiler.nodes.CompressionNode;
+import jdk.graal.compiler.nodes.ValueNode;
 
 import com.oracle.svm.core.ReservedRegisters;
 import com.oracle.svm.core.SubstrateOptions;
diff --git a/substratevm/src/com.oracle.svm.core.graal.amd64/src/com/oracle/svm/core/graal/amd64/SubstrateAMD64Backend.java b/substratevm/src/com.oracle.svm.core.graal.amd64/src/com/oracle/svm/core/graal/amd64/SubstrateAMD64Backend.java
index 299c8e62ea0b..0e5484ddefb7 100644
--- a/substratevm/src/com.oracle.svm.core.graal.amd64/src/com/oracle/svm/core/graal/amd64/SubstrateAMD64Backend.java
+++ b/substratevm/src/com.oracle.svm.core.graal.amd64/src/com/oracle/svm/core/graal/amd64/SubstrateAMD64Backend.java
@@ -34,9 +34,9 @@
 import static jdk.vm.ci.amd64.AMD64.CPUFeature.AVX;
 import static jdk.vm.ci.code.ValueUtil.asRegister;
 import static jdk.vm.ci.code.ValueUtil.isRegister;
-import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.REG;
-import static jdk.compiler.graal.lir.LIRValueUtil.asConstantValue;
-import static jdk.compiler.graal.lir.LIRValueUtil.differentRegisters;
+import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.REG;
+import static jdk.graal.compiler.lir.LIRValueUtil.asConstantValue;
+import static jdk.graal.compiler.lir.LIRValueUtil.differentRegisters;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -44,95 +44,95 @@
 import java.util.List;
 import java.util.function.BiConsumer;
 
-import jdk.compiler.graal.asm.Label;
-import jdk.compiler.graal.asm.amd64.AMD64Address;
-import jdk.compiler.graal.asm.amd64.AMD64Assembler;
-import jdk.compiler.graal.asm.amd64.AMD64BaseAssembler;
-import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler;
-import jdk.compiler.graal.code.CompilationResult;
-import jdk.compiler.graal.core.amd64.AMD64ArithmeticLIRGenerator;
-import jdk.compiler.graal.core.amd64.AMD64LIRGenerator;
-import jdk.compiler.graal.core.amd64.AMD64LIRKindTool;
-import jdk.compiler.graal.core.amd64.AMD64MoveFactory;
-import jdk.compiler.graal.core.amd64.AMD64MoveFactoryBase;
-import jdk.compiler.graal.core.amd64.AMD64NodeLIRBuilder;
-import jdk.compiler.graal.core.amd64.AMD64NodeMatchRules;
-import jdk.compiler.graal.core.common.CompilationIdentifier;
-import jdk.compiler.graal.core.common.CompressEncoding;
-import jdk.compiler.graal.core.common.LIRKind;
-import jdk.compiler.graal.core.common.Stride;
-import jdk.compiler.graal.core.common.alloc.RegisterAllocationConfig;
-import jdk.compiler.graal.core.common.memory.MemoryExtendKind;
-import jdk.compiler.graal.core.common.memory.MemoryOrderMode;
-import jdk.compiler.graal.core.common.spi.ForeignCallDescriptor;
-import jdk.compiler.graal.core.common.spi.ForeignCallLinkage;
-import jdk.compiler.graal.core.common.spi.LIRKindTool;
-import jdk.compiler.graal.core.common.type.CompressibleConstant;
-import jdk.compiler.graal.core.gen.DebugInfoBuilder;
-import jdk.compiler.graal.core.gen.LIRGenerationProvider;
-import jdk.compiler.graal.core.gen.NodeLIRBuilder;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.lir.ConstantValue;
-import jdk.compiler.graal.lir.LIR;
-import jdk.compiler.graal.lir.LIRFrameState;
-import jdk.compiler.graal.lir.LIRInstruction;
-import jdk.compiler.graal.lir.LIRInstructionClass;
-import jdk.compiler.graal.lir.LabelRef;
-import jdk.compiler.graal.lir.Opcode;
-import jdk.compiler.graal.lir.StandardOp.BlockEndOp;
-import jdk.compiler.graal.lir.StandardOp.LabelOp;
-import jdk.compiler.graal.lir.StandardOp.LoadConstantOp;
-import jdk.compiler.graal.lir.Variable;
-import jdk.compiler.graal.lir.amd64.AMD64AddressValue;
-import jdk.compiler.graal.lir.amd64.AMD64BreakpointOp;
-import jdk.compiler.graal.lir.amd64.AMD64Call;
-import jdk.compiler.graal.lir.amd64.AMD64ControlFlow.BranchOp;
-import jdk.compiler.graal.lir.amd64.AMD64FrameMap;
-import jdk.compiler.graal.lir.amd64.AMD64FrameMapBuilder;
-import jdk.compiler.graal.lir.amd64.AMD64LIRInstruction;
-import jdk.compiler.graal.lir.amd64.AMD64Move;
-import jdk.compiler.graal.lir.amd64.AMD64Move.MoveFromConstOp;
-import jdk.compiler.graal.lir.amd64.AMD64Move.PointerCompressionOp;
-import jdk.compiler.graal.lir.amd64.AMD64PrefetchOp;
-import jdk.compiler.graal.lir.amd64.AMD64ReadProcid;
-import jdk.compiler.graal.lir.amd64.AMD64ReadTimestampCounterWithProcid;
-import jdk.compiler.graal.lir.amd64.AMD64VZeroUpper;
-import jdk.compiler.graal.lir.amd64.EndbranchOp;
-import jdk.compiler.graal.lir.asm.CompilationResultBuilder;
-import jdk.compiler.graal.lir.asm.CompilationResultBuilderFactory;
-import jdk.compiler.graal.lir.asm.DataBuilder;
-import jdk.compiler.graal.lir.asm.EntryPointDecorator;
-import jdk.compiler.graal.lir.asm.FrameContext;
-import jdk.compiler.graal.lir.framemap.FrameMap;
-import jdk.compiler.graal.lir.framemap.FrameMapBuilder;
-import jdk.compiler.graal.lir.framemap.FrameMapBuilderTool;
-import jdk.compiler.graal.lir.framemap.ReferenceMapBuilder;
-import jdk.compiler.graal.lir.gen.LIRGenerationResult;
-import jdk.compiler.graal.lir.gen.LIRGeneratorTool;
-import jdk.compiler.graal.lir.gen.MoveFactory;
-import jdk.compiler.graal.lir.gen.MoveFactory.BackupSlotProvider;
-import jdk.compiler.graal.nodes.BreakpointNode;
-import jdk.compiler.graal.nodes.CallTargetNode;
-import jdk.compiler.graal.nodes.DirectCallTargetNode;
-import jdk.compiler.graal.nodes.IndirectCallTargetNode;
-import jdk.compiler.graal.nodes.InvokeWithExceptionNode;
-import jdk.compiler.graal.nodes.LogicNode;
-import jdk.compiler.graal.nodes.LoweredCallTargetNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ParameterNode;
-import jdk.compiler.graal.nodes.SafepointNode;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.cfg.HIRBlock;
-import jdk.compiler.graal.nodes.spi.CoreProviders;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
-import jdk.compiler.graal.nodes.spi.NodeValueMap;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.BasePhase;
-import jdk.compiler.graal.phases.common.AddressLoweringByNodePhase;
-import jdk.compiler.graal.phases.util.Providers;
-import jdk.compiler.graal.replacements.amd64.AMD64IntrinsicStubs;
+import jdk.graal.compiler.asm.Label;
+import jdk.graal.compiler.asm.amd64.AMD64Address;
+import jdk.graal.compiler.asm.amd64.AMD64Assembler;
+import jdk.graal.compiler.asm.amd64.AMD64BaseAssembler;
+import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler;
+import jdk.graal.compiler.code.CompilationResult;
+import jdk.graal.compiler.core.amd64.AMD64ArithmeticLIRGenerator;
+import jdk.graal.compiler.core.amd64.AMD64LIRGenerator;
+import jdk.graal.compiler.core.amd64.AMD64LIRKindTool;
+import jdk.graal.compiler.core.amd64.AMD64MoveFactory;
+import jdk.graal.compiler.core.amd64.AMD64MoveFactoryBase;
+import jdk.graal.compiler.core.amd64.AMD64NodeLIRBuilder;
+import jdk.graal.compiler.core.amd64.AMD64NodeMatchRules;
+import jdk.graal.compiler.core.common.CompilationIdentifier;
+import jdk.graal.compiler.core.common.CompressEncoding;
+import jdk.graal.compiler.core.common.LIRKind;
+import jdk.graal.compiler.core.common.Stride;
+import jdk.graal.compiler.core.common.alloc.RegisterAllocationConfig;
+import jdk.graal.compiler.core.common.memory.MemoryExtendKind;
+import jdk.graal.compiler.core.common.memory.MemoryOrderMode;
+import jdk.graal.compiler.core.common.spi.ForeignCallDescriptor;
+import jdk.graal.compiler.core.common.spi.ForeignCallLinkage;
+import jdk.graal.compiler.core.common.spi.LIRKindTool;
+import jdk.graal.compiler.core.common.type.CompressibleConstant;
+import jdk.graal.compiler.core.gen.DebugInfoBuilder;
+import jdk.graal.compiler.core.gen.LIRGenerationProvider;
+import jdk.graal.compiler.core.gen.NodeLIRBuilder;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.lir.ConstantValue;
+import jdk.graal.compiler.lir.LIR;
+import jdk.graal.compiler.lir.LIRFrameState;
+import jdk.graal.compiler.lir.LIRInstruction;
+import jdk.graal.compiler.lir.LIRInstructionClass;
+import jdk.graal.compiler.lir.LabelRef;
+import jdk.graal.compiler.lir.Opcode;
+import jdk.graal.compiler.lir.StandardOp.BlockEndOp;
+import jdk.graal.compiler.lir.StandardOp.LabelOp;
+import jdk.graal.compiler.lir.StandardOp.LoadConstantOp;
+import jdk.graal.compiler.lir.Variable;
+import jdk.graal.compiler.lir.amd64.AMD64AddressValue;
+import jdk.graal.compiler.lir.amd64.AMD64BreakpointOp;
+import jdk.graal.compiler.lir.amd64.AMD64Call;
+import jdk.graal.compiler.lir.amd64.AMD64ControlFlow.BranchOp;
+import jdk.graal.compiler.lir.amd64.AMD64FrameMap;
+import jdk.graal.compiler.lir.amd64.AMD64FrameMapBuilder;
+import jdk.graal.compiler.lir.amd64.AMD64LIRInstruction;
+import jdk.graal.compiler.lir.amd64.AMD64Move;
+import jdk.graal.compiler.lir.amd64.AMD64Move.MoveFromConstOp;
+import jdk.graal.compiler.lir.amd64.AMD64Move.PointerCompressionOp;
+import jdk.graal.compiler.lir.amd64.AMD64PrefetchOp;
+import jdk.graal.compiler.lir.amd64.AMD64ReadProcid;
+import jdk.graal.compiler.lir.amd64.AMD64ReadTimestampCounterWithProcid;
+import jdk.graal.compiler.lir.amd64.AMD64VZeroUpper;
+import jdk.graal.compiler.lir.amd64.EndbranchOp;
+import jdk.graal.compiler.lir.asm.CompilationResultBuilder;
+import jdk.graal.compiler.lir.asm.CompilationResultBuilderFactory;
+import jdk.graal.compiler.lir.asm.DataBuilder;
+import jdk.graal.compiler.lir.asm.EntryPointDecorator;
+import jdk.graal.compiler.lir.asm.FrameContext;
+import jdk.graal.compiler.lir.framemap.FrameMap;
+import jdk.graal.compiler.lir.framemap.FrameMapBuilder;
+import jdk.graal.compiler.lir.framemap.FrameMapBuilderTool;
+import jdk.graal.compiler.lir.framemap.ReferenceMapBuilder;
+import jdk.graal.compiler.lir.gen.LIRGenerationResult;
+import jdk.graal.compiler.lir.gen.LIRGeneratorTool;
+import jdk.graal.compiler.lir.gen.MoveFactory;
+import jdk.graal.compiler.lir.gen.MoveFactory.BackupSlotProvider;
+import jdk.graal.compiler.nodes.BreakpointNode;
+import jdk.graal.compiler.nodes.CallTargetNode;
+import jdk.graal.compiler.nodes.DirectCallTargetNode;
+import jdk.graal.compiler.nodes.IndirectCallTargetNode;
+import jdk.graal.compiler.nodes.InvokeWithExceptionNode;
+import jdk.graal.compiler.nodes.LogicNode;
+import jdk.graal.compiler.nodes.LoweredCallTargetNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ParameterNode;
+import jdk.graal.compiler.nodes.SafepointNode;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.cfg.HIRBlock;
+import jdk.graal.compiler.nodes.spi.CoreProviders;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.nodes.spi.NodeValueMap;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.BasePhase;
+import jdk.graal.compiler.phases.common.AddressLoweringByNodePhase;
+import jdk.graal.compiler.phases.util.Providers;
+import jdk.graal.compiler.replacements.amd64.AMD64IntrinsicStubs;
 import org.graalvm.nativeimage.ImageInfo;
 import org.graalvm.nativeimage.ImageSingletons;
 
diff --git a/substratevm/src/com.oracle.svm.core.graal.amd64/src/com/oracle/svm/core/graal/amd64/SubstrateAMD64Feature.java b/substratevm/src/com.oracle.svm.core.graal.amd64/src/com/oracle/svm/core/graal/amd64/SubstrateAMD64Feature.java
index e7e1d1bc0e87..28fbc1a1fbaa 100644
--- a/substratevm/src/com.oracle.svm.core.graal.amd64/src/com/oracle/svm/core/graal/amd64/SubstrateAMD64Feature.java
+++ b/substratevm/src/com.oracle.svm.core.graal.amd64/src/com/oracle/svm/core/graal/amd64/SubstrateAMD64Feature.java
@@ -24,13 +24,13 @@
  */
 package com.oracle.svm.core.graal.amd64;
 
-import jdk.compiler.graal.core.common.spi.ForeignCallsProvider;
-import jdk.compiler.graal.core.common.spi.MetaAccessExtensionProvider;
-import jdk.compiler.graal.nodes.spi.PlatformConfigurationProvider;
-import jdk.compiler.graal.phases.util.Providers;
-import jdk.compiler.graal.replacements.DefaultJavaLoweringProvider;
-import jdk.compiler.graal.replacements.TargetGraphBuilderPlugins;
-import jdk.compiler.graal.replacements.amd64.AMD64GraphBuilderPlugins;
+import jdk.graal.compiler.core.common.spi.ForeignCallsProvider;
+import jdk.graal.compiler.core.common.spi.MetaAccessExtensionProvider;
+import jdk.graal.compiler.nodes.spi.PlatformConfigurationProvider;
+import jdk.graal.compiler.phases.util.Providers;
+import jdk.graal.compiler.replacements.DefaultJavaLoweringProvider;
+import jdk.graal.compiler.replacements.TargetGraphBuilderPlugins;
+import jdk.graal.compiler.replacements.amd64.AMD64GraphBuilderPlugins;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
diff --git a/substratevm/src/com.oracle.svm.core.graal.amd64/src/com/oracle/svm/core/graal/amd64/SubstrateAMD64GraphBuilderPlugins.java b/substratevm/src/com.oracle.svm.core.graal.amd64/src/com/oracle/svm/core/graal/amd64/SubstrateAMD64GraphBuilderPlugins.java
index c843602665f1..94917e69d287 100644
--- a/substratevm/src/com.oracle.svm.core.graal.amd64/src/com/oracle/svm/core/graal/amd64/SubstrateAMD64GraphBuilderPlugins.java
+++ b/substratevm/src/com.oracle.svm.core.graal.amd64/src/com/oracle/svm/core/graal/amd64/SubstrateAMD64GraphBuilderPlugins.java
@@ -24,16 +24,16 @@
  */
 package com.oracle.svm.core.graal.amd64;
 
-import jdk.compiler.graal.api.replacements.SnippetReflectionProvider;
-import jdk.compiler.graal.nodes.ComputeObjectAddressNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins;
-import jdk.compiler.graal.nodes.spi.Replacements;
-import jdk.compiler.graal.phases.util.Providers;
-import jdk.compiler.graal.replacements.nodes.VectorizedMismatchNode;
+import jdk.graal.compiler.api.replacements.SnippetReflectionProvider;
+import jdk.graal.compiler.nodes.ComputeObjectAddressNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins;
+import jdk.graal.compiler.nodes.spi.Replacements;
+import jdk.graal.compiler.phases.util.Providers;
+import jdk.graal.compiler.replacements.nodes.VectorizedMismatchNode;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
 
diff --git a/substratevm/src/com.oracle.svm.core.graal.amd64/src/com/oracle/svm/core/graal/amd64/SubstrateAMD64LoweringProvider.java b/substratevm/src/com.oracle.svm.core.graal.amd64/src/com/oracle/svm/core/graal/amd64/SubstrateAMD64LoweringProvider.java
index 584a8a6430d2..59df1b6a39ad 100644
--- a/substratevm/src/com.oracle.svm.core.graal.amd64/src/com/oracle/svm/core/graal/amd64/SubstrateAMD64LoweringProvider.java
+++ b/substratevm/src/com.oracle.svm.core.graal.amd64/src/com/oracle/svm/core/graal/amd64/SubstrateAMD64LoweringProvider.java
@@ -24,13 +24,13 @@
  */
 package com.oracle.svm.core.graal.amd64;
 
-import jdk.compiler.graal.core.amd64.AMD64LoweringProviderMixin;
-import jdk.compiler.graal.core.common.spi.ForeignCallsProvider;
-import jdk.compiler.graal.core.common.spi.MetaAccessExtensionProvider;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.nodes.calc.RemNode;
-import jdk.compiler.graal.nodes.spi.LoweringTool;
-import jdk.compiler.graal.nodes.spi.PlatformConfigurationProvider;
+import jdk.graal.compiler.core.amd64.AMD64LoweringProviderMixin;
+import jdk.graal.compiler.core.common.spi.ForeignCallsProvider;
+import jdk.graal.compiler.core.common.spi.MetaAccessExtensionProvider;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.nodes.calc.RemNode;
+import jdk.graal.compiler.nodes.spi.LoweringTool;
+import jdk.graal.compiler.nodes.spi.PlatformConfigurationProvider;
 
 import com.oracle.svm.core.graal.meta.SubstrateBasicLoweringProvider;
 import com.oracle.svm.core.graal.snippets.NodeLoweringProvider;
diff --git a/substratevm/src/com.oracle.svm.core.graal.amd64/src/com/oracle/svm/core/graal/amd64/SubstrateAMD64RegisterConfig.java b/substratevm/src/com.oracle.svm.core.graal.amd64/src/com/oracle/svm/core/graal/amd64/SubstrateAMD64RegisterConfig.java
index 32819ad4be4e..27db1e4c7331 100644
--- a/substratevm/src/com.oracle.svm.core.graal.amd64/src/com/oracle/svm/core/graal/amd64/SubstrateAMD64RegisterConfig.java
+++ b/substratevm/src/com.oracle.svm.core.graal.amd64/src/com/oracle/svm/core/graal/amd64/SubstrateAMD64RegisterConfig.java
@@ -69,7 +69,7 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import jdk.compiler.graal.core.common.LIRKind;
+import jdk.graal.compiler.core.common.LIRKind;
 import org.graalvm.nativeimage.Platform;
 
 import com.oracle.svm.core.ReservedRegisters;
diff --git a/substratevm/src/com.oracle.svm.core.graal.amd64/src/com/oracle/svm/core/graal/amd64/SubstrateAMD64SuitesCreatorProvider.java b/substratevm/src/com.oracle.svm.core.graal.amd64/src/com/oracle/svm/core/graal/amd64/SubstrateAMD64SuitesCreatorProvider.java
index d6eaa5846551..d13ed11b4ed0 100644
--- a/substratevm/src/com.oracle.svm.core.graal.amd64/src/com/oracle/svm/core/graal/amd64/SubstrateAMD64SuitesCreatorProvider.java
+++ b/substratevm/src/com.oracle.svm.core.graal.amd64/src/com/oracle/svm/core/graal/amd64/SubstrateAMD64SuitesCreatorProvider.java
@@ -24,7 +24,7 @@
  */
 package com.oracle.svm.core.graal.amd64;
 
-import jdk.compiler.graal.core.phases.EconomyCompilerConfiguration;
+import jdk.graal.compiler.core.phases.EconomyCompilerConfiguration;
 
 import com.oracle.svm.core.graal.code.SubstrateSuitesCreatorProvider;
 
diff --git a/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/LLVMFeature.java b/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/LLVMFeature.java
index 62be021f6731..037ef75bb1b7 100644
--- a/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/LLVMFeature.java
+++ b/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/LLVMFeature.java
@@ -27,12 +27,12 @@
 import java.nio.file.Path;
 import java.util.Map;
 
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodes.java.LoadExceptionObjectNode;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.util.Providers;
-import jdk.compiler.graal.replacements.TargetGraphBuilderPlugins;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodes.java.LoadExceptionObjectNode;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.util.Providers;
+import jdk.graal.compiler.replacements.TargetGraphBuilderPlugins;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
diff --git a/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/LLVMGenerator.java b/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/LLVMGenerator.java
index 1dd70a38f9f0..7e0636d9cd85 100644
--- a/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/LLVMGenerator.java
+++ b/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/LLVMGenerator.java
@@ -33,9 +33,9 @@
 import static com.oracle.svm.core.graal.llvm.util.LLVMUtils.dumpValues;
 import static com.oracle.svm.core.graal.llvm.util.LLVMUtils.getType;
 import static com.oracle.svm.core.graal.llvm.util.LLVMUtils.getVal;
-import static jdk.compiler.graal.debug.GraalError.shouldNotReachHere;
-import static jdk.compiler.graal.debug.GraalError.shouldNotReachHereUnexpectedValue;
-import static jdk.compiler.graal.debug.GraalError.unimplemented;
+import static jdk.graal.compiler.debug.GraalError.shouldNotReachHere;
+import static jdk.graal.compiler.debug.GraalError.shouldNotReachHereUnexpectedValue;
+import static jdk.graal.compiler.debug.GraalError.unimplemented;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -45,43 +45,43 @@
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.function.BiFunction;
 
-import jdk.compiler.graal.code.CompilationResult;
-import jdk.compiler.graal.code.DataSection;
-import jdk.compiler.graal.core.common.CompressEncoding;
-import jdk.compiler.graal.core.common.LIRKind;
-import jdk.compiler.graal.core.common.NumUtil;
-import jdk.compiler.graal.core.common.calc.Condition;
-import jdk.compiler.graal.core.common.calc.FloatConvert;
-import jdk.compiler.graal.core.common.cfg.BasicBlock;
-import jdk.compiler.graal.core.common.memory.BarrierType;
-import jdk.compiler.graal.core.common.memory.MemoryExtendKind;
-import jdk.compiler.graal.core.common.memory.MemoryOrderMode;
-import jdk.compiler.graal.core.common.spi.ForeignCallLinkage;
-import jdk.compiler.graal.core.common.spi.ForeignCallsProvider;
-import jdk.compiler.graal.core.common.spi.LIRKindTool;
-import jdk.compiler.graal.core.common.type.CompressibleConstant;
-import jdk.compiler.graal.core.common.type.IllegalStamp;
-import jdk.compiler.graal.core.common.type.RawPointerStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.lir.LIRFrameState;
-import jdk.compiler.graal.lir.LIRInstruction;
-import jdk.compiler.graal.lir.LabelRef;
-import jdk.compiler.graal.lir.Variable;
-import jdk.compiler.graal.lir.VirtualStackSlot;
-import jdk.compiler.graal.lir.gen.ArithmeticLIRGeneratorTool;
-import jdk.compiler.graal.lir.gen.BarrierSetLIRGeneratorTool;
-import jdk.compiler.graal.lir.gen.LIRGenerationResult;
-import jdk.compiler.graal.lir.gen.LIRGeneratorTool;
-import jdk.compiler.graal.lir.gen.MoveFactory;
-import jdk.compiler.graal.nodes.AbstractBeginNode;
-import jdk.compiler.graal.nodes.ParameterNode;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.cfg.HIRBlock;
-import jdk.compiler.graal.nodes.type.NarrowOopStamp;
-import jdk.compiler.graal.phases.util.Providers;
+import jdk.graal.compiler.code.CompilationResult;
+import jdk.graal.compiler.code.DataSection;
+import jdk.graal.compiler.core.common.CompressEncoding;
+import jdk.graal.compiler.core.common.LIRKind;
+import jdk.graal.compiler.core.common.NumUtil;
+import jdk.graal.compiler.core.common.calc.Condition;
+import jdk.graal.compiler.core.common.calc.FloatConvert;
+import jdk.graal.compiler.core.common.cfg.BasicBlock;
+import jdk.graal.compiler.core.common.memory.BarrierType;
+import jdk.graal.compiler.core.common.memory.MemoryExtendKind;
+import jdk.graal.compiler.core.common.memory.MemoryOrderMode;
+import jdk.graal.compiler.core.common.spi.ForeignCallLinkage;
+import jdk.graal.compiler.core.common.spi.ForeignCallsProvider;
+import jdk.graal.compiler.core.common.spi.LIRKindTool;
+import jdk.graal.compiler.core.common.type.CompressibleConstant;
+import jdk.graal.compiler.core.common.type.IllegalStamp;
+import jdk.graal.compiler.core.common.type.RawPointerStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.lir.LIRFrameState;
+import jdk.graal.compiler.lir.LIRInstruction;
+import jdk.graal.compiler.lir.LabelRef;
+import jdk.graal.compiler.lir.Variable;
+import jdk.graal.compiler.lir.VirtualStackSlot;
+import jdk.graal.compiler.lir.gen.ArithmeticLIRGeneratorTool;
+import jdk.graal.compiler.lir.gen.BarrierSetLIRGeneratorTool;
+import jdk.graal.compiler.lir.gen.LIRGenerationResult;
+import jdk.graal.compiler.lir.gen.LIRGeneratorTool;
+import jdk.graal.compiler.lir.gen.MoveFactory;
+import jdk.graal.compiler.nodes.AbstractBeginNode;
+import jdk.graal.compiler.nodes.ParameterNode;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.cfg.HIRBlock;
+import jdk.graal.compiler.nodes.type.NarrowOopStamp;
+import jdk.graal.compiler.phases.util.Providers;
 import org.graalvm.nativeimage.AnnotationAccess;
 import org.graalvm.nativeimage.c.constant.CEnum;
 import org.graalvm.nativeimage.c.function.CEntryPoint;
diff --git a/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/LLVMNativeImageCodeCache.java b/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/LLVMNativeImageCodeCache.java
index 1976bdc18c14..0c8de6681173 100644
--- a/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/LLVMNativeImageCodeCache.java
+++ b/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/LLVMNativeImageCodeCache.java
@@ -47,11 +47,11 @@
 import java.util.stream.IntStream;
 
 import org.graalvm.collections.Pair;
-import jdk.compiler.graal.code.CompilationResult;
-import jdk.compiler.graal.core.common.NumUtil;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.debug.Indent;
+import jdk.graal.compiler.code.CompilationResult;
+import jdk.graal.compiler.core.common.NumUtil;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.debug.Indent;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
 
diff --git a/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/LLVMToolchainUtils.java b/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/LLVMToolchainUtils.java
index c5765b542d2f..15bb3af478f5 100644
--- a/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/LLVMToolchainUtils.java
+++ b/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/LLVMToolchainUtils.java
@@ -33,8 +33,8 @@
 import java.util.function.Function;
 import java.util.function.IntFunction;
 
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.debug.GraalError;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.debug.GraalError;
 
 import com.oracle.graal.pointsto.BigBang;
 import com.oracle.graal.pointsto.util.CompletionExecutor;
diff --git a/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/NodeLLVMBuilder.java b/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/NodeLLVMBuilder.java
index c9dce83668c8..40c8f5caa550 100644
--- a/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/NodeLLVMBuilder.java
+++ b/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/NodeLLVMBuilder.java
@@ -24,10 +24,10 @@
  */
 package com.oracle.svm.core.graal.llvm;
 
-import static jdk.compiler.graal.debug.GraalError.shouldNotReachHere;
-import static jdk.compiler.graal.debug.GraalError.shouldNotReachHereUnexpectedValue;
-import static jdk.compiler.graal.debug.GraalError.unimplemented;
-import static jdk.compiler.graal.debug.GraalError.unimplementedOverride;
+import static jdk.graal.compiler.debug.GraalError.shouldNotReachHere;
+import static jdk.graal.compiler.debug.GraalError.shouldNotReachHereUnexpectedValue;
+import static jdk.graal.compiler.debug.GraalError.unimplemented;
+import static jdk.graal.compiler.debug.GraalError.unimplementedOverride;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -38,57 +38,57 @@
 import java.util.Set;
 
 import org.graalvm.collections.Pair;
-import jdk.compiler.graal.code.CompilationResult;
-import jdk.compiler.graal.core.common.CompressEncoding;
-import jdk.compiler.graal.core.common.NumUtil;
-import jdk.compiler.graal.core.common.calc.Condition;
-import jdk.compiler.graal.core.common.cfg.BasicBlock;
-import jdk.compiler.graal.core.common.cfg.BlockMap;
-import jdk.compiler.graal.core.common.spi.ForeignCallLinkage;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.core.gen.DebugInfoBuilder;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.GraalGraphError;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeInputList;
-import jdk.compiler.graal.graph.iterators.NodeIterable;
-import jdk.compiler.graal.lir.ConstantValue;
-import jdk.compiler.graal.lir.LIRFrameState;
-import jdk.compiler.graal.lir.Variable;
-import jdk.compiler.graal.nodes.AbstractBeginNode;
-import jdk.compiler.graal.nodes.AbstractEndNode;
-import jdk.compiler.graal.nodes.AbstractMergeNode;
-import jdk.compiler.graal.nodes.BreakpointNode;
-import jdk.compiler.graal.nodes.DeoptimizingNode;
-import jdk.compiler.graal.nodes.DirectCallTargetNode;
-import jdk.compiler.graal.nodes.FrameState;
-import jdk.compiler.graal.nodes.FullInfopointNode;
-import jdk.compiler.graal.nodes.IfNode;
-import jdk.compiler.graal.nodes.IndirectCallTargetNode;
-import jdk.compiler.graal.nodes.Invoke;
-import jdk.compiler.graal.nodes.InvokeWithExceptionNode;
-import jdk.compiler.graal.nodes.LogicConstantNode;
-import jdk.compiler.graal.nodes.LogicNode;
-import jdk.compiler.graal.nodes.LoopEndNode;
-import jdk.compiler.graal.nodes.LoweredCallTargetNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ParameterNode;
-import jdk.compiler.graal.nodes.SafepointNode;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.ValuePhiNode;
-import jdk.compiler.graal.nodes.calc.CompareNode;
-import jdk.compiler.graal.nodes.calc.ConditionalNode;
-import jdk.compiler.graal.nodes.calc.IntegerTestNode;
-import jdk.compiler.graal.nodes.calc.IsNullNode;
-import jdk.compiler.graal.nodes.cfg.HIRBlock;
-import jdk.compiler.graal.nodes.extended.ForeignCall;
-import jdk.compiler.graal.nodes.extended.ForeignCallNode;
-import jdk.compiler.graal.nodes.extended.SwitchNode;
-import jdk.compiler.graal.nodes.java.TypeSwitchNode;
-import jdk.compiler.graal.nodes.spi.LIRLowerable;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.code.CompilationResult;
+import jdk.graal.compiler.core.common.CompressEncoding;
+import jdk.graal.compiler.core.common.NumUtil;
+import jdk.graal.compiler.core.common.calc.Condition;
+import jdk.graal.compiler.core.common.cfg.BasicBlock;
+import jdk.graal.compiler.core.common.cfg.BlockMap;
+import jdk.graal.compiler.core.common.spi.ForeignCallLinkage;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.core.gen.DebugInfoBuilder;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.GraalGraphError;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeInputList;
+import jdk.graal.compiler.graph.iterators.NodeIterable;
+import jdk.graal.compiler.lir.ConstantValue;
+import jdk.graal.compiler.lir.LIRFrameState;
+import jdk.graal.compiler.lir.Variable;
+import jdk.graal.compiler.nodes.AbstractBeginNode;
+import jdk.graal.compiler.nodes.AbstractEndNode;
+import jdk.graal.compiler.nodes.AbstractMergeNode;
+import jdk.graal.compiler.nodes.BreakpointNode;
+import jdk.graal.compiler.nodes.DeoptimizingNode;
+import jdk.graal.compiler.nodes.DirectCallTargetNode;
+import jdk.graal.compiler.nodes.FrameState;
+import jdk.graal.compiler.nodes.FullInfopointNode;
+import jdk.graal.compiler.nodes.IfNode;
+import jdk.graal.compiler.nodes.IndirectCallTargetNode;
+import jdk.graal.compiler.nodes.Invoke;
+import jdk.graal.compiler.nodes.InvokeWithExceptionNode;
+import jdk.graal.compiler.nodes.LogicConstantNode;
+import jdk.graal.compiler.nodes.LogicNode;
+import jdk.graal.compiler.nodes.LoopEndNode;
+import jdk.graal.compiler.nodes.LoweredCallTargetNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ParameterNode;
+import jdk.graal.compiler.nodes.SafepointNode;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.ValuePhiNode;
+import jdk.graal.compiler.nodes.calc.CompareNode;
+import jdk.graal.compiler.nodes.calc.ConditionalNode;
+import jdk.graal.compiler.nodes.calc.IntegerTestNode;
+import jdk.graal.compiler.nodes.calc.IsNullNode;
+import jdk.graal.compiler.nodes.cfg.HIRBlock;
+import jdk.graal.compiler.nodes.extended.ForeignCall;
+import jdk.graal.compiler.nodes.extended.ForeignCallNode;
+import jdk.graal.compiler.nodes.extended.SwitchNode;
+import jdk.graal.compiler.nodes.java.TypeSwitchNode;
+import jdk.graal.compiler.nodes.spi.LIRLowerable;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
 
 import com.oracle.svm.core.ReservedRegisters;
 import com.oracle.svm.core.SubstrateOptions;
diff --git a/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/SubstrateLLVMBackend.java b/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/SubstrateLLVMBackend.java
index 3d9f73d013d1..a9835dbcdec8 100644
--- a/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/SubstrateLLVMBackend.java
+++ b/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/SubstrateLLVMBackend.java
@@ -29,23 +29,23 @@
 import java.util.Collections;
 import java.util.List;
 
-import jdk.compiler.graal.code.CompilationResult;
-import jdk.compiler.graal.core.common.CompilationIdentifier;
-import jdk.compiler.graal.debug.CounterKey;
-import jdk.compiler.graal.debug.DebugCloseable;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.debug.TimerKey;
-import jdk.compiler.graal.lir.asm.CompilationResultBuilderFactory;
-import jdk.compiler.graal.lir.asm.EntryPointDecorator;
-import jdk.compiler.graal.lir.phases.LIRSuites;
-import jdk.compiler.graal.nodes.GraphState.StageFlag;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.cfg.HIRBlock;
-import jdk.compiler.graal.nodes.spi.CoreProviders;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.BasePhase;
-import jdk.compiler.graal.phases.common.AddressLoweringByNodePhase;
-import jdk.compiler.graal.phases.util.Providers;
+import jdk.graal.compiler.code.CompilationResult;
+import jdk.graal.compiler.core.common.CompilationIdentifier;
+import jdk.graal.compiler.debug.CounterKey;
+import jdk.graal.compiler.debug.DebugCloseable;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.debug.TimerKey;
+import jdk.graal.compiler.lir.asm.CompilationResultBuilderFactory;
+import jdk.graal.compiler.lir.asm.EntryPointDecorator;
+import jdk.graal.compiler.lir.phases.LIRSuites;
+import jdk.graal.compiler.nodes.GraphState.StageFlag;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.cfg.HIRBlock;
+import jdk.graal.compiler.nodes.spi.CoreProviders;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.BasePhase;
+import jdk.graal.compiler.phases.common.AddressLoweringByNodePhase;
+import jdk.graal.compiler.phases.util.Providers;
 
 import com.oracle.svm.core.graal.code.SubstrateBackend;
 import com.oracle.svm.core.graal.llvm.lowering.LLVMAddressLowering;
diff --git a/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/lowering/LLVMAddressLowering.java b/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/lowering/LLVMAddressLowering.java
index 8390b4097475..b2c5681825c0 100644
--- a/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/lowering/LLVMAddressLowering.java
+++ b/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/lowering/LLVMAddressLowering.java
@@ -24,16 +24,16 @@
  */
 package com.oracle.svm.core.graal.llvm.lowering;
 
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.lir.gen.LIRGeneratorTool;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.memory.address.AddressNode;
-import jdk.compiler.graal.nodes.spi.LIRLowerable;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
-import jdk.compiler.graal.phases.common.AddressLoweringByNodePhase;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.lir.gen.LIRGeneratorTool;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.memory.address.AddressNode;
+import jdk.graal.compiler.nodes.spi.LIRLowerable;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.phases.common.AddressLoweringByNodePhase;
 
 import jdk.vm.ci.meta.Value;
 import jdk.vm.ci.meta.ValueKind;
diff --git a/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/lowering/LLVMLoadExceptionObjectLowering.java b/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/lowering/LLVMLoadExceptionObjectLowering.java
index 05238d5a8ad7..8d8e87efb296 100644
--- a/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/lowering/LLVMLoadExceptionObjectLowering.java
+++ b/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/lowering/LLVMLoadExceptionObjectLowering.java
@@ -24,13 +24,13 @@
  */
 package com.oracle.svm.core.graal.llvm.lowering;
 
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.FrameState;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.java.LoadExceptionObjectNode;
-import jdk.compiler.graal.nodes.spi.LoweringTool;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.FrameState;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.java.LoadExceptionObjectNode;
+import jdk.graal.compiler.nodes.spi.LoweringTool;
 
 import com.oracle.svm.core.graal.nodes.ReadExceptionObjectNode;
 import com.oracle.svm.core.graal.snippets.NodeLoweringProvider;
diff --git a/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/lowering/SubstrateLLVMLoweringProvider.java b/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/lowering/SubstrateLLVMLoweringProvider.java
index ac4421a6a3e8..307e6b1a5607 100644
--- a/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/lowering/SubstrateLLVMLoweringProvider.java
+++ b/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/lowering/SubstrateLLVMLoweringProvider.java
@@ -24,15 +24,15 @@
  */
 package com.oracle.svm.core.graal.llvm.lowering;
 
-import jdk.compiler.graal.core.common.spi.ForeignCallsProvider;
-import jdk.compiler.graal.core.common.spi.MetaAccessExtensionProvider;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.nodes.calc.FloatConvertNode;
-import jdk.compiler.graal.nodes.calc.RemNode;
-import jdk.compiler.graal.nodes.memory.ExtendableMemoryAccess;
-import jdk.compiler.graal.core.common.memory.MemoryExtendKind;
-import jdk.compiler.graal.nodes.spi.LoweringTool;
-import jdk.compiler.graal.nodes.spi.PlatformConfigurationProvider;
+import jdk.graal.compiler.core.common.spi.ForeignCallsProvider;
+import jdk.graal.compiler.core.common.spi.MetaAccessExtensionProvider;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.nodes.calc.FloatConvertNode;
+import jdk.graal.compiler.nodes.calc.RemNode;
+import jdk.graal.compiler.nodes.memory.ExtendableMemoryAccess;
+import jdk.graal.compiler.core.common.memory.MemoryExtendKind;
+import jdk.graal.compiler.nodes.spi.LoweringTool;
+import jdk.graal.compiler.nodes.spi.PlatformConfigurationProvider;
 
 import com.oracle.svm.core.graal.meta.SubstrateBasicLoweringProvider;
 import com.oracle.svm.core.graal.snippets.NodeLoweringProvider;
diff --git a/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/objectfile/LLVMObjectFile.java b/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/objectfile/LLVMObjectFile.java
index 613446646920..54a0e6b30775 100644
--- a/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/objectfile/LLVMObjectFile.java
+++ b/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/objectfile/LLVMObjectFile.java
@@ -45,7 +45,7 @@
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
-import jdk.compiler.graal.debug.DebugContext;
+import jdk.graal.compiler.debug.DebugContext;
 
 import com.oracle.graal.pointsto.BigBang;
 import com.oracle.objectfile.BasicProgbitsSectionImpl;
diff --git a/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/replacements/LLVMBinaryIntrinsicNode.java b/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/replacements/LLVMBinaryIntrinsicNode.java
index d748885c0dac..1293fe7030fa 100644
--- a/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/replacements/LLVMBinaryIntrinsicNode.java
+++ b/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/replacements/LLVMBinaryIntrinsicNode.java
@@ -24,16 +24,16 @@
  */
 package com.oracle.svm.core.graal.llvm.replacements;
 
-import static jdk.compiler.graal.debug.GraalError.shouldNotReachHereUnexpectedValue;
+import static jdk.graal.compiler.debug.GraalError.shouldNotReachHereUnexpectedValue;
 
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.lir.gen.ArithmeticLIRGeneratorTool;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.lir.gen.ArithmeticLIRGeneratorTool;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
 
 import jdk.vm.ci.meta.JavaConstant;
 import jdk.vm.ci.meta.JavaKind;
diff --git a/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/replacements/LLVMCeilNode.java b/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/replacements/LLVMCeilNode.java
index 226f1f42fb6d..3188e8c7066d 100644
--- a/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/replacements/LLVMCeilNode.java
+++ b/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/replacements/LLVMCeilNode.java
@@ -24,12 +24,12 @@
  */
 package com.oracle.svm.core.graal.llvm.replacements;
 
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeCycles;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodeinfo.NodeSize;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.ValueNode;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeCycles;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodeinfo.NodeSize;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.ValueNode;
 
 import jdk.vm.ci.meta.JavaConstant;
 import jdk.vm.ci.meta.JavaKind;
diff --git a/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/replacements/LLVMCopySignNode.java b/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/replacements/LLVMCopySignNode.java
index 1731286bcfc5..699d6333e5af 100644
--- a/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/replacements/LLVMCopySignNode.java
+++ b/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/replacements/LLVMCopySignNode.java
@@ -24,12 +24,12 @@
  */
 package com.oracle.svm.core.graal.llvm.replacements;
 
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeCycles;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodeinfo.NodeSize;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.ValueNode;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeCycles;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodeinfo.NodeSize;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.ValueNode;
 
 import jdk.vm.ci.meta.JavaConstant;
 import jdk.vm.ci.meta.JavaKind;
diff --git a/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/replacements/LLVMCountLeadingZerosNode.java b/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/replacements/LLVMCountLeadingZerosNode.java
index b32cfa0aa75b..d70b86cf984d 100644
--- a/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/replacements/LLVMCountLeadingZerosNode.java
+++ b/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/replacements/LLVMCountLeadingZerosNode.java
@@ -24,12 +24,12 @@
  */
 package com.oracle.svm.core.graal.llvm.replacements;
 
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeCycles;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodeinfo.NodeSize;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.ValueNode;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeCycles;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodeinfo.NodeSize;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.ValueNode;
 
 import jdk.vm.ci.meta.JavaConstant;
 import jdk.vm.ci.meta.JavaKind;
diff --git a/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/replacements/LLVMCountTrailingZerosNode.java b/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/replacements/LLVMCountTrailingZerosNode.java
index c2d14fb43616..387c2019f7ac 100644
--- a/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/replacements/LLVMCountTrailingZerosNode.java
+++ b/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/replacements/LLVMCountTrailingZerosNode.java
@@ -24,12 +24,12 @@
  */
 package com.oracle.svm.core.graal.llvm.replacements;
 
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeCycles;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodeinfo.NodeSize;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.ValueNode;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeCycles;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodeinfo.NodeSize;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.ValueNode;
 
 import jdk.vm.ci.meta.JavaConstant;
 import jdk.vm.ci.meta.JavaKind;
diff --git a/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/replacements/LLVMFloorNode.java b/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/replacements/LLVMFloorNode.java
index 3e70ee8c6b5b..6198082ebb7f 100644
--- a/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/replacements/LLVMFloorNode.java
+++ b/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/replacements/LLVMFloorNode.java
@@ -24,12 +24,12 @@
  */
 package com.oracle.svm.core.graal.llvm.replacements;
 
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeCycles;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodeinfo.NodeSize;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.ValueNode;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeCycles;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodeinfo.NodeSize;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.ValueNode;
 
 import jdk.vm.ci.meta.JavaConstant;
 import jdk.vm.ci.meta.JavaKind;
diff --git a/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/replacements/LLVMGraphBuilderPlugins.java b/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/replacements/LLVMGraphBuilderPlugins.java
index 9bb9c58e5887..a9e6e36414b0 100644
--- a/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/replacements/LLVMGraphBuilderPlugins.java
+++ b/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/replacements/LLVMGraphBuilderPlugins.java
@@ -27,22 +27,22 @@
 import java.lang.reflect.Type;
 import java.util.Arrays;
 
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins.Registration;
-import jdk.compiler.graal.nodes.spi.Replacements;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.replacements.TargetGraphBuilderPlugins;
-import jdk.compiler.graal.replacements.nodes.BinaryMathIntrinsicNode;
-import jdk.compiler.graal.replacements.nodes.BinaryMathIntrinsicNode.BinaryOperation;
-import jdk.compiler.graal.replacements.nodes.BitCountNode;
-import jdk.compiler.graal.replacements.nodes.FusedMultiplyAddNode;
-import jdk.compiler.graal.replacements.nodes.UnaryMathIntrinsicNode;
-import jdk.compiler.graal.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins.Registration;
+import jdk.graal.compiler.nodes.spi.Replacements;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.replacements.TargetGraphBuilderPlugins;
+import jdk.graal.compiler.replacements.nodes.BinaryMathIntrinsicNode;
+import jdk.graal.compiler.replacements.nodes.BinaryMathIntrinsicNode.BinaryOperation;
+import jdk.graal.compiler.replacements.nodes.BitCountNode;
+import jdk.graal.compiler.replacements.nodes.FusedMultiplyAddNode;
+import jdk.graal.compiler.replacements.nodes.UnaryMathIntrinsicNode;
+import jdk.graal.compiler.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation;
 
 import com.oracle.svm.core.graal.llvm.replacements.LLVMIntrinsicNode.LLVMIntrinsicOperation;
 
diff --git a/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/replacements/LLVMIntrinsicNode.java b/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/replacements/LLVMIntrinsicNode.java
index 6b5532d84892..fa833879be70 100644
--- a/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/replacements/LLVMIntrinsicNode.java
+++ b/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/replacements/LLVMIntrinsicNode.java
@@ -24,12 +24,12 @@
  */
 package com.oracle.svm.core.graal.llvm.replacements;
 
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodes.spi.Canonicalizable;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.calc.FloatingNode;
-import jdk.compiler.graal.nodes.spi.ArithmeticLIRLowerable;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodes.spi.Canonicalizable;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.calc.FloatingNode;
+import jdk.graal.compiler.nodes.spi.ArithmeticLIRLowerable;
 
 import jdk.vm.ci.meta.JavaKind;
 
diff --git a/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/replacements/LLVMMaxNode.java b/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/replacements/LLVMMaxNode.java
index c863983009eb..e5d35d4206a4 100644
--- a/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/replacements/LLVMMaxNode.java
+++ b/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/replacements/LLVMMaxNode.java
@@ -24,12 +24,12 @@
  */
 package com.oracle.svm.core.graal.llvm.replacements;
 
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeCycles;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodeinfo.NodeSize;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.ValueNode;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeCycles;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodeinfo.NodeSize;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.ValueNode;
 
 import jdk.vm.ci.meta.JavaConstant;
 import jdk.vm.ci.meta.JavaKind;
diff --git a/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/replacements/LLVMMinNode.java b/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/replacements/LLVMMinNode.java
index ddc2b87ed5d1..e58e2fd81bc0 100644
--- a/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/replacements/LLVMMinNode.java
+++ b/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/replacements/LLVMMinNode.java
@@ -24,12 +24,12 @@
  */
 package com.oracle.svm.core.graal.llvm.replacements;
 
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeCycles;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodeinfo.NodeSize;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.ValueNode;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeCycles;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodeinfo.NodeSize;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.ValueNode;
 
 import jdk.vm.ci.meta.JavaConstant;
 import jdk.vm.ci.meta.JavaKind;
diff --git a/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/replacements/LLVMUnaryIntrinsicNode.java b/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/replacements/LLVMUnaryIntrinsicNode.java
index 1539ffa29a32..9131255fd7b1 100644
--- a/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/replacements/LLVMUnaryIntrinsicNode.java
+++ b/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/replacements/LLVMUnaryIntrinsicNode.java
@@ -24,16 +24,16 @@
  */
 package com.oracle.svm.core.graal.llvm.replacements;
 
-import static jdk.compiler.graal.debug.GraalError.shouldNotReachHereUnexpectedValue;
+import static jdk.graal.compiler.debug.GraalError.shouldNotReachHereUnexpectedValue;
 
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.lir.gen.ArithmeticLIRGeneratorTool;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.lir.gen.ArithmeticLIRGeneratorTool;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
 
 import jdk.vm.ci.meta.JavaConstant;
 import jdk.vm.ci.meta.JavaKind;
diff --git a/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/runtime/LLVMExceptionUnwind.java b/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/runtime/LLVMExceptionUnwind.java
index 9fe98a7e8008..534db288dddb 100644
--- a/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/runtime/LLVMExceptionUnwind.java
+++ b/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/runtime/LLVMExceptionUnwind.java
@@ -28,7 +28,7 @@
 
 import java.util.function.BooleanSupplier;
 
-import jdk.compiler.graal.core.common.NumUtil;
+import jdk.graal.compiler.core.common.NumUtil;
 import org.graalvm.nativeimage.CurrentIsolate;
 import org.graalvm.nativeimage.IsolateThread;
 import org.graalvm.nativeimage.c.CContext;
diff --git a/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/util/LLVMHelperFunctions.java b/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/util/LLVMHelperFunctions.java
index 57503a7341b6..c9c9ecd7f6db 100644
--- a/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/util/LLVMHelperFunctions.java
+++ b/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/util/LLVMHelperFunctions.java
@@ -29,7 +29,7 @@
 import com.oracle.svm.shadowed.org.bytedeco.llvm.LLVM.LLVMBasicBlockRef;
 import com.oracle.svm.shadowed.org.bytedeco.llvm.LLVM.LLVMTypeRef;
 import com.oracle.svm.shadowed.org.bytedeco.llvm.LLVM.LLVMValueRef;
-import jdk.compiler.graal.core.common.memory.MemoryOrderMode;
+import jdk.graal.compiler.core.common.memory.MemoryOrderMode;
 
 /*
  * These helper functions are used to hide the specific lowerings of some instructions
diff --git a/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/util/LLVMIRBuilder.java b/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/util/LLVMIRBuilder.java
index 3087e159fc6f..88f25daededc 100644
--- a/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/util/LLVMIRBuilder.java
+++ b/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/util/LLVMIRBuilder.java
@@ -30,16 +30,16 @@
 import static com.oracle.svm.core.graal.llvm.util.LLVMUtils.dumpTypes;
 import static com.oracle.svm.core.graal.llvm.util.LLVMUtils.dumpValues;
 import static com.oracle.svm.core.util.VMError.shouldNotReachHereUnexpectedInput;
-import static jdk.compiler.graal.debug.GraalError.shouldNotReachHere;
+import static jdk.graal.compiler.debug.GraalError.shouldNotReachHere;
 
 import java.util.Arrays;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
-import jdk.compiler.graal.core.common.NumUtil;
-import jdk.compiler.graal.core.common.calc.Condition;
-import jdk.compiler.graal.core.common.calc.FloatConvert;
-import jdk.compiler.graal.core.common.memory.MemoryOrderMode;
+import jdk.graal.compiler.core.common.NumUtil;
+import jdk.graal.compiler.core.common.calc.Condition;
+import jdk.graal.compiler.core.common.calc.FloatConvert;
+import jdk.graal.compiler.core.common.memory.MemoryOrderMode;
 
 import com.oracle.svm.core.FrameAccess;
 import com.oracle.svm.core.SubstrateOptions;
diff --git a/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/util/LLVMObjectFileReader.java b/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/util/LLVMObjectFileReader.java
index 6f2aabc9cb27..1fed6b3517fd 100644
--- a/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/util/LLVMObjectFileReader.java
+++ b/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/util/LLVMObjectFileReader.java
@@ -37,9 +37,9 @@
 import java.util.TreeMap;
 import java.util.stream.Collectors;
 
-import jdk.compiler.graal.code.CompilationResult;
-import jdk.compiler.graal.core.common.NumUtil;
-import jdk.compiler.graal.debug.GraalError;
+import jdk.graal.compiler.code.CompilationResult;
+import jdk.graal.compiler.core.common.NumUtil;
+import jdk.graal.compiler.debug.GraalError;
 
 import com.oracle.objectfile.ObjectFile;
 import com.oracle.objectfile.SectionName;
diff --git a/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/util/LLVMOptions.java b/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/util/LLVMOptions.java
index 46e38050f255..ddb55220445b 100644
--- a/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/util/LLVMOptions.java
+++ b/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/util/LLVMOptions.java
@@ -27,8 +27,8 @@
 import java.util.Arrays;
 import java.util.List;
 
-import jdk.compiler.graal.options.Option;
-import jdk.compiler.graal.options.OptionType;
+import jdk.graal.compiler.options.Option;
+import jdk.graal.compiler.options.OptionType;
 
 import com.oracle.svm.core.option.HostedOptionKey;
 
diff --git a/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/util/LLVMStackMapInfo.java b/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/util/LLVMStackMapInfo.java
index cbb8e31c0672..7f7b7c0685a1 100644
--- a/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/util/LLVMStackMapInfo.java
+++ b/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/util/LLVMStackMapInfo.java
@@ -32,7 +32,7 @@
 import java.util.Map;
 import java.util.Set;
 
-import jdk.compiler.graal.core.common.NumUtil;
+import jdk.graal.compiler.core.common.NumUtil;
 
 import com.oracle.svm.core.FrameAccess;
 import com.oracle.svm.core.util.VMError;
diff --git a/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/util/LLVMUtils.java b/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/util/LLVMUtils.java
index d7f4e7265114..b8df21cc2ee3 100644
--- a/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/util/LLVMUtils.java
+++ b/substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/util/LLVMUtils.java
@@ -25,15 +25,15 @@
 package com.oracle.svm.core.graal.llvm.util;
 
 import static com.oracle.svm.shadowed.org.bytedeco.llvm.global.LLVM.LLVMTypeOf;
-import static jdk.compiler.graal.debug.GraalError.shouldNotReachHere;
-import static jdk.compiler.graal.debug.GraalError.unimplementedOverride;
-
-import jdk.compiler.graal.core.common.LIRKind;
-import jdk.compiler.graal.core.common.NumUtil;
-import jdk.compiler.graal.core.common.spi.LIRKindTool;
-import jdk.compiler.graal.lir.ConstantValue;
-import jdk.compiler.graal.lir.Variable;
-import jdk.compiler.graal.lir.VirtualStackSlot;
+import static jdk.graal.compiler.debug.GraalError.shouldNotReachHere;
+import static jdk.graal.compiler.debug.GraalError.unimplementedOverride;
+
+import jdk.graal.compiler.core.common.LIRKind;
+import jdk.graal.compiler.core.common.NumUtil;
+import jdk.graal.compiler.core.common.spi.LIRKindTool;
+import jdk.graal.compiler.lir.ConstantValue;
+import jdk.graal.compiler.lir.Variable;
+import jdk.graal.compiler.lir.VirtualStackSlot;
 
 import com.oracle.svm.core.graal.llvm.LLVMGenerator;
 import com.oracle.svm.shadowed.org.bytedeco.llvm.LLVM.LLVMTypeRef;
diff --git a/substratevm/src/com.oracle.svm.core.graal.riscv64/src/com/oracle/svm/core/graal/riscv64/RISCV64ReservedRegisters.java b/substratevm/src/com.oracle.svm.core.graal.riscv64/src/com/oracle/svm/core/graal/riscv64/RISCV64ReservedRegisters.java
index 22e82fd5202c..173096911523 100644
--- a/substratevm/src/com.oracle.svm.core.graal.riscv64/src/com/oracle/svm/core/graal/riscv64/RISCV64ReservedRegisters.java
+++ b/substratevm/src/com.oracle.svm.core.graal.riscv64/src/com/oracle/svm/core/graal/riscv64/RISCV64ReservedRegisters.java
@@ -24,7 +24,7 @@
  */
 package com.oracle.svm.core.graal.riscv64;
 
-import jdk.compiler.graal.core.riscv64.ShadowedRISCV64;
+import jdk.graal.compiler.core.riscv64.ShadowedRISCV64;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
 
diff --git a/substratevm/src/com.oracle.svm.core.graal.riscv64/src/com/oracle/svm/core/graal/riscv64/SubstrateRISCV64Feature.java b/substratevm/src/com.oracle.svm.core.graal.riscv64/src/com/oracle/svm/core/graal/riscv64/SubstrateRISCV64Feature.java
index e5538553738d..bc3659f5a8e6 100644
--- a/substratevm/src/com.oracle.svm.core.graal.riscv64/src/com/oracle/svm/core/graal/riscv64/SubstrateRISCV64Feature.java
+++ b/substratevm/src/com.oracle.svm.core.graal.riscv64/src/com/oracle/svm/core/graal/riscv64/SubstrateRISCV64Feature.java
@@ -24,7 +24,7 @@
  */
 package com.oracle.svm.core.graal.riscv64;
 
-import jdk.compiler.graal.debug.GraalError;
+import jdk.graal.compiler.debug.GraalError;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
diff --git a/substratevm/src/com.oracle.svm.core.graal.riscv64/src/com/oracle/svm/core/graal/riscv64/SubstrateRISCV64RegisterConfig.java b/substratevm/src/com.oracle.svm.core.graal.riscv64/src/com/oracle/svm/core/graal/riscv64/SubstrateRISCV64RegisterConfig.java
index ca0116c7dd0b..8a53e953e516 100644
--- a/substratevm/src/com.oracle.svm.core.graal.riscv64/src/com/oracle/svm/core/graal/riscv64/SubstrateRISCV64RegisterConfig.java
+++ b/substratevm/src/com.oracle.svm.core.graal.riscv64/src/com/oracle/svm/core/graal/riscv64/SubstrateRISCV64RegisterConfig.java
@@ -27,51 +27,51 @@
 import static com.oracle.svm.core.util.VMError.intentionallyUnimplemented;
 import static com.oracle.svm.core.util.VMError.shouldNotReachHereUnexpectedInput;
 import static com.oracle.svm.core.util.VMError.unsupportedFeature;
-import static jdk.compiler.graal.core.riscv64.ShadowedRISCV64.allRegisters;
-import static jdk.compiler.graal.core.riscv64.ShadowedRISCV64.f10;
-import static jdk.compiler.graal.core.riscv64.ShadowedRISCV64.f11;
-import static jdk.compiler.graal.core.riscv64.ShadowedRISCV64.f12;
-import static jdk.compiler.graal.core.riscv64.ShadowedRISCV64.f13;
-import static jdk.compiler.graal.core.riscv64.ShadowedRISCV64.f14;
-import static jdk.compiler.graal.core.riscv64.ShadowedRISCV64.f15;
-import static jdk.compiler.graal.core.riscv64.ShadowedRISCV64.f16;
-import static jdk.compiler.graal.core.riscv64.ShadowedRISCV64.f17;
-import static jdk.compiler.graal.core.riscv64.ShadowedRISCV64.f18;
-import static jdk.compiler.graal.core.riscv64.ShadowedRISCV64.f19;
-import static jdk.compiler.graal.core.riscv64.ShadowedRISCV64.f20;
-import static jdk.compiler.graal.core.riscv64.ShadowedRISCV64.f21;
-import static jdk.compiler.graal.core.riscv64.ShadowedRISCV64.f22;
-import static jdk.compiler.graal.core.riscv64.ShadowedRISCV64.f23;
-import static jdk.compiler.graal.core.riscv64.ShadowedRISCV64.f24;
-import static jdk.compiler.graal.core.riscv64.ShadowedRISCV64.f25;
-import static jdk.compiler.graal.core.riscv64.ShadowedRISCV64.f26;
-import static jdk.compiler.graal.core.riscv64.ShadowedRISCV64.f27;
-import static jdk.compiler.graal.core.riscv64.ShadowedRISCV64.f8;
-import static jdk.compiler.graal.core.riscv64.ShadowedRISCV64.f9;
-import static jdk.compiler.graal.core.riscv64.ShadowedRISCV64.x0;
-import static jdk.compiler.graal.core.riscv64.ShadowedRISCV64.x1;
-import static jdk.compiler.graal.core.riscv64.ShadowedRISCV64.x10;
-import static jdk.compiler.graal.core.riscv64.ShadowedRISCV64.x11;
-import static jdk.compiler.graal.core.riscv64.ShadowedRISCV64.x12;
-import static jdk.compiler.graal.core.riscv64.ShadowedRISCV64.x13;
-import static jdk.compiler.graal.core.riscv64.ShadowedRISCV64.x14;
-import static jdk.compiler.graal.core.riscv64.ShadowedRISCV64.x15;
-import static jdk.compiler.graal.core.riscv64.ShadowedRISCV64.x16;
-import static jdk.compiler.graal.core.riscv64.ShadowedRISCV64.x17;
-import static jdk.compiler.graal.core.riscv64.ShadowedRISCV64.x18;
-import static jdk.compiler.graal.core.riscv64.ShadowedRISCV64.x19;
-import static jdk.compiler.graal.core.riscv64.ShadowedRISCV64.x2;
-import static jdk.compiler.graal.core.riscv64.ShadowedRISCV64.x20;
-import static jdk.compiler.graal.core.riscv64.ShadowedRISCV64.x21;
-import static jdk.compiler.graal.core.riscv64.ShadowedRISCV64.x22;
-import static jdk.compiler.graal.core.riscv64.ShadowedRISCV64.x23;
-import static jdk.compiler.graal.core.riscv64.ShadowedRISCV64.x24;
-import static jdk.compiler.graal.core.riscv64.ShadowedRISCV64.x25;
-import static jdk.compiler.graal.core.riscv64.ShadowedRISCV64.x26;
-import static jdk.compiler.graal.core.riscv64.ShadowedRISCV64.x27;
-import static jdk.compiler.graal.core.riscv64.ShadowedRISCV64.x3;
-import static jdk.compiler.graal.core.riscv64.ShadowedRISCV64.x8;
-import static jdk.compiler.graal.core.riscv64.ShadowedRISCV64.x9;
+import static jdk.graal.compiler.core.riscv64.ShadowedRISCV64.allRegisters;
+import static jdk.graal.compiler.core.riscv64.ShadowedRISCV64.f10;
+import static jdk.graal.compiler.core.riscv64.ShadowedRISCV64.f11;
+import static jdk.graal.compiler.core.riscv64.ShadowedRISCV64.f12;
+import static jdk.graal.compiler.core.riscv64.ShadowedRISCV64.f13;
+import static jdk.graal.compiler.core.riscv64.ShadowedRISCV64.f14;
+import static jdk.graal.compiler.core.riscv64.ShadowedRISCV64.f15;
+import static jdk.graal.compiler.core.riscv64.ShadowedRISCV64.f16;
+import static jdk.graal.compiler.core.riscv64.ShadowedRISCV64.f17;
+import static jdk.graal.compiler.core.riscv64.ShadowedRISCV64.f18;
+import static jdk.graal.compiler.core.riscv64.ShadowedRISCV64.f19;
+import static jdk.graal.compiler.core.riscv64.ShadowedRISCV64.f20;
+import static jdk.graal.compiler.core.riscv64.ShadowedRISCV64.f21;
+import static jdk.graal.compiler.core.riscv64.ShadowedRISCV64.f22;
+import static jdk.graal.compiler.core.riscv64.ShadowedRISCV64.f23;
+import static jdk.graal.compiler.core.riscv64.ShadowedRISCV64.f24;
+import static jdk.graal.compiler.core.riscv64.ShadowedRISCV64.f25;
+import static jdk.graal.compiler.core.riscv64.ShadowedRISCV64.f26;
+import static jdk.graal.compiler.core.riscv64.ShadowedRISCV64.f27;
+import static jdk.graal.compiler.core.riscv64.ShadowedRISCV64.f8;
+import static jdk.graal.compiler.core.riscv64.ShadowedRISCV64.f9;
+import static jdk.graal.compiler.core.riscv64.ShadowedRISCV64.x0;
+import static jdk.graal.compiler.core.riscv64.ShadowedRISCV64.x1;
+import static jdk.graal.compiler.core.riscv64.ShadowedRISCV64.x10;
+import static jdk.graal.compiler.core.riscv64.ShadowedRISCV64.x11;
+import static jdk.graal.compiler.core.riscv64.ShadowedRISCV64.x12;
+import static jdk.graal.compiler.core.riscv64.ShadowedRISCV64.x13;
+import static jdk.graal.compiler.core.riscv64.ShadowedRISCV64.x14;
+import static jdk.graal.compiler.core.riscv64.ShadowedRISCV64.x15;
+import static jdk.graal.compiler.core.riscv64.ShadowedRISCV64.x16;
+import static jdk.graal.compiler.core.riscv64.ShadowedRISCV64.x17;
+import static jdk.graal.compiler.core.riscv64.ShadowedRISCV64.x18;
+import static jdk.graal.compiler.core.riscv64.ShadowedRISCV64.x19;
+import static jdk.graal.compiler.core.riscv64.ShadowedRISCV64.x2;
+import static jdk.graal.compiler.core.riscv64.ShadowedRISCV64.x20;
+import static jdk.graal.compiler.core.riscv64.ShadowedRISCV64.x21;
+import static jdk.graal.compiler.core.riscv64.ShadowedRISCV64.x22;
+import static jdk.graal.compiler.core.riscv64.ShadowedRISCV64.x23;
+import static jdk.graal.compiler.core.riscv64.ShadowedRISCV64.x24;
+import static jdk.graal.compiler.core.riscv64.ShadowedRISCV64.x25;
+import static jdk.graal.compiler.core.riscv64.ShadowedRISCV64.x26;
+import static jdk.graal.compiler.core.riscv64.ShadowedRISCV64.x27;
+import static jdk.graal.compiler.core.riscv64.ShadowedRISCV64.x3;
+import static jdk.graal.compiler.core.riscv64.ShadowedRISCV64.x8;
+import static jdk.graal.compiler.core.riscv64.ShadowedRISCV64.x9;
 
 import java.util.ArrayList;
 
diff --git a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/PosixStat.java b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/PosixStat.java
index f6e3d2338b56..4d5cd8c42191 100644
--- a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/PosixStat.java
+++ b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/PosixStat.java
@@ -26,7 +26,7 @@
 
 import static org.graalvm.nativeimage.c.function.CFunction.Transition.NO_TRANSITION;
 
-import jdk.compiler.graal.api.replacements.Fold;
+import jdk.graal.compiler.api.replacements.Fold;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
 import org.graalvm.nativeimage.c.CContext;
diff --git a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/PosixSubstrateSigprofHandler.java b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/PosixSubstrateSigprofHandler.java
index 3659180dec83..b114dd354677 100644
--- a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/PosixSubstrateSigprofHandler.java
+++ b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/PosixSubstrateSigprofHandler.java
@@ -30,7 +30,7 @@
 
 import java.util.List;
 
-import jdk.compiler.graal.options.Option;
+import jdk.graal.compiler.options.Option;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
diff --git a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/PosixVMSemaphoreSupport.java b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/PosixVMSemaphoreSupport.java
index 3edf125ad980..08e4c32d65a4 100644
--- a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/PosixVMSemaphoreSupport.java
+++ b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/PosixVMSemaphoreSupport.java
@@ -25,7 +25,7 @@
 
 package com.oracle.svm.core.posix;
 
-import jdk.compiler.graal.api.replacements.Fold;
+import jdk.graal.compiler.api.replacements.Fold;
 import org.graalvm.nativeimage.ImageSingletons;
 
 import com.oracle.svm.core.Uninterruptible;
diff --git a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/PosixVirtualMemoryProvider.java b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/PosixVirtualMemoryProvider.java
index 85c0ef9a5915..cffcbbb4550d 100644
--- a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/PosixVirtualMemoryProvider.java
+++ b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/PosixVirtualMemoryProvider.java
@@ -39,7 +39,7 @@
 import static com.oracle.svm.core.posix.headers.Mman.NoTransitions.munmap;
 import static org.graalvm.word.WordFactory.nullPointer;
 
-import jdk.compiler.graal.word.Word;
+import jdk.graal.compiler.word.Word;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.c.type.WordPointer;
diff --git a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/jvmstat/PosixPerfMemoryProvider.java b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/jvmstat/PosixPerfMemoryProvider.java
index dbf7e52d2dfc..1942cde8ee0d 100644
--- a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/jvmstat/PosixPerfMemoryProvider.java
+++ b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/jvmstat/PosixPerfMemoryProvider.java
@@ -41,7 +41,7 @@
 
 import java.nio.ByteBuffer;
 
-import jdk.compiler.graal.core.common.NumUtil;
+import jdk.graal.compiler.core.common.NumUtil;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
diff --git a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/linux/DumpLinuxOSInfo.java b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/linux/DumpLinuxOSInfo.java
index 2d2990b88879..b4d403c9a245 100644
--- a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/linux/DumpLinuxOSInfo.java
+++ b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/linux/DumpLinuxOSInfo.java
@@ -24,7 +24,7 @@
  */
 package com.oracle.svm.core.posix.linux;
 
-import jdk.compiler.graal.core.common.NumUtil;
+import jdk.graal.compiler.core.common.NumUtil;
 import org.graalvm.nativeimage.StackValue;
 import org.graalvm.nativeimage.c.type.CCharPointer;
 import org.graalvm.word.Pointer;
diff --git a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/linux/LinuxImageHeapProvider.java b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/linux/LinuxImageHeapProvider.java
index 2b8bd1c83378..555a381ff406 100644
--- a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/linux/LinuxImageHeapProvider.java
+++ b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/linux/LinuxImageHeapProvider.java
@@ -38,7 +38,7 @@
 
 import java.util.concurrent.ThreadLocalRandom;
 
-import jdk.compiler.graal.word.Word;
+import jdk.graal.compiler.word.Word;
 import org.graalvm.nativeimage.StackValue;
 import org.graalvm.nativeimage.c.type.CCharPointer;
 import org.graalvm.nativeimage.c.type.WordPointer;
diff --git a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/pthread/PthreadConditionUtils.java b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/pthread/PthreadConditionUtils.java
index b89245281187..ee6507dd17ba 100644
--- a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/pthread/PthreadConditionUtils.java
+++ b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/pthread/PthreadConditionUtils.java
@@ -24,7 +24,7 @@
  */
 package com.oracle.svm.core.posix.pthread;
 
-import jdk.compiler.graal.api.replacements.Fold;
+import jdk.graal.compiler.api.replacements.Fold;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.StackValue;
 import org.graalvm.word.WordFactory;
diff --git a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/pthread/PthreadVMLockSupport.java b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/pthread/PthreadVMLockSupport.java
index a06f2f38f7e3..2889bdc72f10 100644
--- a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/pthread/PthreadVMLockSupport.java
+++ b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/pthread/PthreadVMLockSupport.java
@@ -26,7 +26,7 @@
 
 import static com.oracle.svm.core.heap.RestrictHeapAccess.Access.NO_ALLOCATION;
 
-import jdk.compiler.graal.api.replacements.Fold;
+import jdk.graal.compiler.api.replacements.Fold;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.LogHandler;
 import org.graalvm.nativeimage.Platform;
diff --git a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/riscv64/RISCV64LinuxUContextRegisterDumperFeature.java b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/riscv64/RISCV64LinuxUContextRegisterDumperFeature.java
index 0f332d2d9f19..145f692fffb9 100644
--- a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/riscv64/RISCV64LinuxUContextRegisterDumperFeature.java
+++ b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/riscv64/RISCV64LinuxUContextRegisterDumperFeature.java
@@ -26,7 +26,7 @@
 
 import static com.oracle.svm.core.RegisterDumper.dumpReg;
 
-import jdk.compiler.graal.core.riscv64.ShadowedRISCV64;
+import jdk.graal.compiler.core.riscv64.ShadowedRISCV64;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
 import org.graalvm.word.PointerBase;
diff --git a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/thread/PosixPlatformThreads.java b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/thread/PosixPlatformThreads.java
index 931ad7ec36f2..eca2a6bd717d 100644
--- a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/thread/PosixPlatformThreads.java
+++ b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/thread/PosixPlatformThreads.java
@@ -24,7 +24,7 @@
  */
 package com.oracle.svm.core.posix.thread;
 
-import jdk.compiler.graal.core.common.SuppressFBWarnings;
+import jdk.graal.compiler.core.common.SuppressFBWarnings;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.ObjectHandle;
 import org.graalvm.nativeimage.Platform;
diff --git a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/thread/PosixVMThreads.java b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/thread/PosixVMThreads.java
index 965e2f9abdf3..ec925304c015 100644
--- a/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/thread/PosixVMThreads.java
+++ b/substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/thread/PosixVMThreads.java
@@ -24,7 +24,7 @@
  */
 package com.oracle.svm.core.posix.thread;
 
-import jdk.compiler.graal.api.replacements.Fold;
+import jdk.graal.compiler.api.replacements.Fold;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.IsolateThread;
 import org.graalvm.nativeimage.Platform;
diff --git a/substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/WindowsVMLockSupport.java b/substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/WindowsVMLockSupport.java
index 4b59ff966141..9c20be302dc3 100644
--- a/substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/WindowsVMLockSupport.java
+++ b/substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/WindowsVMLockSupport.java
@@ -26,7 +26,7 @@
 
 import static com.oracle.svm.core.heap.RestrictHeapAccess.Access.NO_ALLOCATION;
 
-import jdk.compiler.graal.api.replacements.Fold;
+import jdk.graal.compiler.api.replacements.Fold;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.LogHandler;
 import org.graalvm.nativeimage.Platform;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/CPUFeatureAccess.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/CPUFeatureAccess.java
index 05292f3b8227..6f9ba44571ea 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/CPUFeatureAccess.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/CPUFeatureAccess.java
@@ -26,7 +26,7 @@
 
 import java.util.EnumSet;
 
-import jdk.compiler.graal.api.replacements.Fold;
+import jdk.graal.compiler.api.replacements.Fold;
 import org.graalvm.nativeimage.ImageSingletons;
 
 import jdk.vm.ci.code.Architecture;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/CPUFeatureAccessImpl.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/CPUFeatureAccessImpl.java
index 8531df7dafe4..70226c74f38b 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/CPUFeatureAccessImpl.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/CPUFeatureAccessImpl.java
@@ -27,7 +27,7 @@
 import java.util.EnumSet;
 import java.util.List;
 
-import jdk.compiler.graal.debug.GraalError;
+import jdk.graal.compiler.debug.GraalError;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/CalleeSavedRegisters.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/CalleeSavedRegisters.java
index 887a386652ba..7f4f3696abc0 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/CalleeSavedRegisters.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/CalleeSavedRegisters.java
@@ -27,7 +27,7 @@
 import java.util.List;
 import java.util.Map;
 
-import jdk.compiler.graal.api.replacements.Fold;
+import jdk.graal.compiler.api.replacements.Fold;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/Containers.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/Containers.java
index 3cc242eb4185..c4491fae652a 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/Containers.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/Containers.java
@@ -26,7 +26,7 @@
 
 import static com.oracle.svm.core.Containers.Options.UseContainerSupport;
 
-import jdk.compiler.graal.options.Option;
+import jdk.graal.compiler.options.Option;
 import org.graalvm.nativeimage.Platform;
 
 import com.oracle.svm.core.jdk.Jvm;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/DebugHelper.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/DebugHelper.java
index e172be11fa70..512a98c54857 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/DebugHelper.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/DebugHelper.java
@@ -26,7 +26,7 @@
 
 import java.util.function.BooleanSupplier;
 
-import jdk.compiler.graal.word.Word;
+import jdk.graal.compiler.word.Word;
 import org.graalvm.nativeimage.IsolateThread;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/FallbackExecutor.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/FallbackExecutor.java
index b27a6fa18789..a0882f849811 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/FallbackExecutor.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/FallbackExecutor.java
@@ -33,7 +33,7 @@
 import java.util.Arrays;
 import java.util.List;
 
-import jdk.compiler.graal.options.Option;
+import jdk.graal.compiler.options.Option;
 import org.graalvm.nativeimage.ImageInfo;
 import org.graalvm.nativeimage.ProcessProperties;
 
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/FrameAccess.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/FrameAccess.java
index c6860de65177..c85777e549c8 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/FrameAccess.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/FrameAccess.java
@@ -24,9 +24,9 @@
  */
 package com.oracle.svm.core;
 
-import jdk.compiler.graal.api.replacements.Fold;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.core.common.type.StampFactory;
+import jdk.graal.compiler.api.replacements.Fold;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.core.common.type.StampFactory;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.c.function.CodePointer;
 import org.graalvm.word.Pointer;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/IsolateArgumentParser.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/IsolateArgumentParser.java
index f0df2c40153c..4ded2d09e487 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/IsolateArgumentParser.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/IsolateArgumentParser.java
@@ -28,7 +28,7 @@
 import java.nio.ByteOrder;
 import java.nio.charset.StandardCharsets;
 
-import jdk.compiler.graal.api.replacements.Fold;
+import jdk.graal.compiler.api.replacements.Fold;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/IsolateListenerSupport.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/IsolateListenerSupport.java
index 7094fd543843..ef08c40d253c 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/IsolateListenerSupport.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/IsolateListenerSupport.java
@@ -26,7 +26,7 @@
 
 import java.util.Arrays;
 
-import jdk.compiler.graal.api.replacements.Fold;
+import jdk.graal.compiler.api.replacements.Fold;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Isolate;
 import org.graalvm.nativeimage.Platform;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/Isolates.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/Isolates.java
index 7659e078330d..1723b3fcba9d 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/Isolates.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/Isolates.java
@@ -24,7 +24,7 @@
  */
 package com.oracle.svm.core;
 
-import jdk.compiler.graal.word.Word;
+import jdk.graal.compiler.word.Word;
 import org.graalvm.nativeimage.Isolate;
 import org.graalvm.nativeimage.StackValue;
 import org.graalvm.nativeimage.c.type.WordPointer;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/JavaMainWrapper.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/JavaMainWrapper.java
index a30d83bffe84..f7802cf87943 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/JavaMainWrapper.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/JavaMainWrapper.java
@@ -35,7 +35,7 @@
 import java.util.List;
 import java.util.function.BooleanSupplier;
 
-import jdk.compiler.graal.word.Word;
+import jdk.graal.compiler.word.Word;
 import org.graalvm.nativeimage.CurrentIsolate;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Isolate;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/JavaMemoryUtil.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/JavaMemoryUtil.java
index 36830236f3dd..544206ce9509 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/JavaMemoryUtil.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/JavaMemoryUtil.java
@@ -24,8 +24,8 @@
  */
 package com.oracle.svm.core;
 
-import jdk.compiler.graal.word.BarrieredAccess;
-import jdk.compiler.graal.word.Word;
+import jdk.graal.compiler.word.BarrieredAccess;
+import jdk.graal.compiler.word.Word;
 import org.graalvm.word.Pointer;
 import org.graalvm.word.UnsignedWord;
 import org.graalvm.word.WordFactory;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/LinkToNativeSupport.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/LinkToNativeSupport.java
index 0f410bda4082..000664d0c3ea 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/LinkToNativeSupport.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/LinkToNativeSupport.java
@@ -24,7 +24,7 @@
  */
 package com.oracle.svm.core;
 
-import jdk.compiler.graal.api.replacements.Fold;
+import jdk.graal.compiler.api.replacements.Fold;
 import org.graalvm.nativeimage.ImageSingletons;
 
 public interface LinkToNativeSupport {
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/MissingRegistrationSupport.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/MissingRegistrationSupport.java
index e08c7905eff1..85f79376f6d2 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/MissingRegistrationSupport.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/MissingRegistrationSupport.java
@@ -24,7 +24,7 @@
  */
 package com.oracle.svm.core;
 
-import jdk.compiler.graal.api.replacements.Fold;
+import jdk.graal.compiler.api.replacements.Fold;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/NativeImageClassLoaderOptions.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/NativeImageClassLoaderOptions.java
index e034ad2f7129..59526e7c292c 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/NativeImageClassLoaderOptions.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/NativeImageClassLoaderOptions.java
@@ -24,7 +24,7 @@
  */
 package com.oracle.svm.core;
 
-import jdk.compiler.graal.options.Option;
+import jdk.graal.compiler.options.Option;
 
 import com.oracle.svm.core.option.APIOption;
 import com.oracle.svm.core.option.HostedOptionKey;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/Processor.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/Processor.java
index 6700c25544a5..030c30fd660d 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/Processor.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/Processor.java
@@ -24,7 +24,7 @@
  */
 package com.oracle.svm.core;
 
-import jdk.compiler.graal.api.replacements.Fold;
+import jdk.graal.compiler.api.replacements.Fold;
 import org.graalvm.nativeimage.ImageSingletons;
 
 import com.oracle.svm.core.feature.AutomaticallyRegisteredImageSingleton;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/ReservedRegisters.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/ReservedRegisters.java
index 70b96f5b8441..9a1c4b4a7480 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/ReservedRegisters.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/ReservedRegisters.java
@@ -24,7 +24,7 @@
  */
 package com.oracle.svm.core;
 
-import jdk.compiler.graal.api.replacements.Fold;
+import jdk.graal.compiler.api.replacements.Fold;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Isolate;
 import org.graalvm.nativeimage.IsolateThread;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/RuntimeAssertionsSupport.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/RuntimeAssertionsSupport.java
index 53c2d37b6fcf..ecbae3951a4f 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/RuntimeAssertionsSupport.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/RuntimeAssertionsSupport.java
@@ -29,8 +29,8 @@
 import java.util.StringJoiner;
 import java.util.function.Function;
 
-import jdk.compiler.graal.api.replacements.Fold;
-import jdk.compiler.graal.options.Option;
+import jdk.graal.compiler.api.replacements.Fold;
+import jdk.graal.compiler.options.Option;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/StaticFieldsSupport.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/StaticFieldsSupport.java
index 3143f94e5f48..efd44faca958 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/StaticFieldsSupport.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/StaticFieldsSupport.java
@@ -24,24 +24,24 @@
  */
 package com.oracle.svm.core;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_0;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_1;
 
 import java.util.Objects;
 
-import jdk.compiler.graal.api.replacements.SnippetReflectionProvider;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.calc.FloatingNode;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin.RequiredInvocationPlugin;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins.Registration;
-import jdk.compiler.graal.nodes.spi.Lowerable;
-import jdk.compiler.graal.nodes.spi.LoweringTool;
-import jdk.compiler.graal.phases.util.Providers;
+import jdk.graal.compiler.api.replacements.SnippetReflectionProvider;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.calc.FloatingNode;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin.RequiredInvocationPlugin;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins.Registration;
+import jdk.graal.compiler.nodes.spi.Lowerable;
+import jdk.graal.compiler.nodes.spi.LoweringTool;
+import jdk.graal.compiler.phases.util.Providers;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateControlFlowIntegrity.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateControlFlowIntegrity.java
index a8a35006c199..60747f40f961 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateControlFlowIntegrity.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateControlFlowIntegrity.java
@@ -24,7 +24,7 @@
  */
 package com.oracle.svm.core;
 
-import jdk.compiler.graal.api.replacements.Fold;
+import jdk.graal.compiler.api.replacements.Fold;
 import org.graalvm.nativeimage.ImageSingletons;
 
 public interface SubstrateControlFlowIntegrity {
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateDiagnostics.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateDiagnostics.java
index 32fac8e9492c..0498fcbf22d5 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateDiagnostics.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateDiagnostics.java
@@ -30,16 +30,16 @@
 import java.util.Arrays;
 
 import org.graalvm.collections.EconomicMap;
-import jdk.compiler.graal.api.replacements.Fold;
-import jdk.compiler.graal.core.common.NumUtil;
-import jdk.compiler.graal.core.common.SuppressFBWarnings;
-import jdk.compiler.graal.nodes.PauseNode;
-import jdk.compiler.graal.nodes.java.ArrayLengthNode;
-import jdk.compiler.graal.options.Option;
-import jdk.compiler.graal.options.OptionKey;
-import jdk.compiler.graal.options.OptionType;
-import jdk.compiler.graal.word.ObjectAccess;
-import jdk.compiler.graal.word.Word;
+import jdk.graal.compiler.api.replacements.Fold;
+import jdk.graal.compiler.core.common.NumUtil;
+import jdk.graal.compiler.core.common.SuppressFBWarnings;
+import jdk.graal.compiler.nodes.PauseNode;
+import jdk.graal.compiler.nodes.java.ArrayLengthNode;
+import jdk.graal.compiler.options.Option;
+import jdk.graal.compiler.options.OptionKey;
+import jdk.graal.compiler.options.OptionType;
+import jdk.graal.compiler.word.ObjectAccess;
+import jdk.graal.compiler.word.Word;
 import org.graalvm.nativeimage.CurrentIsolate;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.IsolateThread;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateGCOptions.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateGCOptions.java
index ee722e69d9a2..a5af0e99fa82 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateGCOptions.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateGCOptions.java
@@ -27,9 +27,9 @@
 import static com.oracle.svm.core.option.RuntimeOptionKey.RuntimeOptionKeyFlag.Immutable;
 
 import org.graalvm.collections.EconomicMap;
-import jdk.compiler.graal.options.Option;
-import jdk.compiler.graal.options.OptionKey;
-import jdk.compiler.graal.options.OptionType;
+import jdk.graal.compiler.options.Option;
+import jdk.graal.compiler.options.OptionKey;
+import jdk.graal.compiler.options.OptionType;
 import org.graalvm.word.WordFactory;
 
 import com.oracle.svm.core.heap.HeapSizeVerifier;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateOptions.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateOptions.java
index f60ca0c817fe..2948aacaa928 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateOptions.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateOptions.java
@@ -26,10 +26,10 @@
 
 import static com.oracle.svm.core.option.RuntimeOptionKey.RuntimeOptionKeyFlag.Immutable;
 import static com.oracle.svm.core.option.RuntimeOptionKey.RuntimeOptionKeyFlag.RelevantForCompilationIsolates;
-import static jdk.compiler.graal.core.common.SpectrePHTMitigations.None;
-import static jdk.compiler.graal.core.common.SpectrePHTMitigations.Options.SpectrePHTBarriers;
-import static jdk.compiler.graal.options.OptionType.Expert;
-import static jdk.compiler.graal.options.OptionType.User;
+import static jdk.graal.compiler.core.common.SpectrePHTMitigations.None;
+import static jdk.graal.compiler.core.common.SpectrePHTMitigations.Options.SpectrePHTBarriers;
+import static jdk.graal.compiler.options.OptionType.Expert;
+import static jdk.graal.compiler.options.OptionType.User;
 
 import java.nio.file.InvalidPathException;
 import java.nio.file.Path;
@@ -62,13 +62,13 @@
 import com.oracle.svm.util.ModuleSupport;
 import com.oracle.svm.util.ReflectionUtil;
 
-import jdk.compiler.graal.api.replacements.Fold;
-import jdk.compiler.graal.core.common.GraalOptions;
-import jdk.compiler.graal.options.Option;
-import jdk.compiler.graal.options.OptionKey;
-import jdk.compiler.graal.options.OptionStability;
-import jdk.compiler.graal.options.OptionType;
-import jdk.compiler.graal.options.OptionValues;
+import jdk.graal.compiler.api.replacements.Fold;
+import jdk.graal.compiler.core.common.GraalOptions;
+import jdk.graal.compiler.options.Option;
+import jdk.graal.compiler.options.OptionKey;
+import jdk.graal.compiler.options.OptionStability;
+import jdk.graal.compiler.options.OptionType;
+import jdk.graal.compiler.options.OptionValues;
 import jdk.internal.misc.Unsafe;
 
 public class SubstrateOptions {
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateSegfaultHandler.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateSegfaultHandler.java
index 43560d5f96f0..eceac20c2bc7 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateSegfaultHandler.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateSegfaultHandler.java
@@ -29,8 +29,8 @@
 import java.util.Collections;
 import java.util.List;
 
-import jdk.compiler.graal.api.replacements.Fold;
-import jdk.compiler.graal.options.Option;
+import jdk.graal.compiler.api.replacements.Fold;
+import jdk.graal.compiler.options.Option;
 import org.graalvm.nativeimage.CurrentIsolate;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Isolate;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateUtil.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateUtil.java
index c847d9cd3938..c565552cab19 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateUtil.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateUtil.java
@@ -37,9 +37,9 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import jdk.compiler.graal.graph.Node.NodeIntrinsic;
-import jdk.compiler.graal.java.LambdaUtils;
-import jdk.compiler.graal.nodes.BreakpointNode;
+import jdk.graal.compiler.graph.Node.NodeIntrinsic;
+import jdk.graal.compiler.java.LambdaUtils;
+import jdk.graal.compiler.nodes.BreakpointNode;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
 import org.graalvm.nativeimage.c.type.CCharPointer;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/Uninterruptible.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/Uninterruptible.java
index b63724c0e21c..80f7139777aa 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/Uninterruptible.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/Uninterruptible.java
@@ -32,7 +32,7 @@
 import java.lang.reflect.Executable;
 import java.util.Objects;
 
-import jdk.compiler.graal.api.replacements.Fold;
+import jdk.graal.compiler.api.replacements.Fold;
 import org.graalvm.nativeimage.AnnotationAccess;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/VMInspectionOptions.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/VMInspectionOptions.java
index 64dc7fe5fba6..bf1d2a4e5946 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/VMInspectionOptions.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/VMInspectionOptions.java
@@ -30,10 +30,10 @@
 import java.util.Set;
 
 import org.graalvm.collections.EconomicMap;
-import jdk.compiler.graal.api.replacements.Fold;
-import jdk.compiler.graal.options.Option;
-import jdk.compiler.graal.options.OptionKey;
-import jdk.compiler.graal.options.OptionType;
+import jdk.graal.compiler.api.replacements.Fold;
+import jdk.graal.compiler.options.Option;
+import jdk.graal.compiler.options.OptionKey;
+import jdk.graal.compiler.options.OptionType;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platform.WINDOWS;
 import org.graalvm.nativeimage.Platforms;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/WeakIdentityHashMap.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/WeakIdentityHashMap.java
index 8ee2d5e511c5..4d74a37108af 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/WeakIdentityHashMap.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/WeakIdentityHashMap.java
@@ -28,7 +28,7 @@
 package com.oracle.svm.core;
 
 import com.oracle.svm.core.heap.ReferenceInternals;
-import jdk.compiler.graal.core.common.SuppressFBWarnings;
+import jdk.graal.compiler.core.common.SuppressFBWarnings;
 
 import java.lang.ref.ReferenceQueue;
 import java.lang.ref.WeakReference;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/aarch64/AArch64FrameAccess.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/aarch64/AArch64FrameAccess.java
index 193f37412996..e7faadf68dd1 100755
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/aarch64/AArch64FrameAccess.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/aarch64/AArch64FrameAccess.java
@@ -24,7 +24,7 @@
  */
 package com.oracle.svm.core.aarch64;
 
-import jdk.compiler.graal.api.replacements.Fold;
+import jdk.graal.compiler.api.replacements.Fold;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
 import org.graalvm.nativeimage.c.function.CodePointer;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/allocationprofile/AllocationSite.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/allocationprofile/AllocationSite.java
index 0c885461e0ce..63fa85fba2f0 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/allocationprofile/AllocationSite.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/allocationprofile/AllocationSite.java
@@ -33,7 +33,7 @@
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.atomic.AtomicReference;
 
-import jdk.compiler.graal.options.Option;
+import jdk.graal.compiler.options.Option;
 import org.graalvm.nativeimage.hosted.Feature;
 
 import com.oracle.svm.core.feature.AutomaticallyRegisteredFeature;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/amd64/AMD64FrameAccess.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/amd64/AMD64FrameAccess.java
index 944488efb5e1..23a29ae54ff6 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/amd64/AMD64FrameAccess.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/amd64/AMD64FrameAccess.java
@@ -24,7 +24,7 @@
  */
 package com.oracle.svm.core.amd64;
 
-import jdk.compiler.graal.api.replacements.Fold;
+import jdk.graal.compiler.api.replacements.Fold;
 import org.graalvm.nativeimage.Platform.AMD64;
 import org.graalvm.nativeimage.Platforms;
 import org.graalvm.nativeimage.c.function.CodePointer;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/c/CIsolateDataStorage.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/c/CIsolateDataStorage.java
index f97d0a3d69f8..e89b2ebb7562 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/c/CIsolateDataStorage.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/c/CIsolateDataStorage.java
@@ -32,8 +32,8 @@
 import com.oracle.svm.core.util.UnsignedUtils;
 import com.oracle.svm.core.util.VMError;
 
-import jdk.compiler.graal.api.replacements.Fold;
-import jdk.compiler.graal.word.Word;
+import jdk.graal.compiler.api.replacements.Fold;
+import jdk.graal.compiler.word.Word;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/c/NonmovableArrays.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/c/NonmovableArrays.java
index 2b06f8f55382..05a11db9ecf5 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/c/NonmovableArrays.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/c/NonmovableArrays.java
@@ -28,8 +28,8 @@
 import java.nio.ByteBuffer;
 import java.util.Arrays;
 
-import jdk.compiler.graal.nodes.java.ArrayLengthNode;
-import jdk.compiler.graal.word.Word;
+import jdk.graal.compiler.nodes.java.ArrayLengthNode;
+import jdk.graal.compiler.word.Word;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/c/UnmanagedPrimitiveArrays.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/c/UnmanagedPrimitiveArrays.java
index 5a1855d08a3c..a23112ad2cce 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/c/UnmanagedPrimitiveArrays.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/c/UnmanagedPrimitiveArrays.java
@@ -35,8 +35,8 @@
 import com.oracle.svm.core.snippets.KnownIntrinsics;
 import com.oracle.svm.core.util.VMError;
 
-import jdk.compiler.graal.nodes.java.ArrayLengthNode;
-import jdk.compiler.graal.word.Word;
+import jdk.graal.compiler.nodes.java.ArrayLengthNode;
+import jdk.graal.compiler.word.Word;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.impl.UnmanagedMemorySupport;
 import org.graalvm.word.Pointer;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/c/enums/EnumArrayLookup.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/c/enums/EnumArrayLookup.java
index 8a6cd3084533..16953838b8f1 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/c/enums/EnumArrayLookup.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/c/enums/EnumArrayLookup.java
@@ -24,7 +24,7 @@
  */
 package com.oracle.svm.core.c.enums;
 
-import jdk.compiler.graal.core.common.calc.UnsignedMath;
+import jdk.graal.compiler.core.common.calc.UnsignedMath;
 
 public class EnumArrayLookup extends EnumRuntimeData {
 
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/c/function/CEntryPointSetup.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/c/function/CEntryPointSetup.java
index 302a0adcb3f2..d2ba340e2463 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/c/function/CEntryPointSetup.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/c/function/CEntryPointSetup.java
@@ -24,7 +24,7 @@
  */
 package com.oracle.svm.core.c.function;
 
-import jdk.compiler.graal.word.Word;
+import jdk.graal.compiler.word.Word;
 import org.graalvm.nativeimage.Isolate;
 import org.graalvm.nativeimage.IsolateThread;
 import org.graalvm.nativeimage.c.type.CCharPointer;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/c/libc/LibCBase.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/c/libc/LibCBase.java
index e335538536ed..652d9ebffdef 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/c/libc/LibCBase.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/c/libc/LibCBase.java
@@ -24,7 +24,7 @@
  */
 package com.oracle.svm.core.c.libc;
 
-import jdk.compiler.graal.api.replacements.Fold;
+import jdk.graal.compiler.api.replacements.Fold;
 import org.graalvm.nativeimage.ImageSingletons;
 
 public interface LibCBase {
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/classinitialization/EnsureClassInitializedNode.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/classinitialization/EnsureClassInitializedNode.java
index b0809437d453..f177a07b4278 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/classinitialization/EnsureClassInitializedNode.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/classinitialization/EnsureClassInitializedNode.java
@@ -24,24 +24,24 @@
  */
 package com.oracle.svm.core.classinitialization;
 
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.Node.NodeIntrinsicFactory;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.InputType;
-import jdk.compiler.graal.nodeinfo.NodeCycles;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodeinfo.NodeSize;
-import jdk.compiler.graal.nodes.FrameState;
-import jdk.compiler.graal.nodes.StateSplit;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.WithExceptionNode;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext;
-import jdk.compiler.graal.nodes.memory.SingleMemoryKill;
-import jdk.compiler.graal.nodes.spi.Canonicalizable;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodes.spi.Lowerable;
-import jdk.compiler.graal.nodes.type.StampTool;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.Node.NodeIntrinsicFactory;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.InputType;
+import jdk.graal.compiler.nodeinfo.NodeCycles;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodeinfo.NodeSize;
+import jdk.graal.compiler.nodes.FrameState;
+import jdk.graal.compiler.nodes.StateSplit;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.WithExceptionNode;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext;
+import jdk.graal.compiler.nodes.memory.SingleMemoryKill;
+import jdk.graal.compiler.nodes.spi.Canonicalizable;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodes.spi.Lowerable;
+import jdk.graal.compiler.nodes.type.StampTool;
 import org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.meta.ConstantReflectionProvider;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/classinitialization/EnsureClassInitializedSnippets.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/classinitialization/EnsureClassInitializedSnippets.java
index d62b3a790838..8a904e23c1a4 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/classinitialization/EnsureClassInitializedSnippets.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/classinitialization/EnsureClassInitializedSnippets.java
@@ -26,21 +26,21 @@
 
 import java.util.Map;
 
-import jdk.compiler.graal.api.replacements.Snippet;
-import jdk.compiler.graal.core.common.spi.ForeignCallDescriptor;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.Node.ConstantNodeParameter;
-import jdk.compiler.graal.graph.Node.NodeIntrinsic;
-import jdk.compiler.graal.nodes.PiNode;
-import jdk.compiler.graal.nodes.SnippetAnchorNode;
-import jdk.compiler.graal.nodes.extended.BranchProbabilityNode;
-import jdk.compiler.graal.nodes.spi.LoweringTool;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.util.Providers;
-import jdk.compiler.graal.replacements.SnippetTemplate;
-import jdk.compiler.graal.replacements.SnippetTemplate.Arguments;
-import jdk.compiler.graal.replacements.SnippetTemplate.SnippetInfo;
-import jdk.compiler.graal.replacements.Snippets;
+import jdk.graal.compiler.api.replacements.Snippet;
+import jdk.graal.compiler.core.common.spi.ForeignCallDescriptor;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.Node.ConstantNodeParameter;
+import jdk.graal.compiler.graph.Node.NodeIntrinsic;
+import jdk.graal.compiler.nodes.PiNode;
+import jdk.graal.compiler.nodes.SnippetAnchorNode;
+import jdk.graal.compiler.nodes.extended.BranchProbabilityNode;
+import jdk.graal.compiler.nodes.spi.LoweringTool;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.util.Providers;
+import jdk.graal.compiler.replacements.SnippetTemplate;
+import jdk.graal.compiler.replacements.SnippetTemplate.Arguments;
+import jdk.graal.compiler.replacements.SnippetTemplate.SnippetInfo;
+import jdk.graal.compiler.replacements.Snippets;
 import org.graalvm.word.LocationIdentity;
 
 import com.oracle.svm.core.graal.nodes.ForeignCallWithExceptionNode;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/CodeInfoAccess.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/CodeInfoAccess.java
index a624d9e5022f..5cb0ab8249c8 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/CodeInfoAccess.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/CodeInfoAccess.java
@@ -24,7 +24,7 @@
  */
 package com.oracle.svm.core.code;
 
-import jdk.compiler.graal.api.replacements.Fold;
+import jdk.graal.compiler.api.replacements.Fold;
 import org.graalvm.nativeimage.c.function.CodePointer;
 import org.graalvm.nativeimage.c.struct.SizeOf;
 import org.graalvm.word.UnsignedWord;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/CodeInfoDecoder.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/CodeInfoDecoder.java
index 1dbf1e6f5da2..b2b870877aec 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/CodeInfoDecoder.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/CodeInfoDecoder.java
@@ -26,9 +26,9 @@
 
 import static com.oracle.svm.core.util.VMError.shouldNotReachHereUnexpectedInput;
 
-import jdk.compiler.graal.api.replacements.Fold;
-import jdk.compiler.graal.core.common.util.TypeConversion;
-import jdk.compiler.graal.options.Option;
+import jdk.graal.compiler.api.replacements.Fold;
+import jdk.graal.compiler.core.common.util.TypeConversion;
+import jdk.graal.compiler.options.Option;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/CodeInfoEncoder.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/CodeInfoEncoder.java
index 6865acf7371e..2c605cf59697 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/CodeInfoEncoder.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/CodeInfoEncoder.java
@@ -31,12 +31,12 @@
 
 import org.graalvm.collections.EconomicSet;
 import org.graalvm.collections.Equivalence;
-import jdk.compiler.graal.code.CompilationResult;
-import jdk.compiler.graal.core.common.NumUtil;
-import jdk.compiler.graal.core.common.util.FrequencyEncoder;
-import jdk.compiler.graal.core.common.util.TypeConversion;
-import jdk.compiler.graal.core.common.util.UnsafeArrayTypeWriter;
-import jdk.compiler.graal.options.Option;
+import jdk.graal.compiler.code.CompilationResult;
+import jdk.graal.compiler.core.common.NumUtil;
+import jdk.graal.compiler.core.common.util.FrequencyEncoder;
+import jdk.graal.compiler.core.common.util.TypeConversion;
+import jdk.graal.compiler.core.common.util.UnsafeArrayTypeWriter;
+import jdk.graal.compiler.options.Option;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.word.Pointer;
 import org.graalvm.word.UnsignedWord;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/CodeInfoImpl.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/CodeInfoImpl.java
index 3bd92622e2e0..d3abe8b94d8d 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/CodeInfoImpl.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/CodeInfoImpl.java
@@ -24,7 +24,7 @@
  */
 package com.oracle.svm.core.code;
 
-import jdk.compiler.graal.word.Word;
+import jdk.graal.compiler.word.Word;
 import org.graalvm.nativeimage.c.function.CodePointer;
 import org.graalvm.nativeimage.c.struct.RawField;
 import org.graalvm.nativeimage.c.struct.RawFieldOffset;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/CodeInfoTable.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/CodeInfoTable.java
index 0d6a1ffc6b63..de6af4e6540a 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/CodeInfoTable.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/CodeInfoTable.java
@@ -29,8 +29,8 @@
 import java.util.Arrays;
 import java.util.List;
 
-import jdk.compiler.graal.api.replacements.Fold;
-import jdk.compiler.graal.options.Option;
+import jdk.graal.compiler.api.replacements.Fold;
+import jdk.graal.compiler.options.Option;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.c.function.CodePointer;
 import org.graalvm.nativeimage.hosted.Feature;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/CompilationResultFrameTree.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/CompilationResultFrameTree.java
index e7d69de5694f..c6483298f972 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/CompilationResultFrameTree.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/CompilationResultFrameTree.java
@@ -31,9 +31,9 @@
 import java.util.List;
 import java.util.function.Consumer;
 
-import jdk.compiler.graal.code.CompilationResult;
-import jdk.compiler.graal.code.SourceMapping;
-import jdk.compiler.graal.debug.DebugContext;
+import jdk.graal.compiler.code.CompilationResult;
+import jdk.graal.compiler.code.SourceMapping;
+import jdk.graal.compiler.debug.DebugContext;
 
 import com.oracle.svm.core.util.VMError;
 
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/DeoptimizationSourcePositionDecoder.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/DeoptimizationSourcePositionDecoder.java
index 37a233320d8b..1c2c6014bb65 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/DeoptimizationSourcePositionDecoder.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/DeoptimizationSourcePositionDecoder.java
@@ -24,7 +24,7 @@
  */
 package com.oracle.svm.core.code;
 
-import jdk.compiler.graal.graph.NodeSourcePosition;
+import jdk.graal.compiler.graph.NodeSourcePosition;
 import org.graalvm.nativeimage.c.function.CodePointer;
 
 import com.oracle.svm.core.Uninterruptible;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/DeoptimizationSourcePositionEncoder.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/DeoptimizationSourcePositionEncoder.java
index cc9c14119446..5c77dc245957 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/DeoptimizationSourcePositionEncoder.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/DeoptimizationSourcePositionEncoder.java
@@ -29,10 +29,10 @@
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.EconomicSet;
 import org.graalvm.collections.Equivalence;
-import jdk.compiler.graal.core.common.util.FrequencyEncoder;
-import jdk.compiler.graal.core.common.util.TypeConversion;
-import jdk.compiler.graal.core.common.util.UnsafeArrayTypeWriter;
-import jdk.compiler.graal.graph.NodeSourcePosition;
+import jdk.graal.compiler.core.common.util.FrequencyEncoder;
+import jdk.graal.compiler.core.common.util.TypeConversion;
+import jdk.graal.compiler.core.common.util.UnsafeArrayTypeWriter;
+import jdk.graal.compiler.graph.NodeSourcePosition;
 
 import com.oracle.svm.core.Uninterruptible;
 import com.oracle.svm.core.c.NonmovableArray;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/DynamicMethodAddressResolutionHeapSupport.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/DynamicMethodAddressResolutionHeapSupport.java
index 4bd9a7cb552d..6080aa77ceb5 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/DynamicMethodAddressResolutionHeapSupport.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/DynamicMethodAddressResolutionHeapSupport.java
@@ -26,7 +26,7 @@
 
 import static com.oracle.svm.core.util.PointerUtils.roundUp;
 
-import jdk.compiler.graal.api.replacements.Fold;
+import jdk.graal.compiler.api.replacements.Fold;
 import org.graalvm.nativeimage.CurrentIsolate;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.word.Pointer;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/FrameInfoDecoder.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/FrameInfoDecoder.java
index b619097861af..1a20fbc4bbc3 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/FrameInfoDecoder.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/FrameInfoDecoder.java
@@ -28,8 +28,8 @@
 
 import java.util.Arrays;
 
-import jdk.compiler.graal.core.common.util.TypeConversion;
-import jdk.compiler.graal.nodes.FrameState;
+import jdk.graal.compiler.core.common.util.TypeConversion;
+import jdk.graal.compiler.nodes.FrameState;
 
 import com.oracle.svm.core.Uninterruptible;
 import com.oracle.svm.core.c.NonmovableArray;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/FrameInfoEncoder.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/FrameInfoEncoder.java
index a2d8d4a2102d..1eb95fc5d303 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/FrameInfoEncoder.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/FrameInfoEncoder.java
@@ -38,13 +38,13 @@
 
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.Equivalence;
-import jdk.compiler.graal.code.CompilationResult;
-import jdk.compiler.graal.core.common.LIRKind;
-import jdk.compiler.graal.core.common.NumUtil;
-import jdk.compiler.graal.core.common.type.CompressibleConstant;
-import jdk.compiler.graal.core.common.util.FrequencyEncoder;
-import jdk.compiler.graal.core.common.util.TypeConversion;
-import jdk.compiler.graal.core.common.util.UnsafeArrayTypeWriter;
+import jdk.graal.compiler.code.CompilationResult;
+import jdk.graal.compiler.core.common.LIRKind;
+import jdk.graal.compiler.core.common.NumUtil;
+import jdk.graal.compiler.core.common.type.CompressibleConstant;
+import jdk.graal.compiler.core.common.util.FrequencyEncoder;
+import jdk.graal.compiler.core.common.util.TypeConversion;
+import jdk.graal.compiler.core.common.util.UnsafeArrayTypeWriter;
 import org.graalvm.nativeimage.ImageSingletons;
 
 import com.oracle.svm.core.CalleeSavedRegisters;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/ImageCodeInfo.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/ImageCodeInfo.java
index 62ae7e2c94d9..084e5265f513 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/ImageCodeInfo.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/ImageCodeInfo.java
@@ -26,7 +26,7 @@
 
 import java.util.List;
 
-import jdk.compiler.graal.word.Word;
+import jdk.graal.compiler.word.Word;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/InstalledCodeObserver.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/InstalledCodeObserver.java
index 58027b764c09..f03bc688972d 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/InstalledCodeObserver.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/InstalledCodeObserver.java
@@ -24,8 +24,8 @@
  */
 package com.oracle.svm.core.code;
 
-import jdk.compiler.graal.code.CompilationResult;
-import jdk.compiler.graal.debug.DebugContext;
+import jdk.graal.compiler.code.CompilationResult;
+import jdk.graal.compiler.debug.DebugContext;
 import org.graalvm.nativeimage.c.struct.RawField;
 import org.graalvm.nativeimage.c.struct.RawStructure;
 import org.graalvm.word.Pointer;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/InstalledCodeObserverSupport.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/InstalledCodeObserverSupport.java
index 69cfdef741a3..f2c7f21523a7 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/InstalledCodeObserverSupport.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/InstalledCodeObserverSupport.java
@@ -27,8 +27,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import jdk.compiler.graal.code.CompilationResult;
-import jdk.compiler.graal.debug.DebugContext;
+import jdk.graal.compiler.code.CompilationResult;
+import jdk.graal.compiler.debug.DebugContext;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
 import org.graalvm.word.Pointer;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/ReferenceAdjuster.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/ReferenceAdjuster.java
index 8806b93dd22e..55c69b6fc7f3 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/ReferenceAdjuster.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/ReferenceAdjuster.java
@@ -26,7 +26,7 @@
 
 import java.nio.ByteOrder;
 
-import jdk.compiler.graal.api.replacements.Fold;
+import jdk.graal.compiler.api.replacements.Fold;
 import org.graalvm.word.Pointer;
 import org.graalvm.word.PointerBase;
 
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/ReusableTypeReader.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/ReusableTypeReader.java
index 22e8d26f6d31..5512681d190d 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/ReusableTypeReader.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/ReusableTypeReader.java
@@ -26,8 +26,8 @@
 package com.oracle.svm.core.code;
 
 import com.oracle.svm.core.Uninterruptible;
-import jdk.compiler.graal.core.common.util.AbstractTypeReader;
-import jdk.compiler.graal.core.common.util.UnsafeArrayTypeWriter;
+import jdk.graal.compiler.core.common.util.AbstractTypeReader;
+import jdk.graal.compiler.core.common.util.UnsafeArrayTypeWriter;
 
 import com.oracle.svm.core.c.NonmovableArray;
 import com.oracle.svm.core.c.NonmovableArrays;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/RuntimeCodeCache.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/RuntimeCodeCache.java
index 461a177a86b1..ab304e8edca8 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/RuntimeCodeCache.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/RuntimeCodeCache.java
@@ -28,9 +28,9 @@
 import static com.oracle.svm.core.snippets.KnownIntrinsics.readCallerStackPointer;
 
 import org.graalvm.collections.EconomicMap;
-import jdk.compiler.graal.options.Option;
-import jdk.compiler.graal.options.OptionKey;
-import jdk.compiler.graal.options.OptionType;
+import jdk.graal.compiler.options.Option;
+import jdk.graal.compiler.options.OptionKey;
+import jdk.graal.compiler.options.OptionType;
 import org.graalvm.nativeimage.CurrentIsolate;
 import org.graalvm.nativeimage.IsolateThread;
 import org.graalvm.nativeimage.Platform;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/RuntimeCodeInfoHistory.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/RuntimeCodeInfoHistory.java
index 538a7405b1f7..21d830b298c7 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/RuntimeCodeInfoHistory.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/RuntimeCodeInfoHistory.java
@@ -24,7 +24,7 @@
  */
 package com.oracle.svm.core.code;
 
-import jdk.compiler.graal.api.replacements.Fold;
+import jdk.graal.compiler.api.replacements.Fold;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/RuntimeCodeInfoMemory.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/RuntimeCodeInfoMemory.java
index b2135c2c7f6e..192394d06ab4 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/RuntimeCodeInfoMemory.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/RuntimeCodeInfoMemory.java
@@ -26,7 +26,7 @@
 
 import java.util.concurrent.locks.ReentrantLock;
 
-import jdk.compiler.graal.api.replacements.Fold;
+import jdk.graal.compiler.api.replacements.Fold;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/collections/GrowableWordArrayAccess.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/collections/GrowableWordArrayAccess.java
index bce5e704c63b..f9d7e0e3e337 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/collections/GrowableWordArrayAccess.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/collections/GrowableWordArrayAccess.java
@@ -24,8 +24,8 @@
  */
 package com.oracle.svm.core.collections;
 
-import jdk.compiler.graal.api.replacements.Fold;
-import jdk.compiler.graal.word.Word;
+import jdk.graal.compiler.api.replacements.Fold;
+import jdk.graal.compiler.word.Word;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.c.type.WordPointer;
 import org.graalvm.nativeimage.impl.UnmanagedMemorySupport;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/config/ConfigurationValues.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/config/ConfigurationValues.java
index aa15f61214c3..b0b5febc2b07 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/config/ConfigurationValues.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/config/ConfigurationValues.java
@@ -24,7 +24,7 @@
  */
 package com.oracle.svm.core.config;
 
-import jdk.compiler.graal.api.replacements.Fold;
+import jdk.graal.compiler.api.replacements.Fold;
 import org.graalvm.nativeimage.ImageSingletons;
 
 import com.oracle.svm.core.SubstrateTargetDescription;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/config/ObjectLayout.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/config/ObjectLayout.java
index 2a5bc974378a..43499f456026 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/config/ObjectLayout.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/config/ObjectLayout.java
@@ -24,9 +24,9 @@
  */
 package com.oracle.svm.core.config;
 
-import jdk.compiler.graal.api.directives.GraalDirectives;
-import jdk.compiler.graal.core.common.NumUtil;
-import jdk.compiler.graal.replacements.ReplacementsUtil;
+import jdk.graal.compiler.api.directives.GraalDirectives;
+import jdk.graal.compiler.core.common.NumUtil;
+import jdk.graal.compiler.replacements.ReplacementsUtil;
 import org.graalvm.nativeimage.AnnotationAccess;
 import org.graalvm.nativeimage.c.constant.CEnum;
 import org.graalvm.word.WordBase;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/configure/ConfigurationFiles.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/configure/ConfigurationFiles.java
index 0696a6a8c5b7..8b3d0235878e 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/configure/ConfigurationFiles.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/configure/ConfigurationFiles.java
@@ -34,9 +34,9 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import jdk.compiler.graal.options.Option;
-import jdk.compiler.graal.options.OptionStability;
-import jdk.compiler.graal.options.OptionType;
+import jdk.graal.compiler.options.Option;
+import jdk.graal.compiler.options.OptionStability;
+import jdk.graal.compiler.options.OptionType;
 
 import com.oracle.svm.core.option.BundleMember;
 import com.oracle.svm.core.option.HostedOptionKey;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/configure/ConfigurationParser.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/configure/ConfigurationParser.java
index 8959594964eb..d5b5a1642c71 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/configure/ConfigurationParser.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/configure/ConfigurationParser.java
@@ -41,8 +41,8 @@
 
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.nativeimage.impl.ConfigurationCondition;
-import jdk.compiler.graal.util.json.JSONParser;
-import jdk.compiler.graal.util.json.JSONParserException;
+import jdk.graal.compiler.util.json.JSONParser;
+import jdk.graal.compiler.util.json.JSONParserException;
 
 import com.oracle.svm.core.SubstrateUtil;
 import com.oracle.svm.core.jdk.JavaNetSubstitutions;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/configure/PredefinedClassesConfigurationParser.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/configure/PredefinedClassesConfigurationParser.java
index 5a276d44d828..8a68db201f8e 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/configure/PredefinedClassesConfigurationParser.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/configure/PredefinedClassesConfigurationParser.java
@@ -33,7 +33,7 @@
 import java.util.Collections;
 
 import org.graalvm.collections.EconomicMap;
-import jdk.compiler.graal.util.json.JSONParserException;
+import jdk.graal.compiler.util.json.JSONParserException;
 
 public class PredefinedClassesConfigurationParser extends ConfigurationParser {
     public static InputStream openClassdataStream(URI baseUri, String providedHash) throws IOException {
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/configure/ProxyConfigurationParser.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/configure/ProxyConfigurationParser.java
index 1e7012de3840..ba8b99f0971b 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/configure/ProxyConfigurationParser.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/configure/ProxyConfigurationParser.java
@@ -32,7 +32,7 @@
 
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.nativeimage.impl.ConfigurationCondition;
-import jdk.compiler.graal.util.json.JSONParserException;
+import jdk.graal.compiler.util.json.JSONParserException;
 
 import com.oracle.svm.core.jdk.proxy.DynamicProxyRegistry;
 
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/configure/ReflectionConfigurationParser.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/configure/ReflectionConfigurationParser.java
index 6ddd232c7434..c93041c6b39d 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/configure/ReflectionConfigurationParser.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/configure/ReflectionConfigurationParser.java
@@ -34,7 +34,7 @@
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.MapCursor;
 import org.graalvm.nativeimage.impl.ConfigurationCondition;
-import jdk.compiler.graal.util.json.JSONParserException;
+import jdk.graal.compiler.util.json.JSONParserException;
 
 import com.oracle.svm.core.TypeResult;
 import com.oracle.svm.util.LogUtils;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/configure/ResourceConfigurationParser.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/configure/ResourceConfigurationParser.java
index 9813989cae27..b3e820e38666 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/configure/ResourceConfigurationParser.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/configure/ResourceConfigurationParser.java
@@ -35,7 +35,7 @@
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.MapCursor;
 import org.graalvm.nativeimage.impl.ConfigurationCondition;
-import jdk.compiler.graal.util.json.JSONParserException;
+import jdk.graal.compiler.util.json.JSONParserException;
 
 import com.oracle.svm.core.jdk.localization.LocalizationSupport;
 
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/configure/SerializationConfigurationParser.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/configure/SerializationConfigurationParser.java
index d4b9b8550d18..b2928ed538c1 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/configure/SerializationConfigurationParser.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/configure/SerializationConfigurationParser.java
@@ -33,7 +33,7 @@
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.nativeimage.impl.ConfigurationCondition;
 import org.graalvm.nativeimage.impl.RuntimeSerializationSupport;
-import jdk.compiler.graal.util.json.JSONParserException;
+import jdk.graal.compiler.util.json.JSONParserException;
 
 public class SerializationConfigurationParser extends ConfigurationParser {
 
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/cpufeature/RuntimeCPUFeatureCheck.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/cpufeature/RuntimeCPUFeatureCheck.java
index 74c75c916df5..bf2f197212b6 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/cpufeature/RuntimeCPUFeatureCheck.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/cpufeature/RuntimeCPUFeatureCheck.java
@@ -28,8 +28,8 @@
 import java.util.EnumSet;
 import java.util.Set;
 
-import jdk.compiler.graal.graph.Node.ConstantNodeParameter;
-import jdk.compiler.graal.graph.Node.NodeIntrinsic;
+import jdk.graal.compiler.graph.Node.ConstantNodeParameter;
+import jdk.graal.compiler.graph.Node.NodeIntrinsic;
 
 import com.oracle.svm.core.jdk.RuntimeSupport;
 
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/cpufeature/RuntimeCPUFeatureCheckImpl.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/cpufeature/RuntimeCPUFeatureCheckImpl.java
index b9ad5302f894..fccab105a963 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/cpufeature/RuntimeCPUFeatureCheckImpl.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/cpufeature/RuntimeCPUFeatureCheckImpl.java
@@ -24,7 +24,7 @@
  */
 package com.oracle.svm.core.cpufeature;
 
-import static jdk.compiler.graal.nodes.extended.BranchProbabilityNode.LIKELY_PROBABILITY;
+import static jdk.graal.compiler.nodes.extended.BranchProbabilityNode.LIKELY_PROBABILITY;
 
 import java.lang.reflect.Method;
 import java.util.ArrayList;
@@ -32,23 +32,23 @@
 import java.util.EnumSet;
 import java.util.Set;
 
-import jdk.compiler.graal.api.replacements.Fold;
-import jdk.compiler.graal.api.replacements.SnippetReflectionProvider;
-import jdk.compiler.graal.core.common.NumUtil;
-import jdk.compiler.graal.core.riscv64.RISCV64ReflectionUtil;
-import jdk.compiler.graal.core.riscv64.ShadowedRISCV64;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.Node.InjectedNodeParameter;
-import jdk.compiler.graal.graph.Node.NodeIntrinsicFactory;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.LogicNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.calc.ConditionalNode;
-import jdk.compiler.graal.nodes.calc.IntegerTestNode;
-import jdk.compiler.graal.nodes.extended.BranchProbabilityNode;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext;
-import jdk.compiler.graal.nodes.java.LoadFieldNode;
+import jdk.graal.compiler.api.replacements.Fold;
+import jdk.graal.compiler.api.replacements.SnippetReflectionProvider;
+import jdk.graal.compiler.core.common.NumUtil;
+import jdk.graal.compiler.core.riscv64.RISCV64ReflectionUtil;
+import jdk.graal.compiler.core.riscv64.ShadowedRISCV64;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.Node.InjectedNodeParameter;
+import jdk.graal.compiler.graph.Node.NodeIntrinsicFactory;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.LogicNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.calc.ConditionalNode;
+import jdk.graal.compiler.nodes.calc.IntegerTestNode;
+import jdk.graal.compiler.nodes.extended.BranchProbabilityNode;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext;
+import jdk.graal.compiler.nodes.java.LoadFieldNode;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/cpufeature/Stubs.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/cpufeature/Stubs.java
index 748b0ed00721..91c6c489d1c1 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/cpufeature/Stubs.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/cpufeature/Stubs.java
@@ -38,20 +38,20 @@
 
 import java.util.EnumSet;
 
-import jdk.compiler.graal.api.replacements.Fold;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.replacements.nodes.AESNode;
-import jdk.compiler.graal.replacements.nodes.BigIntegerMulAddNode;
-import jdk.compiler.graal.replacements.nodes.BigIntegerMultiplyToLenNode;
-import jdk.compiler.graal.replacements.nodes.BigIntegerSquareToLenNode;
-import jdk.compiler.graal.replacements.nodes.CipherBlockChainingAESNode;
-import jdk.compiler.graal.replacements.nodes.CounterModeAESNode;
-import jdk.compiler.graal.replacements.nodes.GHASHProcessBlocksNode;
-import jdk.compiler.graal.replacements.nodes.MessageDigestNode.SHA1Node;
-import jdk.compiler.graal.replacements.nodes.MessageDigestNode.SHA256Node;
-import jdk.compiler.graal.replacements.nodes.MessageDigestNode.SHA3Node;
-import jdk.compiler.graal.replacements.nodes.MessageDigestNode.SHA512Node;
+import jdk.graal.compiler.api.replacements.Fold;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.replacements.nodes.AESNode;
+import jdk.graal.compiler.replacements.nodes.BigIntegerMulAddNode;
+import jdk.graal.compiler.replacements.nodes.BigIntegerMultiplyToLenNode;
+import jdk.graal.compiler.replacements.nodes.BigIntegerSquareToLenNode;
+import jdk.graal.compiler.replacements.nodes.CipherBlockChainingAESNode;
+import jdk.graal.compiler.replacements.nodes.CounterModeAESNode;
+import jdk.graal.compiler.replacements.nodes.GHASHProcessBlocksNode;
+import jdk.graal.compiler.replacements.nodes.MessageDigestNode.SHA1Node;
+import jdk.graal.compiler.replacements.nodes.MessageDigestNode.SHA256Node;
+import jdk.graal.compiler.replacements.nodes.MessageDigestNode.SHA3Node;
+import jdk.graal.compiler.replacements.nodes.MessageDigestNode.SHA512Node;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/deopt/DeoptimizationCounters.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/deopt/DeoptimizationCounters.java
index 6c57470e9f33..b6ed50f5db83 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/deopt/DeoptimizationCounters.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/deopt/DeoptimizationCounters.java
@@ -24,8 +24,8 @@
  */
 package com.oracle.svm.core.deopt;
 
-import jdk.compiler.graal.api.replacements.Fold;
-import jdk.compiler.graal.options.Option;
+import jdk.graal.compiler.api.replacements.Fold;
+import jdk.graal.compiler.options.Option;
 import org.graalvm.nativeimage.ImageSingletons;
 
 import com.oracle.svm.core.option.HostedOptionKey;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/deopt/DeoptimizationRuntime.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/deopt/DeoptimizationRuntime.java
index 4b7c6b57a2ce..c70093ca7122 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/deopt/DeoptimizationRuntime.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/deopt/DeoptimizationRuntime.java
@@ -27,7 +27,7 @@
 import java.util.Objects;
 
 import com.oracle.svm.core.SubstrateOptions;
-import jdk.compiler.graal.graph.NodeSourcePosition;
+import jdk.graal.compiler.graph.NodeSourcePosition;
 import org.graalvm.nativeimage.c.function.CodePointer;
 import org.graalvm.word.LocationIdentity;
 import org.graalvm.word.Pointer;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/deopt/DeoptimizationSupport.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/deopt/DeoptimizationSupport.java
index b3a044ade38a..7b4f2c199c83 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/deopt/DeoptimizationSupport.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/deopt/DeoptimizationSupport.java
@@ -24,7 +24,7 @@
  */
 package com.oracle.svm.core.deopt;
 
-import jdk.compiler.graal.api.replacements.Fold;
+import jdk.graal.compiler.api.replacements.Fold;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/deopt/Deoptimizer.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/deopt/Deoptimizer.java
index 718368e4ffcd..ddd18c93344c 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/deopt/Deoptimizer.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/deopt/Deoptimizer.java
@@ -32,11 +32,11 @@
 import java.nio.ByteOrder;
 import java.util.ArrayList;
 
-import jdk.compiler.graal.core.common.NumUtil;
-import jdk.compiler.graal.core.common.util.TypeConversion;
-import jdk.compiler.graal.options.Option;
-import jdk.compiler.graal.word.BarrieredAccess;
-import jdk.compiler.graal.word.Word;
+import jdk.graal.compiler.core.common.NumUtil;
+import jdk.graal.compiler.core.common.util.TypeConversion;
+import jdk.graal.compiler.options.Option;
+import jdk.graal.compiler.word.BarrieredAccess;
+import jdk.graal.compiler.word.Word;
 import org.graalvm.nativeimage.CurrentIsolate;
 import org.graalvm.nativeimage.IsolateThread;
 import org.graalvm.nativeimage.c.function.CodePointer;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/deopt/SubstrateInstalledCode.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/deopt/SubstrateInstalledCode.java
index e73be2a31dcf..1af19b2b1f67 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/deopt/SubstrateInstalledCode.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/deopt/SubstrateInstalledCode.java
@@ -24,7 +24,7 @@
  */
 package com.oracle.svm.core.deopt;
 
-import jdk.compiler.graal.core.common.CompilationIdentifier;
+import jdk.graal.compiler.core.common.CompilationIdentifier;
 
 import com.oracle.svm.core.Uninterruptible;
 import com.oracle.svm.core.code.CodeInfo;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/doc-files/NeverInlineHelp.txt b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/doc-files/NeverInlineHelp.txt
index 65065d7419a4..43462c4f4ddc 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/doc-files/NeverInlineHelp.txt
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/doc-files/NeverInlineHelp.txt
@@ -22,18 +22,18 @@ Examples of method filters:
   of type "Object", and four more parameters of any type. The
   packages of the parameter types are irrelevant.
 ---------
-  jdk.compiler.graal.core.graph.PostOrderNodeIterator.*
+  jdk.graal.compiler.core.graph.PostOrderNodeIterator.*
 
-  Matches all methods in the class "jdk.compiler.graal.core.graph.PostOrderNodeIterator".
+  Matches all methods in the class "jdk.graal.compiler.core.graph.PostOrderNodeIterator".
 ---------
   *
 
   Matches all methods in all classes
 ---------
-  jdk.compiler.graal.core.graph.*.visit
+  jdk.graal.compiler.core.graph.*.visit
 
   Matches all methods named "visit" in classes in the package
-  "jdk.compiler.graal.core.graph".
+  "jdk.graal.compiler.core.graph".
 ---------
   arraycopy,toString
 
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/feature/InternalFeature.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/feature/InternalFeature.java
index 1124c52c41c6..b7ef1b11c16c 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/feature/InternalFeature.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/feature/InternalFeature.java
@@ -26,12 +26,12 @@
 
 import java.util.Map;
 
-import jdk.compiler.graal.api.replacements.SnippetReflectionProvider;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.tiers.Suites;
-import jdk.compiler.graal.phases.util.Providers;
+import jdk.graal.compiler.api.replacements.SnippetReflectionProvider;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.tiers.Suites;
+import jdk.graal.compiler.phases.util.Providers;
 import org.graalvm.nativeimage.hosted.Feature;
 
 import com.oracle.svm.core.ParsingReason;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/EconomyGraalConfiguration.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/EconomyGraalConfiguration.java
index 7eeeb898882f..6e5a91a08689 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/EconomyGraalConfiguration.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/EconomyGraalConfiguration.java
@@ -24,7 +24,7 @@
  */
 package com.oracle.svm.core.graal;
 
-import jdk.compiler.graal.hotspot.EconomyCompilerConfigurationFactory;
+import jdk.graal.compiler.hotspot.EconomyCompilerConfigurationFactory;
 
 public class EconomyGraalConfiguration extends GraalConfiguration {
 
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/GraalConfiguration.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/GraalConfiguration.java
index a101edea3723..06c7873f032b 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/GraalConfiguration.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/GraalConfiguration.java
@@ -29,26 +29,26 @@
 import java.util.ListIterator;
 
 import org.graalvm.collections.EconomicMap;
-import jdk.compiler.graal.core.aarch64.AArch64NodeMatchRules;
-import jdk.compiler.graal.core.amd64.AMD64NodeMatchRules;
-import jdk.compiler.graal.core.common.spi.ForeignCallsProvider;
-import jdk.compiler.graal.core.common.spi.MetaAccessExtensionProvider;
-import jdk.compiler.graal.core.gen.NodeMatchRules;
-import jdk.compiler.graal.core.match.MatchRuleRegistry;
-import jdk.compiler.graal.core.match.MatchStatement;
-import jdk.compiler.graal.core.riscv64.RISCV64NodeMatchRules;
-import jdk.compiler.graal.core.riscv64.RISCV64ReflectionUtil;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.hotspot.CommunityCompilerConfigurationFactory;
-import jdk.compiler.graal.lir.phases.LIRSuites;
-import jdk.compiler.graal.nodes.spi.LoweringProvider;
-import jdk.compiler.graal.nodes.spi.PlatformConfigurationProvider;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.BasePhase;
-import jdk.compiler.graal.phases.PhaseSuite;
-import jdk.compiler.graal.phases.tiers.HighTierContext;
-import jdk.compiler.graal.phases.tiers.Suites;
-import jdk.compiler.graal.phases.util.Providers;
+import jdk.graal.compiler.core.aarch64.AArch64NodeMatchRules;
+import jdk.graal.compiler.core.amd64.AMD64NodeMatchRules;
+import jdk.graal.compiler.core.common.spi.ForeignCallsProvider;
+import jdk.graal.compiler.core.common.spi.MetaAccessExtensionProvider;
+import jdk.graal.compiler.core.gen.NodeMatchRules;
+import jdk.graal.compiler.core.match.MatchRuleRegistry;
+import jdk.graal.compiler.core.match.MatchStatement;
+import jdk.graal.compiler.core.riscv64.RISCV64NodeMatchRules;
+import jdk.graal.compiler.core.riscv64.RISCV64ReflectionUtil;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.hotspot.CommunityCompilerConfigurationFactory;
+import jdk.graal.compiler.lir.phases.LIRSuites;
+import jdk.graal.compiler.nodes.spi.LoweringProvider;
+import jdk.graal.compiler.nodes.spi.PlatformConfigurationProvider;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.BasePhase;
+import jdk.graal.compiler.phases.PhaseSuite;
+import jdk.graal.compiler.phases.tiers.HighTierContext;
+import jdk.graal.compiler.phases.tiers.Suites;
+import jdk.graal.compiler.phases.util.Providers;
 import org.graalvm.nativeimage.ImageSingletons;
 
 import com.oracle.svm.core.config.ConfigurationValues;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/RuntimeCompilation.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/RuntimeCompilation.java
index f6a6ef3343a7..1954418d5116 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/RuntimeCompilation.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/RuntimeCompilation.java
@@ -24,7 +24,7 @@
  */
 package com.oracle.svm.core.graal;
 
-import jdk.compiler.graal.api.replacements.Fold;
+import jdk.graal.compiler.api.replacements.Fold;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.hosted.Feature;
 
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/code/PatchConsumerFactory.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/code/PatchConsumerFactory.java
index 4fe0392f105e..0471743a1729 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/code/PatchConsumerFactory.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/code/PatchConsumerFactory.java
@@ -26,8 +26,8 @@
 
 import java.util.function.Consumer;
 
-import jdk.compiler.graal.asm.Assembler.CodeAnnotation;
-import jdk.compiler.graal.code.CompilationResult;
+import jdk.graal.compiler.asm.Assembler.CodeAnnotation;
+import jdk.graal.compiler.code.CompilationResult;
 import org.graalvm.nativeimage.ImageSingletons;
 
 public abstract class PatchConsumerFactory {
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/code/SubstrateBackend.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/code/SubstrateBackend.java
index 634aede0f966..950ff4894991 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/code/SubstrateBackend.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/code/SubstrateBackend.java
@@ -28,21 +28,21 @@
 
 import java.lang.reflect.Method;
 
-import jdk.compiler.graal.code.CompilationResult;
-import jdk.compiler.graal.core.common.CompilationIdentifier;
-import jdk.compiler.graal.core.common.alloc.RegisterAllocationConfig;
-import jdk.compiler.graal.core.target.Backend;
-import jdk.compiler.graal.lir.LIRFrameState;
-import jdk.compiler.graal.nodes.CallTargetNode;
-import jdk.compiler.graal.nodes.IndirectCallTargetNode;
-import jdk.compiler.graal.nodes.LoweredCallTargetNode;
-import jdk.compiler.graal.nodes.NamedLocationIdentity;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.CoreProviders;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.BasePhase;
-import jdk.compiler.graal.phases.tiers.SuitesProvider;
-import jdk.compiler.graal.phases.util.Providers;
+import jdk.graal.compiler.code.CompilationResult;
+import jdk.graal.compiler.core.common.CompilationIdentifier;
+import jdk.graal.compiler.core.common.alloc.RegisterAllocationConfig;
+import jdk.graal.compiler.core.target.Backend;
+import jdk.graal.compiler.lir.LIRFrameState;
+import jdk.graal.compiler.nodes.CallTargetNode;
+import jdk.graal.compiler.nodes.IndirectCallTargetNode;
+import jdk.graal.compiler.nodes.LoweredCallTargetNode;
+import jdk.graal.compiler.nodes.NamedLocationIdentity;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.CoreProviders;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.BasePhase;
+import jdk.graal.compiler.phases.tiers.SuitesProvider;
+import jdk.graal.compiler.phases.util.Providers;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
 import org.graalvm.word.LocationIdentity;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/code/SubstrateBackendFactory.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/code/SubstrateBackendFactory.java
index 15975feb3989..fb4bebc111b1 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/code/SubstrateBackendFactory.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/code/SubstrateBackendFactory.java
@@ -24,7 +24,7 @@
  */
 package com.oracle.svm.core.graal.code;
 
-import jdk.compiler.graal.phases.util.Providers;
+import jdk.graal.compiler.phases.util.Providers;
 import org.graalvm.nativeimage.ImageSingletons;
 
 public abstract class SubstrateBackendFactory {
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/code/SubstrateCompilationIdentifier.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/code/SubstrateCompilationIdentifier.java
index ed542a6f71c2..6a01e72cacee 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/code/SubstrateCompilationIdentifier.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/code/SubstrateCompilationIdentifier.java
@@ -26,8 +26,8 @@
 
 import java.util.concurrent.atomic.AtomicLong;
 
-import jdk.compiler.graal.core.common.CompilationIdentifier;
-import jdk.compiler.graal.debug.GraalError;
+import jdk.graal.compiler.core.common.CompilationIdentifier;
+import jdk.graal.compiler.debug.GraalError;
 
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/code/SubstrateCompilationResult.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/code/SubstrateCompilationResult.java
index b46b92369c09..85f24b4c49c7 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/code/SubstrateCompilationResult.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/code/SubstrateCompilationResult.java
@@ -26,9 +26,9 @@
 
 import java.util.List;
 
-import jdk.compiler.graal.code.CompilationResult;
-import jdk.compiler.graal.core.common.CompilationIdentifier;
-import jdk.compiler.graal.graph.NodeSourcePosition;
+import jdk.graal.compiler.code.CompilationResult;
+import jdk.graal.compiler.core.common.CompilationIdentifier;
+import jdk.graal.compiler.graph.NodeSourcePosition;
 
 public final class SubstrateCompilationResult extends CompilationResult {
 
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/code/SubstrateCompiledCode.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/code/SubstrateCompiledCode.java
index 8e975520d114..93d0fe58d9de 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/code/SubstrateCompiledCode.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/code/SubstrateCompiledCode.java
@@ -24,7 +24,7 @@
  */
 package com.oracle.svm.core.graal.code;
 
-import jdk.compiler.graal.code.CompilationResult;
+import jdk.graal.compiler.code.CompilationResult;
 
 import jdk.vm.ci.code.CompiledCode;
 
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/code/SubstrateDataBuilder.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/code/SubstrateDataBuilder.java
index 5b27793664f0..ab2fdb08da09 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/code/SubstrateDataBuilder.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/code/SubstrateDataBuilder.java
@@ -28,11 +28,11 @@
 
 import java.nio.ByteBuffer;
 
-import jdk.compiler.graal.code.DataSection.Data;
-import jdk.compiler.graal.code.DataSection.Patches;
-import jdk.compiler.graal.core.common.type.CompressibleConstant;
-import jdk.compiler.graal.core.common.type.TypedConstant;
-import jdk.compiler.graal.lir.asm.DataBuilder;
+import jdk.graal.compiler.code.DataSection.Data;
+import jdk.graal.compiler.code.DataSection.Patches;
+import jdk.graal.compiler.core.common.type.CompressibleConstant;
+import jdk.graal.compiler.core.common.type.TypedConstant;
+import jdk.graal.compiler.lir.asm.DataBuilder;
 
 import com.oracle.svm.core.FrameAccess;
 import com.oracle.svm.core.SubstrateOptions;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/code/SubstrateDebugInfoBuilder.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/code/SubstrateDebugInfoBuilder.java
index cb2c48909059..4c9057f1103f 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/code/SubstrateDebugInfoBuilder.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/code/SubstrateDebugInfoBuilder.java
@@ -24,13 +24,13 @@
  */
 package com.oracle.svm.core.graal.code;
 
-import jdk.compiler.graal.api.replacements.SnippetReflectionProvider;
-import jdk.compiler.graal.core.common.spi.MetaAccessExtensionProvider;
-import jdk.compiler.graal.core.gen.DebugInfoBuilder;
-import jdk.compiler.graal.nodes.FrameState;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.NodeValueMap;
+import jdk.graal.compiler.api.replacements.SnippetReflectionProvider;
+import jdk.graal.compiler.core.common.spi.MetaAccessExtensionProvider;
+import jdk.graal.compiler.core.gen.DebugInfoBuilder;
+import jdk.graal.compiler.nodes.FrameState;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.NodeValueMap;
 
 import com.oracle.svm.core.meta.SharedMethod;
 import com.oracle.svm.core.meta.SharedType;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/code/SubstrateLoweringProviderFactory.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/code/SubstrateLoweringProviderFactory.java
index 3561370d4b8a..2eb355f2de65 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/code/SubstrateLoweringProviderFactory.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/code/SubstrateLoweringProviderFactory.java
@@ -24,10 +24,10 @@
  */
 package com.oracle.svm.core.graal.code;
 
-import jdk.compiler.graal.core.common.spi.ForeignCallsProvider;
-import jdk.compiler.graal.core.common.spi.MetaAccessExtensionProvider;
-import jdk.compiler.graal.nodes.spi.PlatformConfigurationProvider;
-import jdk.compiler.graal.replacements.DefaultJavaLoweringProvider;
+import jdk.graal.compiler.core.common.spi.ForeignCallsProvider;
+import jdk.graal.compiler.core.common.spi.MetaAccessExtensionProvider;
+import jdk.graal.compiler.nodes.spi.PlatformConfigurationProvider;
+import jdk.graal.compiler.replacements.DefaultJavaLoweringProvider;
 
 import jdk.vm.ci.code.TargetDescription;
 import jdk.vm.ci.meta.MetaAccessProvider;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/code/SubstrateMetaAccessExtensionProvider.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/code/SubstrateMetaAccessExtensionProvider.java
index fefb78561a21..2aa1a4b4ba85 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/code/SubstrateMetaAccessExtensionProvider.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/code/SubstrateMetaAccessExtensionProvider.java
@@ -25,7 +25,7 @@
 
 package com.oracle.svm.core.graal.code;
 
-import jdk.compiler.graal.core.common.spi.MetaAccessExtensionProvider;
+import jdk.graal.compiler.core.common.spi.MetaAccessExtensionProvider;
 
 import com.oracle.svm.core.meta.SharedMethod;
 import com.oracle.svm.core.meta.SharedType;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/code/SubstrateNodeLIRBuilder.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/code/SubstrateNodeLIRBuilder.java
index 0bd202e289fb..665a9b48b5b1 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/code/SubstrateNodeLIRBuilder.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/code/SubstrateNodeLIRBuilder.java
@@ -24,7 +24,7 @@
  */
 package com.oracle.svm.core.graal.code;
 
-import jdk.compiler.graal.lir.Variable;
+import jdk.graal.compiler.lir.Variable;
 
 import com.oracle.svm.core.graal.nodes.CGlobalDataLoadAddressNode;
 
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/code/SubstratePlatformConfigurationProvider.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/code/SubstratePlatformConfigurationProvider.java
index ceaddd0e9988..0787c0b7d59b 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/code/SubstratePlatformConfigurationProvider.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/code/SubstratePlatformConfigurationProvider.java
@@ -25,8 +25,8 @@
 
 package com.oracle.svm.core.graal.code;
 
-import jdk.compiler.graal.nodes.gc.BarrierSet;
-import jdk.compiler.graal.nodes.spi.PlatformConfigurationProvider;
+import jdk.graal.compiler.nodes.gc.BarrierSet;
+import jdk.graal.compiler.nodes.spi.PlatformConfigurationProvider;
 
 public class SubstratePlatformConfigurationProvider implements PlatformConfigurationProvider {
     private final BarrierSet barrierSet;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/code/SubstrateSuitesCreator.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/code/SubstrateSuitesCreator.java
index 33f360592571..2bd5d5881848 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/code/SubstrateSuitesCreator.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/code/SubstrateSuitesCreator.java
@@ -24,10 +24,10 @@
  */
 package com.oracle.svm.core.graal.code;
 
-import jdk.compiler.graal.java.DefaultSuitesCreator;
-import jdk.compiler.graal.java.GraphBuilderPhase;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration;
-import jdk.compiler.graal.phases.tiers.CompilerConfiguration;
+import jdk.graal.compiler.java.DefaultSuitesCreator;
+import jdk.graal.compiler.java.GraphBuilderPhase;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
+import jdk.graal.compiler.phases.tiers.CompilerConfiguration;
 
 public class SubstrateSuitesCreator extends DefaultSuitesCreator {
 
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/code/SubstrateSuitesCreatorProvider.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/code/SubstrateSuitesCreatorProvider.java
index effb73d23d0c..c747af4e74b0 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/code/SubstrateSuitesCreatorProvider.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/code/SubstrateSuitesCreatorProvider.java
@@ -25,10 +25,10 @@
  */
 package com.oracle.svm.core.graal.code;
 
-import jdk.compiler.graal.core.phases.CommunityCompilerConfiguration;
-import jdk.compiler.graal.core.phases.EconomyCompilerConfiguration;
-import jdk.compiler.graal.phases.tiers.CompilerConfiguration;
-import jdk.compiler.graal.phases.tiers.SuitesCreator;
+import jdk.graal.compiler.core.phases.CommunityCompilerConfiguration;
+import jdk.graal.compiler.core.phases.EconomyCompilerConfiguration;
+import jdk.graal.compiler.phases.tiers.CompilerConfiguration;
+import jdk.graal.compiler.phases.tiers.SuitesCreator;
 
 import com.oracle.svm.core.SubstrateOptions;
 
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/jdk/JDKIntrinsicsFeature.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/jdk/JDKIntrinsicsFeature.java
index 2831728c6ef8..96188ca3e66a 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/jdk/JDKIntrinsicsFeature.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/jdk/JDKIntrinsicsFeature.java
@@ -26,14 +26,14 @@
 
 import java.util.Map;
 
-import jdk.compiler.graal.api.replacements.SnippetReflectionProvider;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins.Registration;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.util.Providers;
-import jdk.compiler.graal.replacements.arraycopy.ArrayCopySnippets;
+import jdk.graal.compiler.api.replacements.SnippetReflectionProvider;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins.Registration;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.util.Providers;
+import jdk.graal.compiler.replacements.arraycopy.ArrayCopySnippets;
 
 import com.oracle.svm.core.ParsingReason;
 import com.oracle.svm.core.feature.InternalFeature;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/jdk/SubstrateArraycopySnippets.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/jdk/SubstrateArraycopySnippets.java
index 66b836ebdd7f..87796464219f 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/jdk/SubstrateArraycopySnippets.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/jdk/SubstrateArraycopySnippets.java
@@ -24,25 +24,25 @@
  */
 package com.oracle.svm.core.graal.jdk;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_UNKNOWN;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_UNKNOWN;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_UNKNOWN;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_UNKNOWN;
 
 import java.util.Map;
 
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.InputType;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.java.ArrayLengthNode;
-import jdk.compiler.graal.nodes.spi.Lowerable;
-import jdk.compiler.graal.nodes.spi.LoweringTool;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.util.Providers;
-import jdk.compiler.graal.replacements.Snippets;
-import jdk.compiler.graal.replacements.arraycopy.ArrayCopyNode;
-import jdk.compiler.graal.replacements.nodes.BasicArrayCopyNode;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.InputType;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.java.ArrayLengthNode;
+import jdk.graal.compiler.nodes.spi.Lowerable;
+import jdk.graal.compiler.nodes.spi.LoweringTool;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.util.Providers;
+import jdk.graal.compiler.replacements.Snippets;
+import jdk.graal.compiler.replacements.arraycopy.ArrayCopyNode;
+import jdk.graal.compiler.replacements.nodes.BasicArrayCopyNode;
 import org.graalvm.word.LocationIdentity;
 
 import com.oracle.svm.core.JavaMemoryUtil;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/jdk/SubstrateObjectCloneNode.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/jdk/SubstrateObjectCloneNode.java
index e22da9c1d76e..9cebcd473d82 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/jdk/SubstrateObjectCloneNode.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/jdk/SubstrateObjectCloneNode.java
@@ -24,22 +24,22 @@
  */
 package com.oracle.svm.core.graal.jdk;
 
-import jdk.compiler.graal.core.common.type.ObjectStamp;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.core.common.type.StampPair;
-import jdk.compiler.graal.core.common.type.TypeReference;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.InputType;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.DeoptimizingNode.DeoptBefore;
-import jdk.compiler.graal.nodes.FrameState;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.java.LoadFieldNode;
-import jdk.compiler.graal.nodes.spi.Lowerable;
-import jdk.compiler.graal.nodes.spi.LoweringTool;
-import jdk.compiler.graal.nodes.spi.VirtualizerTool;
-import jdk.compiler.graal.replacements.nodes.BasicObjectCloneNode;
-import jdk.compiler.graal.replacements.nodes.MacroNode;
+import jdk.graal.compiler.core.common.type.ObjectStamp;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.core.common.type.StampPair;
+import jdk.graal.compiler.core.common.type.TypeReference;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.InputType;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.DeoptimizingNode.DeoptBefore;
+import jdk.graal.compiler.nodes.FrameState;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.java.LoadFieldNode;
+import jdk.graal.compiler.nodes.spi.Lowerable;
+import jdk.graal.compiler.nodes.spi.LoweringTool;
+import jdk.graal.compiler.nodes.spi.VirtualizerTool;
+import jdk.graal.compiler.replacements.nodes.BasicObjectCloneNode;
+import jdk.graal.compiler.replacements.nodes.MacroNode;
 
 import com.oracle.svm.core.meta.SharedType;
 
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/jdk/SubstrateObjectCloneSnippets.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/jdk/SubstrateObjectCloneSnippets.java
index 46767718c899..c1ee8266b91b 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/jdk/SubstrateObjectCloneSnippets.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/jdk/SubstrateObjectCloneSnippets.java
@@ -24,35 +24,35 @@
  */
 package com.oracle.svm.core.graal.jdk;
 
-import static jdk.compiler.graal.nodes.PiNode.piCastToSnippetReplaceeStamp;
-import static jdk.compiler.graal.nodes.extended.BranchProbabilityNode.FAST_PATH_PROBABILITY;
+import static jdk.graal.compiler.nodes.PiNode.piCastToSnippetReplaceeStamp;
+import static jdk.graal.compiler.nodes.extended.BranchProbabilityNode.FAST_PATH_PROBABILITY;
 
 import java.util.Map;
 
-import jdk.compiler.graal.api.replacements.Snippet;
-import jdk.compiler.graal.core.common.NumUtil;
-import jdk.compiler.graal.core.common.spi.ForeignCallDescriptor;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.Node.ConstantNodeParameter;
-import jdk.compiler.graal.graph.Node.NodeIntrinsic;
-import jdk.compiler.graal.nodes.GraphState;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.extended.BranchProbabilityNode;
-import jdk.compiler.graal.nodes.extended.ForeignCallNode;
-import jdk.compiler.graal.nodes.java.ArrayLengthNode;
-import jdk.compiler.graal.nodes.spi.LoweringTool;
-import jdk.compiler.graal.nodes.spi.VirtualizerTool;
-import jdk.compiler.graal.nodes.virtual.VirtualObjectNode;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.util.Providers;
-import jdk.compiler.graal.replacements.SnippetTemplate;
-import jdk.compiler.graal.replacements.SnippetTemplate.Arguments;
-import jdk.compiler.graal.replacements.SnippetTemplate.SnippetInfo;
-import jdk.compiler.graal.replacements.Snippets;
-import jdk.compiler.graal.replacements.nodes.ObjectClone;
-import jdk.compiler.graal.word.BarrieredAccess;
+import jdk.graal.compiler.api.replacements.Snippet;
+import jdk.graal.compiler.core.common.NumUtil;
+import jdk.graal.compiler.core.common.spi.ForeignCallDescriptor;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.Node.ConstantNodeParameter;
+import jdk.graal.compiler.graph.Node.NodeIntrinsic;
+import jdk.graal.compiler.nodes.GraphState;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.extended.BranchProbabilityNode;
+import jdk.graal.compiler.nodes.extended.ForeignCallNode;
+import jdk.graal.compiler.nodes.java.ArrayLengthNode;
+import jdk.graal.compiler.nodes.spi.LoweringTool;
+import jdk.graal.compiler.nodes.spi.VirtualizerTool;
+import jdk.graal.compiler.nodes.virtual.VirtualObjectNode;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.util.Providers;
+import jdk.graal.compiler.replacements.SnippetTemplate;
+import jdk.graal.compiler.replacements.SnippetTemplate.Arguments;
+import jdk.graal.compiler.replacements.SnippetTemplate.SnippetInfo;
+import jdk.graal.compiler.replacements.Snippets;
+import jdk.graal.compiler.replacements.nodes.ObjectClone;
+import jdk.graal.compiler.word.BarrieredAccess;
 import org.graalvm.word.LocationIdentity;
 import org.graalvm.word.WordFactory;
 
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/jdk/SubstrateObjectCloneWithExceptionNode.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/jdk/SubstrateObjectCloneWithExceptionNode.java
index 6a3ecf4f414f..fb961974d428 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/jdk/SubstrateObjectCloneWithExceptionNode.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/jdk/SubstrateObjectCloneWithExceptionNode.java
@@ -24,25 +24,25 @@
  */
 package com.oracle.svm.core.graal.jdk;
 
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_8;
-
-import jdk.compiler.graal.core.common.type.StampPair;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.InputType;
-import jdk.compiler.graal.nodeinfo.NodeCycles;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.AbstractBeginNode;
-import jdk.compiler.graal.nodes.CallTargetNode.InvokeKind;
-import jdk.compiler.graal.nodes.FixedNode;
-import jdk.compiler.graal.nodes.FrameState;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.WithExceptionNode;
-import jdk.compiler.graal.nodes.memory.SingleMemoryKill;
-import jdk.compiler.graal.nodes.spi.Lowerable;
-import jdk.compiler.graal.nodes.spi.VirtualizerTool;
-import jdk.compiler.graal.nodes.util.GraphUtil;
-import jdk.compiler.graal.replacements.nodes.MacroNode.MacroParams;
-import jdk.compiler.graal.replacements.nodes.ObjectClone;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_8;
+
+import jdk.graal.compiler.core.common.type.StampPair;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.InputType;
+import jdk.graal.compiler.nodeinfo.NodeCycles;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.AbstractBeginNode;
+import jdk.graal.compiler.nodes.CallTargetNode.InvokeKind;
+import jdk.graal.compiler.nodes.FixedNode;
+import jdk.graal.compiler.nodes.FrameState;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.WithExceptionNode;
+import jdk.graal.compiler.nodes.memory.SingleMemoryKill;
+import jdk.graal.compiler.nodes.spi.Lowerable;
+import jdk.graal.compiler.nodes.spi.VirtualizerTool;
+import jdk.graal.compiler.nodes.util.GraphUtil;
+import jdk.graal.compiler.replacements.nodes.MacroNode.MacroParams;
+import jdk.graal.compiler.replacements.nodes.ObjectClone;
 import org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.meta.ResolvedJavaMethod;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/lir/DeoptEntryOp.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/lir/DeoptEntryOp.java
index 20e770c305b0..cd19a05a96a9 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/lir/DeoptEntryOp.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/lir/DeoptEntryOp.java
@@ -26,11 +26,11 @@
 
 import java.util.List;
 
-import jdk.compiler.graal.code.CompilationResult;
-import jdk.compiler.graal.lir.LIRFrameState;
-import jdk.compiler.graal.lir.LIRInstruction;
-import jdk.compiler.graal.lir.LIRInstructionClass;
-import jdk.compiler.graal.lir.asm.CompilationResultBuilder;
+import jdk.graal.compiler.code.CompilationResult;
+import jdk.graal.compiler.lir.LIRFrameState;
+import jdk.graal.compiler.lir.LIRInstruction;
+import jdk.graal.compiler.lir.LIRInstructionClass;
+import jdk.graal.compiler.lir.asm.CompilationResultBuilder;
 
 import com.oracle.svm.core.code.CodeInfoEncoder;
 import com.oracle.svm.core.deopt.DeoptEntryInfopoint;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/lir/DeoptSourcePositionInfoOp.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/lir/DeoptSourcePositionInfoOp.java
index bdbb1908f5aa..fc82573c9a61 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/lir/DeoptSourcePositionInfoOp.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/lir/DeoptSourcePositionInfoOp.java
@@ -26,10 +26,10 @@
 
 import java.util.List;
 
-import jdk.compiler.graal.graph.NodeSourcePosition;
-import jdk.compiler.graal.lir.LIRInstruction;
-import jdk.compiler.graal.lir.LIRInstructionClass;
-import jdk.compiler.graal.lir.asm.CompilationResultBuilder;
+import jdk.graal.compiler.graph.NodeSourcePosition;
+import jdk.graal.compiler.lir.LIRInstruction;
+import jdk.graal.compiler.lir.LIRInstructionClass;
+import jdk.graal.compiler.lir.asm.CompilationResultBuilder;
 
 import com.oracle.svm.core.graal.code.SubstrateCompilationResult;
 
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/lir/VerificationMarkerOp.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/lir/VerificationMarkerOp.java
index a5cf11310e0b..00afe275cfaa 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/lir/VerificationMarkerOp.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/lir/VerificationMarkerOp.java
@@ -24,9 +24,9 @@
  */
 package com.oracle.svm.core.graal.lir;
 
-import jdk.compiler.graal.lir.LIRInstruction;
-import jdk.compiler.graal.lir.LIRInstructionClass;
-import jdk.compiler.graal.lir.asm.CompilationResultBuilder;
+import jdk.graal.compiler.lir.LIRInstruction;
+import jdk.graal.compiler.lir.LIRInstructionClass;
+import jdk.graal.compiler.lir.asm.CompilationResultBuilder;
 
 public final class VerificationMarkerOp extends LIRInstruction {
     public static final LIRInstructionClass TYPE = LIRInstructionClass.create(VerificationMarkerOp.class);
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/lir/VerifyCFunctionReferenceMapsLIRPhase.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/lir/VerifyCFunctionReferenceMapsLIRPhase.java
index ff5c4c8f4656..209fccbed9d5 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/lir/VerifyCFunctionReferenceMapsLIRPhase.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/lir/VerifyCFunctionReferenceMapsLIRPhase.java
@@ -31,12 +31,12 @@
 import java.util.List;
 import java.util.Set;
 
-import jdk.compiler.graal.core.common.cfg.BasicBlock;
-import jdk.compiler.graal.lir.LIR;
-import jdk.compiler.graal.lir.LIRFrameState;
-import jdk.compiler.graal.lir.LIRInstruction;
-import jdk.compiler.graal.lir.gen.LIRGenerationResult;
-import jdk.compiler.graal.lir.phases.FinalCodeAnalysisPhase;
+import jdk.graal.compiler.core.common.cfg.BasicBlock;
+import jdk.graal.compiler.lir.LIR;
+import jdk.graal.compiler.lir.LIRFrameState;
+import jdk.graal.compiler.lir.LIRInstruction;
+import jdk.graal.compiler.lir.gen.LIRGenerationResult;
+import jdk.graal.compiler.lir.phases.FinalCodeAnalysisPhase;
 
 import com.oracle.svm.core.SubstrateOptions;
 import com.oracle.svm.core.graal.snippets.CFunctionSnippets;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/meta/KnownOffsets.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/meta/KnownOffsets.java
index bc843802a585..5e0dd0a4caae 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/meta/KnownOffsets.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/meta/KnownOffsets.java
@@ -24,7 +24,7 @@
  */
 package com.oracle.svm.core.graal.meta;
 
-import jdk.compiler.graal.api.replacements.Fold;
+import jdk.graal.compiler.api.replacements.Fold;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/meta/RuntimeConfiguration.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/meta/RuntimeConfiguration.java
index e2f27791693c..826c68707dfc 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/meta/RuntimeConfiguration.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/meta/RuntimeConfiguration.java
@@ -27,10 +27,10 @@
 import java.util.Collection;
 import java.util.EnumMap;
 
-import jdk.compiler.graal.api.replacements.SnippetReflectionProvider;
-import jdk.compiler.graal.debug.DebugHandlersFactory;
-import jdk.compiler.graal.phases.util.Providers;
-import jdk.compiler.graal.word.WordTypes;
+import jdk.graal.compiler.api.replacements.SnippetReflectionProvider;
+import jdk.graal.compiler.debug.DebugHandlersFactory;
+import jdk.graal.compiler.phases.util.Providers;
+import jdk.graal.compiler.word.WordTypes;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
 
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/meta/SubstrateBasicLoweringProvider.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/meta/SubstrateBasicLoweringProvider.java
index 3bbc84523822..c8c41c3c2274 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/meta/SubstrateBasicLoweringProvider.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/meta/SubstrateBasicLoweringProvider.java
@@ -27,44 +27,44 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import jdk.compiler.graal.core.common.memory.BarrierType;
-import jdk.compiler.graal.core.common.memory.MemoryOrderMode;
-import jdk.compiler.graal.core.common.spi.ForeignCallsProvider;
-import jdk.compiler.graal.core.common.spi.MetaAccessExtensionProvider;
-import jdk.compiler.graal.core.common.type.AbstractObjectStamp;
-import jdk.compiler.graal.core.common.type.ObjectStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.core.common.type.TypeReference;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.nodes.CompressionNode.CompressionOp;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.DeadEndNode;
-import jdk.compiler.graal.nodes.FieldLocationIdentity;
-import jdk.compiler.graal.nodes.FixedNode;
-import jdk.compiler.graal.nodes.NamedLocationIdentity;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.calc.AndNode;
-import jdk.compiler.graal.nodes.calc.LeftShiftNode;
-import jdk.compiler.graal.nodes.calc.UnsignedRightShiftNode;
-import jdk.compiler.graal.nodes.extended.LoadHubNode;
-import jdk.compiler.graal.nodes.extended.LoadMethodNode;
-import jdk.compiler.graal.nodes.memory.FloatingReadNode;
-import jdk.compiler.graal.nodes.memory.ReadNode;
-import jdk.compiler.graal.nodes.memory.address.AddressNode;
-import jdk.compiler.graal.nodes.memory.address.OffsetAddressNode;
-import jdk.compiler.graal.nodes.spi.LoweringTool;
-import jdk.compiler.graal.nodes.spi.PlatformConfigurationProvider;
-import jdk.compiler.graal.nodes.type.NarrowOopStamp;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.util.Providers;
-import jdk.compiler.graal.replacements.DefaultJavaLoweringProvider;
-import jdk.compiler.graal.replacements.IsArraySnippets;
-import jdk.compiler.graal.replacements.SnippetCounter.Group;
-import jdk.compiler.graal.replacements.nodes.AssertionNode;
+import jdk.graal.compiler.core.common.memory.BarrierType;
+import jdk.graal.compiler.core.common.memory.MemoryOrderMode;
+import jdk.graal.compiler.core.common.spi.ForeignCallsProvider;
+import jdk.graal.compiler.core.common.spi.MetaAccessExtensionProvider;
+import jdk.graal.compiler.core.common.type.AbstractObjectStamp;
+import jdk.graal.compiler.core.common.type.ObjectStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.core.common.type.TypeReference;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.nodes.CompressionNode.CompressionOp;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.DeadEndNode;
+import jdk.graal.compiler.nodes.FieldLocationIdentity;
+import jdk.graal.compiler.nodes.FixedNode;
+import jdk.graal.compiler.nodes.NamedLocationIdentity;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.calc.AndNode;
+import jdk.graal.compiler.nodes.calc.LeftShiftNode;
+import jdk.graal.compiler.nodes.calc.UnsignedRightShiftNode;
+import jdk.graal.compiler.nodes.extended.LoadHubNode;
+import jdk.graal.compiler.nodes.extended.LoadMethodNode;
+import jdk.graal.compiler.nodes.memory.FloatingReadNode;
+import jdk.graal.compiler.nodes.memory.ReadNode;
+import jdk.graal.compiler.nodes.memory.address.AddressNode;
+import jdk.graal.compiler.nodes.memory.address.OffsetAddressNode;
+import jdk.graal.compiler.nodes.spi.LoweringTool;
+import jdk.graal.compiler.nodes.spi.PlatformConfigurationProvider;
+import jdk.graal.compiler.nodes.type.NarrowOopStamp;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.util.Providers;
+import jdk.graal.compiler.replacements.DefaultJavaLoweringProvider;
+import jdk.graal.compiler.replacements.IsArraySnippets;
+import jdk.graal.compiler.replacements.SnippetCounter.Group;
+import jdk.graal.compiler.replacements.nodes.AssertionNode;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
 
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/meta/SubstrateForeignCallLinkage.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/meta/SubstrateForeignCallLinkage.java
index d82cc85f1ca6..9bac644128b6 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/meta/SubstrateForeignCallLinkage.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/meta/SubstrateForeignCallLinkage.java
@@ -24,7 +24,7 @@
  */
 package com.oracle.svm.core.graal.meta;
 
-import jdk.compiler.graal.core.common.spi.ForeignCallLinkage;
+import jdk.graal.compiler.core.common.spi.ForeignCallLinkage;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
 
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/meta/SubstrateForeignCallsProvider.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/meta/SubstrateForeignCallsProvider.java
index 91bf2064d734..05db1b3ee960 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/meta/SubstrateForeignCallsProvider.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/meta/SubstrateForeignCallsProvider.java
@@ -29,11 +29,11 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import jdk.compiler.graal.core.common.LIRKind;
-import jdk.compiler.graal.core.common.spi.ForeignCallDescriptor;
-import jdk.compiler.graal.core.common.spi.ForeignCallSignature;
-import jdk.compiler.graal.replacements.arraycopy.ArrayCopyForeignCalls;
-import jdk.compiler.graal.replacements.arraycopy.ArrayCopyLookup;
+import jdk.graal.compiler.core.common.LIRKind;
+import jdk.graal.compiler.core.common.spi.ForeignCallDescriptor;
+import jdk.graal.compiler.core.common.spi.ForeignCallSignature;
+import jdk.graal.compiler.replacements.arraycopy.ArrayCopyForeignCalls;
+import jdk.graal.compiler.replacements.arraycopy.ArrayCopyLookup;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
 import org.graalvm.word.LocationIdentity;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/meta/SubstrateLoweringProvider.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/meta/SubstrateLoweringProvider.java
index 46a1d152f88a..99292d7a5a76 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/meta/SubstrateLoweringProvider.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/meta/SubstrateLoweringProvider.java
@@ -26,16 +26,16 @@
 
 import java.util.Map;
 
-import jdk.compiler.graal.core.common.spi.ForeignCallsProvider;
-import jdk.compiler.graal.core.common.spi.MetaAccessExtensionProvider;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.LoweringProvider;
-import jdk.compiler.graal.nodes.spi.PlatformConfigurationProvider;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.util.Providers;
+import jdk.graal.compiler.core.common.spi.ForeignCallsProvider;
+import jdk.graal.compiler.core.common.spi.MetaAccessExtensionProvider;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.LoweringProvider;
+import jdk.graal.compiler.nodes.spi.PlatformConfigurationProvider;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.util.Providers;
 
 import com.oracle.svm.core.graal.GraalConfiguration;
 import com.oracle.svm.core.graal.snippets.NodeLoweringProvider;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/meta/SubstrateMemoryAccessProvider.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/meta/SubstrateMemoryAccessProvider.java
index b7e427da7a90..44e7b44b8a7d 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/meta/SubstrateMemoryAccessProvider.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/meta/SubstrateMemoryAccessProvider.java
@@ -24,7 +24,7 @@
  */
 package com.oracle.svm.core.graal.meta;
 
-import jdk.compiler.graal.core.common.CompressEncoding;
+import jdk.graal.compiler.core.common.CompressEncoding;
 
 import jdk.vm.ci.meta.Constant;
 import jdk.vm.ci.meta.JavaConstant;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/meta/SubstrateReplacements.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/meta/SubstrateReplacements.java
index e9fa32b6b96b..205136209c80 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/meta/SubstrateReplacements.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/meta/SubstrateReplacements.java
@@ -25,8 +25,8 @@
 package com.oracle.svm.core.graal.meta;
 
 import static com.oracle.svm.core.util.VMError.shouldNotReachHere;
-import static jdk.compiler.graal.nodes.graphbuilderconf.InlineInvokePlugin.InlineInfo.createIntrinsicInlineInfo;
-import static jdk.compiler.graal.nodes.graphbuilderconf.IntrinsicContext.CompilationContext.INLINE_AFTER_PARSING;
+import static jdk.graal.compiler.nodes.graphbuilderconf.InlineInvokePlugin.InlineInfo.createIntrinsicInlineInfo;
+import static jdk.graal.compiler.nodes.graphbuilderconf.IntrinsicContext.CompilationContext.INLINE_AFTER_PARSING;
 
 import java.util.ArrayDeque;
 import java.util.ArrayList;
@@ -42,42 +42,42 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Function;
 
-import jdk.compiler.graal.api.replacements.Snippet;
-import jdk.compiler.graal.api.replacements.SnippetReflectionProvider;
-import jdk.compiler.graal.bytecode.BytecodeProvider;
-import jdk.compiler.graal.core.common.GraalOptions;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.core.common.type.TypeReference;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.debug.DebugOptions;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.graph.NodeSourcePosition;
-import jdk.compiler.graal.nodes.EncodedGraph;
-import jdk.compiler.graal.nodes.GraphEncoder;
-import jdk.compiler.graal.nodes.Invoke;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.graphbuilderconf.GeneratedInvocationPlugin;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderPlugin;
-import jdk.compiler.graal.nodes.graphbuilderconf.InlineInvokePlugin;
-import jdk.compiler.graal.nodes.graphbuilderconf.IntrinsicContext;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins;
-import jdk.compiler.graal.nodes.graphbuilderconf.ParameterPlugin;
-import jdk.compiler.graal.nodes.java.MethodCallTargetNode;
-import jdk.compiler.graal.nodes.spi.SnippetParameterInfo;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.util.Providers;
-import jdk.compiler.graal.printer.GraalDebugHandlersFactory;
-import jdk.compiler.graal.replacements.ConstantBindingParameterPlugin;
-import jdk.compiler.graal.replacements.PEGraphDecoder;
-import jdk.compiler.graal.replacements.ReplacementsImpl;
-import jdk.compiler.graal.word.WordTypes;
+import jdk.graal.compiler.api.replacements.Snippet;
+import jdk.graal.compiler.api.replacements.SnippetReflectionProvider;
+import jdk.graal.compiler.bytecode.BytecodeProvider;
+import jdk.graal.compiler.core.common.GraalOptions;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.core.common.type.TypeReference;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.debug.DebugOptions;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.graph.NodeSourcePosition;
+import jdk.graal.compiler.nodes.EncodedGraph;
+import jdk.graal.compiler.nodes.GraphEncoder;
+import jdk.graal.compiler.nodes.Invoke;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.StructuredGraph.AllowAssumptions;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.graphbuilderconf.GeneratedInvocationPlugin;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderPlugin;
+import jdk.graal.compiler.nodes.graphbuilderconf.InlineInvokePlugin;
+import jdk.graal.compiler.nodes.graphbuilderconf.IntrinsicContext;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins;
+import jdk.graal.compiler.nodes.graphbuilderconf.ParameterPlugin;
+import jdk.graal.compiler.nodes.java.MethodCallTargetNode;
+import jdk.graal.compiler.nodes.spi.SnippetParameterInfo;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.util.Providers;
+import jdk.graal.compiler.printer.GraalDebugHandlersFactory;
+import jdk.graal.compiler.replacements.ConstantBindingParameterPlugin;
+import jdk.graal.compiler.replacements.PEGraphDecoder;
+import jdk.graal.compiler.replacements.ReplacementsImpl;
+import jdk.graal.compiler.word.WordTypes;
 import org.graalvm.nativeimage.AnnotationAccess;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/meta/SubstrateSnippetReflectionProvider.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/meta/SubstrateSnippetReflectionProvider.java
index c7d5fd81741e..b6e34170d5a3 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/meta/SubstrateSnippetReflectionProvider.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/meta/SubstrateSnippetReflectionProvider.java
@@ -27,8 +27,8 @@
 import java.lang.reflect.Executable;
 import java.lang.reflect.Field;
 
-import jdk.compiler.graal.api.replacements.SnippetReflectionProvider;
-import jdk.compiler.graal.word.WordTypes;
+import jdk.graal.compiler.api.replacements.SnippetReflectionProvider;
+import jdk.graal.compiler.word.WordTypes;
 
 import com.oracle.svm.core.meta.SubstrateObjectConstant;
 import com.oracle.svm.core.util.VMError;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/meta/SubstrateStampProvider.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/meta/SubstrateStampProvider.java
index 8029f9b182de..5491a90eaf2a 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/meta/SubstrateStampProvider.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/meta/SubstrateStampProvider.java
@@ -27,11 +27,11 @@
 import com.oracle.svm.core.hub.DynamicHub;
 import com.oracle.svm.core.meta.SubstrateMethodPointerStamp;
 import jdk.vm.ci.meta.MetaAccessProvider;
-import jdk.compiler.graal.core.common.type.AbstractPointerStamp;
-import jdk.compiler.graal.core.common.type.ObjectStamp;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.core.common.type.TypeReference;
-import jdk.compiler.graal.nodes.spi.StampProvider;
+import jdk.graal.compiler.core.common.type.AbstractPointerStamp;
+import jdk.graal.compiler.core.common.type.ObjectStamp;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.core.common.type.TypeReference;
+import jdk.graal.compiler.nodes.spi.StampProvider;
 
 public class SubstrateStampProvider implements StampProvider {
 
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/CEntryPointEnterNode.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/CEntryPointEnterNode.java
index 3d59e6023ffa..44d33ea66678 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/CEntryPointEnterNode.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/CEntryPointEnterNode.java
@@ -24,18 +24,18 @@
  */
 package com.oracle.svm.core.graal.nodes;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_8;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_8;
-
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.InputType;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.DeoptimizingFixedWithNextNode;
-import jdk.compiler.graal.nodes.DeoptimizingNode.DeoptBefore;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.memory.SingleMemoryKill;
-import jdk.compiler.graal.nodes.spi.Lowerable;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_8;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_8;
+
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.InputType;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.DeoptimizingFixedWithNextNode;
+import jdk.graal.compiler.nodes.DeoptimizingNode.DeoptBefore;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.memory.SingleMemoryKill;
+import jdk.graal.compiler.nodes.spi.Lowerable;
 import org.graalvm.word.LocationIdentity;
 
 import com.oracle.svm.core.c.function.CEntryPointActions;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/CEntryPointLeaveNode.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/CEntryPointLeaveNode.java
index b0befffae6e6..05132cb395c8 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/CEntryPointLeaveNode.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/CEntryPointLeaveNode.java
@@ -24,31 +24,31 @@
  */
 package com.oracle.svm.core.graal.nodes;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_8;
-
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.InputType;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodeinfo.NodeSize;
-import jdk.compiler.graal.nodes.AbstractMergeNode;
-import jdk.compiler.graal.nodes.DeoptimizingFixedWithNextNode;
-import jdk.compiler.graal.nodes.DeoptimizingNode.DeoptBefore;
-import jdk.compiler.graal.nodes.EndNode;
-import jdk.compiler.graal.nodes.FixedNode;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.IfNode;
-import jdk.compiler.graal.nodes.MergeNode;
-import jdk.compiler.graal.nodes.ReturnNode;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.extended.FixedValueAnchorNode;
-import jdk.compiler.graal.nodes.java.InstanceOfDynamicNode;
-import jdk.compiler.graal.nodes.memory.SingleMemoryKill;
-import jdk.compiler.graal.nodes.spi.Lowerable;
-import jdk.compiler.graal.nodes.spi.Simplifiable;
-import jdk.compiler.graal.nodes.spi.SimplifierTool;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_8;
+
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.InputType;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodeinfo.NodeSize;
+import jdk.graal.compiler.nodes.AbstractMergeNode;
+import jdk.graal.compiler.nodes.DeoptimizingFixedWithNextNode;
+import jdk.graal.compiler.nodes.DeoptimizingNode.DeoptBefore;
+import jdk.graal.compiler.nodes.EndNode;
+import jdk.graal.compiler.nodes.FixedNode;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.IfNode;
+import jdk.graal.compiler.nodes.MergeNode;
+import jdk.graal.compiler.nodes.ReturnNode;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.extended.FixedValueAnchorNode;
+import jdk.graal.compiler.nodes.java.InstanceOfDynamicNode;
+import jdk.graal.compiler.nodes.memory.SingleMemoryKill;
+import jdk.graal.compiler.nodes.spi.Lowerable;
+import jdk.graal.compiler.nodes.spi.Simplifiable;
+import jdk.graal.compiler.nodes.spi.SimplifierTool;
 import org.graalvm.word.LocationIdentity;
 
 import com.oracle.svm.core.c.function.CEntryPointActions;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/CEntryPointUtilityNode.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/CEntryPointUtilityNode.java
index 88e07f95b283..b61d3f2e8593 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/CEntryPointUtilityNode.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/CEntryPointUtilityNode.java
@@ -24,18 +24,18 @@
  */
 package com.oracle.svm.core.graal.nodes;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_2;
-
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.InputType;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.DeoptimizingFixedWithNextNode;
-import jdk.compiler.graal.nodes.DeoptimizingNode.DeoptBefore;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.memory.SingleMemoryKill;
-import jdk.compiler.graal.nodes.spi.Lowerable;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_2;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_2;
+
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.InputType;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.DeoptimizingFixedWithNextNode;
+import jdk.graal.compiler.nodes.DeoptimizingNode.DeoptBefore;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.memory.SingleMemoryKill;
+import jdk.graal.compiler.nodes.spi.Lowerable;
 import org.graalvm.nativeimage.CurrentIsolate;
 import org.graalvm.word.LocationIdentity;
 
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/CGlobalDataLoadAddressNode.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/CGlobalDataLoadAddressNode.java
index 4d88d1aa6bf2..5ca0b0545f3b 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/CGlobalDataLoadAddressNode.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/CGlobalDataLoadAddressNode.java
@@ -24,13 +24,13 @@
  */
 package com.oracle.svm.core.graal.nodes;
 
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeCycles;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodeinfo.NodeSize;
-import jdk.compiler.graal.nodes.calc.FloatingNode;
-import jdk.compiler.graal.nodes.spi.LIRLowerable;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeCycles;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodeinfo.NodeSize;
+import jdk.graal.compiler.nodes.calc.FloatingNode;
+import jdk.graal.compiler.nodes.spi.LIRLowerable;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
 
 import com.oracle.svm.core.FrameAccess;
 import com.oracle.svm.core.graal.code.CGlobalDataInfo;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/CInterfaceReadNode.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/CInterfaceReadNode.java
index e7ac8378e1aa..9340b015a70f 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/CInterfaceReadNode.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/CInterfaceReadNode.java
@@ -24,13 +24,13 @@
  */
 package com.oracle.svm.core.graal.nodes;
 
-import jdk.compiler.graal.core.common.memory.BarrierType;
-import jdk.compiler.graal.core.common.memory.MemoryOrderMode;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.memory.ReadNode;
-import jdk.compiler.graal.nodes.memory.address.AddressNode;
+import jdk.graal.compiler.core.common.memory.BarrierType;
+import jdk.graal.compiler.core.common.memory.MemoryOrderMode;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.memory.ReadNode;
+import jdk.graal.compiler.nodes.memory.address.AddressNode;
 import org.graalvm.word.LocationIdentity;
 
 /**
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/CInterfaceWriteNode.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/CInterfaceWriteNode.java
index 113ec353bffc..f3c67b6d8d86 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/CInterfaceWriteNode.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/CInterfaceWriteNode.java
@@ -24,13 +24,13 @@
  */
 package com.oracle.svm.core.graal.nodes;
 
-import jdk.compiler.graal.core.common.memory.BarrierType;
-import jdk.compiler.graal.core.common.memory.MemoryOrderMode;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.memory.WriteNode;
-import jdk.compiler.graal.nodes.memory.address.AddressNode;
+import jdk.graal.compiler.core.common.memory.BarrierType;
+import jdk.graal.compiler.core.common.memory.MemoryOrderMode;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.memory.WriteNode;
+import jdk.graal.compiler.nodes.memory.address.AddressNode;
 import org.graalvm.word.LocationIdentity;
 
 /**
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/ComputedIndirectCallTargetNode.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/ComputedIndirectCallTargetNode.java
index e658c2f18d6c..4240630ae1d6 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/ComputedIndirectCallTargetNode.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/ComputedIndirectCallTargetNode.java
@@ -24,11 +24,11 @@
  */
 package com.oracle.svm.core.graal.nodes;
 
-import jdk.compiler.graal.core.common.type.StampPair;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.LoweredCallTargetNode;
-import jdk.compiler.graal.nodes.ValueNode;
+import jdk.graal.compiler.core.common.type.StampPair;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.LoweredCallTargetNode;
+import jdk.graal.compiler.nodes.ValueNode;
 
 import com.oracle.svm.core.graal.code.SubstrateCallingConventionKind;
 
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/DeoptEntryBeginNode.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/DeoptEntryBeginNode.java
index 7176073d8205..77d86f3da82d 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/DeoptEntryBeginNode.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/DeoptEntryBeginNode.java
@@ -24,14 +24,14 @@
  */
 package com.oracle.svm.core.graal.nodes;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_0;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_0;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_0;
 
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.AbstractBeginNode;
-import jdk.compiler.graal.nodes.LoopExitNode;
-import jdk.compiler.graal.nodes.spi.ValueProxy;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.AbstractBeginNode;
+import jdk.graal.compiler.nodes.LoopExitNode;
+import jdk.graal.compiler.nodes.spi.ValueProxy;
 
 /**
  * This class is necessary to create a scheduling point between a {@link DeoptEntryNode} and a
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/DeoptEntryNode.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/DeoptEntryNode.java
index 26b84e3a8c0b..e14302f4a166 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/DeoptEntryNode.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/DeoptEntryNode.java
@@ -24,22 +24,22 @@
  */
 package com.oracle.svm.core.graal.nodes;
 
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.core.gen.NodeLIRBuilder;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.lir.LabelRef;
-import jdk.compiler.graal.nodeinfo.InputType;
-import jdk.compiler.graal.nodeinfo.NodeCycles;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodeinfo.NodeSize;
-import jdk.compiler.graal.nodes.AbstractBeginNode;
-import jdk.compiler.graal.nodes.DeoptimizingNode;
-import jdk.compiler.graal.nodes.FrameState;
-import jdk.compiler.graal.nodes.UnreachableBeginNode;
-import jdk.compiler.graal.nodes.WithExceptionNode;
-import jdk.compiler.graal.nodes.debug.ControlFlowAnchored;
-import jdk.compiler.graal.nodes.memory.SingleMemoryKill;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.core.gen.NodeLIRBuilder;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.lir.LabelRef;
+import jdk.graal.compiler.nodeinfo.InputType;
+import jdk.graal.compiler.nodeinfo.NodeCycles;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodeinfo.NodeSize;
+import jdk.graal.compiler.nodes.AbstractBeginNode;
+import jdk.graal.compiler.nodes.DeoptimizingNode;
+import jdk.graal.compiler.nodes.FrameState;
+import jdk.graal.compiler.nodes.UnreachableBeginNode;
+import jdk.graal.compiler.nodes.WithExceptionNode;
+import jdk.graal.compiler.nodes.debug.ControlFlowAnchored;
+import jdk.graal.compiler.nodes.memory.SingleMemoryKill;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
 import org.graalvm.word.LocationIdentity;
 
 import com.oracle.svm.core.graal.lir.DeoptEntryOp;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/DeoptEntrySupport.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/DeoptEntrySupport.java
index 5b931ba8741c..1c156f511276 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/DeoptEntrySupport.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/DeoptEntrySupport.java
@@ -24,10 +24,10 @@
  */
 package com.oracle.svm.core.graal.nodes;
 
-import jdk.compiler.graal.nodes.FixedNodeInterface;
-import jdk.compiler.graal.nodes.StateSplit;
-import jdk.compiler.graal.nodes.debug.ControlFlowAnchored;
-import jdk.compiler.graal.nodes.spi.LIRLowerable;
+import jdk.graal.compiler.nodes.FixedNodeInterface;
+import jdk.graal.compiler.nodes.StateSplit;
+import jdk.graal.compiler.nodes.debug.ControlFlowAnchored;
+import jdk.graal.compiler.nodes.spi.LIRLowerable;
 
 public interface DeoptEntrySupport extends LIRLowerable, ControlFlowAnchored, FixedNodeInterface, StateSplit {
 
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/DeoptProxyAnchorNode.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/DeoptProxyAnchorNode.java
index 8a5cfbfeba16..d2c6e7d26201 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/DeoptProxyAnchorNode.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/DeoptProxyAnchorNode.java
@@ -24,14 +24,14 @@
  */
 package com.oracle.svm.core.graal.nodes;
 
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.InputType;
-import jdk.compiler.graal.nodeinfo.NodeCycles;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodeinfo.NodeSize;
-import jdk.compiler.graal.nodes.AbstractStateSplit;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.InputType;
+import jdk.graal.compiler.nodeinfo.NodeCycles;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodeinfo.NodeSize;
+import jdk.graal.compiler.nodes.AbstractStateSplit;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
 
 /**
  * The anchor for DeoptProxyNode when no full {@link DeoptEntryNode deoptimization entry} is
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/DeoptSourcePositionInfoNode.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/DeoptSourcePositionInfoNode.java
index a9a76e51768a..8601bc9b5519 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/DeoptSourcePositionInfoNode.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/DeoptSourcePositionInfoNode.java
@@ -24,18 +24,18 @@
  */
 package com.oracle.svm.core.graal.nodes;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_0;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_0;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_0;
 
 import java.util.List;
 
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.graph.NodeSourcePosition;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.spi.LIRLowerable;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.graph.NodeSourcePosition;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.spi.LIRLowerable;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
 
 import com.oracle.svm.core.graal.lir.DeoptSourcePositionInfoOp;
 
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/DeoptTestNode.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/DeoptTestNode.java
index 8674e484a255..ed6cfbfac264 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/DeoptTestNode.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/DeoptTestNode.java
@@ -24,16 +24,16 @@
  */
 package com.oracle.svm.core.graal.nodes;
 
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.InputType;
-import jdk.compiler.graal.nodeinfo.NodeCycles;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodeinfo.NodeSize;
-import jdk.compiler.graal.nodes.AbstractStateSplit;
-import jdk.compiler.graal.nodes.DeoptimizingNode;
-import jdk.compiler.graal.nodes.memory.SingleMemoryKill;
-import jdk.compiler.graal.nodes.spi.Lowerable;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.InputType;
+import jdk.graal.compiler.nodeinfo.NodeCycles;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodeinfo.NodeSize;
+import jdk.graal.compiler.nodes.AbstractStateSplit;
+import jdk.graal.compiler.nodes.DeoptimizingNode;
+import jdk.graal.compiler.nodes.memory.SingleMemoryKill;
+import jdk.graal.compiler.nodes.spi.Lowerable;
 import org.graalvm.word.LocationIdentity;
 
 import com.oracle.svm.core.graal.snippets.DeoptTester;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/FarReturnNode.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/FarReturnNode.java
index 94d055857ace..a300cbf5b8eb 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/FarReturnNode.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/FarReturnNode.java
@@ -24,17 +24,17 @@
  */
 package com.oracle.svm.core.graal.nodes;
 
-import jdk.compiler.graal.core.common.LIRKind;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.lir.gen.LIRGenerator;
-import jdk.compiler.graal.nodeinfo.NodeCycles;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodeinfo.NodeSize;
-import jdk.compiler.graal.nodes.ControlSinkNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.LIRLowerable;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.core.common.LIRKind;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.lir.gen.LIRGenerator;
+import jdk.graal.compiler.nodeinfo.NodeCycles;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodeinfo.NodeSize;
+import jdk.graal.compiler.nodes.ControlSinkNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.LIRLowerable;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
 
 import com.oracle.svm.core.graal.code.SubstrateLIRGenerator;
 
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/FloatingWordCastNode.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/FloatingWordCastNode.java
index a97995f3cc96..5518effdb36b 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/FloatingWordCastNode.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/FloatingWordCastNode.java
@@ -24,19 +24,19 @@
  */
 package com.oracle.svm.core.graal.nodes;
 
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodes.spi.Canonicalizable;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodeinfo.NodeCycles;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodeinfo.NodeSize;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.calc.FloatingNode;
-import jdk.compiler.graal.nodes.spi.LIRLowerable;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodes.spi.Canonicalizable;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodeinfo.NodeCycles;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodeinfo.NodeSize;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.calc.FloatingNode;
+import jdk.graal.compiler.nodes.spi.LIRLowerable;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
 
 import jdk.vm.ci.meta.AllocatableValue;
 import jdk.vm.ci.meta.Value;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/ForeignCallWithExceptionNode.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/ForeignCallWithExceptionNode.java
index f4f1db4063c6..2af49c2c9d32 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/ForeignCallWithExceptionNode.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/ForeignCallWithExceptionNode.java
@@ -24,31 +24,31 @@
  */
 package com.oracle.svm.core.graal.nodes;
 
-import static jdk.compiler.graal.nodeinfo.InputType.Memory;
-import static jdk.compiler.graal.nodeinfo.InputType.State;
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_2;
-
-import jdk.compiler.graal.core.common.spi.ForeignCallDescriptor;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.Node.NodeIntrinsicFactory;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.graph.NodeInputList;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodeinfo.Verbosity;
-import jdk.compiler.graal.nodes.AbstractBeginNode;
-import jdk.compiler.graal.nodes.FixedNode;
-import jdk.compiler.graal.nodes.FrameState;
-import jdk.compiler.graal.nodes.UnreachableBeginNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.WithExceptionNode;
-import jdk.compiler.graal.nodes.extended.ForeignCall;
-import jdk.compiler.graal.nodes.extended.ForeignCallNode;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext;
-import jdk.compiler.graal.nodes.spi.Simplifiable;
-import jdk.compiler.graal.nodes.spi.SimplifierTool;
-import jdk.compiler.graal.nodes.util.GraphUtil;
+import static jdk.graal.compiler.nodeinfo.InputType.Memory;
+import static jdk.graal.compiler.nodeinfo.InputType.State;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_2;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_2;
+
+import jdk.graal.compiler.core.common.spi.ForeignCallDescriptor;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.Node.NodeIntrinsicFactory;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.graph.NodeInputList;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodeinfo.Verbosity;
+import jdk.graal.compiler.nodes.AbstractBeginNode;
+import jdk.graal.compiler.nodes.FixedNode;
+import jdk.graal.compiler.nodes.FrameState;
+import jdk.graal.compiler.nodes.UnreachableBeginNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.WithExceptionNode;
+import jdk.graal.compiler.nodes.extended.ForeignCall;
+import jdk.graal.compiler.nodes.extended.ForeignCallNode;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext;
+import jdk.graal.compiler.nodes.spi.Simplifiable;
+import jdk.graal.compiler.nodes.spi.SimplifierTool;
+import jdk.graal.compiler.nodes.util.GraphUtil;
 
 import jdk.vm.ci.code.BytecodeFrame;
 import jdk.vm.ci.meta.JavaKind;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/InlinedInvokeArgumentsNode.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/InlinedInvokeArgumentsNode.java
index 2133fd9d62b6..4b26a69e91e2 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/InlinedInvokeArgumentsNode.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/InlinedInvokeArgumentsNode.java
@@ -24,15 +24,15 @@
  */
 package com.oracle.svm.core.graal.nodes;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_0;
 
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.graph.NodeInputList;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodeinfo.NodeSize;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.ValueNode;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.graph.NodeInputList;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodeinfo.NodeSize;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.ValueNode;
 
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/LazyConstantNode.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/LazyConstantNode.java
index 919ee4a88a1d..1a57c33b0f73 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/LazyConstantNode.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/LazyConstantNode.java
@@ -24,25 +24,25 @@
  */
 package com.oracle.svm.core.graal.nodes;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_0;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_1;
 
 import java.util.function.Function;
 
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.calc.FloatingNode;
-import jdk.compiler.graal.nodes.spi.Canonicalizable;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodes.spi.CoreProviders;
-import jdk.compiler.graal.nodes.spi.Lowerable;
-import jdk.compiler.graal.nodes.spi.LoweringTool;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.calc.FloatingNode;
+import jdk.graal.compiler.nodes.spi.Canonicalizable;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodes.spi.CoreProviders;
+import jdk.graal.compiler.nodes.spi.Lowerable;
+import jdk.graal.compiler.nodes.spi.LoweringTool;
 
 import jdk.vm.ci.meta.JavaConstant;
 
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/LoweredDeadEndNode.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/LoweredDeadEndNode.java
index f235953fc06d..8165d22f19ce 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/LoweredDeadEndNode.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/LoweredDeadEndNode.java
@@ -24,16 +24,16 @@
  */
 package com.oracle.svm.core.graal.nodes;
 
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.IterableNodeType;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeCycles;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodeinfo.NodeSize;
-import jdk.compiler.graal.nodes.ControlSinkNode;
-import jdk.compiler.graal.nodes.DeadEndNode;
-import jdk.compiler.graal.nodes.spi.LIRLowerable;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.IterableNodeType;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeCycles;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodeinfo.NodeSize;
+import jdk.graal.compiler.nodes.ControlSinkNode;
+import jdk.graal.compiler.nodes.DeadEndNode;
+import jdk.graal.compiler.nodes.spi.LIRLowerable;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
 
 import com.oracle.svm.core.graal.code.SubstrateLIRGenerator;
 
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/MethodReturnNode.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/MethodReturnNode.java
index 064d10deb1db..0bfe580b69a1 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/MethodReturnNode.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/MethodReturnNode.java
@@ -24,19 +24,19 @@
  */
 package com.oracle.svm.core.graal.nodes;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_2;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_2;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_2;
 
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.FixedNode;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.ReturnNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.Lowerable;
-import jdk.compiler.graal.nodes.spi.LoweringTool;
-import jdk.compiler.graal.nodes.util.GraphUtil;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.FixedNode;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.ReturnNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.Lowerable;
+import jdk.graal.compiler.nodes.spi.LoweringTool;
+import jdk.graal.compiler.nodes.util.GraphUtil;
 
 @NodeInfo(cycles = CYCLES_2, size = SIZE_2)
 public class MethodReturnNode extends FixedWithNextNode implements Lowerable {
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/NewPodInstanceNode.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/NewPodInstanceNode.java
index 7d859fd0c9b8..9916e1d89f66 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/NewPodInstanceNode.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/NewPodInstanceNode.java
@@ -24,12 +24,12 @@
  */
 package com.oracle.svm.core.graal.nodes;
 
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.core.common.type.TypeReference;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.java.AbstractNewObjectNode;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.core.common.type.TypeReference;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.java.AbstractNewObjectNode;
 
 import jdk.vm.ci.meta.ResolvedJavaType;
 
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/NewStoredContinuationNode.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/NewStoredContinuationNode.java
index ee6da787a217..6c9c1df6a2d1 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/NewStoredContinuationNode.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/NewStoredContinuationNode.java
@@ -24,12 +24,12 @@
  */
 package com.oracle.svm.core.graal.nodes;
 
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.core.common.type.TypeReference;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.java.AbstractNewArrayNode;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.core.common.type.TypeReference;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.java.AbstractNewArrayNode;
 
 import jdk.vm.ci.meta.ResolvedJavaType;
 
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/ReadCallerStackPointerNode.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/ReadCallerStackPointerNode.java
index 5f9cb190756a..46d5a64e6869 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/ReadCallerStackPointerNode.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/ReadCallerStackPointerNode.java
@@ -24,13 +24,13 @@
  */
 package com.oracle.svm.core.graal.nodes;
 
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeCycles;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodeinfo.NodeSize;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.spi.LIRLowerable;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeCycles;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodeinfo.NodeSize;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.spi.LIRLowerable;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
 
 import com.oracle.svm.core.FrameAccess;
 
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/ReadExceptionObjectNode.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/ReadExceptionObjectNode.java
index 6a41923e6dc0..42274d424046 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/ReadExceptionObjectNode.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/ReadExceptionObjectNode.java
@@ -25,15 +25,15 @@
 package com.oracle.svm.core.graal.nodes;
 
 import jdk.vm.ci.meta.JavaKind;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeCycles;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodeinfo.NodeSize;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.spi.LIRLowerable;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeCycles;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodeinfo.NodeSize;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.spi.LIRLowerable;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
 
 import java.util.concurrent.atomic.AtomicLong;
 
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/ReadReservedRegister.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/ReadReservedRegister.java
index 5461a72a99d2..ed18839d361c 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/ReadReservedRegister.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/ReadReservedRegister.java
@@ -24,8 +24,8 @@
  */
 package com.oracle.svm.core.graal.nodes;
 
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
 
 import com.oracle.svm.common.meta.MultiMethod;
 import com.oracle.svm.core.ReservedRegisters;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/ReadReservedRegisterFixedNode.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/ReadReservedRegisterFixedNode.java
index af798c90ebe9..f53770bc52aa 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/ReadReservedRegisterFixedNode.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/ReadReservedRegisterFixedNode.java
@@ -24,14 +24,14 @@
  */
 package com.oracle.svm.core.graal.nodes;
 
-import jdk.compiler.graal.core.common.LIRKind;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeCycles;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodeinfo.NodeSize;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.spi.LIRLowerable;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.core.common.LIRKind;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeCycles;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodeinfo.NodeSize;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.spi.LIRLowerable;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
 
 import com.oracle.svm.core.FrameAccess;
 
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/ReadReservedRegisterFloatingNode.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/ReadReservedRegisterFloatingNode.java
index 06bb95a2e0ee..10e3c14fe7f7 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/ReadReservedRegisterFloatingNode.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/ReadReservedRegisterFloatingNode.java
@@ -24,14 +24,14 @@
  */
 package com.oracle.svm.core.graal.nodes;
 
-import jdk.compiler.graal.core.common.LIRKind;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeCycles;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodeinfo.NodeSize;
-import jdk.compiler.graal.nodes.calc.FloatingNode;
-import jdk.compiler.graal.nodes.spi.LIRLowerable;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.core.common.LIRKind;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeCycles;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodeinfo.NodeSize;
+import jdk.graal.compiler.nodes.calc.FloatingNode;
+import jdk.graal.compiler.nodes.spi.LIRLowerable;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
 
 import com.oracle.svm.core.FrameAccess;
 
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/ReadReturnAddressNode.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/ReadReturnAddressNode.java
index 4f284ce162e9..9a209ee8a1a4 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/ReadReturnAddressNode.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/ReadReturnAddressNode.java
@@ -24,13 +24,13 @@
  */
 package com.oracle.svm.core.graal.nodes;
 
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeCycles;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodeinfo.NodeSize;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.spi.LIRLowerable;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeCycles;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodeinfo.NodeSize;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.spi.LIRLowerable;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
 
 import com.oracle.svm.core.FrameAccess;
 
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/SubstrateCompressionNode.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/SubstrateCompressionNode.java
index eb4a7b5da107..9a64b33c0a88 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/SubstrateCompressionNode.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/SubstrateCompressionNode.java
@@ -24,19 +24,19 @@
  */
 package com.oracle.svm.core.graal.nodes;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_2;
-
-import jdk.compiler.graal.core.common.CompressEncoding;
-import jdk.compiler.graal.core.common.type.CompressibleConstant;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.CompressionNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_2;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_2;
+
+import jdk.graal.compiler.core.common.CompressEncoding;
+import jdk.graal.compiler.core.common.type.CompressibleConstant;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.CompressionNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
 
 import com.oracle.svm.core.meta.CompressedNullConstant;
 
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/SubstrateFieldLocationIdentity.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/SubstrateFieldLocationIdentity.java
index afa3be6812f8..2d0962856676 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/SubstrateFieldLocationIdentity.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/SubstrateFieldLocationIdentity.java
@@ -24,7 +24,7 @@
  */
 package com.oracle.svm.core.graal.nodes;
 
-import jdk.compiler.graal.nodes.FieldLocationIdentity;
+import jdk.graal.compiler.nodes.FieldLocationIdentity;
 
 import com.oracle.svm.core.meta.SharedField;
 
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/SubstrateNarrowOopStamp.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/SubstrateNarrowOopStamp.java
index 3735f944456f..05795311c9ce 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/SubstrateNarrowOopStamp.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/SubstrateNarrowOopStamp.java
@@ -24,14 +24,14 @@
  */
 package com.oracle.svm.core.graal.nodes;
 
-import jdk.compiler.graal.core.common.CompressEncoding;
-import jdk.compiler.graal.core.common.type.AbstractObjectStamp;
-import jdk.compiler.graal.core.common.type.CompressibleConstant;
-import jdk.compiler.graal.core.common.type.ObjectStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.nodes.CompressionNode.CompressionOp;
-import jdk.compiler.graal.nodes.type.NarrowOopStamp;
+import jdk.graal.compiler.core.common.CompressEncoding;
+import jdk.graal.compiler.core.common.type.AbstractObjectStamp;
+import jdk.graal.compiler.core.common.type.CompressibleConstant;
+import jdk.graal.compiler.core.common.type.ObjectStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.nodes.CompressionNode.CompressionOp;
+import jdk.graal.compiler.nodes.type.NarrowOopStamp;
 
 import com.oracle.svm.core.graal.meta.SubstrateMemoryAccessProvider;
 import com.oracle.svm.core.heap.ReferenceAccess;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/SubstrateNewHybridInstanceNode.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/SubstrateNewHybridInstanceNode.java
index 840b1e250364..95dce9952286 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/SubstrateNewHybridInstanceNode.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/SubstrateNewHybridInstanceNode.java
@@ -24,12 +24,12 @@
  */
 package com.oracle.svm.core.graal.nodes;
 
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.core.common.type.TypeReference;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.java.AbstractNewArrayNode;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.core.common.type.TypeReference;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.java.AbstractNewArrayNode;
 
 import com.oracle.svm.core.hub.Hybrid;
 
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/SubstrateReflectionGetCallerClassNode.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/SubstrateReflectionGetCallerClassNode.java
index 790d5da9725f..3a94b1545f78 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/SubstrateReflectionGetCallerClassNode.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/SubstrateReflectionGetCallerClassNode.java
@@ -24,9 +24,9 @@
  */
 package com.oracle.svm.core.graal.nodes;
 
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.replacements.nodes.ReflectionGetCallerClassNode;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.replacements.nodes.ReflectionGetCallerClassNode;
 
 import com.oracle.svm.core.jdk.StackTraceUtils;
 
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/TestDeoptimizeNode.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/TestDeoptimizeNode.java
index 162ef3765ffb..44cfd709af09 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/TestDeoptimizeNode.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/TestDeoptimizeNode.java
@@ -24,16 +24,16 @@
  */
 package com.oracle.svm.core.graal.nodes;
 
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeCycles;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodeinfo.NodeSize;
-import jdk.compiler.graal.nodes.DeoptimizeNode;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.spi.Canonicalizable;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeCycles;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodeinfo.NodeSize;
+import jdk.graal.compiler.nodes.DeoptimizeNode;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.spi.Canonicalizable;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
 
 import com.oracle.svm.common.meta.MultiMethod;
 import com.oracle.svm.core.SubstrateOptions;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/ThrowBytecodeExceptionNode.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/ThrowBytecodeExceptionNode.java
index c3aacccedbb9..8a9f7888dee1 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/ThrowBytecodeExceptionNode.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/ThrowBytecodeExceptionNode.java
@@ -24,24 +24,24 @@
  */
 package com.oracle.svm.core.graal.nodes;
 
-import static jdk.compiler.graal.nodeinfo.InputType.State;
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_2;
+import static jdk.graal.compiler.nodeinfo.InputType.State;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_2;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_2;
 
 import java.util.List;
 
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.graph.NodeInputList;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.ControlSinkNode;
-import jdk.compiler.graal.nodes.FrameState;
-import jdk.compiler.graal.nodes.UnwindNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.extended.BytecodeExceptionNode;
-import jdk.compiler.graal.nodes.extended.BytecodeExceptionNode.BytecodeExceptionKind;
-import jdk.compiler.graal.nodes.spi.Lowerable;
-import jdk.compiler.graal.nodes.spi.NodeWithState;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.graph.NodeInputList;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.ControlSinkNode;
+import jdk.graal.compiler.nodes.FrameState;
+import jdk.graal.compiler.nodes.UnwindNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.extended.BytecodeExceptionNode;
+import jdk.graal.compiler.nodes.extended.BytecodeExceptionNode.BytecodeExceptionKind;
+import jdk.graal.compiler.nodes.spi.Lowerable;
+import jdk.graal.compiler.nodes.spi.NodeWithState;
 
 /**
  * Throw an implicit exception. In contrast to {@link BytecodeExceptionNode}, this node does not
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/VaListInitializationNode.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/VaListInitializationNode.java
index 00356c82bfa3..d960469e9c7d 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/VaListInitializationNode.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/VaListInitializationNode.java
@@ -24,16 +24,16 @@
  */
 package com.oracle.svm.core.graal.nodes;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_4;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_8;
-
-import jdk.compiler.graal.graph.IterableNodeType;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.memory.SingleMemoryKill;
-import jdk.compiler.graal.nodes.spi.Lowerable;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_4;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_8;
+
+import jdk.graal.compiler.graph.IterableNodeType;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.memory.SingleMemoryKill;
+import jdk.graal.compiler.nodes.spi.Lowerable;
 import org.graalvm.word.LocationIdentity;
 
 import com.oracle.svm.core.FrameAccess;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/VaListNextArgNode.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/VaListNextArgNode.java
index 24076ec1c951..ca67fef51342 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/VaListNextArgNode.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/VaListNextArgNode.java
@@ -24,18 +24,18 @@
  */
 package com.oracle.svm.core.graal.nodes;
 
-import static jdk.compiler.graal.nodeinfo.InputType.Memory;
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_8;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_8;
+import static jdk.graal.compiler.nodeinfo.InputType.Memory;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_8;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_8;
 
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.memory.SingleMemoryKill;
-import jdk.compiler.graal.nodes.spi.Lowerable;
-import jdk.compiler.graal.nodes.spi.LoweringTool;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.memory.SingleMemoryKill;
+import jdk.graal.compiler.nodes.spi.Lowerable;
+import jdk.graal.compiler.nodes.spi.LoweringTool;
 import org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.meta.JavaKind;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/VerificationMarkerNode.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/VerificationMarkerNode.java
index 7e53f3916a26..2e57d766c055 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/VerificationMarkerNode.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/VerificationMarkerNode.java
@@ -24,16 +24,16 @@
  */
 package com.oracle.svm.core.graal.nodes;
 
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeCycles;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodeinfo.NodeSize;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.debug.ControlFlowAnchored;
-import jdk.compiler.graal.nodes.spi.LIRLowerable;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeCycles;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodeinfo.NodeSize;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.debug.ControlFlowAnchored;
+import jdk.graal.compiler.nodes.spi.LIRLowerable;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
 
 import com.oracle.svm.core.graal.code.SubstrateLIRGenerator;
 import com.oracle.svm.core.util.VMError;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/WriteCurrentVMThreadNode.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/WriteCurrentVMThreadNode.java
index e3767420a099..b25fca0b980b 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/WriteCurrentVMThreadNode.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/WriteCurrentVMThreadNode.java
@@ -24,16 +24,16 @@
  */
 package com.oracle.svm.core.graal.nodes;
 
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.lir.gen.LIRGeneratorTool;
-import jdk.compiler.graal.nodeinfo.NodeCycles;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodeinfo.NodeSize;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.LIRLowerable;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.lir.gen.LIRGeneratorTool;
+import jdk.graal.compiler.nodeinfo.NodeCycles;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodeinfo.NodeSize;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.LIRLowerable;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
 import org.graalvm.nativeimage.IsolateThread;
 
 import com.oracle.svm.core.FrameAccess;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/WriteHeapBaseNode.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/WriteHeapBaseNode.java
index 7e6bdd38944c..c276455cc6c6 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/WriteHeapBaseNode.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/WriteHeapBaseNode.java
@@ -24,16 +24,16 @@
  */
 package com.oracle.svm.core.graal.nodes;
 
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.lir.gen.LIRGeneratorTool;
-import jdk.compiler.graal.nodeinfo.NodeCycles;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodeinfo.NodeSize;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.LIRLowerable;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.lir.gen.LIRGeneratorTool;
+import jdk.graal.compiler.nodeinfo.NodeCycles;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodeinfo.NodeSize;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.LIRLowerable;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
 import org.graalvm.word.PointerBase;
 
 import com.oracle.svm.core.FrameAccess;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/WriteReturnAddressNode.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/WriteReturnAddressNode.java
index 51584adbabb4..023b5de322ff 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/WriteReturnAddressNode.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/WriteReturnAddressNode.java
@@ -24,16 +24,16 @@
  */
 package com.oracle.svm.core.graal.nodes;
 
-import jdk.compiler.graal.core.common.LIRKind;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeCycles;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodeinfo.NodeSize;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.LIRLowerable;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.core.common.LIRKind;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeCycles;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodeinfo.NodeSize;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.LIRLowerable;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
 import org.graalvm.word.Pointer;
 
 import jdk.vm.ci.code.StackSlot;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/WriteStackPointerNode.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/WriteStackPointerNode.java
index 8c191e0b3116..9eb22463b7bb 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/WriteStackPointerNode.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/WriteStackPointerNode.java
@@ -24,16 +24,16 @@
  */
 package com.oracle.svm.core.graal.nodes;
 
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.lir.gen.LIRGeneratorTool;
-import jdk.compiler.graal.nodeinfo.NodeCycles;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodeinfo.NodeSize;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.LIRLowerable;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.lir.gen.LIRGeneratorTool;
+import jdk.graal.compiler.nodeinfo.NodeCycles;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodeinfo.NodeSize;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.LIRLowerable;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
 import org.graalvm.word.WordBase;
 
 import com.oracle.svm.core.FrameAccess;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/aarch64/AArch64ISBNode.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/aarch64/AArch64ISBNode.java
index 112885911e88..c3b59da35d61 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/aarch64/AArch64ISBNode.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/aarch64/AArch64ISBNode.java
@@ -25,16 +25,16 @@
  */
 package com.oracle.svm.core.graal.nodes.aarch64;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_1;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_1;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_1;
 
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.lir.gen.LIRGeneratorTool;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.spi.LIRLowerable;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.lir.gen.LIRGeneratorTool;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.spi.LIRLowerable;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
 
 import com.oracle.svm.core.graal.code.SubstrateLIRGenerator;
 
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/aarch64/AArch64XPACNode.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/aarch64/AArch64XPACNode.java
index 6f3f3bfa2581..7f8fdc65116e 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/aarch64/AArch64XPACNode.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/nodes/aarch64/AArch64XPACNode.java
@@ -25,24 +25,24 @@
 package com.oracle.svm.core.graal.nodes.aarch64;
 
 import static jdk.vm.ci.code.ValueUtil.asRegister;
-import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.REG;
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_1;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1;
+import static jdk.graal.compiler.lir.LIRInstruction.OperandFlag.REG;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_1;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_1;
 
-import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler;
-import jdk.compiler.graal.core.common.LIRKind;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.lir.LIRInstructionClass;
-import jdk.compiler.graal.lir.Opcode;
-import jdk.compiler.graal.lir.Variable;
-import jdk.compiler.graal.lir.aarch64.AArch64LIRInstruction;
-import jdk.compiler.graal.lir.asm.CompilationResultBuilder;
-import jdk.compiler.graal.lir.gen.LIRGeneratorTool;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.LIRLowerable;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler;
+import jdk.graal.compiler.core.common.LIRKind;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.lir.LIRInstructionClass;
+import jdk.graal.compiler.lir.Opcode;
+import jdk.graal.compiler.lir.Variable;
+import jdk.graal.compiler.lir.aarch64.AArch64LIRInstruction;
+import jdk.graal.compiler.lir.asm.CompilationResultBuilder;
+import jdk.graal.compiler.lir.gen.LIRGeneratorTool;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.LIRLowerable;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
 import org.graalvm.nativeimage.c.function.CodePointer;
 
 import com.oracle.svm.core.FrameAccess;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/phases/CollectDeoptimizationSourcePositionsPhase.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/phases/CollectDeoptimizationSourcePositionsPhase.java
index 91657d5dc030..b7b667b32e22 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/phases/CollectDeoptimizationSourcePositionsPhase.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/phases/CollectDeoptimizationSourcePositionsPhase.java
@@ -27,12 +27,12 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import jdk.compiler.graal.graph.NodeSourcePosition;
-import jdk.compiler.graal.nodes.DeoptimizeNode;
-import jdk.compiler.graal.nodes.DynamicDeoptimizeNode;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.phases.Phase;
-import jdk.compiler.graal.phases.common.DeoptimizationGroupingPhase;
+import jdk.graal.compiler.graph.NodeSourcePosition;
+import jdk.graal.compiler.nodes.DeoptimizeNode;
+import jdk.graal.compiler.nodes.DynamicDeoptimizeNode;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.phases.Phase;
+import jdk.graal.compiler.phases.common.DeoptimizationGroupingPhase;
 
 import com.oracle.svm.core.graal.nodes.DeoptSourcePositionInfoNode;
 
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/phases/DeadStoreRemovalPhase.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/phases/DeadStoreRemovalPhase.java
index 3f4f888bc8ab..13cb3e633799 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/phases/DeadStoreRemovalPhase.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/phases/DeadStoreRemovalPhase.java
@@ -24,10 +24,10 @@
  */
 package com.oracle.svm.core.graal.phases;
 
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.java.StoreFieldNode;
-import jdk.compiler.graal.phases.Phase;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.java.StoreFieldNode;
+import jdk.graal.compiler.phases.Phase;
 
 import com.oracle.svm.core.meta.SharedField;
 
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/phases/OptimizeExceptionPathsPhase.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/phases/OptimizeExceptionPathsPhase.java
index 3373c9b4dfba..482fd2a1da42 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/phases/OptimizeExceptionPathsPhase.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/phases/OptimizeExceptionPathsPhase.java
@@ -27,23 +27,23 @@
 import java.util.ArrayDeque;
 import java.util.Deque;
 
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeBitMap;
-import jdk.compiler.graal.nodes.AbstractBeginNode;
-import jdk.compiler.graal.nodes.AbstractMergeNode;
-import jdk.compiler.graal.nodes.ControlSinkNode;
-import jdk.compiler.graal.nodes.ControlSplitNode;
-import jdk.compiler.graal.nodes.DeadEndNode;
-import jdk.compiler.graal.nodes.IfNode;
-import jdk.compiler.graal.nodes.MergeNode;
-import jdk.compiler.graal.nodes.ProfileData;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.UnwindNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.WithExceptionNode;
-import jdk.compiler.graal.nodes.extended.BranchProbabilityNode;
-import jdk.compiler.graal.nodes.extended.SwitchNode;
-import jdk.compiler.graal.phases.Phase;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeBitMap;
+import jdk.graal.compiler.nodes.AbstractBeginNode;
+import jdk.graal.compiler.nodes.AbstractMergeNode;
+import jdk.graal.compiler.nodes.ControlSinkNode;
+import jdk.graal.compiler.nodes.ControlSplitNode;
+import jdk.graal.compiler.nodes.DeadEndNode;
+import jdk.graal.compiler.nodes.IfNode;
+import jdk.graal.compiler.nodes.MergeNode;
+import jdk.graal.compiler.nodes.ProfileData;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.UnwindNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.WithExceptionNode;
+import jdk.graal.compiler.nodes.extended.BranchProbabilityNode;
+import jdk.graal.compiler.nodes.extended.SwitchNode;
+import jdk.graal.compiler.phases.Phase;
 
 import com.oracle.svm.core.graal.nodes.LoweredDeadEndNode;
 
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/phases/RemoveUnwindPhase.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/phases/RemoveUnwindPhase.java
index 8d1eb1a7cd9c..4d9ea0a60ca2 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/phases/RemoveUnwindPhase.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/phases/RemoveUnwindPhase.java
@@ -27,21 +27,21 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.nodes.AbstractBeginNode;
-import jdk.compiler.graal.nodes.AbstractEndNode;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.MergeNode;
-import jdk.compiler.graal.nodes.PhiNode;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.UnwindNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.WithExceptionNode;
-import jdk.compiler.graal.nodes.extended.BytecodeExceptionNode;
-import jdk.compiler.graal.nodes.java.ExceptionObjectNode;
-import jdk.compiler.graal.nodes.util.GraphUtil;
-import jdk.compiler.graal.phases.Phase;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.nodes.AbstractBeginNode;
+import jdk.graal.compiler.nodes.AbstractEndNode;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.MergeNode;
+import jdk.graal.compiler.nodes.PhiNode;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.UnwindNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.WithExceptionNode;
+import jdk.graal.compiler.nodes.extended.BytecodeExceptionNode;
+import jdk.graal.compiler.nodes.java.ExceptionObjectNode;
+import jdk.graal.compiler.nodes.util.GraphUtil;
+import jdk.graal.compiler.phases.Phase;
 
 import com.oracle.svm.core.graal.nodes.ThrowBytecodeExceptionNode;
 import com.oracle.svm.core.meta.SharedMethod;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/phases/SubstrateSafepointInsertionPhase.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/phases/SubstrateSafepointInsertionPhase.java
index 76e987deffe7..f7700df0499e 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/phases/SubstrateSafepointInsertionPhase.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/phases/SubstrateSafepointInsertionPhase.java
@@ -24,11 +24,11 @@
  */
 package com.oracle.svm.core.graal.phases;
 
-import jdk.compiler.graal.nodes.ReturnNode;
-import jdk.compiler.graal.nodes.SafepointNode;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.phases.common.LoopSafepointInsertionPhase;
-import jdk.compiler.graal.phases.tiers.MidTierContext;
+import jdk.graal.compiler.nodes.ReturnNode;
+import jdk.graal.compiler.nodes.SafepointNode;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.phases.common.LoopSafepointInsertionPhase;
+import jdk.graal.compiler.phases.tiers.MidTierContext;
 import org.graalvm.nativeimage.AnnotationAccess;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/phases/TrustedInterfaceTypePlugin.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/phases/TrustedInterfaceTypePlugin.java
index 7b3d7859fcff..a82a8f4f68cd 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/phases/TrustedInterfaceTypePlugin.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/phases/TrustedInterfaceTypePlugin.java
@@ -24,11 +24,11 @@
  */
 package com.oracle.svm.core.graal.phases;
 
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.core.common.type.StampPair;
-import jdk.compiler.graal.core.common.type.TypeReference;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderTool;
-import jdk.compiler.graal.nodes.graphbuilderconf.TypePlugin;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.core.common.type.StampPair;
+import jdk.graal.compiler.core.common.type.TypeReference;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderTool;
+import jdk.graal.compiler.nodes.graphbuilderconf.TypePlugin;
 
 import com.oracle.svm.core.meta.SharedType;
 
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/replacements/SubstrateGraphKit.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/replacements/SubstrateGraphKit.java
index 4d957fc6cefe..bb824d02a3ba 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/replacements/SubstrateGraphKit.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/replacements/SubstrateGraphKit.java
@@ -27,51 +27,51 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import jdk.compiler.graal.api.replacements.SnippetReflectionProvider;
-import jdk.compiler.graal.core.common.CompilationIdentifier;
-import jdk.compiler.graal.core.common.spi.ForeignCallDescriptor;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.core.common.type.StampPair;
-import jdk.compiler.graal.core.common.type.TypeReference;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.java.FrameStateBuilder;
-import jdk.compiler.graal.nodes.AbstractBeginNode;
-import jdk.compiler.graal.nodes.BeginNode;
-import jdk.compiler.graal.nodes.CallTargetNode;
-import jdk.compiler.graal.nodes.CallTargetNode.InvokeKind;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.FixedNode;
-import jdk.compiler.graal.nodes.FrameState;
-import jdk.compiler.graal.nodes.IndirectCallTargetNode;
-import jdk.compiler.graal.nodes.InvokeNode;
-import jdk.compiler.graal.nodes.InvokeWithExceptionNode;
-import jdk.compiler.graal.nodes.MergeNode;
-import jdk.compiler.graal.nodes.PiNode;
-import jdk.compiler.graal.nodes.ReturnNode;
-import jdk.compiler.graal.nodes.StateSplit;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.UnwindNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.WithExceptionNode;
-import jdk.compiler.graal.nodes.calc.FloatingNode;
-import jdk.compiler.graal.nodes.calc.NarrowNode;
-import jdk.compiler.graal.nodes.extended.BoxNode;
-import jdk.compiler.graal.nodes.extended.FixedValueAnchorNode;
-import jdk.compiler.graal.nodes.extended.GuardingNode;
-import jdk.compiler.graal.nodes.extended.StateSplitProxyNode;
-import jdk.compiler.graal.nodes.extended.UnboxNode;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration;
-import jdk.compiler.graal.nodes.java.ExceptionObjectNode;
-import jdk.compiler.graal.nodes.java.LoadFieldNode;
-import jdk.compiler.graal.nodes.java.LoadIndexedNode;
-import jdk.compiler.graal.nodes.java.MethodCallTargetNode;
-import jdk.compiler.graal.nodes.java.StoreIndexedNode;
-import jdk.compiler.graal.phases.common.inlining.InliningUtil;
-import jdk.compiler.graal.phases.util.Providers;
-import jdk.compiler.graal.replacements.GraphKit;
-import jdk.compiler.graal.word.WordTypes;
+import jdk.graal.compiler.api.replacements.SnippetReflectionProvider;
+import jdk.graal.compiler.core.common.CompilationIdentifier;
+import jdk.graal.compiler.core.common.spi.ForeignCallDescriptor;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.core.common.type.StampPair;
+import jdk.graal.compiler.core.common.type.TypeReference;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.java.FrameStateBuilder;
+import jdk.graal.compiler.nodes.AbstractBeginNode;
+import jdk.graal.compiler.nodes.BeginNode;
+import jdk.graal.compiler.nodes.CallTargetNode;
+import jdk.graal.compiler.nodes.CallTargetNode.InvokeKind;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.FixedNode;
+import jdk.graal.compiler.nodes.FrameState;
+import jdk.graal.compiler.nodes.IndirectCallTargetNode;
+import jdk.graal.compiler.nodes.InvokeNode;
+import jdk.graal.compiler.nodes.InvokeWithExceptionNode;
+import jdk.graal.compiler.nodes.MergeNode;
+import jdk.graal.compiler.nodes.PiNode;
+import jdk.graal.compiler.nodes.ReturnNode;
+import jdk.graal.compiler.nodes.StateSplit;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.UnwindNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.WithExceptionNode;
+import jdk.graal.compiler.nodes.calc.FloatingNode;
+import jdk.graal.compiler.nodes.calc.NarrowNode;
+import jdk.graal.compiler.nodes.extended.BoxNode;
+import jdk.graal.compiler.nodes.extended.FixedValueAnchorNode;
+import jdk.graal.compiler.nodes.extended.GuardingNode;
+import jdk.graal.compiler.nodes.extended.StateSplitProxyNode;
+import jdk.graal.compiler.nodes.extended.UnboxNode;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
+import jdk.graal.compiler.nodes.java.ExceptionObjectNode;
+import jdk.graal.compiler.nodes.java.LoadFieldNode;
+import jdk.graal.compiler.nodes.java.LoadIndexedNode;
+import jdk.graal.compiler.nodes.java.MethodCallTargetNode;
+import jdk.graal.compiler.nodes.java.StoreIndexedNode;
+import jdk.graal.compiler.phases.common.inlining.InliningUtil;
+import jdk.graal.compiler.phases.util.Providers;
+import jdk.graal.compiler.replacements.GraphKit;
+import jdk.graal.compiler.word.WordTypes;
 import org.graalvm.word.WordBase;
 
 import com.oracle.svm.core.SubstrateOptions;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/ArithmeticSnippets.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/ArithmeticSnippets.java
index 1807976afcba..0642c9000a11 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/ArithmeticSnippets.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/ArithmeticSnippets.java
@@ -25,36 +25,36 @@
 package com.oracle.svm.core.graal.snippets;
 
 import static com.oracle.svm.core.util.VMError.shouldNotReachHereUnexpectedInput;
-import static jdk.compiler.graal.nodes.extended.BranchProbabilityNode.SLOW_PATH_PROBABILITY;
-import static jdk.compiler.graal.nodes.extended.BranchProbabilityNode.probability;
+import static jdk.graal.compiler.nodes.extended.BranchProbabilityNode.SLOW_PATH_PROBABILITY;
+import static jdk.graal.compiler.nodes.extended.BranchProbabilityNode.probability;
 
 import java.util.Map;
 
-import jdk.compiler.graal.api.replacements.Snippet;
-import jdk.compiler.graal.api.replacements.Snippet.ConstantParameter;
-import jdk.compiler.graal.core.common.type.IntegerStamp;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.Node.NodeIntrinsic;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.DeoptimizeNode;
-import jdk.compiler.graal.nodes.FrameState;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.UnreachableNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.calc.IntegerDivRemNode;
-import jdk.compiler.graal.nodes.calc.SignedDivNode;
-import jdk.compiler.graal.nodes.calc.SignedRemNode;
-import jdk.compiler.graal.nodes.calc.UnsignedDivNode;
-import jdk.compiler.graal.nodes.calc.UnsignedRemNode;
-import jdk.compiler.graal.nodes.extended.GuardingNode;
-import jdk.compiler.graal.nodes.spi.LoweringTool;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.util.Providers;
-import jdk.compiler.graal.replacements.SnippetTemplate;
-import jdk.compiler.graal.replacements.SnippetTemplate.Arguments;
-import jdk.compiler.graal.replacements.SnippetTemplate.SnippetInfo;
-import jdk.compiler.graal.replacements.Snippets;
+import jdk.graal.compiler.api.replacements.Snippet;
+import jdk.graal.compiler.api.replacements.Snippet.ConstantParameter;
+import jdk.graal.compiler.core.common.type.IntegerStamp;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.Node.NodeIntrinsic;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.DeoptimizeNode;
+import jdk.graal.compiler.nodes.FrameState;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.UnreachableNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.calc.IntegerDivRemNode;
+import jdk.graal.compiler.nodes.calc.SignedDivNode;
+import jdk.graal.compiler.nodes.calc.SignedRemNode;
+import jdk.graal.compiler.nodes.calc.UnsignedDivNode;
+import jdk.graal.compiler.nodes.calc.UnsignedRemNode;
+import jdk.graal.compiler.nodes.extended.GuardingNode;
+import jdk.graal.compiler.nodes.spi.LoweringTool;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.util.Providers;
+import jdk.graal.compiler.replacements.SnippetTemplate;
+import jdk.graal.compiler.replacements.SnippetTemplate.Arguments;
+import jdk.graal.compiler.replacements.SnippetTemplate.SnippetInfo;
+import jdk.graal.compiler.replacements.Snippets;
 
 import com.oracle.svm.core.config.ConfigurationValues;
 import com.oracle.svm.core.config.ObjectLayout;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/CEntryPointListener.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/CEntryPointListener.java
index e1f446d1c4ae..c43f157aff7c 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/CEntryPointListener.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/CEntryPointListener.java
@@ -26,7 +26,7 @@
 
 import com.oracle.svm.core.Uninterruptible;
 
-import jdk.compiler.graal.api.replacements.Fold;
+import jdk.graal.compiler.api.replacements.Fold;
 import org.graalvm.nativeimage.ImageSingletons;
 
 public interface CEntryPointListener {
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/CEntryPointListenerSupport.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/CEntryPointListenerSupport.java
index 853e7e82929b..09f0aeb89e8d 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/CEntryPointListenerSupport.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/CEntryPointListenerSupport.java
@@ -27,7 +27,7 @@
 import com.oracle.svm.core.Uninterruptible;
 import com.oracle.svm.core.feature.AutomaticallyRegisteredImageSingleton;
 
-import jdk.compiler.graal.api.replacements.Fold;
+import jdk.graal.compiler.api.replacements.Fold;
 import org.graalvm.nativeimage.ImageSingletons;
 
 @AutomaticallyRegisteredImageSingleton
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/CEntryPointSnippets.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/CEntryPointSnippets.java
index e765769bdb47..e10b1c6a3a88 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/CEntryPointSnippets.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/CEntryPointSnippets.java
@@ -33,24 +33,24 @@
 
 import java.util.Map;
 
-import jdk.compiler.graal.api.replacements.Fold;
-import jdk.compiler.graal.api.replacements.Snippet;
-import jdk.compiler.graal.api.replacements.Snippet.ConstantParameter;
-import jdk.compiler.graal.core.common.CompressEncoding;
-import jdk.compiler.graal.core.common.spi.ForeignCallDescriptor;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.Node.ConstantNodeParameter;
-import jdk.compiler.graal.graph.Node.NodeIntrinsic;
-import jdk.compiler.graal.nodes.PauseNode;
-import jdk.compiler.graal.nodes.extended.ForeignCallNode;
-import jdk.compiler.graal.nodes.spi.LoweringTool;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.util.Providers;
-import jdk.compiler.graal.replacements.SnippetTemplate;
-import jdk.compiler.graal.replacements.SnippetTemplate.Arguments;
-import jdk.compiler.graal.replacements.SnippetTemplate.SnippetInfo;
-import jdk.compiler.graal.replacements.Snippets;
-import jdk.compiler.graal.word.Word;
+import jdk.graal.compiler.api.replacements.Fold;
+import jdk.graal.compiler.api.replacements.Snippet;
+import jdk.graal.compiler.api.replacements.Snippet.ConstantParameter;
+import jdk.graal.compiler.core.common.CompressEncoding;
+import jdk.graal.compiler.core.common.spi.ForeignCallDescriptor;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.Node.ConstantNodeParameter;
+import jdk.graal.compiler.graph.Node.NodeIntrinsic;
+import jdk.graal.compiler.nodes.PauseNode;
+import jdk.graal.compiler.nodes.extended.ForeignCallNode;
+import jdk.graal.compiler.nodes.spi.LoweringTool;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.util.Providers;
+import jdk.graal.compiler.replacements.SnippetTemplate;
+import jdk.graal.compiler.replacements.SnippetTemplate.Arguments;
+import jdk.graal.compiler.replacements.SnippetTemplate.SnippetInfo;
+import jdk.graal.compiler.replacements.Snippets;
+import jdk.graal.compiler.word.Word;
 import org.graalvm.nativeimage.CurrentIsolate;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Isolate;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/CFunctionSnippets.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/CFunctionSnippets.java
index 399a3c9558d8..df33854e10a4 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/CFunctionSnippets.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/CFunctionSnippets.java
@@ -28,23 +28,23 @@
 import java.util.List;
 import java.util.Map;
 
-import jdk.compiler.graal.api.replacements.Snippet;
-import jdk.compiler.graal.api.replacements.Snippet.ConstantParameter;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.nodes.FixedNode;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.Invoke;
-import jdk.compiler.graal.nodes.InvokeNode;
-import jdk.compiler.graal.nodes.InvokeWithExceptionNode;
-import jdk.compiler.graal.nodes.extended.MembarNode;
-import jdk.compiler.graal.nodes.spi.LoweringTool;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.util.Providers;
-import jdk.compiler.graal.replacements.ReplacementsUtil;
-import jdk.compiler.graal.replacements.SnippetTemplate;
-import jdk.compiler.graal.replacements.SnippetTemplate.Arguments;
-import jdk.compiler.graal.replacements.SnippetTemplate.SnippetInfo;
-import jdk.compiler.graal.replacements.Snippets;
+import jdk.graal.compiler.api.replacements.Snippet;
+import jdk.graal.compiler.api.replacements.Snippet.ConstantParameter;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.nodes.FixedNode;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.Invoke;
+import jdk.graal.compiler.nodes.InvokeNode;
+import jdk.graal.compiler.nodes.InvokeWithExceptionNode;
+import jdk.graal.compiler.nodes.extended.MembarNode;
+import jdk.graal.compiler.nodes.spi.LoweringTool;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.util.Providers;
+import jdk.graal.compiler.replacements.ReplacementsUtil;
+import jdk.graal.compiler.replacements.SnippetTemplate;
+import jdk.graal.compiler.replacements.SnippetTemplate.Arguments;
+import jdk.graal.compiler.replacements.SnippetTemplate.SnippetInfo;
+import jdk.graal.compiler.replacements.Snippets;
 import org.graalvm.nativeimage.Platforms;
 import org.graalvm.nativeimage.c.struct.SizeOf;
 import org.graalvm.nativeimage.impl.InternalPlatform;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/DeoptHostedSnippets.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/DeoptHostedSnippets.java
index 4fc8d2172c44..2eb40d0e475e 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/DeoptHostedSnippets.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/DeoptHostedSnippets.java
@@ -29,20 +29,20 @@
 
 import java.util.Map;
 
-import jdk.compiler.graal.api.replacements.Snippet;
-import jdk.compiler.graal.api.replacements.Snippet.ConstantParameter;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.nodes.DeoptimizeNode;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.UnreachableNode;
-import jdk.compiler.graal.nodes.spi.LoweringTool;
-import jdk.compiler.graal.nodes.spi.LoweringTool.LoweringStage;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.util.Providers;
-import jdk.compiler.graal.replacements.SnippetTemplate;
-import jdk.compiler.graal.replacements.SnippetTemplate.Arguments;
-import jdk.compiler.graal.replacements.SnippetTemplate.SnippetInfo;
-import jdk.compiler.graal.replacements.Snippets;
+import jdk.graal.compiler.api.replacements.Snippet;
+import jdk.graal.compiler.api.replacements.Snippet.ConstantParameter;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.nodes.DeoptimizeNode;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.UnreachableNode;
+import jdk.graal.compiler.nodes.spi.LoweringTool;
+import jdk.graal.compiler.nodes.spi.LoweringTool.LoweringStage;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.util.Providers;
+import jdk.graal.compiler.replacements.SnippetTemplate;
+import jdk.graal.compiler.replacements.SnippetTemplate.Arguments;
+import jdk.graal.compiler.replacements.SnippetTemplate.SnippetInfo;
+import jdk.graal.compiler.replacements.Snippets;
 import org.graalvm.nativeimage.ImageSingletons;
 
 import com.oracle.svm.core.deopt.DeoptimizationRuntime;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/DeoptRuntimeSnippets.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/DeoptRuntimeSnippets.java
index d995e908e2c1..8cf3580c781e 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/DeoptRuntimeSnippets.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/DeoptRuntimeSnippets.java
@@ -28,19 +28,19 @@
 
 import java.util.Map;
 
-import jdk.compiler.graal.api.replacements.Snippet;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.nodes.AbstractDeoptimizeNode;
-import jdk.compiler.graal.nodes.DeoptimizeNode;
-import jdk.compiler.graal.nodes.DynamicDeoptimizeNode;
-import jdk.compiler.graal.nodes.UnreachableNode;
-import jdk.compiler.graal.nodes.spi.LoweringTool;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.util.Providers;
-import jdk.compiler.graal.replacements.SnippetTemplate;
-import jdk.compiler.graal.replacements.SnippetTemplate.Arguments;
-import jdk.compiler.graal.replacements.SnippetTemplate.SnippetInfo;
-import jdk.compiler.graal.replacements.Snippets;
+import jdk.graal.compiler.api.replacements.Snippet;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.nodes.AbstractDeoptimizeNode;
+import jdk.graal.compiler.nodes.DeoptimizeNode;
+import jdk.graal.compiler.nodes.DynamicDeoptimizeNode;
+import jdk.graal.compiler.nodes.UnreachableNode;
+import jdk.graal.compiler.nodes.spi.LoweringTool;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.util.Providers;
+import jdk.graal.compiler.replacements.SnippetTemplate;
+import jdk.graal.compiler.replacements.SnippetTemplate.Arguments;
+import jdk.graal.compiler.replacements.SnippetTemplate.SnippetInfo;
+import jdk.graal.compiler.replacements.Snippets;
 
 import com.oracle.svm.core.deopt.DeoptimizationRuntime;
 
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/DeoptSnippetsFeature.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/DeoptSnippetsFeature.java
index 84e8cece1d5f..6ab0e7fc66ba 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/DeoptSnippetsFeature.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/DeoptSnippetsFeature.java
@@ -26,9 +26,9 @@
 
 import java.util.Map;
 
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.util.Providers;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.util.Providers;
 
 import com.oracle.svm.core.feature.AutomaticallyRegisteredFeature;
 import com.oracle.svm.core.feature.InternalFeature;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/DeoptTestSnippets.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/DeoptTestSnippets.java
index 739783bb411a..36f9681fcb99 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/DeoptTestSnippets.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/DeoptTestSnippets.java
@@ -28,15 +28,15 @@
 
 import java.util.Map;
 
-import jdk.compiler.graal.api.replacements.Snippet;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.nodes.spi.LoweringTool;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.util.Providers;
-import jdk.compiler.graal.replacements.SnippetTemplate;
-import jdk.compiler.graal.replacements.SnippetTemplate.Arguments;
-import jdk.compiler.graal.replacements.SnippetTemplate.SnippetInfo;
-import jdk.compiler.graal.replacements.Snippets;
+import jdk.graal.compiler.api.replacements.Snippet;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.nodes.spi.LoweringTool;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.util.Providers;
+import jdk.graal.compiler.replacements.SnippetTemplate;
+import jdk.graal.compiler.replacements.SnippetTemplate.Arguments;
+import jdk.graal.compiler.replacements.SnippetTemplate.SnippetInfo;
+import jdk.graal.compiler.replacements.Snippets;
 
 import com.oracle.svm.core.graal.nodes.DeoptTestNode;
 
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/DeoptTester.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/DeoptTester.java
index 93fefb4da263..2237e8004193 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/DeoptTester.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/DeoptTester.java
@@ -27,8 +27,8 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import jdk.compiler.graal.api.replacements.Fold;
-import jdk.compiler.graal.options.Option;
+import jdk.graal.compiler.api.replacements.Fold;
+import jdk.graal.compiler.options.Option;
 import org.graalvm.nativeimage.c.function.CodePointer;
 import org.graalvm.word.LocationIdentity;
 import org.graalvm.word.Pointer;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/ExceptionSnippets.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/ExceptionSnippets.java
index 3f5043f421a3..cde0911b8150 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/ExceptionSnippets.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/ExceptionSnippets.java
@@ -26,25 +26,25 @@
 
 import static com.oracle.svm.core.graal.snippets.SubstrateIntrinsics.runtimeCall;
 import static com.oracle.svm.core.snippets.KnownIntrinsics.readCallerStackPointer;
-import static jdk.compiler.graal.nodes.UnreachableNode.unreachable;
+import static jdk.graal.compiler.nodes.UnreachableNode.unreachable;
 
 import java.util.Map;
 
-import jdk.compiler.graal.api.replacements.Snippet;
-import jdk.compiler.graal.api.replacements.Snippet.ConstantParameter;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.UnwindNode;
-import jdk.compiler.graal.nodes.java.LoadExceptionObjectNode;
-import jdk.compiler.graal.nodes.spi.LoweringTool;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.util.Providers;
-import jdk.compiler.graal.replacements.SnippetTemplate;
-import jdk.compiler.graal.replacements.SnippetTemplate.Arguments;
-import jdk.compiler.graal.replacements.SnippetTemplate.SnippetInfo;
-import jdk.compiler.graal.replacements.Snippets;
+import jdk.graal.compiler.api.replacements.Snippet;
+import jdk.graal.compiler.api.replacements.Snippet.ConstantParameter;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.UnwindNode;
+import jdk.graal.compiler.nodes.java.LoadExceptionObjectNode;
+import jdk.graal.compiler.nodes.spi.LoweringTool;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.util.Providers;
+import jdk.graal.compiler.replacements.SnippetTemplate;
+import jdk.graal.compiler.replacements.SnippetTemplate.Arguments;
+import jdk.graal.compiler.replacements.SnippetTemplate.SnippetInfo;
+import jdk.graal.compiler.replacements.Snippets;
 import org.graalvm.nativeimage.Platforms;
 import org.graalvm.nativeimage.impl.InternalPlatform;
 import org.graalvm.word.Pointer;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/GCAllocationSupport.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/GCAllocationSupport.java
index a9b937bc22a2..f8a091d2aed2 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/GCAllocationSupport.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/GCAllocationSupport.java
@@ -24,8 +24,8 @@
  */
 package com.oracle.svm.core.graal.snippets;
 
-import jdk.compiler.graal.core.common.spi.ForeignCallDescriptor;
-import jdk.compiler.graal.word.Word;
+import jdk.graal.compiler.core.common.spi.ForeignCallDescriptor;
+import jdk.graal.compiler.word.Word;
 import org.graalvm.word.UnsignedWord;
 
 /**
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/NodeLoweringProvider.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/NodeLoweringProvider.java
index b64de14ddf90..a678041894d9 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/NodeLoweringProvider.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/NodeLoweringProvider.java
@@ -24,8 +24,8 @@
  */
 package com.oracle.svm.core.graal.snippets;
 
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.nodes.spi.LoweringTool;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.nodes.spi.LoweringTool;
 
 public interface NodeLoweringProvider {
 
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/NonSnippetLowerings.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/NonSnippetLowerings.java
index fd21e9fc6637..0e55414b2b1e 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/NonSnippetLowerings.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/NonSnippetLowerings.java
@@ -30,53 +30,53 @@
 import java.util.Map;
 import java.util.function.Predicate;
 
-import jdk.compiler.graal.core.common.memory.BarrierType;
-import jdk.compiler.graal.core.common.memory.MemoryOrderMode;
-import jdk.compiler.graal.core.common.spi.ForeignCallDescriptor;
-import jdk.compiler.graal.core.common.type.StampPair;
-import jdk.compiler.graal.core.common.type.TypeReference;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeInputList;
-import jdk.compiler.graal.nodes.BeginNode;
-import jdk.compiler.graal.nodes.CallTargetNode;
-import jdk.compiler.graal.nodes.CallTargetNode.InvokeKind;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.DirectCallTargetNode;
-import jdk.compiler.graal.nodes.FixedGuardNode;
-import jdk.compiler.graal.nodes.FixedNode;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.IfNode;
-import jdk.compiler.graal.nodes.IndirectCallTargetNode;
-import jdk.compiler.graal.nodes.Invoke;
-import jdk.compiler.graal.nodes.InvokeNode;
-import jdk.compiler.graal.nodes.InvokeWithExceptionNode;
-import jdk.compiler.graal.nodes.LogicConstantNode;
-import jdk.compiler.graal.nodes.LogicNode;
-import jdk.compiler.graal.nodes.LoweredCallTargetNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.PiNode;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.calc.IsNullNode;
-import jdk.compiler.graal.nodes.extended.BranchProbabilityNode;
-import jdk.compiler.graal.nodes.extended.BytecodeExceptionNode;
-import jdk.compiler.graal.nodes.extended.BytecodeExceptionNode.BytecodeExceptionKind;
-import jdk.compiler.graal.nodes.extended.FixedValueAnchorNode;
-import jdk.compiler.graal.nodes.extended.ForeignCallNode;
-import jdk.compiler.graal.nodes.extended.GetClassNode;
-import jdk.compiler.graal.nodes.extended.LoadHubNode;
-import jdk.compiler.graal.nodes.extended.OpaqueValueNode;
-import jdk.compiler.graal.nodes.java.InstanceOfNode;
-import jdk.compiler.graal.nodes.java.MethodCallTargetNode;
-import jdk.compiler.graal.nodes.memory.ReadNode;
-import jdk.compiler.graal.nodes.memory.address.AddressNode;
-import jdk.compiler.graal.nodes.memory.address.OffsetAddressNode;
-import jdk.compiler.graal.nodes.spi.LoweringTool;
-import jdk.compiler.graal.nodes.spi.LoweringTool.StandardLoweringStage;
-import jdk.compiler.graal.nodes.spi.StampProvider;
-import jdk.compiler.graal.nodes.type.StampTool;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.util.Providers;
+import jdk.graal.compiler.core.common.memory.BarrierType;
+import jdk.graal.compiler.core.common.memory.MemoryOrderMode;
+import jdk.graal.compiler.core.common.spi.ForeignCallDescriptor;
+import jdk.graal.compiler.core.common.type.StampPair;
+import jdk.graal.compiler.core.common.type.TypeReference;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeInputList;
+import jdk.graal.compiler.nodes.BeginNode;
+import jdk.graal.compiler.nodes.CallTargetNode;
+import jdk.graal.compiler.nodes.CallTargetNode.InvokeKind;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.DirectCallTargetNode;
+import jdk.graal.compiler.nodes.FixedGuardNode;
+import jdk.graal.compiler.nodes.FixedNode;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.IfNode;
+import jdk.graal.compiler.nodes.IndirectCallTargetNode;
+import jdk.graal.compiler.nodes.Invoke;
+import jdk.graal.compiler.nodes.InvokeNode;
+import jdk.graal.compiler.nodes.InvokeWithExceptionNode;
+import jdk.graal.compiler.nodes.LogicConstantNode;
+import jdk.graal.compiler.nodes.LogicNode;
+import jdk.graal.compiler.nodes.LoweredCallTargetNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.PiNode;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.calc.IsNullNode;
+import jdk.graal.compiler.nodes.extended.BranchProbabilityNode;
+import jdk.graal.compiler.nodes.extended.BytecodeExceptionNode;
+import jdk.graal.compiler.nodes.extended.BytecodeExceptionNode.BytecodeExceptionKind;
+import jdk.graal.compiler.nodes.extended.FixedValueAnchorNode;
+import jdk.graal.compiler.nodes.extended.ForeignCallNode;
+import jdk.graal.compiler.nodes.extended.GetClassNode;
+import jdk.graal.compiler.nodes.extended.LoadHubNode;
+import jdk.graal.compiler.nodes.extended.OpaqueValueNode;
+import jdk.graal.compiler.nodes.java.InstanceOfNode;
+import jdk.graal.compiler.nodes.java.MethodCallTargetNode;
+import jdk.graal.compiler.nodes.memory.ReadNode;
+import jdk.graal.compiler.nodes.memory.address.AddressNode;
+import jdk.graal.compiler.nodes.memory.address.OffsetAddressNode;
+import jdk.graal.compiler.nodes.spi.LoweringTool;
+import jdk.graal.compiler.nodes.spi.LoweringTool.StandardLoweringStage;
+import jdk.graal.compiler.nodes.spi.StampProvider;
+import jdk.graal.compiler.nodes.type.StampTool;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.util.Providers;
 import org.graalvm.word.LocationIdentity;
 
 import com.oracle.svm.core.FrameAccess;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/SafepointSnippets.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/SafepointSnippets.java
index c68991847a4a..844a851eea22 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/SafepointSnippets.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/SafepointSnippets.java
@@ -29,23 +29,23 @@
 import java.util.Arrays;
 import java.util.Map;
 
-import jdk.compiler.graal.api.replacements.Snippet;
-import jdk.compiler.graal.core.common.spi.ForeignCallDescriptor;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.Node.ConstantNodeParameter;
-import jdk.compiler.graal.graph.Node.NodeIntrinsic;
-import jdk.compiler.graal.nodeinfo.Verbosity;
-import jdk.compiler.graal.nodes.SafepointNode;
-import jdk.compiler.graal.nodes.extended.BranchProbabilityNode;
-import jdk.compiler.graal.nodes.extended.ForeignCallNode;
-import jdk.compiler.graal.nodes.spi.LoweringTool;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.util.Providers;
-import jdk.compiler.graal.replacements.SnippetTemplate;
-import jdk.compiler.graal.replacements.SnippetTemplate.Arguments;
-import jdk.compiler.graal.replacements.SnippetTemplate.SnippetInfo;
-import jdk.compiler.graal.replacements.Snippets;
+import jdk.graal.compiler.api.replacements.Snippet;
+import jdk.graal.compiler.core.common.spi.ForeignCallDescriptor;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.Node.ConstantNodeParameter;
+import jdk.graal.compiler.graph.Node.NodeIntrinsic;
+import jdk.graal.compiler.nodeinfo.Verbosity;
+import jdk.graal.compiler.nodes.SafepointNode;
+import jdk.graal.compiler.nodes.extended.BranchProbabilityNode;
+import jdk.graal.compiler.nodes.extended.ForeignCallNode;
+import jdk.graal.compiler.nodes.spi.LoweringTool;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.util.Providers;
+import jdk.graal.compiler.replacements.SnippetTemplate;
+import jdk.graal.compiler.replacements.SnippetTemplate.Arguments;
+import jdk.graal.compiler.replacements.SnippetTemplate.SnippetInfo;
+import jdk.graal.compiler.replacements.Snippets;
 import org.graalvm.nativeimage.Platforms;
 import org.graalvm.nativeimage.impl.InternalPlatform;
 import org.graalvm.word.LocationIdentity;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/StackOverflowCheckFeature.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/StackOverflowCheckFeature.java
index 82600e0400e5..359102e88cac 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/StackOverflowCheckFeature.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/StackOverflowCheckFeature.java
@@ -28,14 +28,14 @@
 import java.util.Map;
 import java.util.function.Predicate;
 
-import jdk.compiler.graal.api.replacements.SnippetReflectionProvider;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.BasePhase;
-import jdk.compiler.graal.phases.common.LoweringPhase;
-import jdk.compiler.graal.phases.tiers.MidTierContext;
-import jdk.compiler.graal.phases.tiers.Suites;
-import jdk.compiler.graal.phases.util.Providers;
+import jdk.graal.compiler.api.replacements.SnippetReflectionProvider;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.BasePhase;
+import jdk.graal.compiler.phases.common.LoweringPhase;
+import jdk.graal.compiler.phases.tiers.MidTierContext;
+import jdk.graal.compiler.phases.tiers.Suites;
+import jdk.graal.compiler.phases.util.Providers;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platforms;
 import org.graalvm.nativeimage.impl.InternalPlatform;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/StackOverflowCheckImpl.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/StackOverflowCheckImpl.java
index 656e9b6d0afb..5cfcf3ef2f72 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/StackOverflowCheckImpl.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/StackOverflowCheckImpl.java
@@ -24,39 +24,39 @@
  */
 package com.oracle.svm.core.graal.snippets;
 
-import static jdk.compiler.graal.nodes.extended.BranchProbabilityNode.EXTREMELY_SLOW_PATH_PROBABILITY;
-import static jdk.compiler.graal.nodes.extended.BranchProbabilityNode.probability;
+import static jdk.graal.compiler.nodes.extended.BranchProbabilityNode.EXTREMELY_SLOW_PATH_PROBABILITY;
+import static jdk.graal.compiler.nodes.extended.BranchProbabilityNode.probability;
 
 import java.util.Map;
 import java.util.function.Predicate;
 
-import jdk.compiler.graal.api.replacements.Snippet;
-import jdk.compiler.graal.api.replacements.Snippet.ConstantParameter;
-import jdk.compiler.graal.core.common.spi.ForeignCallDescriptor;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.Node.ConstantNodeParameter;
-import jdk.compiler.graal.graph.Node.NodeIntrinsic;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.graph.NodeMap;
-import jdk.compiler.graal.nodeinfo.NodeCycles;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodeinfo.NodeSize;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.FrameState;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.UnreachableNode;
-import jdk.compiler.graal.nodes.extended.ForeignCallNode;
-import jdk.compiler.graal.nodes.spi.Lowerable;
-import jdk.compiler.graal.nodes.spi.LoweringTool;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.BasePhase;
-import jdk.compiler.graal.phases.tiers.MidTierContext;
-import jdk.compiler.graal.phases.util.Providers;
-import jdk.compiler.graal.replacements.SnippetTemplate;
-import jdk.compiler.graal.replacements.SnippetTemplate.Arguments;
-import jdk.compiler.graal.replacements.SnippetTemplate.SnippetInfo;
-import jdk.compiler.graal.replacements.Snippets;
+import jdk.graal.compiler.api.replacements.Snippet;
+import jdk.graal.compiler.api.replacements.Snippet.ConstantParameter;
+import jdk.graal.compiler.core.common.spi.ForeignCallDescriptor;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.Node.ConstantNodeParameter;
+import jdk.graal.compiler.graph.Node.NodeIntrinsic;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.graph.NodeMap;
+import jdk.graal.compiler.nodeinfo.NodeCycles;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodeinfo.NodeSize;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.FrameState;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.UnreachableNode;
+import jdk.graal.compiler.nodes.extended.ForeignCallNode;
+import jdk.graal.compiler.nodes.spi.Lowerable;
+import jdk.graal.compiler.nodes.spi.LoweringTool;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.BasePhase;
+import jdk.graal.compiler.phases.tiers.MidTierContext;
+import jdk.graal.compiler.phases.util.Providers;
+import jdk.graal.compiler.replacements.SnippetTemplate;
+import jdk.graal.compiler.replacements.SnippetTemplate.Arguments;
+import jdk.graal.compiler.replacements.SnippetTemplate.SnippetInfo;
+import jdk.graal.compiler.replacements.Snippets;
 import org.graalvm.nativeimage.ImageInfo;
 import org.graalvm.nativeimage.StackValue;
 import org.graalvm.nativeimage.c.type.WordPointer;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/SubstrateAllocationSnippets.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/SubstrateAllocationSnippets.java
index 1755d04ffd69..541938993712 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/SubstrateAllocationSnippets.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/SubstrateAllocationSnippets.java
@@ -24,57 +24,57 @@
  */
 package com.oracle.svm.core.graal.snippets;
 
-import static jdk.compiler.graal.nodes.PiArrayNode.piArrayCastToSnippetReplaceeStamp;
-import static jdk.compiler.graal.nodes.PiNode.piCastToSnippetReplaceeStamp;
-import static jdk.compiler.graal.nodes.extended.BranchProbabilityNode.EXTREMELY_FAST_PATH_PROBABILITY;
-import static jdk.compiler.graal.nodes.extended.BranchProbabilityNode.FAST_PATH_PROBABILITY;
-import static jdk.compiler.graal.nodes.extended.BranchProbabilityNode.LIKELY_PROBABILITY;
-import static jdk.compiler.graal.nodes.extended.BranchProbabilityNode.probability;
-import static jdk.compiler.graal.replacements.SnippetTemplate.DEFAULT_REPLACER;
+import static jdk.graal.compiler.nodes.PiArrayNode.piArrayCastToSnippetReplaceeStamp;
+import static jdk.graal.compiler.nodes.PiNode.piCastToSnippetReplaceeStamp;
+import static jdk.graal.compiler.nodes.extended.BranchProbabilityNode.EXTREMELY_FAST_PATH_PROBABILITY;
+import static jdk.graal.compiler.nodes.extended.BranchProbabilityNode.FAST_PATH_PROBABILITY;
+import static jdk.graal.compiler.nodes.extended.BranchProbabilityNode.LIKELY_PROBABILITY;
+import static jdk.graal.compiler.nodes.extended.BranchProbabilityNode.probability;
+import static jdk.graal.compiler.replacements.SnippetTemplate.DEFAULT_REPLACER;
 
 import java.util.Arrays;
 import java.util.Map;
 
-import jdk.compiler.graal.api.directives.GraalDirectives;
-import jdk.compiler.graal.api.replacements.Fold;
-import jdk.compiler.graal.api.replacements.Snippet;
-import jdk.compiler.graal.api.replacements.Snippet.ConstantParameter;
-import jdk.compiler.graal.api.replacements.Snippet.NonNullParameter;
-import jdk.compiler.graal.api.replacements.Snippet.VarargsParameter;
-import jdk.compiler.graal.core.common.GraalOptions;
-import jdk.compiler.graal.core.common.spi.ForeignCallDescriptor;
-import jdk.compiler.graal.core.common.spi.MetaAccessExtensionProvider;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.Node.ConstantNodeParameter;
-import jdk.compiler.graal.graph.Node.NodeIntrinsic;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.GraphState;
-import jdk.compiler.graal.nodes.NamedLocationIdentity;
-import jdk.compiler.graal.nodes.PiNode;
-import jdk.compiler.graal.nodes.SnippetAnchorNode;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.UnreachableNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.extended.ForeignCallNode;
-import jdk.compiler.graal.nodes.java.DynamicNewArrayNode;
-import jdk.compiler.graal.nodes.java.DynamicNewInstanceNode;
-import jdk.compiler.graal.nodes.java.NewArrayNode;
-import jdk.compiler.graal.nodes.java.NewInstanceNode;
-import jdk.compiler.graal.nodes.java.NewMultiArrayNode;
-import jdk.compiler.graal.nodes.java.ValidateNewInstanceClassNode;
-import jdk.compiler.graal.nodes.spi.LoweringTool;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.util.Providers;
-import jdk.compiler.graal.replacements.AllocationSnippets;
-import jdk.compiler.graal.replacements.ReplacementsUtil;
-import jdk.compiler.graal.replacements.SnippetCounter;
-import jdk.compiler.graal.replacements.SnippetTemplate;
-import jdk.compiler.graal.replacements.SnippetTemplate.Arguments;
-import jdk.compiler.graal.replacements.SnippetTemplate.SnippetInfo;
-import jdk.compiler.graal.word.BarrieredAccess;
-import jdk.compiler.graal.word.ObjectAccess;
-import jdk.compiler.graal.word.Word;
+import jdk.graal.compiler.api.directives.GraalDirectives;
+import jdk.graal.compiler.api.replacements.Fold;
+import jdk.graal.compiler.api.replacements.Snippet;
+import jdk.graal.compiler.api.replacements.Snippet.ConstantParameter;
+import jdk.graal.compiler.api.replacements.Snippet.NonNullParameter;
+import jdk.graal.compiler.api.replacements.Snippet.VarargsParameter;
+import jdk.graal.compiler.core.common.GraalOptions;
+import jdk.graal.compiler.core.common.spi.ForeignCallDescriptor;
+import jdk.graal.compiler.core.common.spi.MetaAccessExtensionProvider;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.Node.ConstantNodeParameter;
+import jdk.graal.compiler.graph.Node.NodeIntrinsic;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.GraphState;
+import jdk.graal.compiler.nodes.NamedLocationIdentity;
+import jdk.graal.compiler.nodes.PiNode;
+import jdk.graal.compiler.nodes.SnippetAnchorNode;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.UnreachableNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.extended.ForeignCallNode;
+import jdk.graal.compiler.nodes.java.DynamicNewArrayNode;
+import jdk.graal.compiler.nodes.java.DynamicNewInstanceNode;
+import jdk.graal.compiler.nodes.java.NewArrayNode;
+import jdk.graal.compiler.nodes.java.NewInstanceNode;
+import jdk.graal.compiler.nodes.java.NewMultiArrayNode;
+import jdk.graal.compiler.nodes.java.ValidateNewInstanceClassNode;
+import jdk.graal.compiler.nodes.spi.LoweringTool;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.util.Providers;
+import jdk.graal.compiler.replacements.AllocationSnippets;
+import jdk.graal.compiler.replacements.ReplacementsUtil;
+import jdk.graal.compiler.replacements.SnippetCounter;
+import jdk.graal.compiler.replacements.SnippetTemplate;
+import jdk.graal.compiler.replacements.SnippetTemplate.Arguments;
+import jdk.graal.compiler.replacements.SnippetTemplate.SnippetInfo;
+import jdk.graal.compiler.word.BarrieredAccess;
+import jdk.graal.compiler.word.ObjectAccess;
+import jdk.graal.compiler.word.Word;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.word.LocationIdentity;
 import org.graalvm.word.UnsignedWord;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/SubstrateIntrinsics.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/SubstrateIntrinsics.java
index 506e802e64ce..b9f89d53f8b0 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/SubstrateIntrinsics.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/SubstrateIntrinsics.java
@@ -24,13 +24,13 @@
  */
 package com.oracle.svm.core.graal.snippets;
 
-import jdk.compiler.graal.core.common.spi.ForeignCallDescriptor;
-import jdk.compiler.graal.graph.Node.ConstantNodeParameter;
-import jdk.compiler.graal.graph.Node.NodeIntrinsic;
-import jdk.compiler.graal.nodes.BreakpointNode;
-import jdk.compiler.graal.nodes.extended.ForeignCallNode;
-import jdk.compiler.graal.nodes.extended.LoadHubNode;
-import jdk.compiler.graal.nodes.extended.LoadHubOrNullNode;
+import jdk.graal.compiler.core.common.spi.ForeignCallDescriptor;
+import jdk.graal.compiler.graph.Node.ConstantNodeParameter;
+import jdk.graal.compiler.graph.Node.NodeIntrinsic;
+import jdk.graal.compiler.nodes.BreakpointNode;
+import jdk.graal.compiler.nodes.extended.ForeignCallNode;
+import jdk.graal.compiler.nodes.extended.LoadHubNode;
+import jdk.graal.compiler.nodes.extended.LoadHubOrNullNode;
 import org.graalvm.word.Pointer;
 
 import com.oracle.svm.core.hub.DynamicHub;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/SubstrateTemplates.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/SubstrateTemplates.java
index 09723f642514..5025612ed131 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/SubstrateTemplates.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/SubstrateTemplates.java
@@ -28,11 +28,11 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.util.Providers;
-import jdk.compiler.graal.replacements.SnippetTemplate.AbstractTemplates;
-import jdk.compiler.graal.replacements.SnippetTemplate.SnippetInfo;
-import jdk.compiler.graal.replacements.Snippets;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.util.Providers;
+import jdk.graal.compiler.replacements.SnippetTemplate.AbstractTemplates;
+import jdk.graal.compiler.replacements.SnippetTemplate.SnippetInfo;
+import jdk.graal.compiler.replacements.Snippets;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
 import org.graalvm.word.LocationIdentity;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/TypeSnippets.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/TypeSnippets.java
index 450778ac5f01..e6eb76ee037f 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/TypeSnippets.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/TypeSnippets.java
@@ -26,30 +26,30 @@
 
 import static com.oracle.svm.core.graal.snippets.SubstrateIntrinsics.loadHub;
 import static com.oracle.svm.core.graal.snippets.SubstrateIntrinsics.loadHubOrNull;
-import static jdk.compiler.graal.nodes.extended.BranchProbabilityNode.LIKELY_PROBABILITY;
-import static jdk.compiler.graal.nodes.extended.BranchProbabilityNode.NOT_FREQUENT_PROBABILITY;
-import static jdk.compiler.graal.nodes.extended.BranchProbabilityNode.probability;
+import static jdk.graal.compiler.nodes.extended.BranchProbabilityNode.LIKELY_PROBABILITY;
+import static jdk.graal.compiler.nodes.extended.BranchProbabilityNode.NOT_FREQUENT_PROBABILITY;
+import static jdk.graal.compiler.nodes.extended.BranchProbabilityNode.probability;
 
 import java.util.Map;
 
-import jdk.compiler.graal.api.replacements.Snippet;
-import jdk.compiler.graal.core.common.calc.UnsignedMath;
-import jdk.compiler.graal.core.common.type.TypeReference;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.nodes.NamedLocationIdentity;
-import jdk.compiler.graal.nodes.PiNode;
-import jdk.compiler.graal.nodes.SnippetAnchorNode;
-import jdk.compiler.graal.nodes.calc.FloatingNode;
-import jdk.compiler.graal.nodes.extended.GuardingNode;
-import jdk.compiler.graal.nodes.java.ClassIsAssignableFromNode;
-import jdk.compiler.graal.nodes.java.InstanceOfDynamicNode;
-import jdk.compiler.graal.nodes.java.InstanceOfNode;
-import jdk.compiler.graal.nodes.spi.LoweringTool;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.util.Providers;
-import jdk.compiler.graal.replacements.InstanceOfSnippetsTemplates;
-import jdk.compiler.graal.replacements.SnippetTemplate;
-import jdk.compiler.graal.replacements.Snippets;
+import jdk.graal.compiler.api.replacements.Snippet;
+import jdk.graal.compiler.core.common.calc.UnsignedMath;
+import jdk.graal.compiler.core.common.type.TypeReference;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.nodes.NamedLocationIdentity;
+import jdk.graal.compiler.nodes.PiNode;
+import jdk.graal.compiler.nodes.SnippetAnchorNode;
+import jdk.graal.compiler.nodes.calc.FloatingNode;
+import jdk.graal.compiler.nodes.extended.GuardingNode;
+import jdk.graal.compiler.nodes.java.ClassIsAssignableFromNode;
+import jdk.graal.compiler.nodes.java.InstanceOfDynamicNode;
+import jdk.graal.compiler.nodes.java.InstanceOfNode;
+import jdk.graal.compiler.nodes.spi.LoweringTool;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.util.Providers;
+import jdk.graal.compiler.replacements.InstanceOfSnippetsTemplates;
+import jdk.graal.compiler.replacements.SnippetTemplate;
+import jdk.graal.compiler.replacements.Snippets;
 
 import com.oracle.svm.core.graal.meta.KnownOffsets;
 import com.oracle.svm.core.graal.word.DynamicHubAccess;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/aarch64/AArch64ArithmeticSnippets.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/aarch64/AArch64ArithmeticSnippets.java
index 6cad2d175ee4..0aeeb35566a2 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/aarch64/AArch64ArithmeticSnippets.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/aarch64/AArch64ArithmeticSnippets.java
@@ -26,21 +26,21 @@
 
 import java.util.Map;
 
-import jdk.compiler.graal.api.replacements.Snippet;
-import jdk.compiler.graal.core.common.spi.ForeignCallDescriptor;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.Node.ConstantNodeParameter;
-import jdk.compiler.graal.graph.Node.NodeIntrinsic;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.calc.RemNode;
-import jdk.compiler.graal.nodes.extended.ForeignCallNode;
-import jdk.compiler.graal.nodes.spi.LoweringTool;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.util.Providers;
-import jdk.compiler.graal.replacements.SnippetTemplate;
-import jdk.compiler.graal.replacements.SnippetTemplate.Arguments;
-import jdk.compiler.graal.replacements.SnippetTemplate.SnippetInfo;
+import jdk.graal.compiler.api.replacements.Snippet;
+import jdk.graal.compiler.core.common.spi.ForeignCallDescriptor;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.Node.ConstantNodeParameter;
+import jdk.graal.compiler.graph.Node.NodeIntrinsic;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.calc.RemNode;
+import jdk.graal.compiler.nodes.extended.ForeignCallNode;
+import jdk.graal.compiler.nodes.spi.LoweringTool;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.util.Providers;
+import jdk.graal.compiler.replacements.SnippetTemplate;
+import jdk.graal.compiler.replacements.SnippetTemplate.Arguments;
+import jdk.graal.compiler.replacements.SnippetTemplate.SnippetInfo;
 import org.graalvm.nativeimage.Platform.AARCH64;
 import org.graalvm.nativeimage.Platforms;
 
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/aarch64/AArch64NonSnippetLowerings.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/aarch64/AArch64NonSnippetLowerings.java
index 628a95b97c74..fd0bcb7e8fac 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/aarch64/AArch64NonSnippetLowerings.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/aarch64/AArch64NonSnippetLowerings.java
@@ -27,9 +27,9 @@
 import java.util.Map;
 import java.util.function.Predicate;
 
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.util.Providers;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.util.Providers;
 
 import com.oracle.svm.core.graal.meta.RuntimeConfiguration;
 import com.oracle.svm.core.graal.snippets.NodeLoweringProvider;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/aarch64/AArch64SnippetsFeature.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/aarch64/AArch64SnippetsFeature.java
index d35ed888356e..9f91c86d5eca 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/aarch64/AArch64SnippetsFeature.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/aarch64/AArch64SnippetsFeature.java
@@ -27,9 +27,9 @@
 import java.util.Map;
 import java.util.function.Predicate;
 
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.util.Providers;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.util.Providers;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/aarch64/PosixAArch64VaListSnippets.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/aarch64/PosixAArch64VaListSnippets.java
index ac4996c208db..03489d1deecb 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/aarch64/PosixAArch64VaListSnippets.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/aarch64/PosixAArch64VaListSnippets.java
@@ -26,15 +26,15 @@
 
 import java.util.Map;
 
-import jdk.compiler.graal.api.replacements.Snippet;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.nodes.spi.LoweringTool;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.util.Providers;
-import jdk.compiler.graal.replacements.SnippetTemplate;
-import jdk.compiler.graal.replacements.SnippetTemplate.Arguments;
-import jdk.compiler.graal.replacements.SnippetTemplate.SnippetInfo;
-import jdk.compiler.graal.replacements.Snippets;
+import jdk.graal.compiler.api.replacements.Snippet;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.nodes.spi.LoweringTool;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.util.Providers;
+import jdk.graal.compiler.replacements.SnippetTemplate;
+import jdk.graal.compiler.replacements.SnippetTemplate.Arguments;
+import jdk.graal.compiler.replacements.SnippetTemplate.SnippetInfo;
+import jdk.graal.compiler.replacements.Snippets;
 import org.graalvm.word.Pointer;
 
 import com.oracle.svm.core.graal.nodes.VaListInitializationNode;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/amd64/AMD64ArithmeticSnippets.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/amd64/AMD64ArithmeticSnippets.java
index 6ee91e841dd4..2ac09a399f3a 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/amd64/AMD64ArithmeticSnippets.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/amd64/AMD64ArithmeticSnippets.java
@@ -26,9 +26,9 @@
 
 import java.util.Map;
 
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.util.Providers;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.util.Providers;
 
 import com.oracle.svm.core.graal.snippets.ArithmeticSnippets;
 import com.oracle.svm.core.graal.snippets.NodeLoweringProvider;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/amd64/AMD64NonSnippetLowerings.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/amd64/AMD64NonSnippetLowerings.java
index f0386326f948..a1810e57211d 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/amd64/AMD64NonSnippetLowerings.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/amd64/AMD64NonSnippetLowerings.java
@@ -27,12 +27,12 @@
 import java.util.Map;
 import java.util.function.Predicate;
 
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.nodes.calc.FloatConvertNode;
-import jdk.compiler.graal.nodes.spi.LoweringTool;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.util.Providers;
-import jdk.compiler.graal.replacements.amd64.AMD64ConvertSnippets;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.nodes.calc.FloatConvertNode;
+import jdk.graal.compiler.nodes.spi.LoweringTool;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.util.Providers;
+import jdk.graal.compiler.replacements.amd64.AMD64ConvertSnippets;
 
 import com.oracle.svm.core.graal.meta.RuntimeConfiguration;
 import com.oracle.svm.core.graal.snippets.NodeLoweringProvider;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/amd64/AMD64SnippetsFeature.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/amd64/AMD64SnippetsFeature.java
index abe6f90e71e2..7dfdd79c37be 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/amd64/AMD64SnippetsFeature.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/amd64/AMD64SnippetsFeature.java
@@ -27,9 +27,9 @@
 import java.util.Map;
 import java.util.function.Predicate;
 
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.util.Providers;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.util.Providers;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/amd64/PosixAMD64VaListSnippets.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/amd64/PosixAMD64VaListSnippets.java
index f4156c1dcc73..90777f7eab08 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/amd64/PosixAMD64VaListSnippets.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/amd64/PosixAMD64VaListSnippets.java
@@ -26,15 +26,15 @@
 
 import java.util.Map;
 
-import jdk.compiler.graal.api.replacements.Snippet;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.nodes.spi.LoweringTool;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.util.Providers;
-import jdk.compiler.graal.replacements.SnippetTemplate;
-import jdk.compiler.graal.replacements.SnippetTemplate.Arguments;
-import jdk.compiler.graal.replacements.SnippetTemplate.SnippetInfo;
-import jdk.compiler.graal.replacements.Snippets;
+import jdk.graal.compiler.api.replacements.Snippet;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.nodes.spi.LoweringTool;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.util.Providers;
+import jdk.graal.compiler.replacements.SnippetTemplate;
+import jdk.graal.compiler.replacements.SnippetTemplate.Arguments;
+import jdk.graal.compiler.replacements.SnippetTemplate.SnippetInfo;
+import jdk.graal.compiler.replacements.Snippets;
 import org.graalvm.word.Pointer;
 
 import com.oracle.svm.core.graal.nodes.VaListInitializationNode;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/riscv64/PosixRISCV64VaListSnippets.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/riscv64/PosixRISCV64VaListSnippets.java
index fa2c067a919d..2539965d4e1e 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/riscv64/PosixRISCV64VaListSnippets.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/riscv64/PosixRISCV64VaListSnippets.java
@@ -26,23 +26,23 @@
 
 import java.util.Map;
 
-import jdk.compiler.graal.api.replacements.Snippet;
-import jdk.compiler.graal.core.common.memory.BarrierType;
-import jdk.compiler.graal.core.common.memory.MemoryOrderMode;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.FixedNode;
-import jdk.compiler.graal.nodes.FrameState;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.memory.WriteNode;
-import jdk.compiler.graal.nodes.memory.address.OffsetAddressNode;
-import jdk.compiler.graal.nodes.spi.LoweringTool;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.util.Providers;
-import jdk.compiler.graal.replacements.SnippetTemplate;
-import jdk.compiler.graal.replacements.SnippetTemplate.Arguments;
-import jdk.compiler.graal.replacements.SnippetTemplate.SnippetInfo;
-import jdk.compiler.graal.replacements.Snippets;
+import jdk.graal.compiler.api.replacements.Snippet;
+import jdk.graal.compiler.core.common.memory.BarrierType;
+import jdk.graal.compiler.core.common.memory.MemoryOrderMode;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.FixedNode;
+import jdk.graal.compiler.nodes.FrameState;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.memory.WriteNode;
+import jdk.graal.compiler.nodes.memory.address.OffsetAddressNode;
+import jdk.graal.compiler.nodes.spi.LoweringTool;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.util.Providers;
+import jdk.graal.compiler.replacements.SnippetTemplate;
+import jdk.graal.compiler.replacements.SnippetTemplate.Arguments;
+import jdk.graal.compiler.replacements.SnippetTemplate.SnippetInfo;
+import jdk.graal.compiler.replacements.Snippets;
 import org.graalvm.word.LocationIdentity;
 import org.graalvm.word.Pointer;
 
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/riscv64/RISCV64ArithmeticSnippets.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/riscv64/RISCV64ArithmeticSnippets.java
index 6452d7d25e2a..06e23575b923 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/riscv64/RISCV64ArithmeticSnippets.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/riscv64/RISCV64ArithmeticSnippets.java
@@ -26,9 +26,9 @@
 
 import java.util.Map;
 
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.util.Providers;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.util.Providers;
 
 import com.oracle.svm.core.graal.snippets.ArithmeticSnippets;
 import com.oracle.svm.core.graal.snippets.NodeLoweringProvider;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/riscv64/RISCV64NonSnippetLowerings.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/riscv64/RISCV64NonSnippetLowerings.java
index bafbf043374c..5fb5f3df8903 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/riscv64/RISCV64NonSnippetLowerings.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/riscv64/RISCV64NonSnippetLowerings.java
@@ -27,9 +27,9 @@
 import java.util.Map;
 import java.util.function.Predicate;
 
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.util.Providers;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.util.Providers;
 
 import com.oracle.svm.core.graal.meta.RuntimeConfiguration;
 import com.oracle.svm.core.graal.snippets.NodeLoweringProvider;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/riscv64/RISCV64SnippetsFeature.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/riscv64/RISCV64SnippetsFeature.java
index 1aea2dd301c4..42cc9926c140 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/riscv64/RISCV64SnippetsFeature.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/riscv64/RISCV64SnippetsFeature.java
@@ -27,9 +27,9 @@
 import java.util.Map;
 import java.util.function.Predicate;
 
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.util.Providers;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.util.Providers;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/stackvalue/LoweredStackValueNode.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/stackvalue/LoweredStackValueNode.java
index 11110caecfde..faebec384733 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/stackvalue/LoweredStackValueNode.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/stackvalue/LoweredStackValueNode.java
@@ -24,14 +24,14 @@
  */
 package com.oracle.svm.core.graal.stackvalue;
 
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.lir.ConstantValue;
-import jdk.compiler.graal.lir.VirtualStackSlot;
-import jdk.compiler.graal.nodeinfo.NodeCycles;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodeinfo.NodeSize;
-import jdk.compiler.graal.nodes.spi.LIRLowerable;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.lir.ConstantValue;
+import jdk.graal.compiler.lir.VirtualStackSlot;
+import jdk.graal.compiler.nodeinfo.NodeCycles;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodeinfo.NodeSize;
+import jdk.graal.compiler.nodes.spi.LIRLowerable;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
 import org.graalvm.word.WordBase;
 
 import com.oracle.svm.core.FrameAccess;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/stackvalue/StackValueFeature.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/stackvalue/StackValueFeature.java
index f823dad959fc..5fc5811f101a 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/stackvalue/StackValueFeature.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/stackvalue/StackValueFeature.java
@@ -27,16 +27,16 @@
 import java.util.ListIterator;
 import java.util.Map;
 
-import jdk.compiler.graal.api.replacements.SnippetReflectionProvider;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.BasePhase;
-import jdk.compiler.graal.phases.common.FrameStateAssignmentPhase;
-import jdk.compiler.graal.phases.common.LoweringPhase;
-import jdk.compiler.graal.phases.tiers.LowTierContext;
-import jdk.compiler.graal.phases.tiers.MidTierContext;
-import jdk.compiler.graal.phases.tiers.Suites;
-import jdk.compiler.graal.phases.util.Providers;
+import jdk.graal.compiler.api.replacements.SnippetReflectionProvider;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.BasePhase;
+import jdk.graal.compiler.phases.common.FrameStateAssignmentPhase;
+import jdk.graal.compiler.phases.common.LoweringPhase;
+import jdk.graal.compiler.phases.tiers.LowTierContext;
+import jdk.graal.compiler.phases.tiers.MidTierContext;
+import jdk.graal.compiler.phases.tiers.Suites;
+import jdk.graal.compiler.phases.util.Providers;
 
 import com.oracle.svm.core.feature.AutomaticallyRegisteredFeature;
 import com.oracle.svm.core.feature.InternalFeature;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/stackvalue/StackValueNode.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/stackvalue/StackValueNode.java
index 8c2785c164ed..ca906c62f753 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/stackvalue/StackValueNode.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/stackvalue/StackValueNode.java
@@ -24,22 +24,22 @@
  */
 package com.oracle.svm.core.graal.stackvalue;
 
-import static jdk.compiler.graal.nodeinfo.InputType.Memory;
-
-import jdk.compiler.graal.core.common.NumUtil;
-import jdk.compiler.graal.core.common.PermanentBailoutException;
-import jdk.compiler.graal.core.common.calc.UnsignedMath;
-import jdk.compiler.graal.graph.IterableNodeType;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeCycles;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodeinfo.NodeSize;
-import jdk.compiler.graal.nodes.AbstractStateSplit;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext;
-import jdk.compiler.graal.nodes.memory.MemoryAccess;
-import jdk.compiler.graal.nodes.memory.MemoryKill;
-import jdk.compiler.graal.nodes.spi.Lowerable;
+import static jdk.graal.compiler.nodeinfo.InputType.Memory;
+
+import jdk.graal.compiler.core.common.NumUtil;
+import jdk.graal.compiler.core.common.PermanentBailoutException;
+import jdk.graal.compiler.core.common.calc.UnsignedMath;
+import jdk.graal.compiler.graph.IterableNodeType;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeCycles;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodeinfo.NodeSize;
+import jdk.graal.compiler.nodes.AbstractStateSplit;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext;
+import jdk.graal.compiler.nodes.memory.MemoryAccess;
+import jdk.graal.compiler.nodes.memory.MemoryKill;
+import jdk.graal.compiler.nodes.spi.Lowerable;
 import org.graalvm.nativeimage.StackValue;
 import org.graalvm.word.LocationIdentity;
 
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/stackvalue/StackValueRecursionDepthPhase.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/stackvalue/StackValueRecursionDepthPhase.java
index f114f15a5463..9e4e09b856aa 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/stackvalue/StackValueRecursionDepthPhase.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/stackvalue/StackValueRecursionDepthPhase.java
@@ -24,9 +24,9 @@
  */
 package com.oracle.svm.core.graal.stackvalue;
 
-import jdk.compiler.graal.nodes.FrameState;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.phases.Phase;
+import jdk.graal.compiler.nodes.FrameState;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.phases.Phase;
 
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/stackvalue/StackValueSlotAssignmentPhase.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/stackvalue/StackValueSlotAssignmentPhase.java
index 85fc2157a0b1..085bbb7a55a1 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/stackvalue/StackValueSlotAssignmentPhase.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/stackvalue/StackValueSlotAssignmentPhase.java
@@ -27,8 +27,8 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.phases.Phase;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.phases.Phase;
 
 import com.oracle.svm.core.graal.stackvalue.LoweredStackValueNode.StackSlotHolder;
 import com.oracle.svm.core.graal.stackvalue.StackValueNode.StackSlotIdentity;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/stackvalue/StackValueSnippets.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/stackvalue/StackValueSnippets.java
index dddc2c9ea713..67f784dddb23 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/stackvalue/StackValueSnippets.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/stackvalue/StackValueSnippets.java
@@ -24,25 +24,25 @@
  */
 package com.oracle.svm.core.graal.stackvalue;
 
-import static jdk.compiler.graal.nodes.extended.BranchProbabilityNode.EXTREMELY_SLOW_PATH_PROBABILITY;
-import static jdk.compiler.graal.nodes.extended.BranchProbabilityNode.probability;
+import static jdk.graal.compiler.nodes.extended.BranchProbabilityNode.EXTREMELY_SLOW_PATH_PROBABILITY;
+import static jdk.graal.compiler.nodes.extended.BranchProbabilityNode.probability;
 
 import java.util.Map;
 
-import jdk.compiler.graal.api.replacements.Snippet;
-import jdk.compiler.graal.api.replacements.Snippet.ConstantParameter;
-import jdk.compiler.graal.core.common.spi.ForeignCallDescriptor;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.Node.ConstantNodeParameter;
-import jdk.compiler.graal.graph.Node.NodeIntrinsic;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.extended.ForeignCallNode;
-import jdk.compiler.graal.nodes.spi.LoweringTool;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.util.Providers;
-import jdk.compiler.graal.replacements.SnippetTemplate;
-import jdk.compiler.graal.replacements.Snippets;
+import jdk.graal.compiler.api.replacements.Snippet;
+import jdk.graal.compiler.api.replacements.Snippet.ConstantParameter;
+import jdk.graal.compiler.core.common.spi.ForeignCallDescriptor;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.Node.ConstantNodeParameter;
+import jdk.graal.compiler.graph.Node.NodeIntrinsic;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.extended.ForeignCallNode;
+import jdk.graal.compiler.nodes.spi.LoweringTool;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.util.Providers;
+import jdk.graal.compiler.replacements.SnippetTemplate;
+import jdk.graal.compiler.replacements.Snippets;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.word.WordBase;
 
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/thread/AddressOfVMThreadLocalNode.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/thread/AddressOfVMThreadLocalNode.java
index 7b54f0182c92..b4fcebb61593 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/thread/AddressOfVMThreadLocalNode.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/thread/AddressOfVMThreadLocalNode.java
@@ -24,16 +24,16 @@
  */
 package com.oracle.svm.core.graal.thread;
 
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeCycles;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodeinfo.NodeSize;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.calc.AddNode;
-import jdk.compiler.graal.nodes.calc.FloatingNode;
-import jdk.compiler.graal.nodes.spi.Lowerable;
-import jdk.compiler.graal.nodes.spi.LoweringTool;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeCycles;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodeinfo.NodeSize;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.calc.AddNode;
+import jdk.graal.compiler.nodes.calc.FloatingNode;
+import jdk.graal.compiler.nodes.spi.Lowerable;
+import jdk.graal.compiler.nodes.spi.LoweringTool;
 
 import com.oracle.svm.core.FrameAccess;
 import com.oracle.svm.core.graal.nodes.FloatingWordCastNode;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/thread/CompareAndSetVMThreadLocalNode.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/thread/CompareAndSetVMThreadLocalNode.java
index 09d62a408cfe..f3293c535e79 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/thread/CompareAndSetVMThreadLocalNode.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/thread/CompareAndSetVMThreadLocalNode.java
@@ -24,20 +24,20 @@
  */
 package com.oracle.svm.core.graal.thread;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_8;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_8;
 
-import jdk.compiler.graal.core.common.memory.MemoryOrderMode;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodeinfo.NodeSize;
-import jdk.compiler.graal.nodes.AbstractStateSplit;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.java.UnsafeCompareAndSwapNode;
-import jdk.compiler.graal.nodes.memory.SingleMemoryKill;
-import jdk.compiler.graal.nodes.spi.Lowerable;
-import jdk.compiler.graal.nodes.spi.LoweringTool;
+import jdk.graal.compiler.core.common.memory.MemoryOrderMode;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodeinfo.NodeSize;
+import jdk.graal.compiler.nodes.AbstractStateSplit;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.java.UnsafeCompareAndSwapNode;
+import jdk.graal.compiler.nodes.memory.SingleMemoryKill;
+import jdk.graal.compiler.nodes.spi.Lowerable;
+import jdk.graal.compiler.nodes.spi.LoweringTool;
 import org.graalvm.word.LocationIdentity;
 
 import com.oracle.svm.core.threadlocal.VMThreadLocalInfo;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/thread/LoadVMThreadLocalNode.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/thread/LoadVMThreadLocalNode.java
index 208382df2dcb..6cac3a5ff63d 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/thread/LoadVMThreadLocalNode.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/thread/LoadVMThreadLocalNode.java
@@ -24,27 +24,27 @@
  */
 package com.oracle.svm.core.graal.thread;
 
-import jdk.compiler.graal.core.common.memory.BarrierType;
-import jdk.compiler.graal.core.common.memory.MemoryOrderMode;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.core.common.type.TypeReference;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeCycles;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodeinfo.NodeSize;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.extended.JavaReadNode;
-import jdk.compiler.graal.nodes.memory.FloatableThreadLocalAccess;
-import jdk.compiler.graal.nodes.memory.MemoryAccess;
-import jdk.compiler.graal.nodes.memory.MemoryKill;
-import jdk.compiler.graal.nodes.memory.OrderedMemoryAccess;
-import jdk.compiler.graal.nodes.memory.SingleMemoryKill;
-import jdk.compiler.graal.nodes.memory.address.AddressNode;
-import jdk.compiler.graal.nodes.memory.address.OffsetAddressNode;
-import jdk.compiler.graal.nodes.spi.Lowerable;
-import jdk.compiler.graal.nodes.spi.LoweringTool;
+import jdk.graal.compiler.core.common.memory.BarrierType;
+import jdk.graal.compiler.core.common.memory.MemoryOrderMode;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.core.common.type.TypeReference;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeCycles;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodeinfo.NodeSize;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.extended.JavaReadNode;
+import jdk.graal.compiler.nodes.memory.FloatableThreadLocalAccess;
+import jdk.graal.compiler.nodes.memory.MemoryAccess;
+import jdk.graal.compiler.nodes.memory.MemoryKill;
+import jdk.graal.compiler.nodes.memory.OrderedMemoryAccess;
+import jdk.graal.compiler.nodes.memory.SingleMemoryKill;
+import jdk.graal.compiler.nodes.memory.address.AddressNode;
+import jdk.graal.compiler.nodes.memory.address.OffsetAddressNode;
+import jdk.graal.compiler.nodes.spi.Lowerable;
+import jdk.graal.compiler.nodes.spi.LoweringTool;
 import org.graalvm.word.LocationIdentity;
 
 import com.oracle.svm.core.threadlocal.VMThreadLocalInfo;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/thread/StoreVMThreadLocalNode.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/thread/StoreVMThreadLocalNode.java
index 09cf02cb0ed5..df7f2670a79f 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/thread/StoreVMThreadLocalNode.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/thread/StoreVMThreadLocalNode.java
@@ -24,24 +24,24 @@
  */
 package com.oracle.svm.core.graal.thread;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_2;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_1;
 
-import jdk.compiler.graal.core.common.memory.BarrierType;
-import jdk.compiler.graal.core.common.memory.MemoryOrderMode;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.AbstractStateSplit;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.extended.JavaWriteNode;
-import jdk.compiler.graal.nodes.memory.OrderedMemoryAccess;
-import jdk.compiler.graal.nodes.memory.SingleMemoryKill;
-import jdk.compiler.graal.nodes.memory.address.AddressNode;
-import jdk.compiler.graal.nodes.memory.address.OffsetAddressNode;
-import jdk.compiler.graal.nodes.spi.Lowerable;
-import jdk.compiler.graal.nodes.spi.LoweringTool;
+import jdk.graal.compiler.core.common.memory.BarrierType;
+import jdk.graal.compiler.core.common.memory.MemoryOrderMode;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.AbstractStateSplit;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.extended.JavaWriteNode;
+import jdk.graal.compiler.nodes.memory.OrderedMemoryAccess;
+import jdk.graal.compiler.nodes.memory.SingleMemoryKill;
+import jdk.graal.compiler.nodes.memory.address.AddressNode;
+import jdk.graal.compiler.nodes.memory.address.OffsetAddressNode;
+import jdk.graal.compiler.nodes.spi.Lowerable;
+import jdk.graal.compiler.nodes.spi.LoweringTool;
 import org.graalvm.word.LocationIdentity;
 
 import com.oracle.svm.core.threadlocal.VMThreadLocalInfo;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/thread/VMThreadLocalSTHolderNode.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/thread/VMThreadLocalSTHolderNode.java
index 86bfe45f11d7..f1a3a04f06e5 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/thread/VMThreadLocalSTHolderNode.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/thread/VMThreadLocalSTHolderNode.java
@@ -24,18 +24,18 @@
  */
 package com.oracle.svm.core.graal.thread;
 
-import jdk.compiler.graal.api.replacements.SnippetReflectionProvider;
-import jdk.compiler.graal.core.common.LIRKind;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeCycles;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodeinfo.NodeSize;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.spi.LIRLowerable;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
-import jdk.compiler.graal.phases.util.Providers;
+import jdk.graal.compiler.api.replacements.SnippetReflectionProvider;
+import jdk.graal.compiler.core.common.LIRKind;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeCycles;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodeinfo.NodeSize;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.spi.LIRLowerable;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.phases.util.Providers;
 import org.graalvm.nativeimage.ImageSingletons;
 
 import com.oracle.svm.core.threadlocal.VMThreadLocalInfo;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/word/DynamicHubAccess.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/word/DynamicHubAccess.java
index 4509e1af6778..31cd51d38b85 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/word/DynamicHubAccess.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/word/DynamicHubAccess.java
@@ -24,7 +24,7 @@
  */
 package com.oracle.svm.core.graal.word;
 
-import jdk.compiler.graal.nodes.extended.GuardingNode;
+import jdk.graal.compiler.nodes.extended.GuardingNode;
 import org.graalvm.word.LocationIdentity;
 
 import com.oracle.svm.core.graal.word.SubstrateOperation.SubstrateOpcode;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/word/SubstrateWordOperationPlugins.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/word/SubstrateWordOperationPlugins.java
index 5a22c726104d..8b00a33ace9c 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/word/SubstrateWordOperationPlugins.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/word/SubstrateWordOperationPlugins.java
@@ -24,21 +24,21 @@
  */
 package com.oracle.svm.core.graal.word;
 
-import jdk.compiler.graal.api.replacements.SnippetReflectionProvider;
-import jdk.compiler.graal.core.common.memory.BarrierType;
-import jdk.compiler.graal.core.common.memory.MemoryOrderMode;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.extended.GuardingNode;
-import jdk.compiler.graal.nodes.gc.BarrierSet;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext;
-import jdk.compiler.graal.nodes.memory.FixedAccessNode;
-import jdk.compiler.graal.nodes.memory.ReadNode;
-import jdk.compiler.graal.nodes.memory.address.AddressNode;
-import jdk.compiler.graal.word.WordOperationPlugin;
-import jdk.compiler.graal.word.WordTypes;
+import jdk.graal.compiler.api.replacements.SnippetReflectionProvider;
+import jdk.graal.compiler.core.common.memory.BarrierType;
+import jdk.graal.compiler.core.common.memory.MemoryOrderMode;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.extended.GuardingNode;
+import jdk.graal.compiler.nodes.gc.BarrierSet;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext;
+import jdk.graal.compiler.nodes.memory.FixedAccessNode;
+import jdk.graal.compiler.nodes.memory.ReadNode;
+import jdk.graal.compiler.nodes.memory.address.AddressNode;
+import jdk.graal.compiler.word.WordOperationPlugin;
+import jdk.graal.compiler.word.WordTypes;
 import org.graalvm.nativeimage.AnnotationAccess;
 import org.graalvm.word.LocationIdentity;
 
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/word/SubstrateWordTypes.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/word/SubstrateWordTypes.java
index 47c8e7fbc6ed..709dbddc8023 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/word/SubstrateWordTypes.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/word/SubstrateWordTypes.java
@@ -24,7 +24,7 @@
  */
 package com.oracle.svm.core.graal.word;
 
-import jdk.compiler.graal.word.WordTypes;
+import jdk.graal.compiler.word.WordTypes;
 import org.graalvm.nativeimage.AnnotationAccess;
 import org.graalvm.nativeimage.c.function.InvokeCFunctionPointer;
 
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/headers/LibC.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/headers/LibC.java
index 9e0db1a9970e..b72147d4a989 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/headers/LibC.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/headers/LibC.java
@@ -24,7 +24,7 @@
  */
 package com.oracle.svm.core.headers;
 
-import jdk.compiler.graal.api.replacements.Fold;
+import jdk.graal.compiler.api.replacements.Fold;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.c.type.CCharPointer;
 import org.graalvm.nativeimage.c.type.CCharPointerPointer;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/headers/WindowsAPIs.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/headers/WindowsAPIs.java
index e5262707fb88..3c2f934a210b 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/headers/WindowsAPIs.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/headers/WindowsAPIs.java
@@ -24,7 +24,7 @@
  */
 package com.oracle.svm.core.headers;
 
-import jdk.compiler.graal.api.replacements.Fold;
+import jdk.graal.compiler.api.replacements.Fold;
 import org.graalvm.nativeimage.ImageSingletons;
 
 import com.oracle.svm.core.Uninterruptible;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/BarrierSetProvider.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/BarrierSetProvider.java
index ea4eda1a1555..34c991b8c449 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/BarrierSetProvider.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/BarrierSetProvider.java
@@ -24,7 +24,7 @@
  */
 package com.oracle.svm.core.heap;
 
-import jdk.compiler.graal.nodes.gc.BarrierSet;
+import jdk.graal.compiler.nodes.gc.BarrierSet;
 
 import jdk.vm.ci.meta.MetaAccessProvider;
 
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/CodeReferenceMapDecoder.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/CodeReferenceMapDecoder.java
index f82188bddbc2..8e8a9fd596b5 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/CodeReferenceMapDecoder.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/CodeReferenceMapDecoder.java
@@ -24,8 +24,8 @@
  */
 package com.oracle.svm.core.heap;
 
-import jdk.compiler.graal.core.common.util.AbstractTypeReader;
-import jdk.compiler.graal.core.common.util.UnsafeArrayTypeWriter;
+import jdk.graal.compiler.core.common.util.AbstractTypeReader;
+import jdk.graal.compiler.core.common.util.UnsafeArrayTypeWriter;
 import org.graalvm.word.Pointer;
 import org.graalvm.word.PointerBase;
 import org.graalvm.word.UnsignedWord;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/CodeReferenceMapEncoder.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/CodeReferenceMapEncoder.java
index f8980dcba418..748ef36012da 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/CodeReferenceMapEncoder.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/CodeReferenceMapEncoder.java
@@ -29,7 +29,7 @@
 import java.util.Map.Entry;
 import java.util.Set;
 
-import jdk.compiler.graal.core.common.util.TypeWriter;
+import jdk.graal.compiler.core.common.util.TypeWriter;
 
 import com.oracle.svm.core.FrameAccess;
 import com.oracle.svm.core.config.ConfigurationValues;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/Heap.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/Heap.java
index cd2228811cb2..0e4873ad4a35 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/Heap.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/Heap.java
@@ -29,7 +29,7 @@
 import java.util.List;
 import java.util.function.Consumer;
 
-import jdk.compiler.graal.api.replacements.Fold;
+import jdk.graal.compiler.api.replacements.Fold;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.IsolateThread;
 import org.graalvm.nativeimage.Platform;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/ObjectHeader.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/ObjectHeader.java
index 21d09aa7bacb..0c443fb4ebbd 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/ObjectHeader.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/ObjectHeader.java
@@ -24,9 +24,9 @@
  */
 package com.oracle.svm.core.heap;
 
-import jdk.compiler.graal.api.replacements.Fold;
-import jdk.compiler.graal.word.ObjectAccess;
-import jdk.compiler.graal.word.Word;
+import jdk.graal.compiler.api.replacements.Fold;
+import jdk.graal.compiler.word.ObjectAccess;
+import jdk.graal.compiler.word.Word;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
 import org.graalvm.word.Pointer;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/Pod.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/Pod.java
index 0078023ea7c2..970e26ff7180 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/Pod.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/Pod.java
@@ -38,7 +38,7 @@
 import java.util.function.Supplier;
 
 import org.graalvm.collections.EconomicMap;
-import jdk.compiler.graal.api.replacements.Fold;
+import jdk.graal.compiler.api.replacements.Fold;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/PodReferenceMapDecoder.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/PodReferenceMapDecoder.java
index ec467efc3eaa..71dbad71f698 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/PodReferenceMapDecoder.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/PodReferenceMapDecoder.java
@@ -24,9 +24,9 @@
  */
 package com.oracle.svm.core.heap;
 
-import jdk.compiler.graal.api.directives.GraalDirectives;
-import jdk.compiler.graal.nodes.java.ArrayLengthNode;
-import jdk.compiler.graal.word.BarrieredAccess;
+import jdk.graal.compiler.api.directives.GraalDirectives;
+import jdk.graal.compiler.nodes.java.ArrayLengthNode;
+import jdk.graal.compiler.word.BarrieredAccess;
 import org.graalvm.word.LocationIdentity;
 import org.graalvm.word.Pointer;
 import org.graalvm.word.UnsignedWord;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/ReferenceAccess.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/ReferenceAccess.java
index 7c98f691f25b..ac81a094d3d3 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/ReferenceAccess.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/ReferenceAccess.java
@@ -25,9 +25,9 @@
 
 package com.oracle.svm.core.heap;
 
-import jdk.compiler.graal.api.replacements.Fold;
-import jdk.compiler.graal.core.common.CompressEncoding;
-import jdk.compiler.graal.word.Word;
+import jdk.graal.compiler.api.replacements.Fold;
+import jdk.graal.compiler.core.common.CompressEncoding;
+import jdk.graal.compiler.word.Word;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.word.Pointer;
 import org.graalvm.word.UnsignedWord;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/ReferenceAccessImpl.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/ReferenceAccessImpl.java
index 7659e647f08a..1658ff894237 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/ReferenceAccessImpl.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/ReferenceAccessImpl.java
@@ -24,11 +24,11 @@
  */
 package com.oracle.svm.core.heap;
 
-import jdk.compiler.graal.api.replacements.Fold;
-import jdk.compiler.graal.core.common.CompressEncoding;
-import jdk.compiler.graal.word.BarrieredAccess;
-import jdk.compiler.graal.word.ObjectAccess;
-import jdk.compiler.graal.word.Word;
+import jdk.graal.compiler.api.replacements.Fold;
+import jdk.graal.compiler.core.common.CompressEncoding;
+import jdk.graal.compiler.word.BarrieredAccess;
+import jdk.graal.compiler.word.ObjectAccess;
+import jdk.graal.compiler.word.Word;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.word.Pointer;
 import org.graalvm.word.UnsignedWord;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/ReferenceHandlerThread.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/ReferenceHandlerThread.java
index 3b1b6b0226b6..1e72b35ae4cc 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/ReferenceHandlerThread.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/ReferenceHandlerThread.java
@@ -24,7 +24,7 @@
  */
 package com.oracle.svm.core.heap;
 
-import jdk.compiler.graal.api.replacements.Fold;
+import jdk.graal.compiler.api.replacements.Fold;
 import org.graalvm.nativeimage.CurrentIsolate;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.IsolateThread;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/ReferenceInternals.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/ReferenceInternals.java
index 33de7550e12f..1f5bf7e241f9 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/ReferenceInternals.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/ReferenceInternals.java
@@ -24,17 +24,17 @@
  */
 package com.oracle.svm.core.heap;
 
-import static jdk.compiler.graal.nodes.extended.BranchProbabilityNode.EXTREMELY_FAST_PATH_PROBABILITY;
-import static jdk.compiler.graal.nodes.extended.BranchProbabilityNode.probability;
+import static jdk.graal.compiler.nodes.extended.BranchProbabilityNode.EXTREMELY_FAST_PATH_PROBABILITY;
+import static jdk.graal.compiler.nodes.extended.BranchProbabilityNode.probability;
 
 import java.lang.ref.Reference;
 import java.lang.ref.SoftReference;
 
-import jdk.compiler.graal.core.common.SuppressFBWarnings;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.word.BarrieredAccess;
-import jdk.compiler.graal.word.ObjectAccess;
-import jdk.compiler.graal.word.Word;
+import jdk.graal.compiler.core.common.SuppressFBWarnings;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.word.BarrieredAccess;
+import jdk.graal.compiler.word.ObjectAccess;
+import jdk.graal.compiler.word.Word;
 import org.graalvm.word.Pointer;
 import org.graalvm.word.WordFactory;
 
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/ReferenceMapEncoder.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/ReferenceMapEncoder.java
index cab03286ce60..e1f987790055 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/ReferenceMapEncoder.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/ReferenceMapEncoder.java
@@ -33,8 +33,8 @@
 import java.util.PrimitiveIterator;
 import java.util.Set;
 
-import jdk.compiler.graal.core.common.util.TypeConversion;
-import jdk.compiler.graal.core.common.util.UnsafeArrayTypeWriter;
+import jdk.graal.compiler.core.common.util.TypeConversion;
+import jdk.graal.compiler.core.common.util.UnsafeArrayTypeWriter;
 
 import com.oracle.svm.core.c.NonmovableArray;
 import com.oracle.svm.core.c.NonmovableArrays;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/StoredContinuation.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/StoredContinuation.java
index b569d76f2e76..0085793591d0 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/StoredContinuation.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/StoredContinuation.java
@@ -25,7 +25,7 @@
 package com.oracle.svm.core.heap;
 
 import com.oracle.svm.core.hub.Hybrid;
-import jdk.compiler.graal.word.Word;
+import jdk.graal.compiler.word.Word;
 import org.graalvm.nativeimage.c.function.CodePointer;
 
 /** Execution state of a continuation, use via {@link StoredContinuationAccess}. */
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/StoredContinuationAccess.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/StoredContinuationAccess.java
index 76d50221e126..88d39fd13825 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/StoredContinuationAccess.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/StoredContinuationAccess.java
@@ -24,11 +24,11 @@
  */
 package com.oracle.svm.core.heap;
 
-import jdk.compiler.graal.api.directives.GraalDirectives;
-import jdk.compiler.graal.graph.Node.NodeIntrinsic;
-import jdk.compiler.graal.nodes.extended.MembarNode;
-import jdk.compiler.graal.nodes.java.ArrayLengthNode;
-import jdk.compiler.graal.word.Word;
+import jdk.graal.compiler.api.directives.GraalDirectives;
+import jdk.graal.compiler.graph.Node.NodeIntrinsic;
+import jdk.graal.compiler.nodes.extended.MembarNode;
+import jdk.graal.compiler.nodes.java.ArrayLengthNode;
+import jdk.graal.compiler.word.Word;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.StackValue;
 import org.graalvm.nativeimage.c.function.CodePointer;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/SubstrateReferenceMap.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/SubstrateReferenceMap.java
index be962ca2528d..952f9a7a0c07 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/SubstrateReferenceMap.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/SubstrateReferenceMap.java
@@ -34,7 +34,7 @@
 
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.Equivalence;
-import jdk.compiler.graal.core.common.NumUtil;
+import jdk.graal.compiler.core.common.NumUtil;
 
 import com.oracle.svm.core.FrameAccess;
 import com.oracle.svm.core.config.ConfigurationValues;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/SubstrateReferenceMapBuilder.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/SubstrateReferenceMapBuilder.java
index 909eb191c762..0714cb8402a0 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/SubstrateReferenceMapBuilder.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/SubstrateReferenceMapBuilder.java
@@ -24,9 +24,9 @@
  */
 package com.oracle.svm.core.heap;
 
-import jdk.compiler.graal.core.common.LIRKind;
-import jdk.compiler.graal.lir.LIRFrameState;
-import jdk.compiler.graal.lir.framemap.ReferenceMapBuilder;
+import jdk.graal.compiler.core.common.LIRKind;
+import jdk.graal.compiler.lir.LIRFrameState;
+import jdk.graal.compiler.lir.framemap.ReferenceMapBuilder;
 
 import com.oracle.svm.core.CalleeSavedRegisters;
 import com.oracle.svm.core.util.VMError;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/Target_java_lang_ref_Reference.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/Target_java_lang_ref_Reference.java
index e7efb051d921..f603ce577abc 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/Target_java_lang_ref_Reference.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/Target_java_lang_ref_Reference.java
@@ -29,7 +29,7 @@
 import java.lang.reflect.Field;
 import java.util.function.BooleanSupplier;
 
-import jdk.compiler.graal.nodes.java.ReachabilityFenceNode;
+import jdk.graal.compiler.nodes.java.ReachabilityFenceNode;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
 import org.graalvm.nativeimage.hosted.FieldValueTransformer;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/VMOperationInfos.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/VMOperationInfos.java
index b1b4bb15427c..eb54708abe92 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/VMOperationInfos.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/VMOperationInfos.java
@@ -28,7 +28,7 @@
 import java.util.Map.Entry;
 import java.util.Objects;
 
-import jdk.compiler.graal.api.replacements.Fold;
+import jdk.graal.compiler.api.replacements.Fold;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/dump/HProfSubRecord.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/dump/HProfSubRecord.java
index 6008d73102ee..bcb266c5b3c0 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/dump/HProfSubRecord.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/dump/HProfSubRecord.java
@@ -24,7 +24,7 @@
  */
 package com.oracle.svm.core.heap.dump;
 
-import jdk.compiler.graal.core.common.NumUtil;
+import jdk.graal.compiler.core.common.NumUtil;
 
 /* Enum of all relevant HPROF sub-records (see enum hprofTag in HotSpot). */
 public enum HProfSubRecord {
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/dump/HProfTopLevelRecord.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/dump/HProfTopLevelRecord.java
index 7f025e5314a0..615ddb3e3509 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/dump/HProfTopLevelRecord.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/dump/HProfTopLevelRecord.java
@@ -24,7 +24,7 @@
  */
 package com.oracle.svm.core.heap.dump;
 
-import jdk.compiler.graal.core.common.NumUtil;
+import jdk.graal.compiler.core.common.NumUtil;
 
 /* Enum of all relevant HPROF top-level records (see enum hprofTag in HotSpot). */
 public enum HProfTopLevelRecord {
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/dump/HProfType.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/dump/HProfType.java
index 40c387bbb62e..3cf31e420469 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/dump/HProfType.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/dump/HProfType.java
@@ -24,7 +24,7 @@
  */
 package com.oracle.svm.core.heap.dump;
 
-import jdk.compiler.graal.core.common.NumUtil;
+import jdk.graal.compiler.core.common.NumUtil;
 
 import com.oracle.svm.core.config.ConfigurationValues;
 
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/dump/HeapDumpMetadata.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/dump/HeapDumpMetadata.java
index 95c20c0f5a8c..04ef357f2423 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/dump/HeapDumpMetadata.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/dump/HeapDumpMetadata.java
@@ -24,7 +24,7 @@
  */
 package com.oracle.svm.core.heap.dump;
 
-import jdk.compiler.graal.api.replacements.Fold;
+import jdk.graal.compiler.api.replacements.Fold;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/dump/HeapDumpSupportImpl.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/dump/HeapDumpSupportImpl.java
index 9a7b51dcf640..95cffbb587bd 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/dump/HeapDumpSupportImpl.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/dump/HeapDumpSupportImpl.java
@@ -28,7 +28,7 @@
 
 import java.io.IOException;
 
-import jdk.compiler.graal.api.replacements.Fold;
+import jdk.graal.compiler.api.replacements.Fold;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/dump/HeapDumpWriter.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/dump/HeapDumpWriter.java
index 44266f9b4231..5942d332845a 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/dump/HeapDumpWriter.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/dump/HeapDumpWriter.java
@@ -26,11 +26,11 @@
 
 import static com.oracle.svm.core.heap.RestrictHeapAccess.Access.NO_ALLOCATION;
 
-import jdk.compiler.graal.api.replacements.Fold;
-import jdk.compiler.graal.core.common.NumUtil;
-import jdk.compiler.graal.nodes.java.ArrayLengthNode;
-import jdk.compiler.graal.word.ObjectAccess;
-import jdk.compiler.graal.word.Word;
+import jdk.graal.compiler.api.replacements.Fold;
+import jdk.graal.compiler.core.common.NumUtil;
+import jdk.graal.compiler.nodes.java.ArrayLengthNode;
+import jdk.graal.compiler.word.ObjectAccess;
+import jdk.graal.compiler.word.Word;
 import org.graalvm.nativeimage.CurrentIsolate;
 import org.graalvm.nativeimage.IsolateThread;
 import org.graalvm.nativeimage.Platform;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/dump/HeapDumping.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/dump/HeapDumping.java
index 39b0eb3616e6..197f41adef61 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/dump/HeapDumping.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/dump/HeapDumping.java
@@ -28,7 +28,7 @@
 import java.nio.file.Files;
 import java.nio.file.Paths;
 
-import jdk.compiler.graal.api.replacements.Fold;
+import jdk.graal.compiler.api.replacements.Fold;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.ProcessProperties;
 import org.graalvm.nativeimage.impl.HeapDumpSupport;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heapdump/HeapDumpUtils.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heapdump/HeapDumpUtils.java
index e7265520fc6e..cdd51a81350e 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heapdump/HeapDumpUtils.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heapdump/HeapDumpUtils.java
@@ -26,7 +26,7 @@
 
 import static com.oracle.svm.core.snippets.KnownIntrinsics.readCallerStackPointer;
 
-import jdk.compiler.graal.word.Word;
+import jdk.graal.compiler.word.Word;
 import org.graalvm.nativeimage.CurrentIsolate;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.IsolateThread;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/hub/DynamicHub.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/hub/DynamicHub.java
index e0e2ab9aad11..d1651798ff2d 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/hub/DynamicHub.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/hub/DynamicHub.java
@@ -72,9 +72,9 @@
 import java.util.Optional;
 import java.util.StringJoiner;
 
-import jdk.compiler.graal.api.replacements.Fold;
-import jdk.compiler.graal.core.common.NumUtil;
-import jdk.compiler.graal.core.common.SuppressFBWarnings;
+import jdk.graal.compiler.api.replacements.Fold;
+import jdk.graal.compiler.core.common.NumUtil;
+import jdk.graal.compiler.core.common.SuppressFBWarnings;
 import org.graalvm.nativeimage.AnnotationAccess;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/hub/InteriorObjRefWalker.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/hub/InteriorObjRefWalker.java
index 25c128eaf93a..9bfb976bf16f 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/hub/InteriorObjRefWalker.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/hub/InteriorObjRefWalker.java
@@ -26,8 +26,8 @@
 
 import java.util.function.IntConsumer;
 
-import jdk.compiler.graal.nodes.java.ArrayLengthNode;
-import jdk.compiler.graal.word.Word;
+import jdk.graal.compiler.nodes.java.ArrayLengthNode;
+import jdk.graal.compiler.word.Word;
 import org.graalvm.word.Pointer;
 import org.graalvm.word.WordFactory;
 
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/hub/LayoutEncoding.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/hub/LayoutEncoding.java
index 37740de90462..bd57b4339266 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/hub/LayoutEncoding.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/hub/LayoutEncoding.java
@@ -24,9 +24,9 @@
  */
 package com.oracle.svm.core.hub;
 
-import jdk.compiler.graal.core.common.calc.UnsignedMath;
-import jdk.compiler.graal.nodes.java.ArrayLengthNode;
-import jdk.compiler.graal.word.Word;
+import jdk.graal.compiler.core.common.calc.UnsignedMath;
+import jdk.graal.compiler.nodes.java.ArrayLengthNode;
+import jdk.graal.compiler.word.Word;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
 import org.graalvm.word.Pointer;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/hub/PredefinedClassesSupport.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/hub/PredefinedClassesSupport.java
index 802cf78b0a34..0f95929f6057 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/hub/PredefinedClassesSupport.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/hub/PredefinedClassesSupport.java
@@ -33,8 +33,8 @@
 import java.util.concurrent.locks.ReentrantLock;
 
 import org.graalvm.collections.EconomicMap;
-import jdk.compiler.graal.api.replacements.Fold;
-import jdk.compiler.graal.options.Option;
+import jdk.graal.compiler.api.replacements.Fold;
+import jdk.graal.compiler.options.Option;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/hub/ReferenceType.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/hub/ReferenceType.java
index 0b2443a8918c..9bf1c10b44ea 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/hub/ReferenceType.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/hub/ReferenceType.java
@@ -24,7 +24,7 @@
  */
 package com.oracle.svm.core.hub;
 
-import jdk.compiler.graal.core.common.NumUtil;
+import jdk.graal.compiler.core.common.NumUtil;
 
 import com.oracle.svm.core.util.DuplicatedInNativeCode;
 
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/identityhashcode/IdentityHashCodeSupport.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/identityhashcode/IdentityHashCodeSupport.java
index 47d535cc5dc1..549e28ef4110 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/identityhashcode/IdentityHashCodeSupport.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/identityhashcode/IdentityHashCodeSupport.java
@@ -26,12 +26,12 @@
 
 import java.util.SplittableRandom;
 
-import jdk.compiler.graal.nodes.NamedLocationIdentity;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.util.Providers;
-import jdk.compiler.graal.replacements.IdentityHashCodeSnippets;
-import jdk.compiler.graal.word.ObjectAccess;
-import jdk.compiler.graal.word.Word;
+import jdk.graal.compiler.nodes.NamedLocationIdentity;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.util.Providers;
+import jdk.graal.compiler.replacements.IdentityHashCodeSnippets;
+import jdk.graal.compiler.word.ObjectAccess;
+import jdk.graal.compiler.word.Word;
 import org.graalvm.word.LocationIdentity;
 import org.graalvm.word.SignedWord;
 import org.graalvm.word.WordFactory;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/identityhashcode/SubstrateIdentityHashCodeNode.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/identityhashcode/SubstrateIdentityHashCodeNode.java
index 16c6315787ae..e35a3c0844ab 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/identityhashcode/SubstrateIdentityHashCodeNode.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/identityhashcode/SubstrateIdentityHashCodeNode.java
@@ -24,14 +24,14 @@
  */
 package com.oracle.svm.core.identityhashcode;
 
-import jdk.compiler.graal.api.replacements.Fold;
-import jdk.compiler.graal.core.common.type.TypedConstant;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeCycles;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodeinfo.NodeSize;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.replacements.nodes.IdentityHashCodeNode;
+import jdk.graal.compiler.api.replacements.Fold;
+import jdk.graal.compiler.core.common.type.TypedConstant;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeCycles;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodeinfo.NodeSize;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.replacements.nodes.IdentityHashCodeNode;
 import org.graalvm.word.LocationIdentity;
 
 import com.oracle.svm.core.config.ConfigurationValues;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/identityhashcode/SubstrateIdentityHashCodeSnippets.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/identityhashcode/SubstrateIdentityHashCodeSnippets.java
index f7eb407f8abd..f09d0a799bcf 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/identityhashcode/SubstrateIdentityHashCodeSnippets.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/identityhashcode/SubstrateIdentityHashCodeSnippets.java
@@ -24,20 +24,20 @@
  */
 package com.oracle.svm.core.identityhashcode;
 
-import static jdk.compiler.graal.nodes.extended.BranchProbabilityNode.LIKELY_PROBABILITY;
-import static jdk.compiler.graal.nodes.extended.BranchProbabilityNode.NOT_FREQUENT_PROBABILITY;
-import static jdk.compiler.graal.nodes.extended.BranchProbabilityNode.SLOW_PATH_PROBABILITY;
-import static jdk.compiler.graal.nodes.extended.BranchProbabilityNode.probability;
+import static jdk.graal.compiler.nodes.extended.BranchProbabilityNode.LIKELY_PROBABILITY;
+import static jdk.graal.compiler.nodes.extended.BranchProbabilityNode.NOT_FREQUENT_PROBABILITY;
+import static jdk.graal.compiler.nodes.extended.BranchProbabilityNode.SLOW_PATH_PROBABILITY;
+import static jdk.graal.compiler.nodes.extended.BranchProbabilityNode.probability;
 
-import jdk.compiler.graal.core.common.spi.ForeignCallDescriptor;
-import jdk.compiler.graal.graph.Node.ConstantNodeParameter;
-import jdk.compiler.graal.graph.Node.NodeIntrinsic;
-import jdk.compiler.graal.nodes.extended.ForeignCallNode;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.util.Providers;
-import jdk.compiler.graal.replacements.IdentityHashCodeSnippets;
-import jdk.compiler.graal.word.ObjectAccess;
-import jdk.compiler.graal.word.Word;
+import jdk.graal.compiler.core.common.spi.ForeignCallDescriptor;
+import jdk.graal.compiler.graph.Node.ConstantNodeParameter;
+import jdk.graal.compiler.graph.Node.NodeIntrinsic;
+import jdk.graal.compiler.nodes.extended.ForeignCallNode;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.util.Providers;
+import jdk.graal.compiler.replacements.IdentityHashCodeSnippets;
+import jdk.graal.compiler.word.ObjectAccess;
+import jdk.graal.compiler.word.Word;
 
 import com.oracle.svm.core.config.ConfigurationValues;
 import com.oracle.svm.core.config.ObjectLayout;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/ClassLoaderSupport.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/ClassLoaderSupport.java
index 1a9b106a6816..15d175aa1c7e 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/ClassLoaderSupport.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/ClassLoaderSupport.java
@@ -29,7 +29,7 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
-import jdk.compiler.graal.debug.GraalError;
+import jdk.graal.compiler.debug.GraalError;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/FileSystemProviderSupport.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/FileSystemProviderSupport.java
index 9a55dbf81f00..85b0dc32eb18 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/FileSystemProviderSupport.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/FileSystemProviderSupport.java
@@ -30,7 +30,7 @@
 import java.util.Collections;
 import java.util.List;
 
-import jdk.compiler.graal.options.Option;
+import jdk.graal.compiler.options.Option;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JDK11OrEarlier.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JDK11OrEarlier.java
index c2a1a04addb3..d586a24fa224 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JDK11OrEarlier.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JDK11OrEarlier.java
@@ -26,7 +26,7 @@
 
 import java.util.function.BooleanSupplier;
 
-import jdk.compiler.graal.serviceprovider.JavaVersionUtil;
+import jdk.graal.compiler.serviceprovider.JavaVersionUtil;
 
 @Deprecated(since = "23.1.0", forRemoval = true)
 public class JDK11OrEarlier implements BooleanSupplier {
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JDK17OrEarlier.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JDK17OrEarlier.java
index d5e319a626e2..665457788cd2 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JDK17OrEarlier.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JDK17OrEarlier.java
@@ -26,7 +26,7 @@
 
 import java.util.function.BooleanSupplier;
 
-import jdk.compiler.graal.serviceprovider.JavaVersionUtil;
+import jdk.graal.compiler.serviceprovider.JavaVersionUtil;
 
 @Deprecated(since = "24.0.0", forRemoval = true)
 public class JDK17OrEarlier implements BooleanSupplier {
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JDK17OrLater.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JDK17OrLater.java
index 564ca2aef8ad..dd3c20d07d07 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JDK17OrLater.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JDK17OrLater.java
@@ -26,7 +26,7 @@
 
 import java.util.function.BooleanSupplier;
 
-import jdk.compiler.graal.serviceprovider.JavaVersionUtil;
+import jdk.graal.compiler.serviceprovider.JavaVersionUtil;
 
 @Deprecated(since = "23.1.0", forRemoval = true)
 public class JDK17OrLater implements BooleanSupplier {
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JDK21OrEarlier.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JDK21OrEarlier.java
index 03bdf9f72cf2..dcf75cb50a33 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JDK21OrEarlier.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JDK21OrEarlier.java
@@ -26,7 +26,7 @@
 
 import java.util.function.BooleanSupplier;
 
-import jdk.compiler.graal.serviceprovider.JavaVersionUtil;
+import jdk.graal.compiler.serviceprovider.JavaVersionUtil;
 
 public class JDK21OrEarlier implements BooleanSupplier {
     @Override
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JDK22OrLater.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JDK22OrLater.java
index 9425414370a6..8c6ae30c9076 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JDK22OrLater.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JDK22OrLater.java
@@ -26,7 +26,7 @@
 
 import java.util.function.BooleanSupplier;
 
-import jdk.compiler.graal.serviceprovider.JavaVersionUtil;
+import jdk.graal.compiler.serviceprovider.JavaVersionUtil;
 
 public class JDK22OrLater implements BooleanSupplier {
     @Override
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JRTSupport.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JRTSupport.java
index 068ea6394123..5ff6a4924994 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JRTSupport.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JRTSupport.java
@@ -37,8 +37,8 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.BooleanSupplier;
 
-import jdk.compiler.graal.options.Option;
-import jdk.compiler.graal.options.OptionType;
+import jdk.graal.compiler.options.Option;
+import jdk.graal.compiler.options.OptionType;
 
 import com.oracle.svm.core.annotate.Alias;
 import com.oracle.svm.core.annotate.Delete;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JavaIOSubstitutions.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JavaIOSubstitutions.java
index f559f90d1743..6d22b6418f11 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JavaIOSubstitutions.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JavaIOSubstitutions.java
@@ -35,7 +35,7 @@
 import java.util.concurrent.ConcurrentMap;
 import java.util.stream.Collectors;
 
-import jdk.compiler.graal.java.LambdaUtils;
+import jdk.graal.compiler.java.LambdaUtils;
 
 import com.oracle.svm.core.annotate.Alias;
 import com.oracle.svm.core.annotate.RecomputeFieldValue;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JavaLangReflectSubstitutions.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JavaLangReflectSubstitutions.java
index 7b65a41d29b8..bbaaa52b38de 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JavaLangReflectSubstitutions.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JavaLangReflectSubstitutions.java
@@ -29,7 +29,7 @@
 import java.lang.reflect.Array;
 import java.util.Objects;
 
-import jdk.compiler.graal.word.BarrieredAccess;
+import jdk.graal.compiler.word.BarrieredAccess;
 import org.graalvm.word.UnsignedWord;
 
 import com.oracle.svm.core.SubstrateUtil;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JavaLangSubstitutions.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JavaLangSubstitutions.java
index f988b36b97e8..8a09a6dd84e8 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JavaLangSubstitutions.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JavaLangSubstitutions.java
@@ -42,10 +42,10 @@
 import java.util.function.BooleanSupplier;
 import java.util.stream.Stream;
 
-import jdk.compiler.graal.replacements.nodes.BinaryMathIntrinsicNode;
-import jdk.compiler.graal.replacements.nodes.BinaryMathIntrinsicNode.BinaryOperation;
-import jdk.compiler.graal.replacements.nodes.UnaryMathIntrinsicNode;
-import jdk.compiler.graal.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation;
+import jdk.graal.compiler.replacements.nodes.BinaryMathIntrinsicNode;
+import jdk.graal.compiler.replacements.nodes.BinaryMathIntrinsicNode.BinaryOperation;
+import jdk.graal.compiler.replacements.nodes.UnaryMathIntrinsicNode;
+import jdk.graal.compiler.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/ProtectionDomainSupport.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/ProtectionDomainSupport.java
index 2f5c5f613791..f976aefbf3f6 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/ProtectionDomainSupport.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/ProtectionDomainSupport.java
@@ -32,8 +32,8 @@
 import java.security.cert.Certificate;
 import java.util.function.Supplier;
 
-import jdk.compiler.graal.options.Option;
-import jdk.compiler.graal.options.OptionType;
+import jdk.graal.compiler.options.Option;
+import jdk.graal.compiler.options.OptionType;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/RuntimeSupport.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/RuntimeSupport.java
index d6caa6971fe3..d108e7115982 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/RuntimeSupport.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/RuntimeSupport.java
@@ -28,7 +28,7 @@
 import java.util.Objects;
 import java.util.concurrent.atomic.AtomicReference;
 
-import jdk.compiler.graal.api.replacements.Fold;
+import jdk.graal.compiler.api.replacements.Fold;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/StackTraceUtils.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/StackTraceUtils.java
index 38cc6bf04a62..d11b1a456e14 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/StackTraceUtils.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/StackTraceUtils.java
@@ -32,8 +32,8 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 
-import jdk.compiler.graal.api.replacements.Fold;
-import jdk.compiler.graal.word.Word;
+import jdk.graal.compiler.api.replacements.Fold;
+import jdk.graal.compiler.word.Word;
 import org.graalvm.nativeimage.AnnotationAccess;
 import org.graalvm.nativeimage.IsolateThread;
 import org.graalvm.nativeimage.c.function.CodePointer;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/SunMiscSubstitutions.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/SunMiscSubstitutions.java
index f27f141b3491..a20bee43c883 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/SunMiscSubstitutions.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/SunMiscSubstitutions.java
@@ -29,7 +29,7 @@
 import java.lang.reflect.Method;
 import java.security.ProtectionDomain;
 
-import jdk.compiler.graal.nodes.extended.MembarNode;
+import jdk.graal.compiler.nodes.extended.MembarNode;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.UnmanagedMemory;
 import org.graalvm.nativeimage.impl.UnsafeMemorySupport;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/SystemPropertiesSupport.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/SystemPropertiesSupport.java
index 47ea05da1a46..a389d7cba365 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/SystemPropertiesSupport.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/SystemPropertiesSupport.java
@@ -30,7 +30,7 @@
 import java.util.Properties;
 import java.util.function.Supplier;
 
-import jdk.compiler.graal.api.replacements.Fold;
+import jdk.graal.compiler.api.replacements.Fold;
 import org.graalvm.nativeimage.ImageInfo;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/TimeZoneSubstitutions.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/TimeZoneSubstitutions.java
index 71f527120a8f..6875c685d0c2 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/TimeZoneSubstitutions.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/TimeZoneSubstitutions.java
@@ -32,8 +32,8 @@
 import java.util.TimeZone;
 
 import org.graalvm.collections.EconomicMap;
-import jdk.compiler.graal.options.Option;
-import jdk.compiler.graal.options.OptionKey;
+import jdk.graal.compiler.options.Option;
+import jdk.graal.compiler.options.OptionKey;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platforms;
 import org.graalvm.nativeimage.UnmanagedMemory;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/VMErrorSubstitutions.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/VMErrorSubstitutions.java
index 1b3973869e7e..89e76ff009a9 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/VMErrorSubstitutions.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/VMErrorSubstitutions.java
@@ -26,7 +26,7 @@
 
 import static com.oracle.svm.core.heap.RestrictHeapAccess.Access.NO_ALLOCATION;
 
-import jdk.compiler.graal.nodes.UnreachableNode;
+import jdk.graal.compiler.nodes.UnreachableNode;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.LogHandler;
 import org.graalvm.nativeimage.Platforms;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/localization/BundleContentSubstitutedLocalizationSupport.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/localization/BundleContentSubstitutedLocalizationSupport.java
index feeaf5a0c5ea..9f918232531e 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/localization/BundleContentSubstitutedLocalizationSupport.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/localization/BundleContentSubstitutedLocalizationSupport.java
@@ -37,7 +37,7 @@
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
 
-import jdk.compiler.graal.debug.GraalError;
+import jdk.graal.compiler.debug.GraalError;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
 
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/localization/LocalizationSupport.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/localization/LocalizationSupport.java
index 01711633ab18..d6ab244df836 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/localization/LocalizationSupport.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/localization/LocalizationSupport.java
@@ -36,7 +36,7 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import jdk.compiler.graal.debug.GraalError;
+import jdk.graal.compiler.debug.GraalError;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/localization/compression/utils/BundleSerializationUtils.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/localization/compression/utils/BundleSerializationUtils.java
index b3f2f80556cb..00b606d9d6e7 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/localization/compression/utils/BundleSerializationUtils.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/localization/compression/utils/BundleSerializationUtils.java
@@ -27,7 +27,7 @@
 import com.oracle.svm.core.util.VMError;
 import com.oracle.svm.util.ReflectionUtil;
 import org.graalvm.collections.Pair;
-import jdk.compiler.graal.debug.GraalError;
+import jdk.graal.compiler.debug.GraalError;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
 
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/management/JmxIncluded.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/management/JmxIncluded.java
index 2077e46f69f4..e64023d2f7b3 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/management/JmxIncluded.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/management/JmxIncluded.java
@@ -28,7 +28,7 @@
 
 import java.util.function.BooleanSupplier;
 
-import jdk.compiler.graal.api.replacements.Fold;
+import jdk.graal.compiler.api.replacements.Fold;
 
 import com.oracle.svm.core.VMInspectionOptions;
 
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/management/ManagementSupport.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/management/ManagementSupport.java
index c30f350b7d23..d0b24e1448d0 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/management/ManagementSupport.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/management/ManagementSupport.java
@@ -46,7 +46,7 @@
 import javax.management.StandardEmitterMBean;
 import javax.management.StandardMBean;
 
-import jdk.compiler.graal.api.replacements.Fold;
+import jdk.graal.compiler.api.replacements.Fold;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.IsolateThread;
 import org.graalvm.nativeimage.Platform;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/HasJfrSupport.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/HasJfrSupport.java
index eb1ea6497e3f..976a9005c27f 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/HasJfrSupport.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/HasJfrSupport.java
@@ -26,7 +26,7 @@
 
 import java.util.function.BooleanSupplier;
 
-import jdk.compiler.graal.api.replacements.Fold;
+import jdk.graal.compiler.api.replacements.Fold;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrBufferAccess.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrBufferAccess.java
index 27cb7c41b570..31da845e8aa1 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrBufferAccess.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrBufferAccess.java
@@ -24,7 +24,7 @@
  */
 package com.oracle.svm.core.jfr;
 
-import jdk.compiler.graal.api.replacements.Fold;
+import jdk.graal.compiler.api.replacements.Fold;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.c.struct.SizeOf;
 import org.graalvm.nativeimage.impl.UnmanagedMemorySupport;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrCheckpointType.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrCheckpointType.java
index 6ea5c43dd374..e011224a6d86 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrCheckpointType.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrCheckpointType.java
@@ -25,7 +25,7 @@
  */
 package com.oracle.svm.core.jfr;
 
-import jdk.compiler.graal.core.common.NumUtil;
+import jdk.graal.compiler.core.common.NumUtil;
 
 import com.oracle.svm.core.Uninterruptible;
 
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrChunkWriter.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrChunkWriter.java
index b834da6834ed..219bdb4c5b7c 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrChunkWriter.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrChunkWriter.java
@@ -29,8 +29,8 @@
 
 import java.nio.charset.StandardCharsets;
 
-import jdk.compiler.graal.api.replacements.Fold;
-import jdk.compiler.graal.core.common.NumUtil;
+import jdk.graal.compiler.api.replacements.Fold;
+import jdk.graal.compiler.core.common.NumUtil;
 import org.graalvm.nativeimage.IsolateThread;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrGCNames.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrGCNames.java
index 1863f583ab64..57e01ea47470 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrGCNames.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrGCNames.java
@@ -27,7 +27,7 @@
 
 import java.util.Arrays;
 
-import jdk.compiler.graal.api.replacements.Fold;
+import jdk.graal.compiler.api.replacements.Fold;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrJdkCompatibility.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrJdkCompatibility.java
index da09146abb2b..bce971f070c5 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrJdkCompatibility.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrJdkCompatibility.java
@@ -28,7 +28,7 @@
 import java.lang.reflect.Method;
 import java.time.Duration;
 
-import jdk.compiler.graal.serviceprovider.JavaVersionUtil;
+import jdk.graal.compiler.serviceprovider.JavaVersionUtil;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
 
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrManager.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrManager.java
index 249aa69bc73a..e0c6a333fe0e 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrManager.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrManager.java
@@ -36,8 +36,8 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import jdk.compiler.graal.api.replacements.Fold;
-import jdk.compiler.graal.core.common.SuppressFBWarnings;
+import jdk.graal.compiler.api.replacements.Fold;
+import jdk.graal.compiler.core.common.SuppressFBWarnings;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrMetadataTypeLibrary.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrMetadataTypeLibrary.java
index 223f99f07046..6eb51f9a17db 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrMetadataTypeLibrary.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrMetadataTypeLibrary.java
@@ -28,8 +28,8 @@
 import java.util.Collection;
 import java.util.HashMap;
 
-import jdk.compiler.graal.core.common.NumUtil;
-import jdk.compiler.graal.options.OptionsParser;
+import jdk.graal.compiler.core.common.NumUtil;
+import jdk.graal.compiler.options.OptionsParser;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
 
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrOptionSet.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrOptionSet.java
index b50a0d494aac..977e82957dad 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrOptionSet.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrOptionSet.java
@@ -24,7 +24,7 @@
  */
 package com.oracle.svm.core.jfr;
 
-import jdk.compiler.graal.core.common.NumUtil;
+import jdk.graal.compiler.core.common.NumUtil;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
 
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrRecorderThread.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrRecorderThread.java
index 570fe75eb3e7..8536602d691c 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrRecorderThread.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrRecorderThread.java
@@ -24,7 +24,7 @@
  */
 package com.oracle.svm.core.jfr;
 
-import jdk.compiler.graal.core.common.SuppressFBWarnings;
+import jdk.graal.compiler.core.common.SuppressFBWarnings;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
 import org.graalvm.word.UnsignedWord;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrSerializerSupport.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrSerializerSupport.java
index 40b412911de1..f2c2869da0cd 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrSerializerSupport.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrSerializerSupport.java
@@ -26,7 +26,7 @@
 
 import java.util.Arrays;
 
-import jdk.compiler.graal.api.replacements.Fold;
+import jdk.graal.compiler.api.replacements.Fold;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrSymbolRepository.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrSymbolRepository.java
index c483a4f0cad7..8949a12c50cb 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrSymbolRepository.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrSymbolRepository.java
@@ -24,8 +24,8 @@
  */
 package com.oracle.svm.core.jfr;
 
-import jdk.compiler.graal.core.common.SuppressFBWarnings;
-import jdk.compiler.graal.word.Word;
+import jdk.graal.compiler.core.common.SuppressFBWarnings;
+import jdk.graal.compiler.word.Word;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
 import org.graalvm.nativeimage.StackValue;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrThreadLocal.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrThreadLocal.java
index 3ccdfce6b56d..d5c78f1fb61d 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrThreadLocal.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrThreadLocal.java
@@ -24,7 +24,7 @@
  */
 package com.oracle.svm.core.jfr;
 
-import jdk.compiler.graal.api.replacements.Fold;
+import jdk.graal.compiler.api.replacements.Fold;
 import org.graalvm.nativeimage.CurrentIsolate;
 import org.graalvm.nativeimage.IsolateThread;
 import org.graalvm.nativeimage.Platform;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/SubstrateJVM.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/SubstrateJVM.java
index 512249a6d1b5..d09667b187fe 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/SubstrateJVM.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/SubstrateJVM.java
@@ -27,8 +27,8 @@
 import java.lang.reflect.Field;
 import java.util.List;
 
-import jdk.compiler.graal.api.replacements.Fold;
-import jdk.compiler.graal.core.common.NumUtil;
+import jdk.graal.compiler.api.replacements.Fold;
+import jdk.graal.compiler.core.common.NumUtil;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.IsolateThread;
 import org.graalvm.nativeimage.Platform;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/Target_jdk_jfr_internal_JVM.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/Target_jdk_jfr_internal_JVM.java
index 486b41ae616d..15db4a59c588 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/Target_jdk_jfr_internal_JVM.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/Target_jdk_jfr_internal_JVM.java
@@ -27,7 +27,7 @@
 import java.util.List;
 import java.util.function.BooleanSupplier;
 
-import jdk.compiler.graal.api.replacements.Fold;
+import jdk.graal.compiler.api.replacements.Fold;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
 import org.graalvm.nativeimage.ProcessProperties;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/events/JavaMonitorEnterEvent.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/events/JavaMonitorEnterEvent.java
index 8beb3b8e5442..671924ba1a48 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/events/JavaMonitorEnterEvent.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/events/JavaMonitorEnterEvent.java
@@ -26,7 +26,7 @@
 
 package com.oracle.svm.core.jfr.events;
 
-import jdk.compiler.graal.word.Word;
+import jdk.graal.compiler.word.Word;
 import org.graalvm.nativeimage.StackValue;
 
 import com.oracle.svm.core.Uninterruptible;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/events/JavaMonitorInflateEvent.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/events/JavaMonitorInflateEvent.java
index 7b02a000e91b..d663c70fd559 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/events/JavaMonitorInflateEvent.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/events/JavaMonitorInflateEvent.java
@@ -26,7 +26,7 @@
 
 package com.oracle.svm.core.jfr.events;
 
-import jdk.compiler.graal.word.Word;
+import jdk.graal.compiler.word.Word;
 import org.graalvm.nativeimage.StackValue;
 
 import com.oracle.svm.core.Uninterruptible;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/events/JavaMonitorWaitEvent.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/events/JavaMonitorWaitEvent.java
index 16be69444bd9..2e6c2ac0957b 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/events/JavaMonitorWaitEvent.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/events/JavaMonitorWaitEvent.java
@@ -26,7 +26,7 @@
 
 package com.oracle.svm.core.jfr.events;
 
-import jdk.compiler.graal.word.Word;
+import jdk.graal.compiler.word.Word;
 
 import com.oracle.svm.core.Uninterruptible;
 import com.oracle.svm.core.jfr.HasJfrSupport;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/events/ThreadParkEvent.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/events/ThreadParkEvent.java
index f8cafc2b4b2a..da810978b7ed 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/events/ThreadParkEvent.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/events/ThreadParkEvent.java
@@ -26,7 +26,7 @@
 
 package com.oracle.svm.core.jfr.events;
 
-import jdk.compiler.graal.word.Word;
+import jdk.graal.compiler.word.Word;
 import org.graalvm.nativeimage.StackValue;
 
 import com.oracle.svm.core.Uninterruptible;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/sampler/AbstractJfrExecutionSampler.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/sampler/AbstractJfrExecutionSampler.java
index c33f9e3a55bb..9b7a235f0019 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/sampler/AbstractJfrExecutionSampler.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/sampler/AbstractJfrExecutionSampler.java
@@ -24,7 +24,7 @@
  */
 package com.oracle.svm.core.jfr.sampler;
 
-import jdk.compiler.graal.api.replacements.Fold;
+import jdk.graal.compiler.api.replacements.Fold;
 import org.graalvm.nativeimage.CurrentIsolate;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.IsolateThread;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/sampler/JfrExecutionSampler.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/sampler/JfrExecutionSampler.java
index 5dcc6b702fde..22c3f08753df 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/sampler/JfrExecutionSampler.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/sampler/JfrExecutionSampler.java
@@ -25,7 +25,7 @@
 package com.oracle.svm.core.jfr.sampler;
 
 import com.oracle.svm.core.Uninterruptible;
-import jdk.compiler.graal.api.replacements.Fold;
+import jdk.graal.compiler.api.replacements.Fold;
 import org.graalvm.nativeimage.ImageSingletons;
 
 public abstract class JfrExecutionSampler {
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/traceid/JfrTraceIdEpoch.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/traceid/JfrTraceIdEpoch.java
index 0bd36f9afc77..400d919c4973 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/traceid/JfrTraceIdEpoch.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/traceid/JfrTraceIdEpoch.java
@@ -25,7 +25,7 @@
 
 package com.oracle.svm.core.jfr.traceid;
 
-import jdk.compiler.graal.api.replacements.Fold;
+import jdk.graal.compiler.api.replacements.Fold;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/traceid/JfrTraceIdMap.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/traceid/JfrTraceIdMap.java
index 251fb08bb594..376918d423a3 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/traceid/JfrTraceIdMap.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/traceid/JfrTraceIdMap.java
@@ -28,7 +28,7 @@
 
 import java.util.Arrays;
 
-import jdk.compiler.graal.api.replacements.Fold;
+import jdk.graal.compiler.api.replacements.Fold;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jni/JNIJavaVMList.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jni/JNIJavaVMList.java
index b098e608c228..24131c95471d 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jni/JNIJavaVMList.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jni/JNIJavaVMList.java
@@ -29,7 +29,7 @@
 import static org.graalvm.word.WordFactory.unsigned;
 import static org.graalvm.word.WordFactory.zero;
 
-import jdk.compiler.graal.word.Word;
+import jdk.graal.compiler.word.Word;
 import org.graalvm.nativeimage.UnmanagedMemory;
 import org.graalvm.nativeimage.c.struct.SizeOf;
 import org.graalvm.nativeimage.c.type.CIntPointer;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jni/JNIObjectHandles.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jni/JNIObjectHandles.java
index 68a2a82363c5..c91eaaab3a8d 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jni/JNIObjectHandles.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jni/JNIObjectHandles.java
@@ -24,9 +24,9 @@
  */
 package com.oracle.svm.core.jni;
 
-import jdk.compiler.graal.api.replacements.Fold;
-import jdk.compiler.graal.nodes.extended.BranchProbabilityNode;
-import jdk.compiler.graal.word.Word;
+import jdk.graal.compiler.api.replacements.Fold;
+import jdk.graal.compiler.nodes.extended.BranchProbabilityNode;
+import jdk.graal.compiler.word.Word;
 import org.graalvm.nativeimage.CurrentIsolate;
 import org.graalvm.nativeimage.Isolate;
 import org.graalvm.nativeimage.ObjectHandle;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jni/access/JNIAccessibleMethod.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jni/access/JNIAccessibleMethod.java
index 3d9d1147d9f0..dfeb709e08f6 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jni/access/JNIAccessibleMethod.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jni/access/JNIAccessibleMethod.java
@@ -27,8 +27,8 @@
 import java.lang.reflect.Modifier;
 
 import org.graalvm.collections.EconomicSet;
-import jdk.compiler.graal.nodes.NamedLocationIdentity;
-import jdk.compiler.graal.word.BarrieredAccess;
+import jdk.graal.compiler.nodes.NamedLocationIdentity;
+import jdk.graal.compiler.word.BarrieredAccess;
 import org.graalvm.nativeimage.Platform.HOSTED_ONLY;
 import org.graalvm.nativeimage.Platforms;
 import org.graalvm.nativeimage.c.function.CodePointer;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jni/access/JNIReflectionDictionary.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jni/access/JNIReflectionDictionary.java
index b469b9e915d4..f0bd475315a8 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jni/access/JNIReflectionDictionary.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jni/access/JNIReflectionDictionary.java
@@ -34,7 +34,7 @@
 import org.graalvm.collections.Equivalence;
 import org.graalvm.collections.MapCursor;
 import org.graalvm.collections.UnmodifiableMapCursor;
-import jdk.compiler.graal.word.Word;
+import jdk.graal.compiler.word.Word;
 import org.graalvm.nativeimage.CurrentIsolate;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform.HOSTED_ONLY;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jni/functions/JNIFunctionTables.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jni/functions/JNIFunctionTables.java
index a55f683da821..a37b95b84958 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jni/functions/JNIFunctionTables.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jni/functions/JNIFunctionTables.java
@@ -24,7 +24,7 @@
  */
 package com.oracle.svm.core.jni.functions;
 
-import jdk.compiler.graal.word.Word;
+import jdk.graal.compiler.word.Word;
 import org.graalvm.nativeimage.CurrentIsolate;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jni/functions/JNIFunctions.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jni/functions/JNIFunctions.java
index dc3219f87873..e5e75aa9ae74 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jni/functions/JNIFunctions.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jni/functions/JNIFunctions.java
@@ -35,9 +35,9 @@
 import java.nio.ByteBuffer;
 import java.util.Arrays;
 
-import jdk.compiler.graal.core.common.SuppressFBWarnings;
-import jdk.compiler.graal.nodes.java.ArrayLengthNode;
-import jdk.compiler.graal.serviceprovider.JavaVersionUtil;
+import jdk.graal.compiler.core.common.SuppressFBWarnings;
+import jdk.graal.compiler.nodes.java.ArrayLengthNode;
+import jdk.graal.compiler.serviceprovider.JavaVersionUtil;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.IsolateThread;
 import org.graalvm.nativeimage.LogHandler;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jni/functions/JNIInvocationInterface.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jni/functions/JNIInvocationInterface.java
index 6396357d95d3..60d6d3b04e1e 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jni/functions/JNIInvocationInterface.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jni/functions/JNIInvocationInterface.java
@@ -24,7 +24,7 @@
  */
 package com.oracle.svm.core.jni.functions;
 
-import jdk.compiler.graal.serviceprovider.IsolateUtil;
+import jdk.graal.compiler.serviceprovider.IsolateUtil;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Isolate;
 import org.graalvm.nativeimage.LogHandler;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jni/headers/JNIVersion.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jni/headers/JNIVersion.java
index 72eb2fd5a963..d5f5ac0d95c6 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jni/headers/JNIVersion.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jni/headers/JNIVersion.java
@@ -24,7 +24,7 @@
  */
 package com.oracle.svm.core.jni.headers;
 
-import jdk.compiler.graal.serviceprovider.JavaVersionUtil;
+import jdk.graal.compiler.serviceprovider.JavaVersionUtil;
 import org.graalvm.nativeimage.c.CContext;
 import org.graalvm.nativeimage.c.constant.CConstant;
 
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jni/headers/JNIVersionJDK22OrLater.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jni/headers/JNIVersionJDK22OrLater.java
index 2bddc883bc39..29f28a4c28ba 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jni/headers/JNIVersionJDK22OrLater.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jni/headers/JNIVersionJDK22OrLater.java
@@ -24,7 +24,7 @@
  */
 package com.oracle.svm.core.jni.headers;
 
-import jdk.compiler.graal.serviceprovider.JavaVersionUtil;
+import jdk.graal.compiler.serviceprovider.JavaVersionUtil;
 import org.graalvm.nativeimage.c.CContext;
 import org.graalvm.nativeimage.c.constant.CConstant;
 
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jvmstat/AbstractPerfDataEntry.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jvmstat/AbstractPerfDataEntry.java
index dfd3df85f88e..88897a52055c 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jvmstat/AbstractPerfDataEntry.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jvmstat/AbstractPerfDataEntry.java
@@ -27,8 +27,8 @@
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 
-import jdk.compiler.graal.core.common.NumUtil;
-import jdk.compiler.graal.word.Word;
+import jdk.graal.compiler.core.common.NumUtil;
+import jdk.graal.compiler.word.Word;
 import org.graalvm.nativeimage.ImageSingletons;
 
 import jdk.vm.ci.meta.JavaKind;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jvmstat/PerfManager.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jvmstat/PerfManager.java
index fd317fd1afa8..101b7cff4215 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jvmstat/PerfManager.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jvmstat/PerfManager.java
@@ -30,8 +30,8 @@
 import java.util.ArrayList;
 
 import org.graalvm.collections.EconomicMap;
-import jdk.compiler.graal.options.Option;
-import jdk.compiler.graal.word.Word;
+import jdk.graal.compiler.options.Option;
+import jdk.graal.compiler.word.Word;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jvmstat/PerfMemory.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jvmstat/PerfMemory.java
index 950216add4f7..223f2481a1a3 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jvmstat/PerfMemory.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jvmstat/PerfMemory.java
@@ -29,7 +29,7 @@
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 
-import jdk.compiler.graal.word.Word;
+import jdk.graal.compiler.word.Word;
 import org.graalvm.nativeimage.CurrentIsolate;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jvmstat/PerfMemoryPrologue.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jvmstat/PerfMemoryPrologue.java
index 8a743915bb5b..cd63fcf5fdb7 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jvmstat/PerfMemoryPrologue.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jvmstat/PerfMemoryPrologue.java
@@ -24,7 +24,7 @@
  */
 package com.oracle.svm.core.jvmstat;
 
-import jdk.compiler.graal.word.Word;
+import jdk.graal.compiler.word.Word;
 
 /**
  * Class representing the 2.0 version of the HotSpot PerfData instrumentation buffer header.
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/log/Log.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/log/Log.java
index 5a97981773a3..fdb20d4a957b 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/log/Log.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/log/Log.java
@@ -28,7 +28,7 @@
 import java.io.OutputStream;
 import java.io.PrintStream;
 
-import jdk.compiler.graal.api.replacements.Fold;
+import jdk.graal.compiler.api.replacements.Fold;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.LogHandler;
 import org.graalvm.nativeimage.Platform;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/log/RealLog.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/log/RealLog.java
index 8976c9ba1cee..5cfacb066bf2 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/log/RealLog.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/log/RealLog.java
@@ -27,8 +27,8 @@
 
 import java.nio.charset.StandardCharsets;
 
-import jdk.compiler.graal.core.common.calc.UnsignedMath;
-import jdk.compiler.graal.word.Word;
+import jdk.graal.compiler.core.common.calc.UnsignedMath;
+import jdk.graal.compiler.word.Word;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.LogHandler;
 import org.graalvm.nativeimage.c.type.CCharPointer;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/meta/CompressedNullConstant.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/meta/CompressedNullConstant.java
index a91281d2bf0a..4fb4318fea06 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/meta/CompressedNullConstant.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/meta/CompressedNullConstant.java
@@ -24,7 +24,7 @@
  */
 package com.oracle.svm.core.meta;
 
-import jdk.compiler.graal.core.common.type.CompressibleConstant;
+import jdk.graal.compiler.core.common.type.CompressibleConstant;
 
 import jdk.vm.ci.meta.JavaConstant;
 import jdk.vm.ci.meta.JavaKind;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/meta/ObjectConstantEquality.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/meta/ObjectConstantEquality.java
index 41f5294a5efc..87d9b2e27932 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/meta/ObjectConstantEquality.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/meta/ObjectConstantEquality.java
@@ -24,8 +24,8 @@
  */
 package com.oracle.svm.core.meta;
 
-import jdk.compiler.graal.api.replacements.Fold;
-import jdk.compiler.graal.truffle.nodes.ObjectLocationIdentity;
+import jdk.graal.compiler.api.replacements.Fold;
+import jdk.graal.compiler.truffle.nodes.ObjectLocationIdentity;
 import org.graalvm.nativeimage.ImageSingletons;
 
 import jdk.vm.ci.meta.ConstantReflectionProvider;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/meta/SubstrateMethodPointerStamp.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/meta/SubstrateMethodPointerStamp.java
index 3d933feebab1..8cf213a4e8e4 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/meta/SubstrateMethodPointerStamp.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/meta/SubstrateMethodPointerStamp.java
@@ -24,11 +24,11 @@
  */
 package com.oracle.svm.core.meta;
 
-import jdk.compiler.graal.core.common.LIRKind;
-import jdk.compiler.graal.core.common.spi.LIRKindTool;
-import jdk.compiler.graal.core.common.type.AbstractPointerStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.debug.GraalError;
+import jdk.graal.compiler.core.common.LIRKind;
+import jdk.graal.compiler.core.common.spi.LIRKindTool;
+import jdk.graal.compiler.core.common.type.AbstractPointerStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.debug.GraalError;
 
 import jdk.vm.ci.meta.Constant;
 import jdk.vm.ci.meta.JavaConstant;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/meta/SubstrateObjectConstant.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/meta/SubstrateObjectConstant.java
index 56a97c2a7cdc..df1841f343ad 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/meta/SubstrateObjectConstant.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/meta/SubstrateObjectConstant.java
@@ -24,8 +24,8 @@
  */
 package com.oracle.svm.core.meta;
 
-import jdk.compiler.graal.core.common.type.CompressibleConstant;
-import jdk.compiler.graal.core.common.type.TypedConstant;
+import jdk.graal.compiler.core.common.type.CompressibleConstant;
+import jdk.graal.compiler.core.common.type.TypedConstant;
 
 import com.oracle.svm.core.SubstrateUtil;
 import com.oracle.svm.core.hub.DynamicHub;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/methodhandles/Target_java_lang_invoke_MethodHandleNatives.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/methodhandles/Target_java_lang_invoke_MethodHandleNatives.java
index 000adb48d0ac..8cdee0ec8a8c 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/methodhandles/Target_java_lang_invoke_MethodHandleNatives.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/methodhandles/Target_java_lang_invoke_MethodHandleNatives.java
@@ -38,7 +38,7 @@
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 
-import jdk.compiler.graal.debug.GraalError;
+import jdk.graal.compiler.debug.GraalError;
 
 import com.oracle.svm.core.StaticFieldsSupport;
 import com.oracle.svm.core.SubstrateUtil;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/monitor/JavaMonitor.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/monitor/JavaMonitor.java
index 3a366678e8d3..dccd9aa4f8ae 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/monitor/JavaMonitor.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/monitor/JavaMonitor.java
@@ -26,9 +26,9 @@
 
 package com.oracle.svm.core.monitor;
 
-import static jdk.compiler.graal.nodes.extended.BranchProbabilityNode.FREQUENT_PROBABILITY;
-import static jdk.compiler.graal.nodes.extended.BranchProbabilityNode.NOT_FREQUENT_PROBABILITY;
-import static jdk.compiler.graal.nodes.extended.BranchProbabilityNode.probability;
+import static jdk.graal.compiler.nodes.extended.BranchProbabilityNode.FREQUENT_PROBABILITY;
+import static jdk.graal.compiler.nodes.extended.BranchProbabilityNode.NOT_FREQUENT_PROBABILITY;
+import static jdk.graal.compiler.nodes.extended.BranchProbabilityNode.probability;
 
 import java.util.concurrent.locks.ReentrantLock;
 
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/monitor/MonitorFeature.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/monitor/MonitorFeature.java
index 6471fa27f6c4..d11cf0de643e 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/monitor/MonitorFeature.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/monitor/MonitorFeature.java
@@ -26,9 +26,9 @@
 
 import java.util.Map;
 
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.util.Providers;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.util.Providers;
 import org.graalvm.nativeimage.ImageSingletons;
 
 import com.oracle.svm.core.SubstrateOptions;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/monitor/MonitorSnippets.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/monitor/MonitorSnippets.java
index f1f600c16edc..dbeb84053ba6 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/monitor/MonitorSnippets.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/monitor/MonitorSnippets.java
@@ -29,29 +29,29 @@
 
 import java.util.Map;
 
-import jdk.compiler.graal.api.replacements.Snippet;
-import jdk.compiler.graal.core.common.spi.ForeignCallDescriptor;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.Node.ConstantNodeParameter;
-import jdk.compiler.graal.graph.Node.NodeIntrinsic;
-import jdk.compiler.graal.nodes.PiNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.calc.IsNullNode;
-import jdk.compiler.graal.nodes.extended.ForeignCallNode;
-import jdk.compiler.graal.nodes.extended.GuardingNode;
-import jdk.compiler.graal.nodes.extended.MembarNode;
-import jdk.compiler.graal.nodes.java.AccessMonitorNode;
-import jdk.compiler.graal.nodes.java.MonitorEnterNode;
-import jdk.compiler.graal.nodes.java.MonitorExitNode;
-import jdk.compiler.graal.nodes.spi.LoweringTool;
-import jdk.compiler.graal.nodes.type.StampTool;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.util.Providers;
-import jdk.compiler.graal.replacements.SnippetTemplate;
-import jdk.compiler.graal.replacements.SnippetTemplate.Arguments;
-import jdk.compiler.graal.replacements.SnippetTemplate.SnippetInfo;
-import jdk.compiler.graal.replacements.Snippets;
+import jdk.graal.compiler.api.replacements.Snippet;
+import jdk.graal.compiler.core.common.spi.ForeignCallDescriptor;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.Node.ConstantNodeParameter;
+import jdk.graal.compiler.graph.Node.NodeIntrinsic;
+import jdk.graal.compiler.nodes.PiNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.calc.IsNullNode;
+import jdk.graal.compiler.nodes.extended.ForeignCallNode;
+import jdk.graal.compiler.nodes.extended.GuardingNode;
+import jdk.graal.compiler.nodes.extended.MembarNode;
+import jdk.graal.compiler.nodes.java.AccessMonitorNode;
+import jdk.graal.compiler.nodes.java.MonitorEnterNode;
+import jdk.graal.compiler.nodes.java.MonitorExitNode;
+import jdk.graal.compiler.nodes.spi.LoweringTool;
+import jdk.graal.compiler.nodes.type.StampTool;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.util.Providers;
+import jdk.graal.compiler.replacements.SnippetTemplate;
+import jdk.graal.compiler.replacements.SnippetTemplate.Arguments;
+import jdk.graal.compiler.replacements.SnippetTemplate.SnippetInfo;
+import jdk.graal.compiler.replacements.Snippets;
 import org.graalvm.word.LocationIdentity;
 
 import com.oracle.svm.core.SubstrateOptions;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/monitor/MonitorSupport.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/monitor/MonitorSupport.java
index 4ded426160b4..b9b6e55b775f 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/monitor/MonitorSupport.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/monitor/MonitorSupport.java
@@ -24,7 +24,7 @@
  */
 package com.oracle.svm.core.monitor;
 
-import jdk.compiler.graal.api.replacements.Fold;
+import jdk.graal.compiler.api.replacements.Fold;
 import org.graalvm.nativeimage.ImageSingletons;
 
 import com.oracle.svm.core.Uninterruptible;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/monitor/MultiThreadedMonitorSupport.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/monitor/MultiThreadedMonitorSupport.java
index 71b507d4c9a2..c9ce4e04b414 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/monitor/MultiThreadedMonitorSupport.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/monitor/MultiThreadedMonitorSupport.java
@@ -33,8 +33,8 @@
 import java.util.concurrent.locks.LockSupport;
 import java.util.concurrent.locks.ReentrantLock;
 
-import jdk.compiler.graal.core.common.SuppressFBWarnings;
-import jdk.compiler.graal.word.BarrieredAccess;
+import jdk.graal.compiler.core.common.SuppressFBWarnings;
+import jdk.graal.compiler.word.BarrieredAccess;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
 
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/nodes/CFunctionCaptureNode.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/nodes/CFunctionCaptureNode.java
index 24091e3009c7..7ad629819f2a 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/nodes/CFunctionCaptureNode.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/nodes/CFunctionCaptureNode.java
@@ -24,24 +24,24 @@
  */
 package com.oracle.svm.core.nodes;
 
-import static jdk.compiler.graal.nodeinfo.InputType.Memory;
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_UNKNOWN;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_UNKNOWN;
+import static jdk.graal.compiler.nodeinfo.InputType.Memory;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_UNKNOWN;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_UNKNOWN;
 
 import java.util.Objects;
 
-import jdk.compiler.graal.core.common.spi.ForeignCallDescriptor;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.extended.FixedValueAnchorNode;
-import jdk.compiler.graal.nodes.extended.ForeignCallNode;
-import jdk.compiler.graal.nodes.memory.SingleMemoryKill;
-import jdk.compiler.graal.nodes.spi.Lowerable;
-import jdk.compiler.graal.nodes.spi.LoweringTool;
+import jdk.graal.compiler.core.common.spi.ForeignCallDescriptor;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.extended.FixedValueAnchorNode;
+import jdk.graal.compiler.nodes.extended.ForeignCallNode;
+import jdk.graal.compiler.nodes.memory.SingleMemoryKill;
+import jdk.graal.compiler.nodes.spi.Lowerable;
+import jdk.graal.compiler.nodes.spi.LoweringTool;
 import org.graalvm.word.LocationIdentity;
 
 /**
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/nodes/CFunctionEpilogueNode.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/nodes/CFunctionEpilogueNode.java
index 5fd2816a98f8..e257b4cf3396 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/nodes/CFunctionEpilogueNode.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/nodes/CFunctionEpilogueNode.java
@@ -24,21 +24,21 @@
  */
 package com.oracle.svm.core.nodes;
 
-import static jdk.compiler.graal.nodeinfo.InputType.Memory;
-import static jdk.compiler.graal.nodeinfo.InputType.State;
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_8;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_8;
+import static jdk.graal.compiler.nodeinfo.InputType.Memory;
+import static jdk.graal.compiler.nodeinfo.InputType.State;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_8;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_8;
 
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.AbstractStateSplit;
-import jdk.compiler.graal.nodes.DeoptimizingNode.DeoptBefore;
-import jdk.compiler.graal.nodes.FrameState;
-import jdk.compiler.graal.nodes.debug.ControlFlowAnchored;
-import jdk.compiler.graal.nodes.memory.SingleMemoryKill;
-import jdk.compiler.graal.nodes.spi.Lowerable;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.AbstractStateSplit;
+import jdk.graal.compiler.nodes.DeoptimizingNode.DeoptBefore;
+import jdk.graal.compiler.nodes.FrameState;
+import jdk.graal.compiler.nodes.debug.ControlFlowAnchored;
+import jdk.graal.compiler.nodes.memory.SingleMemoryKill;
+import jdk.graal.compiler.nodes.spi.Lowerable;
 import org.graalvm.word.LocationIdentity;
 
 /**
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/nodes/CFunctionPrologueDataNode.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/nodes/CFunctionPrologueDataNode.java
index 0b5bc75d6c7b..62d253187f6e 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/nodes/CFunctionPrologueDataNode.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/nodes/CFunctionPrologueDataNode.java
@@ -24,15 +24,15 @@
  */
 package com.oracle.svm.core.nodes;
 
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeCycles;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodeinfo.NodeSize;
-import jdk.compiler.graal.nodes.InvokeNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.spi.LIRLowerable;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeCycles;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodeinfo.NodeSize;
+import jdk.graal.compiler.nodes.InvokeNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.spi.LIRLowerable;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
 
 import com.oracle.svm.core.stack.JavaFrameAnchor;
 
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/nodes/CFunctionPrologueNode.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/nodes/CFunctionPrologueNode.java
index a6de4a0bedce..f1d23b7703d4 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/nodes/CFunctionPrologueNode.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/nodes/CFunctionPrologueNode.java
@@ -24,20 +24,20 @@
  */
 package com.oracle.svm.core.nodes;
 
-import static jdk.compiler.graal.nodeinfo.InputType.Memory;
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_8;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_8;
+import static jdk.graal.compiler.nodeinfo.InputType.Memory;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_8;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_8;
 
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.InvokeNode;
-import jdk.compiler.graal.nodes.InvokeWithExceptionNode;
-import jdk.compiler.graal.nodes.debug.ControlFlowAnchored;
-import jdk.compiler.graal.nodes.memory.SingleMemoryKill;
-import jdk.compiler.graal.nodes.spi.Lowerable;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.InvokeNode;
+import jdk.graal.compiler.nodes.InvokeWithExceptionNode;
+import jdk.graal.compiler.nodes.debug.ControlFlowAnchored;
+import jdk.graal.compiler.nodes.memory.SingleMemoryKill;
+import jdk.graal.compiler.nodes.spi.Lowerable;
 import org.graalvm.word.LocationIdentity;
 
 import com.oracle.svm.core.stack.JavaFrameAnchor;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/nodes/CodeSynchronizationNode.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/nodes/CodeSynchronizationNode.java
index d540197ca481..f28239ce2d26 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/nodes/CodeSynchronizationNode.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/nodes/CodeSynchronizationNode.java
@@ -25,14 +25,14 @@
  */
 package com.oracle.svm.core.nodes;
 
-import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_1;
-import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1;
+import static jdk.graal.compiler.nodeinfo.NodeCycles.CYCLES_1;
+import static jdk.graal.compiler.nodeinfo.NodeSize.SIZE_1;
 
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.spi.Lowerable;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.spi.Lowerable;
 
 @NodeInfo(cycles = CYCLES_1, size = SIZE_1)
 public class CodeSynchronizationNode extends FixedWithNextNode implements Lowerable {
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/nodes/SafepointCheckNode.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/nodes/SafepointCheckNode.java
index d8f83a8805b0..cfbc93c32f14 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/nodes/SafepointCheckNode.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/nodes/SafepointCheckNode.java
@@ -24,20 +24,20 @@
  */
 package com.oracle.svm.core.nodes;
 
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodes.spi.Canonicalizable;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodeinfo.NodeCycles;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodeinfo.NodeSize;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.LogicNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.calc.ConditionalNode;
-import jdk.compiler.graal.nodes.calc.FloatingNode;
-import jdk.compiler.graal.nodes.spi.LIRLowerable;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodes.spi.Canonicalizable;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodeinfo.NodeCycles;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodeinfo.NodeSize;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.LogicNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.calc.ConditionalNode;
+import jdk.graal.compiler.nodes.calc.FloatingNode;
+import jdk.graal.compiler.nodes.spi.LIRLowerable;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
 
 import com.oracle.svm.core.thread.Safepoint;
 
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/nodes/SubstrateMethodCallTargetNode.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/nodes/SubstrateMethodCallTargetNode.java
index 37a5b6f0915a..d4f63ee9f734 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/nodes/SubstrateMethodCallTargetNode.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/nodes/SubstrateMethodCallTargetNode.java
@@ -24,11 +24,11 @@
  */
 package com.oracle.svm.core.nodes;
 
-import jdk.compiler.graal.core.common.type.StampPair;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.java.MethodCallTargetNode;
+import jdk.graal.compiler.core.common.type.StampPair;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.java.MethodCallTargetNode;
 
 import jdk.vm.ci.meta.JavaMethodProfile;
 import jdk.vm.ci.meta.JavaTypeProfile;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/option/APIOption.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/option/APIOption.java
index 24d1ef0ebb34..71e2d97c90eb 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/option/APIOption.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/option/APIOption.java
@@ -31,7 +31,7 @@
 import java.lang.annotation.Target;
 import java.util.function.Function;
 
-import jdk.compiler.graal.options.Option;
+import jdk.graal.compiler.options.Option;
 
 import com.oracle.svm.core.util.VMError;
 
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/option/HostedOptionKey.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/option/HostedOptionKey.java
index 3502d9dbf8b7..b4cc5b2ea22f 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/option/HostedOptionKey.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/option/HostedOptionKey.java
@@ -27,9 +27,9 @@
 import com.oracle.svm.common.option.LocatableOption;
 import com.oracle.svm.common.option.MultiOptionValue;
 import org.graalvm.collections.EconomicMap;
-import jdk.compiler.graal.api.replacements.Fold;
-import jdk.compiler.graal.options.Option;
-import jdk.compiler.graal.options.OptionKey;
+import jdk.graal.compiler.api.replacements.Fold;
+import jdk.graal.compiler.options.Option;
+import jdk.graal.compiler.options.OptionKey;
 
 import java.util.function.Consumer;
 
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/option/HostedOptionValues.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/option/HostedOptionValues.java
index 9daac8b4c6de..e8233649a677 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/option/HostedOptionValues.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/option/HostedOptionValues.java
@@ -25,8 +25,8 @@
 package com.oracle.svm.core.option;
 
 import org.graalvm.collections.EconomicMap;
-import jdk.compiler.graal.options.OptionKey;
-import jdk.compiler.graal.options.OptionValues;
+import jdk.graal.compiler.options.OptionKey;
+import jdk.graal.compiler.options.OptionValues;
 import org.graalvm.nativeimage.ImageSingletons;
 
 /**
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/option/OptionOrigin.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/option/OptionOrigin.java
index 68eed0474e8d..0c0b24015035 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/option/OptionOrigin.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/option/OptionOrigin.java
@@ -37,7 +37,7 @@
 import java.util.List;
 import java.util.Objects;
 
-import jdk.compiler.graal.core.common.SuppressFBWarnings;
+import jdk.graal.compiler.core.common.SuppressFBWarnings;
 
 import com.oracle.svm.core.util.VMError;
 
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/option/OptionUtils.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/option/OptionUtils.java
index 620604709b66..d2db5ebbaed4 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/option/OptionUtils.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/option/OptionUtils.java
@@ -31,7 +31,7 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import jdk.compiler.graal.options.OptionKey;
+import jdk.graal.compiler.options.OptionKey;
 
 import com.oracle.svm.core.SubstrateUtil;
 import com.oracle.svm.core.util.UserError;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/option/RuntimeOptionKey.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/option/RuntimeOptionKey.java
index 931ab4dc9de6..ed02adf22a05 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/option/RuntimeOptionKey.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/option/RuntimeOptionKey.java
@@ -28,9 +28,9 @@
 import java.util.function.Consumer;
 
 import org.graalvm.collections.EconomicMap;
-import jdk.compiler.graal.api.replacements.Fold;
-import jdk.compiler.graal.options.Option;
-import jdk.compiler.graal.options.OptionKey;
+import jdk.graal.compiler.api.replacements.Fold;
+import jdk.graal.compiler.options.Option;
+import jdk.graal.compiler.options.OptionKey;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/option/RuntimeOptionParser.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/option/RuntimeOptionParser.java
index 40633fdb9f3d..c393a102b7a9 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/option/RuntimeOptionParser.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/option/RuntimeOptionParser.java
@@ -30,11 +30,11 @@
 import java.util.function.Predicate;
 
 import org.graalvm.collections.EconomicMap;
-import jdk.compiler.graal.api.replacements.Fold;
-import jdk.compiler.graal.options.OptionDescriptor;
-import jdk.compiler.graal.options.OptionKey;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.options.OptionsParser;
+import jdk.graal.compiler.api.replacements.Fold;
+import jdk.graal.compiler.options.OptionDescriptor;
+import jdk.graal.compiler.options.OptionKey;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.options.OptionsParser;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/option/RuntimeOptionValues.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/option/RuntimeOptionValues.java
index 78f8c8f3a945..526f97af57bb 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/option/RuntimeOptionValues.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/option/RuntimeOptionValues.java
@@ -30,12 +30,12 @@
 
 import org.graalvm.collections.EconomicSet;
 import org.graalvm.collections.UnmodifiableEconomicMap;
-import jdk.compiler.graal.api.replacements.Fold;
-import jdk.compiler.graal.options.ModifiableOptionValues;
-import jdk.compiler.graal.options.OptionDescriptor;
-import jdk.compiler.graal.options.OptionKey;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.options.OptionsParser;
+import jdk.graal.compiler.api.replacements.Fold;
+import jdk.graal.compiler.options.ModifiableOptionValues;
+import jdk.graal.compiler.options.OptionDescriptor;
+import jdk.graal.compiler.options.OptionKey;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.options.OptionsParser;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.RuntimeOptions.Descriptor;
 import org.graalvm.nativeimage.impl.RuntimeOptionsSupport;
@@ -149,7 +149,7 @@ public Descriptor getDescriptor(String optionName) {
 }
 
 @TargetClass(OptionKey.class)
-final class Target_jdk_compiler_graal_options_OptionKey {
+final class Target_jdk_graal_compiler_options_OptionKey {
 
     @AnnotateOriginal
     @RestrictHeapAccess(access = RestrictHeapAccess.Access.UNRESTRICTED, reason = "Static analysis imprecision makes all hashCode implementations reachable from this method")
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/option/SubstrateOptionsParser.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/option/SubstrateOptionsParser.java
index 3a77e67ca972..9b4bb45e80f0 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/option/SubstrateOptionsParser.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/option/SubstrateOptionsParser.java
@@ -33,9 +33,9 @@
 import java.util.function.Predicate;
 
 import org.graalvm.collections.EconomicMap;
-import jdk.compiler.graal.options.OptionDescriptor;
-import jdk.compiler.graal.options.OptionDescriptors;
-import jdk.compiler.graal.options.OptionKey;
+import jdk.graal.compiler.options.OptionDescriptor;
+import jdk.graal.compiler.options.OptionDescriptors;
+import jdk.graal.compiler.options.OptionKey;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
 
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/option/ValidateImageBuildOptionsFeature.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/option/ValidateImageBuildOptionsFeature.java
index d709fd70da5f..b7fea207a8ce 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/option/ValidateImageBuildOptionsFeature.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/option/ValidateImageBuildOptionsFeature.java
@@ -25,7 +25,7 @@
 package com.oracle.svm.core.option;
 
 import org.graalvm.collections.UnmodifiableMapCursor;
-import jdk.compiler.graal.options.OptionKey;
+import jdk.graal.compiler.options.OptionKey;
 
 import com.oracle.svm.core.feature.InternalFeature;
 import com.oracle.svm.core.feature.AutomaticallyRegisteredFeature;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/option/XOptions.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/option/XOptions.java
index 4865a70e553d..ef248993a871 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/option/XOptions.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/option/XOptions.java
@@ -25,7 +25,7 @@
 package com.oracle.svm.core.option;
 
 import org.graalvm.collections.EconomicMap;
-import jdk.compiler.graal.options.OptionKey;
+import jdk.graal.compiler.options.OptionKey;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
 
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/option/package-info.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/option/package-info.java
index 599edf1e4907..2d648d99373a 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/option/package-info.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/option/package-info.java
@@ -26,8 +26,8 @@
 /**
  * Substrate VM re-uses much of the Graal option system for handling its own options. In the Graal
  * option system, an option is declared as a {@code static final} field that is annotated with the
- * annotation {@link jdk.compiler.graal.options.Option}. Values are stored in
- * {@link jdk.compiler.graal.options.OptionValues}.
+ * annotation {@link jdk.graal.compiler.options.Option}. Values are stored in
+ * {@link jdk.graal.compiler.options.OptionValues}.
  * 

  * Substrate VM has two distinct kinds of options:
  * 
    
@@ -39,7 +39,7 @@
  * {@link com.oracle.svm.core.option.HostedOptionKey#getValue()}.
  * 
    
  * Hosted options cannot be changed at run time. Instead they are guaranteed to be constant folded
- * in the image. This is implemented using the {@link jdk.compiler.graal.api.replacements.Fold}
+ * in the image. This is implemented using the {@link jdk.graal.compiler.api.replacements.Fold}
  * annotation on {@link com.oracle.svm.core.option.HostedOptionKey#getValue()}.
  *
  * 
  • Runtime options: get their initial value during native image generation, using the prefix
@@ -55,12 +55,12 @@
  *
  * Substrate VM re-uses much of the Graal option system for handling. However, Graal itself is
  * stateless, i.e, every Graal compilation can be configured with its own set of
- * {@link jdk.compiler.graal.options.OptionValues}. Therefore, access of a Graal option using
- * {@link jdk.compiler.graal.options.OptionKey#getValue(OptionValues)} requires to explicitly
+ * {@link jdk.graal.compiler.options.OptionValues}. Therefore, access of a Graal option using
+ * {@link jdk.graal.compiler.options.OptionKey#getValue(OptionValues)} requires to explicitly
  * specify one of the two option values of Substrate VM:
  * {@link com.oracle.svm.core.option.HostedOptionValues#singleton()} or
  * {@link com.oracle.svm.core.option.RuntimeOptionValues#singleton()}.
  */
 package com.oracle.svm.core.option;
 
-import jdk.compiler.graal.options.OptionValues;
\ No newline at end of file
+import jdk.graal.compiler.options.OptionValues;
\ No newline at end of file
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/os/AbstractCommittedMemoryProvider.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/os/AbstractCommittedMemoryProvider.java
index 80afbfd0f7bb..55c4add3af9e 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/os/AbstractCommittedMemoryProvider.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/os/AbstractCommittedMemoryProvider.java
@@ -32,7 +32,7 @@
 
 import java.util.EnumSet;
 
-import jdk.compiler.graal.api.replacements.Fold;
+import jdk.graal.compiler.api.replacements.Fold;
 import org.graalvm.word.Pointer;
 import org.graalvm.word.PointerBase;
 import org.graalvm.word.UnsignedWord;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/os/AbstractCopyingImageHeapProvider.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/os/AbstractCopyingImageHeapProvider.java
index 9b893ade1add..afe8fde670ff 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/os/AbstractCopyingImageHeapProvider.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/os/AbstractCopyingImageHeapProvider.java
@@ -30,7 +30,7 @@
 import static com.oracle.svm.core.util.PointerUtils.roundUp;
 
 import com.oracle.svm.core.code.DynamicMethodAddressResolutionHeapSupport;
-import jdk.compiler.graal.word.Word;
+import jdk.graal.compiler.word.Word;
 import org.graalvm.nativeimage.c.type.WordPointer;
 import org.graalvm.word.Pointer;
 import org.graalvm.word.PointerBase;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/os/AbstractImageHeapProvider.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/os/AbstractImageHeapProvider.java
index a3863b19e75f..906a55e92f67 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/os/AbstractImageHeapProvider.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/os/AbstractImageHeapProvider.java
@@ -27,7 +27,7 @@
 import static com.oracle.svm.core.Isolates.IMAGE_HEAP_BEGIN;
 import static com.oracle.svm.core.Isolates.IMAGE_HEAP_END;
 
-import jdk.compiler.graal.word.Word;
+import jdk.graal.compiler.word.Word;
 import org.graalvm.word.UnsignedWord;
 
 import com.oracle.svm.core.Uninterruptible;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/os/AbstractRawFileOperationSupport.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/os/AbstractRawFileOperationSupport.java
index 9495ce2b55e3..af9d461fb5c1 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/os/AbstractRawFileOperationSupport.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/os/AbstractRawFileOperationSupport.java
@@ -26,8 +26,8 @@
 
 import java.io.File;
 
-import jdk.compiler.graal.api.replacements.Fold;
-import jdk.compiler.graal.word.Word;
+import jdk.graal.compiler.api.replacements.Fold;
+import jdk.graal.compiler.word.Word;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/os/BufferedFileOperationSupport.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/os/BufferedFileOperationSupport.java
index 1711df10c39a..f2638b6de817 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/os/BufferedFileOperationSupport.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/os/BufferedFileOperationSupport.java
@@ -26,8 +26,8 @@
 
 import java.nio.ByteOrder;
 
-import jdk.compiler.graal.api.replacements.Fold;
-import jdk.compiler.graal.word.Word;
+import jdk.graal.compiler.api.replacements.Fold;
+import jdk.graal.compiler.word.Word;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/os/CommittedMemoryProvider.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/os/CommittedMemoryProvider.java
index f5bb21a4e553..c1111a02654c 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/os/CommittedMemoryProvider.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/os/CommittedMemoryProvider.java
@@ -26,7 +26,7 @@
 
 import java.util.EnumSet;
 
-import jdk.compiler.graal.api.replacements.Fold;
+import jdk.graal.compiler.api.replacements.Fold;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.c.type.WordPointer;
 import org.graalvm.word.Pointer;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/os/ImageHeapProvider.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/os/ImageHeapProvider.java
index 5bbdd62f89b0..b277db95d154 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/os/ImageHeapProvider.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/os/ImageHeapProvider.java
@@ -24,7 +24,7 @@
  */
 package com.oracle.svm.core.os;
 
-import jdk.compiler.graal.api.replacements.Fold;
+import jdk.graal.compiler.api.replacements.Fold;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.c.type.WordPointer;
 import org.graalvm.word.Pointer;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/os/MemoryProtectionProvider.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/os/MemoryProtectionProvider.java
index 6a719e63de7f..194515e60ae1 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/os/MemoryProtectionProvider.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/os/MemoryProtectionProvider.java
@@ -24,7 +24,7 @@
  */
 package com.oracle.svm.core.os;
 
-import jdk.compiler.graal.api.replacements.Fold;
+import jdk.graal.compiler.api.replacements.Fold;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Isolates.ProtectionDomain;
 import org.graalvm.word.PointerBase;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/os/RawFileOperationSupport.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/os/RawFileOperationSupport.java
index 7d802f8e4965..139af6afa1b6 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/os/RawFileOperationSupport.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/os/RawFileOperationSupport.java
@@ -26,7 +26,7 @@
 
 import java.io.File;
 
-import jdk.compiler.graal.api.replacements.Fold;
+import jdk.graal.compiler.api.replacements.Fold;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.c.type.CCharPointer;
 import org.graalvm.nativeimage.impl.UnmanagedMemorySupport;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/os/VirtualMemoryProvider.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/os/VirtualMemoryProvider.java
index 51c443b22812..7aa211c1bd41 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/os/VirtualMemoryProvider.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/os/VirtualMemoryProvider.java
@@ -24,7 +24,7 @@
  */
 package com.oracle.svm.core.os;
 
-import jdk.compiler.graal.api.replacements.Fold;
+import jdk.graal.compiler.api.replacements.Fold;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.word.Pointer;
 import org.graalvm.word.PointerBase;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/reflect/SubstrateMethodAccessor.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/reflect/SubstrateMethodAccessor.java
index 1b02be0441a2..1f522fe4400a 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/reflect/SubstrateMethodAccessor.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/reflect/SubstrateMethodAccessor.java
@@ -26,8 +26,8 @@
 
 import java.lang.reflect.Executable;
 
-import jdk.compiler.graal.nodes.NamedLocationIdentity;
-import jdk.compiler.graal.word.BarrieredAccess;
+import jdk.graal.compiler.nodes.NamedLocationIdentity;
+import jdk.graal.compiler.word.BarrieredAccess;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
 import org.graalvm.nativeimage.c.function.CFunctionPointer;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/reflect/proxy/DynamicProxySupport.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/reflect/proxy/DynamicProxySupport.java
index 6fe983bed303..f884b790d616 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/reflect/proxy/DynamicProxySupport.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/reflect/proxy/DynamicProxySupport.java
@@ -31,7 +31,7 @@
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.EconomicSet;
 import org.graalvm.collections.Equivalence;
-import jdk.compiler.graal.debug.GraalError;
+import jdk.graal.compiler.debug.GraalError;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
 import org.graalvm.nativeimage.hosted.RuntimeClassInitialization;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/reflect/serialize/SerializationSupport.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/reflect/serialize/SerializationSupport.java
index 9f3aa8bcc8c5..5a119ecee4f7 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/reflect/serialize/SerializationSupport.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/reflect/serialize/SerializationSupport.java
@@ -36,7 +36,7 @@
 import java.util.concurrent.ConcurrentHashMap;
 
 import org.graalvm.collections.EconomicMap;
-import jdk.compiler.graal.java.LambdaUtils;
+import jdk.graal.compiler.java.LambdaUtils;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
 
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/reflect/target/ReflectionMetadataDecoderImpl.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/reflect/target/ReflectionMetadataDecoderImpl.java
index 2331edcad68c..a3da47c27ab9 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/reflect/target/ReflectionMetadataDecoderImpl.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/reflect/target/ReflectionMetadataDecoderImpl.java
@@ -34,7 +34,7 @@
 import java.util.Arrays;
 import java.util.function.Function;
 
-import jdk.compiler.graal.core.common.util.UnsafeArrayTypeReader;
+import jdk.graal.compiler.core.common.util.UnsafeArrayTypeReader;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platforms;
 import org.graalvm.nativeimage.impl.InternalPlatform;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/reflect/target/Target_jdk_internal_reflect_AccessorGenerator.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/reflect/target/Target_jdk_internal_reflect_AccessorGenerator.java
index e9e5fd9e1890..1247b80bb3bf 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/reflect/target/Target_jdk_internal_reflect_AccessorGenerator.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/reflect/target/Target_jdk_internal_reflect_AccessorGenerator.java
@@ -26,7 +26,7 @@
 
 import java.util.function.Function;
 
-import jdk.compiler.graal.serviceprovider.JavaVersionUtil;
+import jdk.graal.compiler.serviceprovider.JavaVersionUtil;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/riscv64/RISCV64CPUFeatureAccess.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/riscv64/RISCV64CPUFeatureAccess.java
index 3186f04c8537..76ab83ce1ff7 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/riscv64/RISCV64CPUFeatureAccess.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/riscv64/RISCV64CPUFeatureAccess.java
@@ -30,7 +30,7 @@
 import java.util.ArrayList;
 import java.util.EnumSet;
 
-import jdk.compiler.graal.core.riscv64.RISCV64ReflectionUtil;
+import jdk.graal.compiler.core.riscv64.RISCV64ReflectionUtil;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
 import org.graalvm.nativeimage.StackValue;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/riscv64/RISCV64FrameAccess.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/riscv64/RISCV64FrameAccess.java
index 173b2509c8e9..5ffa5a6d468b 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/riscv64/RISCV64FrameAccess.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/riscv64/RISCV64FrameAccess.java
@@ -24,7 +24,7 @@
  */
 package com.oracle.svm.core.riscv64;
 
-import jdk.compiler.graal.api.replacements.Fold;
+import jdk.graal.compiler.api.replacements.Fold;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
 import org.graalvm.nativeimage.c.function.CodePointer;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/sampler/SafepointProfilingSampler.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/sampler/SafepointProfilingSampler.java
index 8442d7cd30f4..aa559088cf0a 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/sampler/SafepointProfilingSampler.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/sampler/SafepointProfilingSampler.java
@@ -34,7 +34,7 @@
 import java.util.concurrent.TimeUnit;
 
 import org.graalvm.collections.LockFreePrefixTree;
-import jdk.compiler.graal.options.Option;
+import jdk.graal.compiler.options.Option;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
 import org.graalvm.nativeimage.Threading;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/sampler/SamplerBufferAccess.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/sampler/SamplerBufferAccess.java
index 5d2cdac0a682..6b9c4b2b83d3 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/sampler/SamplerBufferAccess.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/sampler/SamplerBufferAccess.java
@@ -25,7 +25,7 @@
 
 package com.oracle.svm.core.sampler;
 
-import jdk.compiler.graal.api.replacements.Fold;
+import jdk.graal.compiler.api.replacements.Fold;
 import org.graalvm.nativeimage.c.struct.SizeOf;
 import org.graalvm.word.Pointer;
 import org.graalvm.word.UnsignedWord;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/sampler/SamplerSampleWriter.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/sampler/SamplerSampleWriter.java
index be19927c57d1..1681a0c255e6 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/sampler/SamplerSampleWriter.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/sampler/SamplerSampleWriter.java
@@ -25,7 +25,7 @@
 
 package com.oracle.svm.core.sampler;
 
-import jdk.compiler.graal.api.replacements.Fold;
+import jdk.graal.compiler.api.replacements.Fold;
 import org.graalvm.word.Pointer;
 import org.graalvm.word.UnsignedWord;
 import org.graalvm.word.WordFactory;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/sampler/SamplerSpinLock.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/sampler/SamplerSpinLock.java
index 220dd164ac12..68a91da9394d 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/sampler/SamplerSpinLock.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/sampler/SamplerSpinLock.java
@@ -25,7 +25,7 @@
 
 package com.oracle.svm.core.sampler;
 
-import jdk.compiler.graal.nodes.PauseNode;
+import jdk.graal.compiler.nodes.PauseNode;
 import org.graalvm.nativeimage.CurrentIsolate;
 import org.graalvm.nativeimage.IsolateThread;
 import org.graalvm.nativeimage.Platform;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/sampler/SubstrateSigprofHandler.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/sampler/SubstrateSigprofHandler.java
index 117916a18e31..80bc27c7cdeb 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/sampler/SubstrateSigprofHandler.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/sampler/SubstrateSigprofHandler.java
@@ -24,7 +24,7 @@
  */
 package com.oracle.svm.core.sampler;
 
-import jdk.compiler.graal.api.replacements.Fold;
+import jdk.graal.compiler.api.replacements.Fold;
 import org.graalvm.nativeimage.CurrentIsolate;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Isolate;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/snippets/SnippetRuntime.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/snippets/SnippetRuntime.java
index ebd892456754..3f6f301653b1 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/snippets/SnippetRuntime.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/snippets/SnippetRuntime.java
@@ -28,9 +28,9 @@
 
 import java.lang.reflect.Method;
 
-import jdk.compiler.graal.core.common.spi.ForeignCallDescriptor;
-import jdk.compiler.graal.replacements.nodes.BinaryMathIntrinsicNode.BinaryOperation;
-import jdk.compiler.graal.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation;
+import jdk.graal.compiler.core.common.spi.ForeignCallDescriptor;
+import jdk.graal.compiler.replacements.nodes.BinaryMathIntrinsicNode.BinaryOperation;
+import jdk.graal.compiler.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation;
 import org.graalvm.nativeimage.AnnotationAccess;
 import org.graalvm.word.LocationIdentity;
 
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/snippets/SubstrateIsArraySnippets.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/snippets/SubstrateIsArraySnippets.java
index afad65c7fbfa..d6f4e25dfeab 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/snippets/SubstrateIsArraySnippets.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/snippets/SubstrateIsArraySnippets.java
@@ -24,7 +24,7 @@
  */
 package com.oracle.svm.core.snippets;
 
-import jdk.compiler.graal.replacements.IsArraySnippets;
+import jdk.graal.compiler.replacements.IsArraySnippets;
 
 import com.oracle.svm.core.hub.DynamicHub;
 
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/stack/StackOverflowCheck.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/stack/StackOverflowCheck.java
index 0d7cd68f3a61..ff4c95b60e9d 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/stack/StackOverflowCheck.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/stack/StackOverflowCheck.java
@@ -24,8 +24,8 @@
  */
 package com.oracle.svm.core.stack;
 
-import jdk.compiler.graal.api.replacements.Fold;
-import jdk.compiler.graal.options.Option;
+import jdk.graal.compiler.api.replacements.Fold;
+import jdk.graal.compiler.options.Option;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.c.type.WordPointer;
 import org.graalvm.word.UnsignedWord;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/stack/SubstrateStackIntrospection.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/stack/SubstrateStackIntrospection.java
index ba9f94872d89..db7a6d092574 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/stack/SubstrateStackIntrospection.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/stack/SubstrateStackIntrospection.java
@@ -26,7 +26,7 @@
 
 import static com.oracle.svm.core.util.VMError.intentionallyUnimplemented;
 
-import jdk.compiler.graal.word.Word;
+import jdk.graal.compiler.word.Word;
 import org.graalvm.nativeimage.CurrentIsolate;
 import org.graalvm.nativeimage.c.function.CodePointer;
 import org.graalvm.word.Pointer;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/ContinuationSupport.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/ContinuationSupport.java
index 2943946c0d60..a7de46564a3f 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/ContinuationSupport.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/ContinuationSupport.java
@@ -41,9 +41,9 @@
 import com.oracle.svm.core.option.HostedOptionKey;
 import com.oracle.svm.core.snippets.KnownIntrinsics;
 
-import jdk.compiler.graal.api.replacements.Fold;
-import jdk.compiler.graal.options.Option;
-import jdk.compiler.graal.options.OptionType;
+import jdk.graal.compiler.api.replacements.Fold;
+import jdk.graal.compiler.options.Option;
+import jdk.graal.compiler.options.OptionType;
 
 public class ContinuationSupport {
     static final class Options {
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/JavaSpinLockUtils.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/JavaSpinLockUtils.java
index d24b51c5fbac..a7cc89c494e7 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/JavaSpinLockUtils.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/JavaSpinLockUtils.java
@@ -24,7 +24,7 @@
  */
 package com.oracle.svm.core.thread;
 
-import jdk.compiler.graal.nodes.PauseNode;
+import jdk.graal.compiler.nodes.PauseNode;
 
 import com.oracle.svm.core.Uninterruptible;
 
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/JavaThreads.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/JavaThreads.java
index e16f8326735c..03963b6fc951 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/JavaThreads.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/JavaThreads.java
@@ -49,9 +49,9 @@
 import com.oracle.svm.core.threadlocal.FastThreadLocalLong;
 import com.oracle.svm.util.ReflectionUtil;
 
-import jdk.compiler.graal.api.directives.GraalDirectives;
-import jdk.compiler.graal.core.common.SuppressFBWarnings;
-import jdk.compiler.graal.replacements.ReplacementsUtil;
+import jdk.graal.compiler.api.directives.GraalDirectives;
+import jdk.graal.compiler.core.common.SuppressFBWarnings;
+import jdk.graal.compiler.replacements.ReplacementsUtil;
 
 /**
  * Implements operations on {@linkplain Target_java_lang_Thread Java threads}, which are on a higher
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/Parker.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/Parker.java
index ecabc8500c96..e5b7e21267bf 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/Parker.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/Parker.java
@@ -24,7 +24,7 @@
  */
 package com.oracle.svm.core.thread;
 
-import jdk.compiler.graal.api.replacements.Fold;
+import jdk.graal.compiler.api.replacements.Fold;
 import org.graalvm.nativeimage.ImageSingletons;
 
 import com.oracle.svm.core.Uninterruptible;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/PlatformThreads.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/PlatformThreads.java
index 0e3e7f1cf9d9..8a7742d47955 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/PlatformThreads.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/PlatformThreads.java
@@ -48,8 +48,8 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import jdk.compiler.graal.api.replacements.Fold;
-import jdk.compiler.graal.core.common.SuppressFBWarnings;
+import jdk.graal.compiler.api.replacements.Fold;
+import jdk.graal.compiler.core.common.SuppressFBWarnings;
 import org.graalvm.nativeimage.CurrentIsolate;
 import org.graalvm.nativeimage.ImageInfo;
 import org.graalvm.nativeimage.ImageSingletons;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/Safepoint.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/Safepoint.java
index 687314b35df8..154ede835acb 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/Safepoint.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/Safepoint.java
@@ -28,15 +28,15 @@
 
 import java.util.concurrent.atomic.AtomicInteger;
 
-import jdk.compiler.graal.api.replacements.Fold;
-import jdk.compiler.graal.core.common.spi.ForeignCallDescriptor;
-import jdk.compiler.graal.graph.Node.ConstantNodeParameter;
-import jdk.compiler.graal.graph.Node.NodeIntrinsic;
-import jdk.compiler.graal.nodes.PauseNode;
-import jdk.compiler.graal.nodes.extended.BranchProbabilityNode;
-import jdk.compiler.graal.nodes.extended.ForeignCallNode;
-import jdk.compiler.graal.nodes.extended.MembarNode;
-import jdk.compiler.graal.options.Option;
+import jdk.graal.compiler.api.replacements.Fold;
+import jdk.graal.compiler.core.common.spi.ForeignCallDescriptor;
+import jdk.graal.compiler.graph.Node.ConstantNodeParameter;
+import jdk.graal.compiler.graph.Node.NodeIntrinsic;
+import jdk.graal.compiler.nodes.PauseNode;
+import jdk.graal.compiler.nodes.extended.BranchProbabilityNode;
+import jdk.graal.compiler.nodes.extended.ForeignCallNode;
+import jdk.graal.compiler.nodes.extended.MembarNode;
+import jdk.graal.compiler.options.Option;
 import org.graalvm.nativeimage.CurrentIsolate;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.IsolateThread;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/SafepointListenerSupport.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/SafepointListenerSupport.java
index f6d002d92c6b..b4fbb878d021 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/SafepointListenerSupport.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/SafepointListenerSupport.java
@@ -29,7 +29,7 @@
 import com.oracle.svm.core.Uninterruptible;
 import com.oracle.svm.core.feature.AutomaticallyRegisteredImageSingleton;
 
-import jdk.compiler.graal.api.replacements.Fold;
+import jdk.graal.compiler.api.replacements.Fold;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/Target_java_lang_ScopedValue.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/Target_java_lang_ScopedValue.java
index a90052dc962e..0e6152bcc791 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/Target_java_lang_ScopedValue.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/Target_java_lang_ScopedValue.java
@@ -27,7 +27,7 @@
 import java.util.concurrent.Callable;
 import java.util.function.BooleanSupplier;
 
-import jdk.compiler.graal.serviceprovider.JavaVersionUtil;
+import jdk.graal.compiler.serviceprovider.JavaVersionUtil;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
 
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/Target_java_lang_Thread.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/Target_java_lang_Thread.java
index d4fd75ee2182..0bc51646f8b3 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/Target_java_lang_Thread.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/Target_java_lang_Thread.java
@@ -31,8 +31,8 @@
 import java.util.Map;
 import java.util.Objects;
 
-import jdk.compiler.graal.api.directives.GraalDirectives;
-import jdk.compiler.graal.replacements.ReplacementsUtil;
+import jdk.graal.compiler.api.directives.GraalDirectives;
+import jdk.graal.compiler.replacements.ReplacementsUtil;
 import org.graalvm.nativeimage.IsolateThread;
 import org.graalvm.nativeimage.Platforms;
 import org.graalvm.nativeimage.impl.InternalPlatform;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/Target_java_lang_VirtualThread.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/Target_java_lang_VirtualThread.java
index 4e45d2facd77..41cdb0fe17a7 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/Target_java_lang_VirtualThread.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/Target_java_lang_VirtualThread.java
@@ -29,7 +29,7 @@
 
 import java.util.Locale;
 
-import jdk.compiler.graal.serviceprovider.JavaVersionUtil;
+import jdk.graal.compiler.serviceprovider.JavaVersionUtil;
 
 import com.oracle.svm.core.SubstrateUtil;
 import com.oracle.svm.core.Uninterruptible;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/ThreadCpuTimeSupport.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/ThreadCpuTimeSupport.java
index 674db772e042..df3978971a4d 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/ThreadCpuTimeSupport.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/ThreadCpuTimeSupport.java
@@ -24,7 +24,7 @@
  */
 package com.oracle.svm.core.thread;
 
-import jdk.compiler.graal.api.replacements.Fold;
+import jdk.graal.compiler.api.replacements.Fold;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.IsolateThread;
 
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/ThreadListenerSupport.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/ThreadListenerSupport.java
index c7ef1f0debbc..0f29e38303b5 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/ThreadListenerSupport.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/ThreadListenerSupport.java
@@ -26,7 +26,7 @@
 
 import java.util.Arrays;
 
-import jdk.compiler.graal.api.replacements.Fold;
+import jdk.graal.compiler.api.replacements.Fold;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.IsolateThread;
 import org.graalvm.nativeimage.Platform;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/ThreadingSupportImpl.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/ThreadingSupportImpl.java
index 28f16f574a08..f85267b4e573 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/ThreadingSupportImpl.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/ThreadingSupportImpl.java
@@ -29,8 +29,8 @@
 
 import java.util.concurrent.TimeUnit;
 
-import jdk.compiler.graal.api.replacements.Fold;
-import jdk.compiler.graal.options.Option;
+import jdk.graal.compiler.api.replacements.Fold;
+import jdk.graal.compiler.options.Option;
 import org.graalvm.nativeimage.CurrentIsolate;
 import org.graalvm.nativeimage.IsolateThread;
 import org.graalvm.nativeimage.Threading.RecurringCallback;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/VMOperationControl.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/VMOperationControl.java
index 75c6bf856e97..154df7b18dbb 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/VMOperationControl.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/VMOperationControl.java
@@ -26,8 +26,8 @@
 
 import static com.oracle.svm.core.SubstrateOptions.MultiThreaded;
 
-import jdk.compiler.graal.api.replacements.Fold;
-import jdk.compiler.graal.word.Word;
+import jdk.graal.compiler.api.replacements.Fold;
+import jdk.graal.compiler.word.Word;
 import org.graalvm.nativeimage.CurrentIsolate;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.IsolateThread;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/VMOperationListenerSupport.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/VMOperationListenerSupport.java
index 3d023bbd1294..f54cf0d11482 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/VMOperationListenerSupport.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/VMOperationListenerSupport.java
@@ -26,7 +26,7 @@
 
 import java.util.Arrays;
 
-import jdk.compiler.graal.api.replacements.Fold;
+import jdk.graal.compiler.api.replacements.Fold;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/VMThreads.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/VMThreads.java
index a6c92da595d3..dc9b724b2fc9 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/VMThreads.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/VMThreads.java
@@ -24,10 +24,10 @@
  */
 package com.oracle.svm.core.thread;
 
-import jdk.compiler.graal.api.directives.GraalDirectives;
-import jdk.compiler.graal.api.replacements.Fold;
-import jdk.compiler.graal.replacements.ReplacementsUtil;
-import jdk.compiler.graal.replacements.nodes.AssertionNode;
+import jdk.graal.compiler.api.directives.GraalDirectives;
+import jdk.graal.compiler.api.replacements.Fold;
+import jdk.graal.compiler.replacements.ReplacementsUtil;
+import jdk.graal.compiler.replacements.nodes.AssertionNode;
 import org.graalvm.nativeimage.CurrentIsolate;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Isolate;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/threadlocal/VMThreadLocalInfos.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/threadlocal/VMThreadLocalInfos.java
index be975b44ca87..0d5f5b43a15a 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/threadlocal/VMThreadLocalInfos.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/threadlocal/VMThreadLocalInfos.java
@@ -26,8 +26,8 @@
 
 import java.util.Collection;
 
-import jdk.compiler.graal.word.ObjectAccess;
-import jdk.compiler.graal.word.Word;
+import jdk.graal.compiler.word.ObjectAccess;
+import jdk.graal.compiler.word.Word;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.IsolateThread;
 import org.graalvm.nativeimage.Platform;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/threadlocal/VMThreadLocalMTSupport.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/threadlocal/VMThreadLocalMTSupport.java
index edc89dc66285..1c6534cc5b10 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/threadlocal/VMThreadLocalMTSupport.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/threadlocal/VMThreadLocalMTSupport.java
@@ -24,7 +24,7 @@
  */
 package com.oracle.svm.core.threadlocal;
 
-import jdk.compiler.graal.api.replacements.Fold;
+import jdk.graal.compiler.api.replacements.Fold;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.IsolateThread;
 import org.graalvm.nativeimage.Platform;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/util/ByteArrayReader.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/util/ByteArrayReader.java
index 3c564c9bf6f3..77786562dc9f 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/util/ByteArrayReader.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/util/ByteArrayReader.java
@@ -24,8 +24,8 @@
  */
 package com.oracle.svm.core.util;
 
-import jdk.compiler.graal.api.replacements.Fold;
-import jdk.compiler.graal.core.common.util.UnsafeArrayTypeReader;
+import jdk.graal.compiler.api.replacements.Fold;
+import jdk.graal.compiler.core.common.util.UnsafeArrayTypeReader;
 
 import com.oracle.svm.core.config.ConfigurationValues;
 
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/util/CounterSupport.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/util/CounterSupport.java
index 64edd7c0cd23..d40a2fafd249 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/util/CounterSupport.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/util/CounterSupport.java
@@ -24,7 +24,7 @@
  */
 package com.oracle.svm.core.util;
 
-import jdk.compiler.graal.api.replacements.Fold;
+import jdk.graal.compiler.api.replacements.Fold;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/util/HostedByteBufferPointer.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/util/HostedByteBufferPointer.java
index d3efe723283c..0d0019ea5ad3 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/util/HostedByteBufferPointer.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/util/HostedByteBufferPointer.java
@@ -26,7 +26,7 @@
 
 import java.nio.ByteBuffer;
 
-import jdk.compiler.graal.core.common.NumUtil;
+import jdk.graal.compiler.core.common.NumUtil;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
 import org.graalvm.word.ComparableWord;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/util/HostedStringDeduplication.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/util/HostedStringDeduplication.java
index 50f68d7f81e7..b8d65edaa2b6 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/util/HostedStringDeduplication.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/util/HostedStringDeduplication.java
@@ -30,7 +30,7 @@
 import java.util.concurrent.ConcurrentMap;
 
 import com.oracle.svm.core.feature.AutomaticallyRegisteredImageSingleton;
-import jdk.compiler.graal.core.common.SuppressFBWarnings;
+import jdk.graal.compiler.core.common.SuppressFBWarnings;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/util/NonmovableByteArrayReader.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/util/NonmovableByteArrayReader.java
index 48e9dccf0d8c..18e71f1a7177 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/util/NonmovableByteArrayReader.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/util/NonmovableByteArrayReader.java
@@ -24,7 +24,7 @@
  */
 package com.oracle.svm.core.util;
 
-import jdk.compiler.graal.api.replacements.Fold;
+import jdk.graal.compiler.api.replacements.Fold;
 import org.graalvm.word.Pointer;
 
 import com.oracle.svm.core.SubstrateUtil;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/util/NonmovableByteArrayTypeReader.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/util/NonmovableByteArrayTypeReader.java
index 55862c6d0034..9abc03b8b23c 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/util/NonmovableByteArrayTypeReader.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/util/NonmovableByteArrayTypeReader.java
@@ -24,7 +24,7 @@
  */
 package com.oracle.svm.core.util;
 
-import jdk.compiler.graal.core.common.util.AbstractTypeReader;
+import jdk.graal.compiler.core.common.util.AbstractTypeReader;
 
 import com.oracle.svm.core.c.NonmovableArray;
 
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/util/coder/Pack200Coder.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/util/coder/Pack200Coder.java
index 344785d2d247..138f9775c957 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/util/coder/Pack200Coder.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/util/coder/Pack200Coder.java
@@ -24,7 +24,7 @@
  */
 package com.oracle.svm.core.util.coder;
 
-import jdk.compiler.graal.core.common.util.UnsafeArrayTypeWriter;
+import jdk.graal.compiler.core.common.util.UnsafeArrayTypeWriter;
 import org.graalvm.nativeimage.StackValue;
 import org.graalvm.word.Pointer;
 
diff --git a/substratevm/src/com.oracle.svm.driver/src/com/oracle/svm/driver/APIOptionHandler.java b/substratevm/src/com.oracle.svm.driver/src/com/oracle/svm/driver/APIOptionHandler.java
index 422083736ba1..3cbc7926f48e 100644
--- a/substratevm/src/com.oracle.svm.driver/src/com/oracle/svm/driver/APIOptionHandler.java
+++ b/substratevm/src/com.oracle.svm.driver/src/com/oracle/svm/driver/APIOptionHandler.java
@@ -45,9 +45,9 @@
 import java.util.stream.Collectors;
 
 import org.graalvm.collections.EconomicMap;
-import jdk.compiler.graal.options.OptionDescriptor;
-import jdk.compiler.graal.options.OptionDescriptors;
-import jdk.compiler.graal.options.OptionStability;
+import jdk.graal.compiler.options.OptionDescriptor;
+import jdk.graal.compiler.options.OptionDescriptors;
+import jdk.graal.compiler.options.OptionStability;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.hosted.Feature;
 
@@ -621,7 +621,7 @@ final class APIOptionFeature implements Feature {
     @Override
     public void afterRegistration(AfterRegistrationAccess access) {
         ModuleSupport.accessPackagesToClass(ModuleSupport.Access.EXPORT, APIOptionFeature.class, true,
-                        "jdk.compiler.graal", "jdk.compiler.graal.options");
+                        "jdk.graal.compiler", "jdk.graal.compiler.options");
     }
 
     @Override
diff --git a/substratevm/src/com.oracle.svm.driver/src/com/oracle/svm/driver/CmdLineOptionHandler.java b/substratevm/src/com.oracle.svm.driver/src/com/oracle/svm/driver/CmdLineOptionHandler.java
index f11d98251d75..2d7d6ad67d03 100644
--- a/substratevm/src/com.oracle.svm.driver/src/com/oracle/svm/driver/CmdLineOptionHandler.java
+++ b/substratevm/src/com.oracle.svm.driver/src/com/oracle/svm/driver/CmdLineOptionHandler.java
@@ -30,7 +30,7 @@
 import java.util.Optional;
 import java.util.regex.Pattern;
 
-import jdk.compiler.graal.options.OptionType;
+import jdk.graal.compiler.options.OptionType;
 
 import com.oracle.svm.core.VM;
 import com.oracle.svm.core.option.OptionOrigin;
diff --git a/substratevm/src/com.oracle.svm.driver/src/com/oracle/svm/driver/NativeImage.java b/substratevm/src/com.oracle.svm.driver/src/com/oracle/svm/driver/NativeImage.java
index 96b3ab60be74..ca573188bb4e 100644
--- a/substratevm/src/com.oracle.svm.driver/src/com/oracle/svm/driver/NativeImage.java
+++ b/substratevm/src/com.oracle.svm.driver/src/com/oracle/svm/driver/NativeImage.java
@@ -69,8 +69,8 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import jdk.compiler.graal.options.OptionKey;
-import jdk.compiler.graal.serviceprovider.JavaVersionUtil;
+import jdk.graal.compiler.options.OptionKey;
+import jdk.graal.compiler.serviceprovider.JavaVersionUtil;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.ProcessProperties;
 
@@ -537,7 +537,7 @@ public List getBuilderJavaArgs() {
                 if (!modulePathBuild && line.startsWith("--add-exports=")) {
                     /*-
                      * Turns e.g.
-                     * --add-exports=jdk.internal.vm.ci/jdk.vm.ci.code.stack=jdk.compiler.graal,org.graalvm.nativeimage.builder
+                     * --add-exports=jdk.internal.vm.ci/jdk.vm.ci.code.stack=jdk.graal.compiler,org.graalvm.nativeimage.builder
                      * into:
                      * --add-exports=jdk.internal.vm.ci/jdk.vm.ci.code.stack=ALL-UNNAMED
                      */
diff --git a/substratevm/src/com.oracle.svm.driver/src/com/oracle/svm/driver/metainf/MetaInfFileType.java b/substratevm/src/com.oracle.svm.driver/src/com/oracle/svm/driver/metainf/MetaInfFileType.java
index 12c47b9163e2..9c6502ebff63 100644
--- a/substratevm/src/com.oracle.svm.driver/src/com/oracle/svm/driver/metainf/MetaInfFileType.java
+++ b/substratevm/src/com.oracle.svm.driver/src/com/oracle/svm/driver/metainf/MetaInfFileType.java
@@ -24,7 +24,7 @@
  */
 package com.oracle.svm.driver.metainf;
 
-import jdk.compiler.graal.options.OptionKey;
+import jdk.graal.compiler.options.OptionKey;
 
 import com.oracle.svm.core.configure.ConfigurationFile;
 import com.oracle.svm.core.configure.ConfigurationFiles;
diff --git a/substratevm/src/com.oracle.svm.graal.hotspot.libgraal/src/com/oracle/svm/graal/hotspot/libgraal/LibGraalEntryPoints.java b/substratevm/src/com.oracle.svm.graal.hotspot.libgraal/src/com/oracle/svm/graal/hotspot/libgraal/LibGraalEntryPoints.java
index cdccaf193690..7fef8b6ecf1c 100644
--- a/substratevm/src/com.oracle.svm.graal.hotspot.libgraal/src/com/oracle/svm/graal/hotspot/libgraal/LibGraalEntryPoints.java
+++ b/substratevm/src/com.oracle.svm.graal.hotspot.libgraal/src/com/oracle/svm/graal/hotspot/libgraal/LibGraalEntryPoints.java
@@ -35,21 +35,21 @@
 
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.EconomicSet;
-import jdk.compiler.graal.core.common.spi.ForeignCallSignature;
-import jdk.compiler.graal.core.target.Backend;
-import jdk.compiler.graal.debug.GlobalMetrics;
-import jdk.compiler.graal.hotspot.CompilationContext;
-import jdk.compiler.graal.hotspot.CompilationTask;
-import jdk.compiler.graal.hotspot.HotSpotForeignCallLinkageImpl.CodeInfo;
-import jdk.compiler.graal.hotspot.HotSpotGraalCompiler;
-import jdk.compiler.graal.hotspot.HotSpotGraalRuntime;
-import jdk.compiler.graal.hotspot.HotSpotGraalServices;
-import jdk.compiler.graal.hotspot.ProfileReplaySupport;
-import jdk.compiler.graal.hotspot.stubs.Stub;
-import jdk.compiler.graal.options.OptionDescriptors;
-import jdk.compiler.graal.options.OptionKey;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.options.OptionsParser;
+import jdk.graal.compiler.core.common.spi.ForeignCallSignature;
+import jdk.graal.compiler.core.target.Backend;
+import jdk.graal.compiler.debug.GlobalMetrics;
+import jdk.graal.compiler.hotspot.CompilationContext;
+import jdk.graal.compiler.hotspot.CompilationTask;
+import jdk.graal.compiler.hotspot.HotSpotForeignCallLinkageImpl.CodeInfo;
+import jdk.graal.compiler.hotspot.HotSpotGraalCompiler;
+import jdk.graal.compiler.hotspot.HotSpotGraalRuntime;
+import jdk.graal.compiler.hotspot.HotSpotGraalServices;
+import jdk.graal.compiler.hotspot.ProfileReplaySupport;
+import jdk.graal.compiler.hotspot.stubs.Stub;
+import jdk.graal.compiler.options.OptionDescriptors;
+import jdk.graal.compiler.options.OptionKey;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.options.OptionsParser;
 import org.graalvm.jniutils.JNI.JNIEnv;
 import org.graalvm.jniutils.JNIMethodScope;
 import org.graalvm.nativeimage.UnmanagedMemory;
@@ -60,7 +60,7 @@
 import org.graalvm.nativeimage.c.struct.SizeOf;
 import org.graalvm.nativeimage.c.type.CIntPointer;
 import org.graalvm.nativeimage.c.type.CTypeConversion;
-import jdk.compiler.graal.util.OptionsEncoder;
+import jdk.graal.compiler.util.OptionsEncoder;
 import org.graalvm.word.Pointer;
 import org.graalvm.word.PointerBase;
 import org.graalvm.word.WordFactory;
@@ -239,7 +239,7 @@ private static OptionValues decodeOptions(long address, int size, int hash) {
     }
 
     @SuppressWarnings({"unused", "try"})
-    @CEntryPoint(name = "Java_jdk_compiler_graal_hotspot_test_LibGraalCompilerTest_hashConstantOopFields", include = LibGraalFeature.IsEnabled.class)
+    @CEntryPoint(name = "Java_jdk_graal_compiler_hotspot_test_LibGraalCompilerTest_hashConstantOopFields", include = LibGraalFeature.IsEnabled.class)
     private static long hashConstantOopFields(JNIEnv jniEnv,
                     PointerBase jclass,
                     @CEntryPoint.IsolateThreadContext long isolateThread,
@@ -300,7 +300,7 @@ private static long hashConstantOopFields(JNIEnv jniEnv,
 
     /**
      * The implementation of
-     * {@code jdk.compiler.graal.hotspot.test.CompileTheWorld.compileMethodInLibgraal()}.
+     * {@code jdk.graal.compiler.hotspot.test.CompileTheWorld.compileMethodInLibgraal()}.
      *
      * @param methodHandle the method to be compiled. This is a handle to a
      *            {@link HotSpotResolvedJavaMethod} in HotSpot's heap. A value of 0L can be passed
@@ -335,7 +335,7 @@ private static long hashConstantOopFields(JNIEnv jniEnv,
      * @return a handle to a {@link InstalledCode} in HotSpot's heap or 0 if compilation failed
      */
     @SuppressWarnings({"unused", "try"})
-    @CEntryPoint(name = "Java_jdk_compiler_graal_hotspot_test_CompileTheWorld_compileMethodInLibgraal", include = LibGraalFeature.IsEnabled.class)
+    @CEntryPoint(name = "Java_jdk_graal_compiler_hotspot_test_CompileTheWorld_compileMethodInLibgraal", include = LibGraalFeature.IsEnabled.class)
     private static long compileMethod(JNIEnv jniEnv,
                     PointerBase jclass,
                     @CEntryPoint.IsolateThreadContext long isolateThread,
diff --git a/substratevm/src/com.oracle.svm.graal.hotspot.libgraal/src/com/oracle/svm/graal/hotspot/libgraal/LibGraalFeature.java b/substratevm/src/com.oracle.svm.graal.hotspot.libgraal/src/com/oracle/svm/graal/hotspot/libgraal/LibGraalFeature.java
index 08ebb2223883..74b63e513fed 100644
--- a/substratevm/src/com.oracle.svm.graal.hotspot.libgraal/src/com/oracle/svm/graal/hotspot/libgraal/LibGraalFeature.java
+++ b/substratevm/src/com.oracle.svm.graal.hotspot.libgraal/src/com/oracle/svm/graal/hotspot/libgraal/LibGraalFeature.java
@@ -53,47 +53,47 @@
 import java.util.stream.Collectors;
 
 import org.graalvm.collections.EconomicMap;
-import jdk.compiler.graal.code.DisassemblerProvider;
-import jdk.compiler.graal.core.GraalServiceThread;
-import jdk.compiler.graal.core.common.spi.ForeignCallSignature;
-import jdk.compiler.graal.core.target.Backend;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.hotspot.EncodedSnippets;
-import jdk.compiler.graal.hotspot.HotSpotBackend;
-import jdk.compiler.graal.hotspot.HotSpotCodeCacheListener;
-import jdk.compiler.graal.hotspot.HotSpotForeignCallLinkageImpl;
-import jdk.compiler.graal.hotspot.HotSpotForeignCallLinkageImpl.CodeInfo;
-import jdk.compiler.graal.hotspot.HotSpotGraalCompiler;
-import jdk.compiler.graal.hotspot.HotSpotGraalOptionValues;
-import jdk.compiler.graal.hotspot.HotSpotGraalRuntime;
-import jdk.compiler.graal.hotspot.HotSpotReplacementsImpl;
-import jdk.compiler.graal.hotspot.SnippetObjectConstant;
-import jdk.compiler.graal.hotspot.meta.HotSpotHostForeignCallsProvider;
-import jdk.compiler.graal.hotspot.meta.HotSpotInvocationPluginProvider;
-import jdk.compiler.graal.hotspot.meta.HotSpotProviders;
-import jdk.compiler.graal.hotspot.stubs.Stub;
-import jdk.compiler.graal.nodes.graphbuilderconf.GeneratedPluginFactory;
-import jdk.compiler.graal.nodes.spi.SnippetParameterInfo;
-import jdk.compiler.graal.options.Option;
-import jdk.compiler.graal.options.OptionDescriptor;
-import jdk.compiler.graal.options.OptionDescriptors;
-import jdk.compiler.graal.options.OptionDescriptorsMap;
-import jdk.compiler.graal.options.OptionKey;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.options.OptionsParser;
-import jdk.compiler.graal.phases.util.Providers;
-import jdk.compiler.graal.serviceprovider.GlobalAtomicLong;
-import jdk.compiler.graal.serviceprovider.GraalServices;
-import jdk.compiler.graal.serviceprovider.SpeculationReasonGroup;
-import jdk.compiler.graal.truffle.PartialEvaluatorConfiguration;
-import jdk.compiler.graal.truffle.host.TruffleHostEnvironment;
-import jdk.compiler.graal.truffle.hotspot.HotSpotTruffleCompilerImpl;
-import jdk.compiler.graal.truffle.hotspot.TruffleCallBoundaryInstrumentationFactory;
-import jdk.compiler.graal.truffle.substitutions.GraphBuilderInvocationPluginProvider;
-import jdk.compiler.graal.truffle.substitutions.GraphDecoderInvocationPluginProvider;
+import jdk.graal.compiler.code.DisassemblerProvider;
+import jdk.graal.compiler.core.GraalServiceThread;
+import jdk.graal.compiler.core.common.spi.ForeignCallSignature;
+import jdk.graal.compiler.core.target.Backend;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.hotspot.EncodedSnippets;
+import jdk.graal.compiler.hotspot.HotSpotBackend;
+import jdk.graal.compiler.hotspot.HotSpotCodeCacheListener;
+import jdk.graal.compiler.hotspot.HotSpotForeignCallLinkageImpl;
+import jdk.graal.compiler.hotspot.HotSpotForeignCallLinkageImpl.CodeInfo;
+import jdk.graal.compiler.hotspot.HotSpotGraalCompiler;
+import jdk.graal.compiler.hotspot.HotSpotGraalOptionValues;
+import jdk.graal.compiler.hotspot.HotSpotGraalRuntime;
+import jdk.graal.compiler.hotspot.HotSpotReplacementsImpl;
+import jdk.graal.compiler.hotspot.SnippetObjectConstant;
+import jdk.graal.compiler.hotspot.meta.HotSpotHostForeignCallsProvider;
+import jdk.graal.compiler.hotspot.meta.HotSpotInvocationPluginProvider;
+import jdk.graal.compiler.hotspot.meta.HotSpotProviders;
+import jdk.graal.compiler.hotspot.stubs.Stub;
+import jdk.graal.compiler.nodes.graphbuilderconf.GeneratedPluginFactory;
+import jdk.graal.compiler.nodes.spi.SnippetParameterInfo;
+import jdk.graal.compiler.options.Option;
+import jdk.graal.compiler.options.OptionDescriptor;
+import jdk.graal.compiler.options.OptionDescriptors;
+import jdk.graal.compiler.options.OptionDescriptorsMap;
+import jdk.graal.compiler.options.OptionKey;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.options.OptionsParser;
+import jdk.graal.compiler.phases.util.Providers;
+import jdk.graal.compiler.serviceprovider.GlobalAtomicLong;
+import jdk.graal.compiler.serviceprovider.GraalServices;
+import jdk.graal.compiler.serviceprovider.SpeculationReasonGroup;
+import jdk.graal.compiler.truffle.PartialEvaluatorConfiguration;
+import jdk.graal.compiler.truffle.host.TruffleHostEnvironment;
+import jdk.graal.compiler.truffle.hotspot.HotSpotTruffleCompilerImpl;
+import jdk.graal.compiler.truffle.hotspot.TruffleCallBoundaryInstrumentationFactory;
+import jdk.graal.compiler.truffle.substitutions.GraphBuilderInvocationPluginProvider;
+import jdk.graal.compiler.truffle.substitutions.GraphDecoderInvocationPluginProvider;
 import org.graalvm.jniutils.JNI;
 import org.graalvm.jniutils.JNIExceptionWrapper;
 import org.graalvm.jniutils.JNIMethodScope;
@@ -179,8 +179,8 @@ public LibGraalFeature() {
         /* Open up all modules needed to build LibGraal image */
         ModuleSupport.accessPackagesToClass(ModuleSupport.Access.EXPORT, LibGraalFeature.class, false, "java.base", "jdk.internal.misc");
         ModuleSupport.accessPackagesToClass(ModuleSupport.Access.EXPORT, LibGraalFeature.class, false, "jdk.internal.vm.ci");
-        ModuleSupport.accessPackagesToClass(ModuleSupport.Access.EXPORT, LibGraalFeature.class, false, "jdk.compiler.graal");
-        ModuleSupport.accessPackagesToClass(ModuleSupport.Access.EXPORT, LibGraalFeature.class, false, "jdk.compiler.graal.management");
+        ModuleSupport.accessPackagesToClass(ModuleSupport.Access.EXPORT, LibGraalFeature.class, false, "jdk.graal.compiler");
+        ModuleSupport.accessPackagesToClass(ModuleSupport.Access.EXPORT, LibGraalFeature.class, false, "jdk.graal.compiler.management");
         ModuleSupport.accessPackagesToClass(ModuleSupport.Access.EXPORT, LibGraalFeature.class, false, "org.graalvm.collections");
         ModuleSupport.accessPackagesToClass(ModuleSupport.Access.EXPORT, LibGraalFeature.class, false, "org.graalvm.word");
         ModuleSupport.accessPackagesToClass(ModuleSupport.Access.EXPORT, LibGraalFeature.class, false, "org.graalvm.nativeimage", "org.graalvm.nativeimage.impl");
@@ -629,7 +629,7 @@ static Object convertUnknownValue(Object object) {
 }
 
 @TargetClass(value = SpeculationReasonGroup.class, onlyWith = LibGraalFeature.IsEnabled.class)
-final class Target_jdk_compiler_graal_serviceprovider_SpeculationReasonGroup {
+final class Target_jdk_graal_compiler_serviceprovider_SpeculationReasonGroup {
 
     /**
      * Delete this constructor to ensure {@link SpeculationReasonGroup} ids are in the libgraal
@@ -670,8 +670,8 @@ void constructor(Object object, boolean compressed) {
     }
 }
 
-@TargetClass(className = "jdk.compiler.graal.hotspot.HotSpotGraalCompiler", onlyWith = LibGraalFeature.IsEnabled.class)
-final class Target_jdk_compiler_graal_hotspot_HotSpotGraalCompiler {
+@TargetClass(className = "jdk.graal.compiler.hotspot.HotSpotGraalCompiler", onlyWith = LibGraalFeature.IsEnabled.class)
+final class Target_jdk_graal_compiler_hotspot_HotSpotGraalCompiler {
 
     @SuppressWarnings({"unused", "try"})
     @Substitute
@@ -696,8 +696,8 @@ private static CompilationRequestResult compileMethod(HotSpotGraalCompiler compi
     }
 }
 
-@TargetClass(className = "jdk.compiler.graal.hotspot.HotSpotGraalRuntime", onlyWith = LibGraalFeature.IsEnabled.class)
-final class Target_jdk_compiler_graal_hotspot_HotSpotGraalRuntime {
+@TargetClass(className = "jdk.graal.compiler.hotspot.HotSpotGraalRuntime", onlyWith = LibGraalFeature.IsEnabled.class)
+final class Target_jdk_graal_compiler_hotspot_HotSpotGraalRuntime {
 
     @SuppressWarnings("unused")
     @Substitute
@@ -732,8 +732,8 @@ private static void shutdownLibGraal(HotSpotGraalRuntime runtime) {
     }
 }
 
-@TargetClass(className = "jdk.compiler.graal.serviceprovider.GraalServices", onlyWith = LibGraalFeature.IsEnabled.class)
-final class Target_jdk_compiler_graal_serviceprovider_GraalServices {
+@TargetClass(className = "jdk.graal.compiler.serviceprovider.GraalServices", onlyWith = LibGraalFeature.IsEnabled.class)
+final class Target_jdk_graal_compiler_serviceprovider_GraalServices {
 
     @Substitute
     private static void notifyLowMemoryPoint(boolean fullGC) {
@@ -741,8 +741,8 @@ private static void notifyLowMemoryPoint(boolean fullGC) {
     }
 }
 
-@TargetClass(className = "jdk.compiler.graal.hotspot.HotSpotGraalOptionValues", onlyWith = LibGraalFeature.IsEnabled.class)
-final class Target_jdk_compiler_graal_hotspot_HotSpotGraalOptionValues {
+@TargetClass(className = "jdk.graal.compiler.hotspot.HotSpotGraalOptionValues", onlyWith = LibGraalFeature.IsEnabled.class)
+final class Target_jdk_graal_compiler_hotspot_HotSpotGraalOptionValues {
     @Substitute
     private static OptionValues initializeOptions() {
         return HotSpotGraalOptionValuesUtil.initializeOptions();
@@ -806,8 +806,8 @@ private static String removePrefix(String value, String prefix) {
     }
 }
 
-@TargetClass(className = "jdk.compiler.graal.core.GraalServiceThread", onlyWith = LibGraalFeature.IsEnabled.class)
-final class Target_jdk_compiler_graal_core_GraalServiceThread {
+@TargetClass(className = "jdk.graal.compiler.core.GraalServiceThread", onlyWith = LibGraalFeature.IsEnabled.class)
+final class Target_jdk_graal_compiler_core_GraalServiceThread {
     @Substitute()
     void beforeRun() {
         GraalServiceThread thread = SubstrateUtil.cast(this, GraalServiceThread.class);
@@ -823,8 +823,8 @@ void afterRun() {
     }
 }
 
-@TargetClass(className = "jdk.compiler.graal.core.GraalCompiler", onlyWith = LibGraalFeature.IsEnabled.class)
-final class Target_jdk_compiler_graal_core_GraalCompiler {
+@TargetClass(className = "jdk.graal.compiler.core.GraalCompiler", onlyWith = LibGraalFeature.IsEnabled.class)
+final class Target_jdk_graal_compiler_core_GraalCompiler {
     @SuppressWarnings("unused")
     @Substitute()
     private static boolean notifyCrash(String crashMessage) {
@@ -850,13 +850,13 @@ private static boolean notifyCrash(String crashMessage) {
     }
 }
 
-@TargetClass(className = "jdk.compiler.graal.hotspot.SymbolicSnippetEncoder", onlyWith = LibGraalFeature.IsEnabled.class)
+@TargetClass(className = "jdk.graal.compiler.hotspot.SymbolicSnippetEncoder", onlyWith = LibGraalFeature.IsEnabled.class)
 @Delete("shouldn't appear in libgraal")
-final class Target_jdk_compiler_graal_hotspot_SymbolicSnippetEncoder {
+final class Target_jdk_graal_compiler_hotspot_SymbolicSnippetEncoder {
 }
 
 @TargetClass(value = HotSpotForeignCallLinkageImpl.class, onlyWith = LibGraalFeature.IsEnabled.class)
-final class Target_jdk_compiler_graal_hotspot_HotSpotForeignCallLinkageImpl {
+final class Target_jdk_graal_compiler_hotspot_HotSpotForeignCallLinkageImpl {
     /**
      * Gets the code info for a runtime stub, consulting and updating
      * {@link LibGraalEntryPoints#STUBS} in the process to share runtime stub code info between
diff --git a/substratevm/src/com.oracle.svm.graal.hotspot.libgraal/src/com/oracle/svm/graal/hotspot/libgraal/truffle/HSTruffleCompilable.java b/substratevm/src/com.oracle.svm.graal.hotspot.libgraal/src/com/oracle/svm/graal/hotspot/libgraal/truffle/HSTruffleCompilable.java
index 67a89d3301b9..4490f1e09b14 100644
--- a/substratevm/src/com.oracle.svm.graal.hotspot.libgraal/src/com/oracle/svm/graal/hotspot/libgraal/truffle/HSTruffleCompilable.java
+++ b/substratevm/src/com.oracle.svm.graal.hotspot.libgraal/src/com/oracle/svm/graal/hotspot/libgraal/truffle/HSTruffleCompilable.java
@@ -57,8 +57,8 @@
 import java.util.Map;
 import java.util.function.Supplier;
 
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.hotspot.HotSpotGraalServices;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.hotspot.HotSpotGraalServices;
 import org.graalvm.jniutils.HSObject;
 import org.graalvm.jniutils.JNI;
 import org.graalvm.jniutils.JNI.JNIEnv;
diff --git a/substratevm/src/com.oracle.svm.graal.hotspot.libgraal/src/com/oracle/svm/graal/hotspot/libgraal/truffle/LibGraalNativeBridgeSupport.java b/substratevm/src/com.oracle.svm.graal.hotspot.libgraal/src/com/oracle/svm/graal/hotspot/libgraal/truffle/LibGraalNativeBridgeSupport.java
index 9240fb8b4d75..d9014bcdf211 100644
--- a/substratevm/src/com.oracle.svm.graal.hotspot.libgraal/src/com/oracle/svm/graal/hotspot/libgraal/truffle/LibGraalNativeBridgeSupport.java
+++ b/substratevm/src/com.oracle.svm.graal.hotspot.libgraal/src/com/oracle/svm/graal/hotspot/libgraal/truffle/LibGraalNativeBridgeSupport.java
@@ -26,8 +26,8 @@
 
 import java.util.concurrent.atomic.AtomicInteger;
 
-import jdk.compiler.graal.debug.TTY;
-import jdk.compiler.graal.serviceprovider.IsolateUtil;
+import jdk.graal.compiler.debug.TTY;
+import jdk.graal.compiler.serviceprovider.IsolateUtil;
 import org.graalvm.jniutils.JNIMethodScope;
 import org.graalvm.jniutils.NativeBridgeSupport;
 
diff --git a/substratevm/src/com.oracle.svm.graal.hotspot.libgraal/src/com/oracle/svm/graal/hotspot/libgraal/truffle/LibGraalTruffleHostEnvironment.java b/substratevm/src/com.oracle.svm.graal.hotspot.libgraal/src/com/oracle/svm/graal/hotspot/libgraal/truffle/LibGraalTruffleHostEnvironment.java
index 7d725e836394..7ecdaf85abbc 100644
--- a/substratevm/src/com.oracle.svm.graal.hotspot.libgraal/src/com/oracle/svm/graal/hotspot/libgraal/truffle/LibGraalTruffleHostEnvironment.java
+++ b/substratevm/src/com.oracle.svm.graal.hotspot.libgraal/src/com/oracle/svm/graal/hotspot/libgraal/truffle/LibGraalTruffleHostEnvironment.java
@@ -24,11 +24,11 @@
  */
 package com.oracle.svm.graal.hotspot.libgraal.truffle;
 
-import jdk.compiler.graal.core.common.util.MethodKey;
-import jdk.compiler.graal.truffle.TruffleCompilerImpl;
-import jdk.compiler.graal.truffle.TruffleElementCache;
-import jdk.compiler.graal.truffle.host.TruffleHostEnvironment;
-import jdk.compiler.graal.truffle.hotspot.HotSpotTruffleCompilerImpl;
+import jdk.graal.compiler.core.common.util.MethodKey;
+import jdk.graal.compiler.truffle.TruffleCompilerImpl;
+import jdk.graal.compiler.truffle.TruffleElementCache;
+import jdk.graal.compiler.truffle.host.TruffleHostEnvironment;
+import jdk.graal.compiler.truffle.hotspot.HotSpotTruffleCompilerImpl;
 
 import com.oracle.truffle.compiler.HostMethodInfo;
 import com.oracle.truffle.compiler.TruffleCompilable;
diff --git a/substratevm/src/com.oracle.svm.graal.hotspot.libgraal/src/com/oracle/svm/graal/hotspot/libgraal/truffle/LibGraalTruffleHostEnvironmentLookup.java b/substratevm/src/com.oracle.svm.graal.hotspot.libgraal/src/com/oracle/svm/graal/hotspot/libgraal/truffle/LibGraalTruffleHostEnvironmentLookup.java
index 1f7cdc8fb36d..788b4e1355e4 100644
--- a/substratevm/src/com.oracle.svm.graal.hotspot.libgraal/src/com/oracle/svm/graal/hotspot/libgraal/truffle/LibGraalTruffleHostEnvironmentLookup.java
+++ b/substratevm/src/com.oracle.svm.graal.hotspot.libgraal/src/com/oracle/svm/graal/hotspot/libgraal/truffle/LibGraalTruffleHostEnvironmentLookup.java
@@ -24,9 +24,9 @@
  */
 package com.oracle.svm.graal.hotspot.libgraal.truffle;
 
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.serviceprovider.GlobalAtomicLong;
-import jdk.compiler.graal.truffle.host.TruffleHostEnvironment;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.serviceprovider.GlobalAtomicLong;
+import jdk.graal.compiler.truffle.host.TruffleHostEnvironment;
 import org.graalvm.jniutils.JNI.JClass;
 import org.graalvm.jniutils.JNI.JNIEnv;
 import org.graalvm.jniutils.JNI.JObject;
diff --git a/substratevm/src/com.oracle.svm.graal.hotspot.libgraal/src/com/oracle/svm/graal/hotspot/libgraal/truffle/TruffleLibGraalFeature.java b/substratevm/src/com.oracle.svm.graal.hotspot.libgraal/src/com/oracle/svm/graal/hotspot/libgraal/truffle/TruffleLibGraalFeature.java
index 14cfb16ed4ca..cbbc8d2805d9 100644
--- a/substratevm/src/com.oracle.svm.graal.hotspot.libgraal/src/com/oracle/svm/graal/hotspot/libgraal/truffle/TruffleLibGraalFeature.java
+++ b/substratevm/src/com.oracle.svm.graal.hotspot.libgraal/src/com/oracle/svm/graal/hotspot/libgraal/truffle/TruffleLibGraalFeature.java
@@ -24,7 +24,7 @@
  */
 package com.oracle.svm.graal.hotspot.libgraal.truffle;
 
-import jdk.compiler.graal.truffle.host.TruffleHostEnvironment;
+import jdk.graal.compiler.truffle.host.TruffleHostEnvironment;
 import org.graalvm.jniutils.NativeBridgeSupport;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.hosted.Feature;
diff --git a/substratevm/src/com.oracle.svm.graal.hotspot.libgraal/src/com/oracle/svm/graal/hotspot/libgraal/truffle/TruffleLibGraalShutdownHook.java b/substratevm/src/com.oracle.svm.graal.hotspot.libgraal/src/com/oracle/svm/graal/hotspot/libgraal/truffle/TruffleLibGraalShutdownHook.java
index 7248ff0d9354..e51f868916cc 100644
--- a/substratevm/src/com.oracle.svm.graal.hotspot.libgraal/src/com/oracle/svm/graal/hotspot/libgraal/truffle/TruffleLibGraalShutdownHook.java
+++ b/substratevm/src/com.oracle.svm.graal.hotspot.libgraal/src/com/oracle/svm/graal/hotspot/libgraal/truffle/TruffleLibGraalShutdownHook.java
@@ -24,8 +24,8 @@
  */
 package com.oracle.svm.graal.hotspot.libgraal.truffle;
 
-import jdk.compiler.graal.serviceprovider.IsolateUtil;
-import jdk.compiler.graal.serviceprovider.ServiceProvider;
+import jdk.graal.compiler.serviceprovider.IsolateUtil;
+import jdk.graal.compiler.serviceprovider.ServiceProvider;
 import org.graalvm.jniutils.JNI.JClass;
 import org.graalvm.jniutils.JNI.JNIEnv;
 import org.graalvm.jniutils.JNI.JavaVM;
diff --git a/substratevm/src/com.oracle.svm.graal.hotspot.libgraal/src/com/oracle/svm/graal/hotspot/libgraal/truffle/TruffleToLibGraalEntryPoints.java b/substratevm/src/com.oracle.svm.graal.hotspot.libgraal/src/com/oracle/svm/graal/hotspot/libgraal/truffle/TruffleToLibGraalEntryPoints.java
index 2b669c1d7aa3..095a87f1765e 100644
--- a/substratevm/src/com.oracle.svm.graal.hotspot.libgraal/src/com/oracle/svm/graal/hotspot/libgraal/truffle/TruffleToLibGraalEntryPoints.java
+++ b/substratevm/src/com.oracle.svm.graal.hotspot.libgraal/src/com/oracle/svm/graal/hotspot/libgraal/truffle/TruffleToLibGraalEntryPoints.java
@@ -50,12 +50,12 @@
 
 import java.util.function.Supplier;
 
-import jdk.compiler.graal.hotspot.CompilationContext;
-import jdk.compiler.graal.hotspot.HotSpotGraalServices;
-import jdk.compiler.graal.serviceprovider.IsolateUtil;
-import jdk.compiler.graal.truffle.TruffleCompilerOptions;
-import jdk.compiler.graal.truffle.hotspot.HotSpotTruffleCompilationSupport;
-import jdk.compiler.graal.truffle.hotspot.HotSpotTruffleCompilerImpl;
+import jdk.graal.compiler.hotspot.CompilationContext;
+import jdk.graal.compiler.hotspot.HotSpotGraalServices;
+import jdk.graal.compiler.serviceprovider.IsolateUtil;
+import jdk.graal.compiler.truffle.TruffleCompilerOptions;
+import jdk.graal.compiler.truffle.hotspot.HotSpotTruffleCompilationSupport;
+import jdk.graal.compiler.truffle.hotspot.HotSpotTruffleCompilerImpl;
 import org.graalvm.jniutils.JNI.JByteArray;
 import org.graalvm.jniutils.JNI.JClass;
 import org.graalvm.jniutils.JNI.JNIEnv;
diff --git a/substratevm/src/com.oracle.svm.graal.test/src/com/oracle/svm/graal/test/IsolatedSpeculationLogEncodingNativeTest.java b/substratevm/src/com.oracle.svm.graal.test/src/com/oracle/svm/graal/test/IsolatedSpeculationLogEncodingNativeTest.java
index fa24b404cd3e..edca6ad03e69 100644
--- a/substratevm/src/com.oracle.svm.graal.test/src/com/oracle/svm/graal/test/IsolatedSpeculationLogEncodingNativeTest.java
+++ b/substratevm/src/com.oracle.svm.graal.test/src/com/oracle/svm/graal/test/IsolatedSpeculationLogEncodingNativeTest.java
@@ -29,8 +29,8 @@
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 
-import jdk.compiler.graal.serviceprovider.GraalServices;
-import jdk.compiler.graal.serviceprovider.UnencodedSpeculationReason;
+import jdk.graal.compiler.serviceprovider.GraalServices;
+import jdk.graal.compiler.serviceprovider.UnencodedSpeculationReason;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/GraalSupport.java b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/GraalSupport.java
index c957baa7d75b..51fdbcb121fd 100644
--- a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/GraalSupport.java
+++ b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/GraalSupport.java
@@ -37,32 +37,32 @@
 import java.util.function.Function;
 
 import org.graalvm.collections.EconomicMap;
-import jdk.compiler.graal.core.CompilationWrapper.ExceptionAction;
-import jdk.compiler.graal.core.common.CompilationIdentifier;
-import jdk.compiler.graal.core.gen.NodeMatchRules;
-import jdk.compiler.graal.core.match.MatchStatement;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.debug.DebugContext.Builder;
-import jdk.compiler.graal.debug.DebugContext.Description;
-import jdk.compiler.graal.debug.DebugHandlersFactory;
-import jdk.compiler.graal.debug.DiagnosticsOutputDirectory;
-import jdk.compiler.graal.debug.GlobalMetrics;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.lir.CompositeValueClass;
-import jdk.compiler.graal.lir.LIRInstructionClass;
-import jdk.compiler.graal.lir.phases.LIRPhase;
-import jdk.compiler.graal.lir.phases.LIRSuites;
-import jdk.compiler.graal.nodes.EncodedGraph;
-import jdk.compiler.graal.nodes.GraphDecoder;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.BasePhase;
-import jdk.compiler.graal.phases.FloatingGuardPhase;
-import jdk.compiler.graal.phases.Speculative;
-import jdk.compiler.graal.phases.tiers.Suites;
-import jdk.compiler.graal.phases.util.Providers;
-import jdk.compiler.graal.serviceprovider.GraalServices;
+import jdk.graal.compiler.core.CompilationWrapper.ExceptionAction;
+import jdk.graal.compiler.core.common.CompilationIdentifier;
+import jdk.graal.compiler.core.gen.NodeMatchRules;
+import jdk.graal.compiler.core.match.MatchStatement;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.debug.DebugContext.Builder;
+import jdk.graal.compiler.debug.DebugContext.Description;
+import jdk.graal.compiler.debug.DebugHandlersFactory;
+import jdk.graal.compiler.debug.DiagnosticsOutputDirectory;
+import jdk.graal.compiler.debug.GlobalMetrics;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.lir.CompositeValueClass;
+import jdk.graal.compiler.lir.LIRInstructionClass;
+import jdk.graal.compiler.lir.phases.LIRPhase;
+import jdk.graal.compiler.lir.phases.LIRSuites;
+import jdk.graal.compiler.nodes.EncodedGraph;
+import jdk.graal.compiler.nodes.GraphDecoder;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.BasePhase;
+import jdk.graal.compiler.phases.FloatingGuardPhase;
+import jdk.graal.compiler.phases.Speculative;
+import jdk.graal.compiler.phases.tiers.Suites;
+import jdk.graal.compiler.phases.util.Providers;
+import jdk.graal.compiler.serviceprovider.GraalServices;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
diff --git a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/RuntimeCPUFeatureRegion.java b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/RuntimeCPUFeatureRegion.java
index c6446ca6a1c1..2f89ea825d65 100644
--- a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/RuntimeCPUFeatureRegion.java
+++ b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/RuntimeCPUFeatureRegion.java
@@ -24,29 +24,29 @@
  */
 package com.oracle.svm.graal;
 
-import static jdk.compiler.graal.graph.Node.ConstantNodeParameter;
+import static jdk.graal.compiler.graph.Node.ConstantNodeParameter;
 
 import java.util.Arrays;
 import java.util.EnumSet;
 
-import jdk.compiler.graal.api.replacements.SnippetReflectionProvider;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.lir.gen.LIRGenerator;
-import jdk.compiler.graal.nodeinfo.NodeCycles;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodeinfo.NodeSize;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins;
-import jdk.compiler.graal.nodes.spi.LIRLowerable;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
-import jdk.compiler.graal.phases.util.Providers;
+import jdk.graal.compiler.api.replacements.SnippetReflectionProvider;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.lir.gen.LIRGenerator;
+import jdk.graal.compiler.nodeinfo.NodeCycles;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodeinfo.NodeSize;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins;
+import jdk.graal.compiler.nodes.spi.LIRLowerable;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.phases.util.Providers;
 
 import com.oracle.svm.core.ParsingReason;
 import com.oracle.svm.core.config.ConfigurationValues;
diff --git a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/SubstrateGraalRuntime.java b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/SubstrateGraalRuntime.java
index 2e91b1a60344..fab37efba3a4 100644
--- a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/SubstrateGraalRuntime.java
+++ b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/SubstrateGraalRuntime.java
@@ -24,10 +24,10 @@
  */
 package com.oracle.svm.graal;
 
-import jdk.compiler.graal.api.replacements.SnippetReflectionProvider;
-import jdk.compiler.graal.api.runtime.GraalRuntime;
-import jdk.compiler.graal.core.target.Backend;
-import jdk.compiler.graal.runtime.RuntimeProvider;
+import jdk.graal.compiler.api.replacements.SnippetReflectionProvider;
+import jdk.graal.compiler.api.runtime.GraalRuntime;
+import jdk.graal.compiler.core.target.Backend;
+import jdk.graal.compiler.runtime.RuntimeProvider;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
 
diff --git a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/SubstrateGraalUtils.java b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/SubstrateGraalUtils.java
index 9dcc9c7114fd..00c9a90d9042 100644
--- a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/SubstrateGraalUtils.java
+++ b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/SubstrateGraalUtils.java
@@ -31,23 +31,23 @@
 import java.util.EnumMap;
 import java.util.Map;
 
-import jdk.compiler.graal.code.CompilationResult;
-import jdk.compiler.graal.core.CompilationWatchDog;
-import jdk.compiler.graal.core.CompilationWrapper;
-import jdk.compiler.graal.core.CompilationWrapper.ExceptionAction;
-import jdk.compiler.graal.core.GraalCompiler;
-import jdk.compiler.graal.core.common.CompilationIdentifier;
-import jdk.compiler.graal.core.target.Backend;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.debug.Indent;
-import jdk.compiler.graal.debug.TTY;
-import jdk.compiler.graal.lir.asm.CompilationResultBuilderFactory;
-import jdk.compiler.graal.lir.phases.LIRSuites;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.options.Option;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.OptimisticOptimizations;
-import jdk.compiler.graal.phases.tiers.Suites;
+import jdk.graal.compiler.code.CompilationResult;
+import jdk.graal.compiler.core.CompilationWatchDog;
+import jdk.graal.compiler.core.CompilationWrapper;
+import jdk.graal.compiler.core.CompilationWrapper.ExceptionAction;
+import jdk.graal.compiler.core.GraalCompiler;
+import jdk.graal.compiler.core.common.CompilationIdentifier;
+import jdk.graal.compiler.core.target.Backend;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.debug.Indent;
+import jdk.graal.compiler.debug.TTY;
+import jdk.graal.compiler.lir.asm.CompilationResultBuilderFactory;
+import jdk.graal.compiler.lir.phases.LIRSuites;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.options.Option;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.OptimisticOptimizations;
+import jdk.graal.compiler.phases.tiers.Suites;
 import org.graalvm.nativeimage.ImageSingletons;
 
 import com.oracle.svm.core.CPUFeatureAccess;
diff --git a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/aarch64/AArch64CPUFeatureRegionOp.java b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/aarch64/AArch64CPUFeatureRegionOp.java
index 6d1579546a76..2bdc105b6fe4 100644
--- a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/aarch64/AArch64CPUFeatureRegionOp.java
+++ b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/aarch64/AArch64CPUFeatureRegionOp.java
@@ -26,10 +26,10 @@
 
 import java.util.EnumSet;
 
-import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler;
-import jdk.compiler.graal.lir.LIRInstructionClass;
-import jdk.compiler.graal.lir.aarch64.AArch64LIRInstruction;
-import jdk.compiler.graal.lir.asm.CompilationResultBuilder;
+import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler;
+import jdk.graal.compiler.lir.LIRInstructionClass;
+import jdk.graal.compiler.lir.aarch64.AArch64LIRInstruction;
+import jdk.graal.compiler.lir.asm.CompilationResultBuilder;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
 
diff --git a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/amd64/AMD64CPUFeatureRegionOp.java b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/amd64/AMD64CPUFeatureRegionOp.java
index b45718bdc7fe..3b2dda618a20 100644
--- a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/amd64/AMD64CPUFeatureRegionOp.java
+++ b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/amd64/AMD64CPUFeatureRegionOp.java
@@ -26,10 +26,10 @@
 
 import java.util.EnumSet;
 
-import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler;
-import jdk.compiler.graal.lir.LIRInstructionClass;
-import jdk.compiler.graal.lir.amd64.AMD64LIRInstruction;
-import jdk.compiler.graal.lir.asm.CompilationResultBuilder;
+import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler;
+import jdk.graal.compiler.lir.LIRInstructionClass;
+import jdk.graal.compiler.lir.amd64.AMD64LIRInstruction;
+import jdk.graal.compiler.lir.asm.CompilationResultBuilder;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
 
diff --git a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/hosted/DeoptimizationFeature.java b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/hosted/DeoptimizationFeature.java
index 8b5c6b701140..b32e68717eaf 100644
--- a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/hosted/DeoptimizationFeature.java
+++ b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/hosted/DeoptimizationFeature.java
@@ -28,9 +28,9 @@
 import java.util.List;
 import java.util.Map;
 
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.util.Providers;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.util.Providers;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platforms;
 import org.graalvm.nativeimage.hosted.Feature;
diff --git a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/hosted/FieldsOffsetsFeature.java b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/hosted/FieldsOffsetsFeature.java
index a4e1a9447145..156a9d916cb0 100644
--- a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/hosted/FieldsOffsetsFeature.java
+++ b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/hosted/FieldsOffsetsFeature.java
@@ -31,15 +31,15 @@
 import java.util.function.Function;
 
 import org.graalvm.collections.EconomicMap;
-import jdk.compiler.graal.core.common.FieldIntrospection;
-import jdk.compiler.graal.core.common.Fields;
-import jdk.compiler.graal.graph.Edges;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.lir.CompositeValue;
-import jdk.compiler.graal.lir.CompositeValueClass;
-import jdk.compiler.graal.lir.LIRInstruction;
-import jdk.compiler.graal.lir.LIRInstructionClass;
+import jdk.graal.compiler.core.common.FieldIntrospection;
+import jdk.graal.compiler.core.common.Fields;
+import jdk.graal.compiler.graph.Edges;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.lir.CompositeValue;
+import jdk.graal.compiler.lir.CompositeValueClass;
+import jdk.graal.compiler.lir.LIRInstruction;
+import jdk.graal.compiler.lir.LIRInstructionClass;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.hosted.Feature;
 
diff --git a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/hosted/GraalGraphObjectReplacer.java b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/hosted/GraalGraphObjectReplacer.java
index d01b4cf1b873..662fbc7b8590 100644
--- a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/hosted/GraalGraphObjectReplacer.java
+++ b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/hosted/GraalGraphObjectReplacer.java
@@ -29,18 +29,18 @@
 import java.util.concurrent.ConcurrentMap;
 import java.util.function.Function;
 
-import jdk.compiler.graal.api.replacements.SnippetReflectionProvider;
-import jdk.compiler.graal.api.runtime.GraalRuntime;
-import jdk.compiler.graal.core.common.spi.ForeignCallsProvider;
-import jdk.compiler.graal.debug.MetricKey;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.hotspot.GraalHotSpotVMConfig;
-import jdk.compiler.graal.hotspot.HotSpotBackendFactory;
-import jdk.compiler.graal.hotspot.SnippetResolvedJavaMethod;
-import jdk.compiler.graal.hotspot.SnippetResolvedJavaType;
-import jdk.compiler.graal.nodes.FieldLocationIdentity;
-import jdk.compiler.graal.options.Option;
-import jdk.compiler.graal.phases.util.Providers;
+import jdk.graal.compiler.api.replacements.SnippetReflectionProvider;
+import jdk.graal.compiler.api.runtime.GraalRuntime;
+import jdk.graal.compiler.core.common.spi.ForeignCallsProvider;
+import jdk.graal.compiler.debug.MetricKey;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.hotspot.GraalHotSpotVMConfig;
+import jdk.graal.compiler.hotspot.HotSpotBackendFactory;
+import jdk.graal.compiler.hotspot.SnippetResolvedJavaMethod;
+import jdk.graal.compiler.hotspot.SnippetResolvedJavaType;
+import jdk.graal.compiler.nodes.FieldLocationIdentity;
+import jdk.graal.compiler.options.Option;
+import jdk.graal.compiler.phases.util.Providers;
 import org.graalvm.nativeimage.c.function.RelocatedPointer;
 import org.graalvm.nativeimage.hosted.Feature.BeforeHeapLayoutAccess;
 
diff --git a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/hosted/LegacyRuntimeCompilationFeature.java b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/hosted/LegacyRuntimeCompilationFeature.java
index 64ec144820da..c4f7f0826ea2 100644
--- a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/hosted/LegacyRuntimeCompilationFeature.java
+++ b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/hosted/LegacyRuntimeCompilationFeature.java
@@ -39,32 +39,32 @@
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
-import jdk.compiler.graal.api.replacements.Fold;
-import jdk.compiler.graal.core.common.spi.ConstantFieldProvider;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.java.BytecodeParser;
-import jdk.compiler.graal.java.GraphBuilderPhase;
-import jdk.compiler.graal.loop.phases.ConvertDeoptimizeToGuardPhase;
-import jdk.compiler.graal.nodes.CallTargetNode;
-import jdk.compiler.graal.nodes.FixedGuardNode;
-import jdk.compiler.graal.nodes.FrameState;
-import jdk.compiler.graal.nodes.GraphEncoder;
-import jdk.compiler.graal.nodes.Invoke;
-import jdk.compiler.graal.nodes.LogicConstantNode;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration;
-import jdk.compiler.graal.nodes.graphbuilderconf.IntrinsicContext;
-import jdk.compiler.graal.nodes.java.MethodCallTargetNode;
-import jdk.compiler.graal.phases.OptimisticOptimizations;
-import jdk.compiler.graal.phases.common.CanonicalizerPhase;
-import jdk.compiler.graal.phases.common.IterativeConditionalEliminationPhase;
-import jdk.compiler.graal.phases.common.inlining.InliningUtil;
-import jdk.compiler.graal.phases.util.Providers;
-import jdk.compiler.graal.truffle.phases.DeoptimizeOnExceptionPhase;
-import jdk.compiler.graal.word.WordTypes;
+import jdk.graal.compiler.api.replacements.Fold;
+import jdk.graal.compiler.core.common.spi.ConstantFieldProvider;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.java.BytecodeParser;
+import jdk.graal.compiler.java.GraphBuilderPhase;
+import jdk.graal.compiler.loop.phases.ConvertDeoptimizeToGuardPhase;
+import jdk.graal.compiler.nodes.CallTargetNode;
+import jdk.graal.compiler.nodes.FixedGuardNode;
+import jdk.graal.compiler.nodes.FrameState;
+import jdk.graal.compiler.nodes.GraphEncoder;
+import jdk.graal.compiler.nodes.Invoke;
+import jdk.graal.compiler.nodes.LogicConstantNode;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
+import jdk.graal.compiler.nodes.graphbuilderconf.IntrinsicContext;
+import jdk.graal.compiler.nodes.java.MethodCallTargetNode;
+import jdk.graal.compiler.phases.OptimisticOptimizations;
+import jdk.graal.compiler.phases.common.CanonicalizerPhase;
+import jdk.graal.compiler.phases.common.IterativeConditionalEliminationPhase;
+import jdk.graal.compiler.phases.common.inlining.InliningUtil;
+import jdk.graal.compiler.phases.util.Providers;
+import jdk.graal.compiler.truffle.phases.DeoptimizeOnExceptionPhase;
+import jdk.graal.compiler.word.WordTypes;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.hosted.Feature;
 
diff --git a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/hosted/ParseOnceDeoptTestFeature.java b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/hosted/ParseOnceDeoptTestFeature.java
index 3a51e48b4810..14329990aca0 100644
--- a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/hosted/ParseOnceDeoptTestFeature.java
+++ b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/hosted/ParseOnceDeoptTestFeature.java
@@ -32,9 +32,9 @@
 import java.util.function.Function;
 import java.util.function.Supplier;
 
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.hosted.Feature;
 
diff --git a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/hosted/ParseOnceRuntimeCompilationFeature.java b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/hosted/ParseOnceRuntimeCompilationFeature.java
index 94b4696c6fce..5409eb73a922 100644
--- a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/hosted/ParseOnceRuntimeCompilationFeature.java
+++ b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/hosted/ParseOnceRuntimeCompilationFeature.java
@@ -28,7 +28,7 @@
 import static com.oracle.svm.common.meta.MultiMethod.ORIGINAL_METHOD;
 import static com.oracle.svm.hosted.code.SubstrateCompilationDirectives.RUNTIME_COMPILED_METHOD;
 import static com.oracle.svm.hosted.phases.InlineBeforeAnalysisPolicyUtils.Options.InlineBeforeAnalysisAllowedDepth;
-import static jdk.compiler.graal.java.BytecodeParserOptions.InlineDuringParsingMaxDepth;
+import static jdk.graal.compiler.java.BytecodeParserOptions.InlineDuringParsingMaxDepth;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -101,42 +101,42 @@
 import com.oracle.svm.hosted.phases.InlineBeforeAnalysisPolicyUtils.AlwaysInlineScope;
 import com.oracle.svm.hosted.phases.StrengthenStampsPhase;
 
-import jdk.compiler.graal.core.common.PermanentBailoutException;
-import jdk.compiler.graal.core.common.spi.ConstantFieldProvider;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.debug.DebugHandlersFactory;
-import jdk.compiler.graal.debug.Indent;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.graph.NodeSourcePosition;
-import jdk.compiler.graal.java.BytecodeParser;
-import jdk.compiler.graal.java.GraphBuilderPhase;
-import jdk.compiler.graal.loop.phases.ConvertDeoptimizeToGuardPhase;
-import jdk.compiler.graal.nodes.CallTargetNode;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.FrameState;
-import jdk.compiler.graal.nodes.GraphEncoder;
-import jdk.compiler.graal.nodes.StateSplit;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext;
-import jdk.compiler.graal.nodes.graphbuilderconf.InlineInvokePlugin;
-import jdk.compiler.graal.nodes.graphbuilderconf.IntrinsicContext;
-import jdk.compiler.graal.nodes.graphbuilderconf.NodePlugin;
-import jdk.compiler.graal.nodes.java.ExceptionObjectNode;
-import jdk.compiler.graal.options.Option;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.OptimisticOptimizations;
-import jdk.compiler.graal.phases.Phase;
-import jdk.compiler.graal.phases.PhaseSuite;
-import jdk.compiler.graal.phases.common.CanonicalizerPhase;
-import jdk.compiler.graal.phases.common.DominatorBasedGlobalValueNumberingPhase;
-import jdk.compiler.graal.phases.common.IterativeConditionalEliminationPhase;
-import jdk.compiler.graal.phases.tiers.HighTierContext;
-import jdk.compiler.graal.phases.util.Providers;
-import jdk.compiler.graal.printer.GraalDebugHandlersFactory;
-import jdk.compiler.graal.truffle.phases.DeoptimizeOnExceptionPhase;
-import jdk.compiler.graal.word.WordTypes;
+import jdk.graal.compiler.core.common.PermanentBailoutException;
+import jdk.graal.compiler.core.common.spi.ConstantFieldProvider;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.debug.DebugHandlersFactory;
+import jdk.graal.compiler.debug.Indent;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.graph.NodeSourcePosition;
+import jdk.graal.compiler.java.BytecodeParser;
+import jdk.graal.compiler.java.GraphBuilderPhase;
+import jdk.graal.compiler.loop.phases.ConvertDeoptimizeToGuardPhase;
+import jdk.graal.compiler.nodes.CallTargetNode;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.FrameState;
+import jdk.graal.compiler.nodes.GraphEncoder;
+import jdk.graal.compiler.nodes.StateSplit;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext;
+import jdk.graal.compiler.nodes.graphbuilderconf.InlineInvokePlugin;
+import jdk.graal.compiler.nodes.graphbuilderconf.IntrinsicContext;
+import jdk.graal.compiler.nodes.graphbuilderconf.NodePlugin;
+import jdk.graal.compiler.nodes.java.ExceptionObjectNode;
+import jdk.graal.compiler.options.Option;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.OptimisticOptimizations;
+import jdk.graal.compiler.phases.Phase;
+import jdk.graal.compiler.phases.PhaseSuite;
+import jdk.graal.compiler.phases.common.CanonicalizerPhase;
+import jdk.graal.compiler.phases.common.DominatorBasedGlobalValueNumberingPhase;
+import jdk.graal.compiler.phases.common.IterativeConditionalEliminationPhase;
+import jdk.graal.compiler.phases.tiers.HighTierContext;
+import jdk.graal.compiler.phases.util.Providers;
+import jdk.graal.compiler.printer.GraalDebugHandlersFactory;
+import jdk.graal.compiler.truffle.phases.DeoptimizeOnExceptionPhase;
+import jdk.graal.compiler.word.WordTypes;
 import jdk.vm.ci.code.BytecodeFrame;
 import jdk.vm.ci.code.BytecodePosition;
 import jdk.vm.ci.meta.JavaConstant;
diff --git a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/hosted/RuntimeCompilationFeature.java b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/hosted/RuntimeCompilationFeature.java
index 94e99a4cac82..1453aad39e1b 100644
--- a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/hosted/RuntimeCompilationFeature.java
+++ b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/hosted/RuntimeCompilationFeature.java
@@ -40,26 +40,26 @@
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
-import jdk.compiler.graal.api.runtime.GraalRuntime;
-import jdk.compiler.graal.core.common.spi.ConstantFieldProvider;
-import jdk.compiler.graal.core.common.spi.MetaAccessExtensionProvider;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.lir.phases.LIRSuites;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.GraphEncoder;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.extended.BytecodeExceptionNode;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration.BytecodeExceptionMode;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext;
-import jdk.compiler.graal.options.Option;
-import jdk.compiler.graal.options.OptionStability;
-import jdk.compiler.graal.phases.OptimisticOptimizations;
-import jdk.compiler.graal.phases.tiers.Suites;
-import jdk.compiler.graal.phases.util.Providers;
-import jdk.compiler.graal.word.WordTypes;
+import jdk.graal.compiler.api.runtime.GraalRuntime;
+import jdk.graal.compiler.core.common.spi.ConstantFieldProvider;
+import jdk.graal.compiler.core.common.spi.MetaAccessExtensionProvider;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.lir.phases.LIRSuites;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.GraphEncoder;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.extended.BytecodeExceptionNode;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.BytecodeExceptionMode;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext;
+import jdk.graal.compiler.options.Option;
+import jdk.graal.compiler.options.OptionStability;
+import jdk.graal.compiler.phases.OptimisticOptimizations;
+import jdk.graal.compiler.phases.tiers.Suites;
+import jdk.graal.compiler.phases.util.Providers;
+import jdk.graal.compiler.word.WordTypes;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.hosted.Feature;
 import org.graalvm.nativeimage.hosted.Feature.AfterCompilationAccess;
diff --git a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/hosted/SubstrateGraalCompilerSetup.java b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/hosted/SubstrateGraalCompilerSetup.java
index a9e97d7504f2..0112dfe25e31 100644
--- a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/hosted/SubstrateGraalCompilerSetup.java
+++ b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/hosted/SubstrateGraalCompilerSetup.java
@@ -26,9 +26,9 @@
 
 import java.util.function.Function;
 
-import jdk.compiler.graal.nodes.spi.LoopsDataProvider;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.util.Providers;
+import jdk.graal.compiler.nodes.spi.LoopsDataProvider;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.util.Providers;
 
 import com.oracle.graal.pointsto.infrastructure.UniverseMetaAccess;
 import com.oracle.graal.pointsto.meta.AnalysisMetaAccess;
diff --git a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/hosted/SubstrateProviders.java b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/hosted/SubstrateProviders.java
index b4fc73dccb66..eaedef987713 100644
--- a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/hosted/SubstrateProviders.java
+++ b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/hosted/SubstrateProviders.java
@@ -24,9 +24,9 @@
  */
 package com.oracle.svm.graal.hosted;
 
-import jdk.compiler.graal.api.replacements.SnippetReflectionProvider;
-import jdk.compiler.graal.core.common.spi.ConstantFieldProvider;
-import jdk.compiler.graal.core.common.spi.ForeignCallsProvider;
+import jdk.graal.compiler.api.replacements.SnippetReflectionProvider;
+import jdk.graal.compiler.core.common.spi.ConstantFieldProvider;
+import jdk.graal.compiler.core.common.spi.ForeignCallsProvider;
 
 import com.oracle.graal.pointsto.meta.AnalysisMetaAccess;
 import com.oracle.svm.graal.GraalSupport;
diff --git a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/CodeInstallInfo.java b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/CodeInstallInfo.java
index 8b7f779c0b90..ca0bd963d50c 100644
--- a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/CodeInstallInfo.java
+++ b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/CodeInstallInfo.java
@@ -24,7 +24,7 @@
  */
 package com.oracle.svm.graal.isolated;
 
-import jdk.compiler.graal.core.common.CompilationIdentifier;
+import jdk.graal.compiler.core.common.CompilationIdentifier;
 import org.graalvm.nativeimage.c.struct.RawField;
 import org.graalvm.nativeimage.c.struct.RawStructure;
 import org.graalvm.word.PointerBase;
diff --git a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/DisableSnippetCountersFeature.java b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/DisableSnippetCountersFeature.java
index 0faa2a46d9dc..895e25e96c48 100644
--- a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/DisableSnippetCountersFeature.java
+++ b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/DisableSnippetCountersFeature.java
@@ -30,17 +30,17 @@
 import com.oracle.svm.core.feature.InternalFeature;
 import com.oracle.svm.core.option.HostedOptionValues;
 
-import jdk.compiler.graal.api.replacements.SnippetReflectionProvider;
-import jdk.compiler.graal.core.common.GraalOptions;
-import jdk.compiler.graal.hotspot.SymbolicSnippetEncoder;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext;
-import jdk.compiler.graal.nodes.graphbuilderconf.NodePlugin;
-import jdk.compiler.graal.phases.util.Providers;
-import jdk.compiler.graal.replacements.SnippetCounter;
-import jdk.compiler.graal.replacements.SnippetIntegerHistogram;
+import jdk.graal.compiler.api.replacements.SnippetReflectionProvider;
+import jdk.graal.compiler.core.common.GraalOptions;
+import jdk.graal.compiler.hotspot.SymbolicSnippetEncoder;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext;
+import jdk.graal.compiler.nodes.graphbuilderconf.NodePlugin;
+import jdk.graal.compiler.phases.util.Providers;
+import jdk.graal.compiler.replacements.SnippetCounter;
+import jdk.graal.compiler.replacements.SnippetIntegerHistogram;
 import jdk.vm.ci.meta.JavaConstant;
 import jdk.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.ResolvedJavaField;
diff --git a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/ImageHeapObjects.java b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/ImageHeapObjects.java
index eef4738d4d62..3bf3cdac064a 100644
--- a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/ImageHeapObjects.java
+++ b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/ImageHeapObjects.java
@@ -24,7 +24,7 @@
  */
 package com.oracle.svm.graal.isolated;
 
-import jdk.compiler.graal.word.Word;
+import jdk.graal.compiler.word.Word;
 import org.graalvm.word.Pointer;
 import org.graalvm.word.WordFactory;
 
diff --git a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/IsolateAwareCodeCacheProvider.java b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/IsolateAwareCodeCacheProvider.java
index 7ea21ded7999..4e7d3bace565 100644
--- a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/IsolateAwareCodeCacheProvider.java
+++ b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/IsolateAwareCodeCacheProvider.java
@@ -24,7 +24,7 @@
  */
 package com.oracle.svm.graal.isolated;
 
-import jdk.compiler.graal.code.CompilationResult;
+import jdk.graal.compiler.code.CompilationResult;
 
 import com.oracle.svm.core.SubstrateOptions;
 import com.oracle.svm.core.deopt.SubstrateInstalledCode;
diff --git a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/IsolateAwareConstantReflectionProvider.java b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/IsolateAwareConstantReflectionProvider.java
index e117b665887c..691a3347890c 100644
--- a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/IsolateAwareConstantReflectionProvider.java
+++ b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/IsolateAwareConstantReflectionProvider.java
@@ -26,7 +26,7 @@
 
 import java.lang.reflect.Array;
 
-import jdk.compiler.graal.core.common.CompressEncoding;
+import jdk.graal.compiler.core.common.CompressEncoding;
 import org.graalvm.nativeimage.StackValue;
 import org.graalvm.nativeimage.c.function.CEntryPoint;
 import org.graalvm.word.WordFactory;
diff --git a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/IsolateAwareProviders.java b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/IsolateAwareProviders.java
index 299cf888de78..fd339043ee33 100644
--- a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/IsolateAwareProviders.java
+++ b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/IsolateAwareProviders.java
@@ -24,7 +24,7 @@
  */
 package com.oracle.svm.graal.isolated;
 
-import jdk.compiler.graal.api.replacements.SnippetReflectionProvider;
+import jdk.graal.compiler.api.replacements.SnippetReflectionProvider;
 
 import com.oracle.graal.pointsto.meta.AnalysisMetaAccess;
 import com.oracle.svm.graal.hosted.SubstrateProviders;
diff --git a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/IsolateAwareSnippetReflectionProvider.java b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/IsolateAwareSnippetReflectionProvider.java
index 8b5f2da9eb44..946ffa2058d8 100644
--- a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/IsolateAwareSnippetReflectionProvider.java
+++ b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/IsolateAwareSnippetReflectionProvider.java
@@ -27,7 +27,7 @@
 import java.lang.reflect.Executable;
 import java.lang.reflect.Field;
 
-import jdk.compiler.graal.api.replacements.SnippetReflectionProvider;
+import jdk.graal.compiler.api.replacements.SnippetReflectionProvider;
 
 import com.oracle.svm.core.SubstrateOptions;
 import com.oracle.svm.core.meta.SubstrateObjectConstant;
diff --git a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/IsolatedGraalUtils.java b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/IsolatedGraalUtils.java
index cccfd6a9e733..7f02effc7faa 100644
--- a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/IsolatedGraalUtils.java
+++ b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/IsolatedGraalUtils.java
@@ -29,13 +29,13 @@
 
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.UnmodifiableMapCursor;
-import jdk.compiler.graal.code.CompilationResult;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.debug.DebugContext.Builder;
-import jdk.compiler.graal.debug.DebugOptions;
-import jdk.compiler.graal.options.OptionKey;
-import jdk.compiler.graal.options.OptionsParser;
-import jdk.compiler.graal.printer.GraalDebugHandlersFactory;
+import jdk.graal.compiler.code.CompilationResult;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.debug.DebugContext.Builder;
+import jdk.graal.compiler.debug.DebugOptions;
+import jdk.graal.compiler.options.OptionKey;
+import jdk.graal.compiler.options.OptionsParser;
+import jdk.graal.compiler.printer.GraalDebugHandlersFactory;
 import org.graalvm.nativeimage.CurrentIsolate;
 import org.graalvm.nativeimage.Isolates;
 import org.graalvm.nativeimage.Isolates.CreateIsolateParameters;
diff --git a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/IsolatedRuntimeCodeInstaller.java b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/IsolatedRuntimeCodeInstaller.java
index dccc3207645a..9e1bb36ba2f5 100644
--- a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/IsolatedRuntimeCodeInstaller.java
+++ b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/IsolatedRuntimeCodeInstaller.java
@@ -24,8 +24,8 @@
  */
 package com.oracle.svm.graal.isolated;
 
-import jdk.compiler.graal.code.CompilationResult;
-import jdk.compiler.graal.core.common.CompilationIdentifier;
+import jdk.graal.compiler.code.CompilationResult;
+import jdk.graal.compiler.core.common.CompilationIdentifier;
 import org.graalvm.nativeimage.IsolateThread;
 import org.graalvm.nativeimage.UnmanagedMemory;
 import org.graalvm.nativeimage.c.function.CEntryPoint;
diff --git a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/IsolatedSpeculationLog.java b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/IsolatedSpeculationLog.java
index 880d253de745..26bb8a26e424 100644
--- a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/IsolatedSpeculationLog.java
+++ b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/IsolatedSpeculationLog.java
@@ -27,7 +27,7 @@
 import java.lang.reflect.Field;
 import java.nio.ByteBuffer;
 
-import jdk.compiler.graal.serviceprovider.UnencodedSpeculationReason;
+import jdk.graal.compiler.serviceprovider.UnencodedSpeculationReason;
 import org.graalvm.nativeimage.c.function.CEntryPoint;
 import org.graalvm.nativeimage.c.type.CTypeConversion;
 import org.graalvm.word.PointerBase;
diff --git a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/OptionValuesEncoder.java b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/OptionValuesEncoder.java
index 14017b4e59fc..799bbd1931db 100644
--- a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/OptionValuesEncoder.java
+++ b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/isolated/OptionValuesEncoder.java
@@ -31,9 +31,9 @@
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.UnmodifiableEconomicMap;
 import org.graalvm.collections.UnmodifiableMapCursor;
-import jdk.compiler.graal.options.OptionKey;
-import jdk.compiler.graal.util.TypedDataInputStream;
-import jdk.compiler.graal.util.TypedDataOutputStream;
+import jdk.graal.compiler.options.OptionKey;
+import jdk.graal.compiler.util.TypedDataInputStream;
+import jdk.graal.compiler.util.TypedDataOutputStream;
 import org.graalvm.word.WordFactory;
 
 final class OptionValuesEncoder {
diff --git a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/meta/EncodedLineNumberTable.java b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/meta/EncodedLineNumberTable.java
index 5ee68a70d68d..29a6ca210413 100644
--- a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/meta/EncodedLineNumberTable.java
+++ b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/meta/EncodedLineNumberTable.java
@@ -26,9 +26,9 @@
 
 import java.util.Arrays;
 
-import jdk.compiler.graal.core.common.util.TypeConversion;
-import jdk.compiler.graal.core.common.util.UnsafeArrayTypeReader;
-import jdk.compiler.graal.core.common.util.UnsafeArrayTypeWriter;
+import jdk.graal.compiler.core.common.util.TypeConversion;
+import jdk.graal.compiler.core.common.util.UnsafeArrayTypeReader;
+import jdk.graal.compiler.core.common.util.UnsafeArrayTypeWriter;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
 
diff --git a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/meta/RuntimeCodeInstaller.java b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/meta/RuntimeCodeInstaller.java
index 3a5b31fe5afa..0804bd248381 100644
--- a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/meta/RuntimeCodeInstaller.java
+++ b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/meta/RuntimeCodeInstaller.java
@@ -29,13 +29,13 @@
 import java.util.HashSet;
 import java.util.Map;
 
-import jdk.compiler.graal.code.CompilationResult;
-import jdk.compiler.graal.code.CompilationResult.CodeAnnotation;
-import jdk.compiler.graal.core.common.NumUtil;
-import jdk.compiler.graal.core.common.type.CompressibleConstant;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.debug.Indent;
-import jdk.compiler.graal.truffle.TruffleCompilerImpl;
+import jdk.graal.compiler.code.CompilationResult;
+import jdk.graal.compiler.code.CompilationResult.CodeAnnotation;
+import jdk.graal.compiler.core.common.NumUtil;
+import jdk.graal.compiler.core.common.type.CompressibleConstant;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.debug.Indent;
+import jdk.graal.compiler.truffle.TruffleCompilerImpl;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.c.type.CTypeConversion;
 import org.graalvm.word.Pointer;
diff --git a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/meta/SubstrateCodeCacheProvider.java b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/meta/SubstrateCodeCacheProvider.java
index 47a8fde046b4..3dd818d25f27 100644
--- a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/meta/SubstrateCodeCacheProvider.java
+++ b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/meta/SubstrateCodeCacheProvider.java
@@ -24,8 +24,8 @@
  */
 package com.oracle.svm.graal.meta;
 
-import jdk.compiler.graal.code.CompilationResult;
-import jdk.compiler.graal.core.common.SuppressFBWarnings;
+import jdk.graal.compiler.code.CompilationResult;
+import jdk.graal.compiler.core.common.SuppressFBWarnings;
 
 import com.oracle.svm.core.deopt.SubstrateInstalledCode;
 import com.oracle.svm.core.graal.code.SubstrateCompiledCode;
diff --git a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/meta/SubstrateConstantFieldProvider.java b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/meta/SubstrateConstantFieldProvider.java
index f843afc75a79..2c3c9c511874 100644
--- a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/meta/SubstrateConstantFieldProvider.java
+++ b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/meta/SubstrateConstantFieldProvider.java
@@ -24,7 +24,7 @@
  */
 package com.oracle.svm.graal.meta;
 
-import jdk.compiler.graal.core.common.spi.JavaConstantFieldProvider;
+import jdk.graal.compiler.core.common.spi.JavaConstantFieldProvider;
 
 import jdk.vm.ci.meta.MetaAccessProvider;
 import jdk.vm.ci.meta.ResolvedJavaField;
diff --git a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/meta/SubstrateConstantReflectionProvider.java b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/meta/SubstrateConstantReflectionProvider.java
index 8cce95405491..0e4216448055 100644
--- a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/meta/SubstrateConstantReflectionProvider.java
+++ b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/meta/SubstrateConstantReflectionProvider.java
@@ -24,8 +24,8 @@
  */
 package com.oracle.svm.graal.meta;
 
-import jdk.compiler.graal.core.common.NumUtil;
-import jdk.compiler.graal.word.Word;
+import jdk.graal.compiler.core.common.NumUtil;
+import jdk.graal.compiler.word.Word;
 import org.graalvm.nativeimage.CurrentIsolate;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
diff --git a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/meta/SubstrateInstalledCodeImpl.java b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/meta/SubstrateInstalledCodeImpl.java
index 44e47a2180ac..a24be13c4f0e 100644
--- a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/meta/SubstrateInstalledCodeImpl.java
+++ b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/meta/SubstrateInstalledCodeImpl.java
@@ -26,7 +26,7 @@
 
 import static com.oracle.svm.core.util.VMError.shouldNotReachHere;
 
-import jdk.compiler.graal.core.common.CompilationIdentifier;
+import jdk.graal.compiler.core.common.CompilationIdentifier;
 
 import com.oracle.svm.core.Uninterruptible;
 import com.oracle.svm.core.code.CodeInfo;
diff --git a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/meta/SubstrateMemoryAccessProviderImpl.java b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/meta/SubstrateMemoryAccessProviderImpl.java
index a26610ed0e67..6505cde99d31 100644
--- a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/meta/SubstrateMemoryAccessProviderImpl.java
+++ b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/meta/SubstrateMemoryAccessProviderImpl.java
@@ -24,8 +24,8 @@
  */
 package com.oracle.svm.graal.meta;
 
-import jdk.compiler.graal.core.common.CompressEncoding;
-import jdk.compiler.graal.word.BarrieredAccess;
+import jdk.graal.compiler.core.common.CompressEncoding;
+import jdk.graal.compiler.word.BarrieredAccess;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
 import org.graalvm.word.SignedWord;
diff --git a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/meta/SubstrateMethod.java b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/meta/SubstrateMethod.java
index f75935656f73..70a7d9dd7607 100644
--- a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/meta/SubstrateMethod.java
+++ b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/meta/SubstrateMethod.java
@@ -32,8 +32,8 @@
 import java.lang.reflect.Modifier;
 import java.lang.reflect.Type;
 
-import jdk.compiler.graal.api.replacements.Snippet;
-import jdk.compiler.graal.core.common.util.TypeConversion;
+import jdk.graal.compiler.api.replacements.Snippet;
+import jdk.graal.compiler.core.common.util.TypeConversion;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
 import org.graalvm.nativeimage.c.function.CEntryPoint;
diff --git a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/meta/SubstrateRuntimeConfigurationBuilder.java b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/meta/SubstrateRuntimeConfigurationBuilder.java
index e6c17c3079e4..76f52d836cf7 100644
--- a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/meta/SubstrateRuntimeConfigurationBuilder.java
+++ b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/meta/SubstrateRuntimeConfigurationBuilder.java
@@ -26,22 +26,22 @@
 
 import java.util.function.Function;
 
-import jdk.compiler.graal.api.replacements.SnippetReflectionProvider;
-import jdk.compiler.graal.bytecode.BytecodeProvider;
-import jdk.compiler.graal.bytecode.ResolvedJavaMethodBytecodeProvider;
-import jdk.compiler.graal.core.common.spi.ConstantFieldProvider;
-import jdk.compiler.graal.core.common.spi.ForeignCallsProvider;
-import jdk.compiler.graal.core.common.spi.MetaAccessExtensionProvider;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.spi.LoopsDataProvider;
-import jdk.compiler.graal.nodes.spi.LoweringProvider;
-import jdk.compiler.graal.nodes.spi.PlatformConfigurationProvider;
-import jdk.compiler.graal.nodes.spi.Replacements;
-import jdk.compiler.graal.nodes.spi.StampProvider;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.util.Providers;
-import jdk.compiler.graal.replacements.ReplacementsImpl;
-import jdk.compiler.graal.word.WordTypes;
+import jdk.graal.compiler.api.replacements.SnippetReflectionProvider;
+import jdk.graal.compiler.bytecode.BytecodeProvider;
+import jdk.graal.compiler.bytecode.ResolvedJavaMethodBytecodeProvider;
+import jdk.graal.compiler.core.common.spi.ConstantFieldProvider;
+import jdk.graal.compiler.core.common.spi.ForeignCallsProvider;
+import jdk.graal.compiler.core.common.spi.MetaAccessExtensionProvider;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.spi.LoopsDataProvider;
+import jdk.graal.compiler.nodes.spi.LoweringProvider;
+import jdk.graal.compiler.nodes.spi.PlatformConfigurationProvider;
+import jdk.graal.compiler.nodes.spi.Replacements;
+import jdk.graal.compiler.nodes.spi.StampProvider;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.util.Providers;
+import jdk.graal.compiler.replacements.ReplacementsImpl;
+import jdk.graal.compiler.word.WordTypes;
 
 import com.oracle.graal.pointsto.infrastructure.UniverseMetaAccess;
 import com.oracle.graal.pointsto.meta.AnalysisUniverse;
diff --git a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/stubs/AArch64StubForeignCallsFeature.java b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/stubs/AArch64StubForeignCallsFeature.java
index a55ce3636859..1774ca168012 100644
--- a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/stubs/AArch64StubForeignCallsFeature.java
+++ b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/stubs/AArch64StubForeignCallsFeature.java
@@ -26,31 +26,31 @@
 
 import static com.oracle.svm.core.cpufeature.Stubs.AArch64Features.EMPTY_CPU_FEATURES_AARCH64;
 
-import jdk.compiler.graal.replacements.StringLatin1InflateNode;
-import jdk.compiler.graal.replacements.StringUTF16CompressNode;
-import jdk.compiler.graal.replacements.nodes.AESNode;
-import jdk.compiler.graal.replacements.nodes.ArrayCompareToForeignCalls;
-import jdk.compiler.graal.replacements.nodes.ArrayCopyWithConversionsForeignCalls;
-import jdk.compiler.graal.replacements.nodes.ArrayEqualsForeignCalls;
-import jdk.compiler.graal.replacements.nodes.ArrayEqualsWithMaskForeignCalls;
-import jdk.compiler.graal.replacements.nodes.ArrayIndexOfForeignCalls;
-import jdk.compiler.graal.replacements.nodes.ArrayRegionCompareToForeignCalls;
-import jdk.compiler.graal.replacements.nodes.BigIntegerMulAddNode;
-import jdk.compiler.graal.replacements.nodes.BigIntegerMultiplyToLenNode;
-import jdk.compiler.graal.replacements.nodes.BigIntegerSquareToLenNode;
-import jdk.compiler.graal.replacements.nodes.CalcStringAttributesForeignCalls;
-import jdk.compiler.graal.replacements.nodes.CalcStringAttributesNode;
-import jdk.compiler.graal.replacements.nodes.CipherBlockChainingAESNode;
-import jdk.compiler.graal.replacements.nodes.CountPositivesNode;
-import jdk.compiler.graal.replacements.nodes.CounterModeAESNode;
-import jdk.compiler.graal.replacements.nodes.EncodeArrayNode;
-import jdk.compiler.graal.replacements.nodes.GHASHProcessBlocksNode;
-import jdk.compiler.graal.replacements.nodes.MessageDigestNode.MD5Node;
-import jdk.compiler.graal.replacements.nodes.MessageDigestNode.SHA1Node;
-import jdk.compiler.graal.replacements.nodes.MessageDigestNode.SHA256Node;
-import jdk.compiler.graal.replacements.nodes.MessageDigestNode.SHA3Node;
-import jdk.compiler.graal.replacements.nodes.MessageDigestNode.SHA512Node;
-import jdk.compiler.graal.replacements.nodes.VectorizedMismatchNode;
+import jdk.graal.compiler.replacements.StringLatin1InflateNode;
+import jdk.graal.compiler.replacements.StringUTF16CompressNode;
+import jdk.graal.compiler.replacements.nodes.AESNode;
+import jdk.graal.compiler.replacements.nodes.ArrayCompareToForeignCalls;
+import jdk.graal.compiler.replacements.nodes.ArrayCopyWithConversionsForeignCalls;
+import jdk.graal.compiler.replacements.nodes.ArrayEqualsForeignCalls;
+import jdk.graal.compiler.replacements.nodes.ArrayEqualsWithMaskForeignCalls;
+import jdk.graal.compiler.replacements.nodes.ArrayIndexOfForeignCalls;
+import jdk.graal.compiler.replacements.nodes.ArrayRegionCompareToForeignCalls;
+import jdk.graal.compiler.replacements.nodes.BigIntegerMulAddNode;
+import jdk.graal.compiler.replacements.nodes.BigIntegerMultiplyToLenNode;
+import jdk.graal.compiler.replacements.nodes.BigIntegerSquareToLenNode;
+import jdk.graal.compiler.replacements.nodes.CalcStringAttributesForeignCalls;
+import jdk.graal.compiler.replacements.nodes.CalcStringAttributesNode;
+import jdk.graal.compiler.replacements.nodes.CipherBlockChainingAESNode;
+import jdk.graal.compiler.replacements.nodes.CountPositivesNode;
+import jdk.graal.compiler.replacements.nodes.CounterModeAESNode;
+import jdk.graal.compiler.replacements.nodes.EncodeArrayNode;
+import jdk.graal.compiler.replacements.nodes.GHASHProcessBlocksNode;
+import jdk.graal.compiler.replacements.nodes.MessageDigestNode.MD5Node;
+import jdk.graal.compiler.replacements.nodes.MessageDigestNode.SHA1Node;
+import jdk.graal.compiler.replacements.nodes.MessageDigestNode.SHA256Node;
+import jdk.graal.compiler.replacements.nodes.MessageDigestNode.SHA3Node;
+import jdk.graal.compiler.replacements.nodes.MessageDigestNode.SHA512Node;
+import jdk.graal.compiler.replacements.nodes.VectorizedMismatchNode;
 import org.graalvm.nativeimage.Platform.AARCH64;
 import org.graalvm.nativeimage.Platforms;
 
diff --git a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/stubs/AMD64StubForeignCallsFeature.java b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/stubs/AMD64StubForeignCallsFeature.java
index d0fabd6de0a8..15af110370ac 100644
--- a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/stubs/AMD64StubForeignCallsFeature.java
+++ b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/stubs/AMD64StubForeignCallsFeature.java
@@ -32,31 +32,31 @@
 
 import java.util.EnumSet;
 
-import jdk.compiler.graal.replacements.StringLatin1InflateNode;
-import jdk.compiler.graal.replacements.StringUTF16CompressNode;
-import jdk.compiler.graal.replacements.nodes.AESNode;
-import jdk.compiler.graal.replacements.nodes.ArrayCompareToForeignCalls;
-import jdk.compiler.graal.replacements.nodes.ArrayCopyWithConversionsForeignCalls;
-import jdk.compiler.graal.replacements.nodes.ArrayEqualsForeignCalls;
-import jdk.compiler.graal.replacements.nodes.ArrayEqualsWithMaskForeignCalls;
-import jdk.compiler.graal.replacements.nodes.ArrayIndexOfForeignCalls;
-import jdk.compiler.graal.replacements.nodes.ArrayRegionCompareToForeignCalls;
-import jdk.compiler.graal.replacements.nodes.BigIntegerMulAddNode;
-import jdk.compiler.graal.replacements.nodes.BigIntegerMultiplyToLenNode;
-import jdk.compiler.graal.replacements.nodes.BigIntegerSquareToLenNode;
-import jdk.compiler.graal.replacements.nodes.CalcStringAttributesForeignCalls;
-import jdk.compiler.graal.replacements.nodes.CalcStringAttributesNode;
-import jdk.compiler.graal.replacements.nodes.CipherBlockChainingAESNode;
-import jdk.compiler.graal.replacements.nodes.CountPositivesNode;
-import jdk.compiler.graal.replacements.nodes.CounterModeAESNode;
-import jdk.compiler.graal.replacements.nodes.EncodeArrayNode;
-import jdk.compiler.graal.replacements.nodes.GHASHProcessBlocksNode;
-import jdk.compiler.graal.replacements.nodes.MessageDigestNode.MD5Node;
-import jdk.compiler.graal.replacements.nodes.MessageDigestNode.SHA1Node;
-import jdk.compiler.graal.replacements.nodes.MessageDigestNode.SHA256Node;
-import jdk.compiler.graal.replacements.nodes.MessageDigestNode.SHA512Node;
-import jdk.compiler.graal.replacements.nodes.VectorizedHashCodeNode;
-import jdk.compiler.graal.replacements.nodes.VectorizedMismatchNode;
+import jdk.graal.compiler.replacements.StringLatin1InflateNode;
+import jdk.graal.compiler.replacements.StringUTF16CompressNode;
+import jdk.graal.compiler.replacements.nodes.AESNode;
+import jdk.graal.compiler.replacements.nodes.ArrayCompareToForeignCalls;
+import jdk.graal.compiler.replacements.nodes.ArrayCopyWithConversionsForeignCalls;
+import jdk.graal.compiler.replacements.nodes.ArrayEqualsForeignCalls;
+import jdk.graal.compiler.replacements.nodes.ArrayEqualsWithMaskForeignCalls;
+import jdk.graal.compiler.replacements.nodes.ArrayIndexOfForeignCalls;
+import jdk.graal.compiler.replacements.nodes.ArrayRegionCompareToForeignCalls;
+import jdk.graal.compiler.replacements.nodes.BigIntegerMulAddNode;
+import jdk.graal.compiler.replacements.nodes.BigIntegerMultiplyToLenNode;
+import jdk.graal.compiler.replacements.nodes.BigIntegerSquareToLenNode;
+import jdk.graal.compiler.replacements.nodes.CalcStringAttributesForeignCalls;
+import jdk.graal.compiler.replacements.nodes.CalcStringAttributesNode;
+import jdk.graal.compiler.replacements.nodes.CipherBlockChainingAESNode;
+import jdk.graal.compiler.replacements.nodes.CountPositivesNode;
+import jdk.graal.compiler.replacements.nodes.CounterModeAESNode;
+import jdk.graal.compiler.replacements.nodes.EncodeArrayNode;
+import jdk.graal.compiler.replacements.nodes.GHASHProcessBlocksNode;
+import jdk.graal.compiler.replacements.nodes.MessageDigestNode.MD5Node;
+import jdk.graal.compiler.replacements.nodes.MessageDigestNode.SHA1Node;
+import jdk.graal.compiler.replacements.nodes.MessageDigestNode.SHA256Node;
+import jdk.graal.compiler.replacements.nodes.MessageDigestNode.SHA512Node;
+import jdk.graal.compiler.replacements.nodes.VectorizedHashCodeNode;
+import jdk.graal.compiler.replacements.nodes.VectorizedMismatchNode;
 import org.graalvm.nativeimage.Platform.AMD64;
 import org.graalvm.nativeimage.Platforms;
 
diff --git a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/stubs/SVMIntrinsicStubs.java b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/stubs/SVMIntrinsicStubs.java
index a81a16b724d8..a2b56e050c40 100644
--- a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/stubs/SVMIntrinsicStubs.java
+++ b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/stubs/SVMIntrinsicStubs.java
@@ -24,33 +24,33 @@
  */
 package com.oracle.svm.graal.stubs;
 
-import jdk.compiler.graal.lir.GeneratedStubsHolder;
-import jdk.compiler.graal.replacements.StringLatin1InflateNode;
-import jdk.compiler.graal.replacements.StringUTF16CompressNode;
-import jdk.compiler.graal.replacements.nodes.AESNode;
-import jdk.compiler.graal.replacements.nodes.ArrayCompareToNode;
-import jdk.compiler.graal.replacements.nodes.ArrayCopyWithConversionsNode;
-import jdk.compiler.graal.replacements.nodes.ArrayEqualsNode;
-import jdk.compiler.graal.replacements.nodes.ArrayIndexOfNode;
-import jdk.compiler.graal.replacements.nodes.ArrayRegionCompareToNode;
-import jdk.compiler.graal.replacements.nodes.ArrayRegionEqualsNode;
-import jdk.compiler.graal.replacements.nodes.ArrayRegionEqualsWithMaskNode;
-import jdk.compiler.graal.replacements.nodes.BigIntegerMulAddNode;
-import jdk.compiler.graal.replacements.nodes.BigIntegerMultiplyToLenNode;
-import jdk.compiler.graal.replacements.nodes.BigIntegerSquareToLenNode;
-import jdk.compiler.graal.replacements.nodes.CalcStringAttributesNode;
-import jdk.compiler.graal.replacements.nodes.CipherBlockChainingAESNode;
-import jdk.compiler.graal.replacements.nodes.CountPositivesNode;
-import jdk.compiler.graal.replacements.nodes.CounterModeAESNode;
-import jdk.compiler.graal.replacements.nodes.EncodeArrayNode;
-import jdk.compiler.graal.replacements.nodes.GHASHProcessBlocksNode;
-import jdk.compiler.graal.replacements.nodes.MessageDigestNode.MD5Node;
-import jdk.compiler.graal.replacements.nodes.MessageDigestNode.SHA1Node;
-import jdk.compiler.graal.replacements.nodes.MessageDigestNode.SHA256Node;
-import jdk.compiler.graal.replacements.nodes.MessageDigestNode.SHA3Node;
-import jdk.compiler.graal.replacements.nodes.MessageDigestNode.SHA512Node;
-import jdk.compiler.graal.replacements.nodes.VectorizedHashCodeNode;
-import jdk.compiler.graal.replacements.nodes.VectorizedMismatchNode;
+import jdk.graal.compiler.lir.GeneratedStubsHolder;
+import jdk.graal.compiler.replacements.StringLatin1InflateNode;
+import jdk.graal.compiler.replacements.StringUTF16CompressNode;
+import jdk.graal.compiler.replacements.nodes.AESNode;
+import jdk.graal.compiler.replacements.nodes.ArrayCompareToNode;
+import jdk.graal.compiler.replacements.nodes.ArrayCopyWithConversionsNode;
+import jdk.graal.compiler.replacements.nodes.ArrayEqualsNode;
+import jdk.graal.compiler.replacements.nodes.ArrayIndexOfNode;
+import jdk.graal.compiler.replacements.nodes.ArrayRegionCompareToNode;
+import jdk.graal.compiler.replacements.nodes.ArrayRegionEqualsNode;
+import jdk.graal.compiler.replacements.nodes.ArrayRegionEqualsWithMaskNode;
+import jdk.graal.compiler.replacements.nodes.BigIntegerMulAddNode;
+import jdk.graal.compiler.replacements.nodes.BigIntegerMultiplyToLenNode;
+import jdk.graal.compiler.replacements.nodes.BigIntegerSquareToLenNode;
+import jdk.graal.compiler.replacements.nodes.CalcStringAttributesNode;
+import jdk.graal.compiler.replacements.nodes.CipherBlockChainingAESNode;
+import jdk.graal.compiler.replacements.nodes.CountPositivesNode;
+import jdk.graal.compiler.replacements.nodes.CounterModeAESNode;
+import jdk.graal.compiler.replacements.nodes.EncodeArrayNode;
+import jdk.graal.compiler.replacements.nodes.GHASHProcessBlocksNode;
+import jdk.graal.compiler.replacements.nodes.MessageDigestNode.MD5Node;
+import jdk.graal.compiler.replacements.nodes.MessageDigestNode.SHA1Node;
+import jdk.graal.compiler.replacements.nodes.MessageDigestNode.SHA256Node;
+import jdk.graal.compiler.replacements.nodes.MessageDigestNode.SHA3Node;
+import jdk.graal.compiler.replacements.nodes.MessageDigestNode.SHA512Node;
+import jdk.graal.compiler.replacements.nodes.VectorizedHashCodeNode;
+import jdk.graal.compiler.replacements.nodes.VectorizedMismatchNode;
 
 @GeneratedStubsHolder(targetVM = "substrate", sources = {
                 ArrayIndexOfNode.class,
diff --git a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/stubs/StubForeignCallsFeatureBase.java b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/stubs/StubForeignCallsFeatureBase.java
index e0d6ffa27c2a..d783fcd5c8bb 100644
--- a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/stubs/StubForeignCallsFeatureBase.java
+++ b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/stubs/StubForeignCallsFeatureBase.java
@@ -29,9 +29,9 @@
 import java.util.Set;
 import java.util.function.Function;
 
-import jdk.compiler.graal.core.common.spi.ForeignCallDescriptor;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.replacements.nodes.ArrayRegionEqualsNode;
+import jdk.graal.compiler.core.common.spi.ForeignCallDescriptor;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.replacements.nodes.ArrayRegionEqualsNode;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
diff --git a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/substitutions/GraalSubstitutions.java b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/substitutions/GraalSubstitutions.java
index 54c62e4be437..338206c69f9b 100644
--- a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/substitutions/GraalSubstitutions.java
+++ b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/substitutions/GraalSubstitutions.java
@@ -35,43 +35,43 @@
 import java.util.concurrent.ConcurrentHashMap;
 
 import com.oracle.svm.graal.GraalSupport;
-import jdk.compiler.graal.core.match.MatchRuleRegistry;
-import jdk.compiler.graal.debug.KeyRegistry;
-import jdk.compiler.graal.debug.TTY;
-import jdk.compiler.graal.nodes.NamedLocationIdentity;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins;
-import jdk.compiler.graal.phases.common.inlining.info.elem.InlineableGraph;
-import jdk.compiler.graal.phases.common.inlining.walker.ComputeInliningRelevance;
-import jdk.compiler.graal.replacements.nodes.BinaryMathIntrinsicNode;
-import jdk.compiler.graal.replacements.nodes.UnaryMathIntrinsicNode;
+import jdk.graal.compiler.core.match.MatchRuleRegistry;
+import jdk.graal.compiler.debug.KeyRegistry;
+import jdk.graal.compiler.debug.TTY;
+import jdk.graal.compiler.nodes.NamedLocationIdentity;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins;
+import jdk.graal.compiler.phases.common.inlining.info.elem.InlineableGraph;
+import jdk.graal.compiler.phases.common.inlining.walker.ComputeInliningRelevance;
+import jdk.graal.compiler.replacements.nodes.BinaryMathIntrinsicNode;
+import jdk.graal.compiler.replacements.nodes.UnaryMathIntrinsicNode;
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.EconomicSet;
 import org.graalvm.collections.Equivalence;
-import jdk.compiler.graal.core.common.CompilationIdentifier;
-import jdk.compiler.graal.core.common.SuppressFBWarnings;
-import jdk.compiler.graal.core.gen.NodeLIRBuilder;
-import jdk.compiler.graal.core.match.MatchStatement;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.debug.DebugHandlersFactory;
-import jdk.compiler.graal.debug.MetricKey;
-import jdk.compiler.graal.debug.TimeSource;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.lir.CompositeValue;
-import jdk.compiler.graal.lir.CompositeValueClass;
-import jdk.compiler.graal.lir.LIRInstruction;
-import jdk.compiler.graal.lir.LIRInstructionClass;
-import jdk.compiler.graal.lir.gen.ArithmeticLIRGeneratorTool;
-import jdk.compiler.graal.lir.phases.LIRPhase;
-import jdk.compiler.graal.nodes.Invoke;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.BasePhase;
-import jdk.compiler.graal.phases.common.CanonicalizerPhase;
-import jdk.compiler.graal.phases.tiers.HighTierContext;
-import jdk.compiler.graal.printer.NoDeadCodeVerifyHandler;
-import jdk.compiler.graal.serviceprovider.GlobalAtomicLong;
+import jdk.graal.compiler.core.common.CompilationIdentifier;
+import jdk.graal.compiler.core.common.SuppressFBWarnings;
+import jdk.graal.compiler.core.gen.NodeLIRBuilder;
+import jdk.graal.compiler.core.match.MatchStatement;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.debug.DebugHandlersFactory;
+import jdk.graal.compiler.debug.MetricKey;
+import jdk.graal.compiler.debug.TimeSource;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.lir.CompositeValue;
+import jdk.graal.compiler.lir.CompositeValueClass;
+import jdk.graal.compiler.lir.LIRInstruction;
+import jdk.graal.compiler.lir.LIRInstructionClass;
+import jdk.graal.compiler.lir.gen.ArithmeticLIRGeneratorTool;
+import jdk.graal.compiler.lir.phases.LIRPhase;
+import jdk.graal.compiler.nodes.Invoke;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.BasePhase;
+import jdk.graal.compiler.phases.common.CanonicalizerPhase;
+import jdk.graal.compiler.phases.tiers.HighTierContext;
+import jdk.graal.compiler.printer.NoDeadCodeVerifyHandler;
+import jdk.graal.compiler.serviceprovider.GlobalAtomicLong;
 import org.graalvm.nativeimage.CurrentIsolate;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.hosted.FieldValueTransformer;
@@ -103,7 +103,7 @@
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 
 @TargetClass(value = InvocationPlugins.class, onlyWith = RuntimeCompilationFeature.IsEnabledAndNotLibgraal.class)
-final class Target_jdk_compiler_graal_nodes_graphbuilderconf_InvocationPlugins {
+final class Target_jdk_graal_compiler_nodes_graphbuilderconf_InvocationPlugins {
 
     @Alias//
     private List deferredRegistrations = new ArrayList<>();
@@ -118,7 +118,7 @@ private void flushDeferrables() {
 
 @TargetClass(value = InlineableGraph.class, onlyWith = RuntimeCompilationFeature.IsEnabledAndNotLibgraal.class)
 @SuppressWarnings({"unused"})
-final class Target_jdk_compiler_graal_phases_common_inlining_info_elem_InlineableGraph {
+final class Target_jdk_graal_compiler_phases_common_inlining_info_elem_InlineableGraph {
 
     @Substitute
     private static StructuredGraph parseBytecodes(ResolvedJavaMethod method, HighTierContext context, CanonicalizerPhase canonicalizer, StructuredGraph caller, boolean trackNodeSourcePosition) {
@@ -132,7 +132,7 @@ private static StructuredGraph parseBytecodes(ResolvedJavaMethod method, HighTie
 
 @TargetClass(value = ComputeInliningRelevance.class, onlyWith = RuntimeCompilationFeature.IsEnabledAndNotLibgraal.class)
 @SuppressWarnings({"static-method", "unused"})
-final class Target_jdk_compiler_graal_phases_common_inlining_walker_ComputeInliningRelevance {
+final class Target_jdk_graal_compiler_phases_common_inlining_walker_ComputeInliningRelevance {
 
     @Substitute
     private void compute() {
@@ -149,11 +149,11 @@ public double getRelevance(Invoke invoke) {
 }
 
 @TargetClass(value = DebugContext.class, innerClass = "Invariants", onlyWith = RuntimeCompilationFeature.IsEnabled.class)
-final class Target_jdk_compiler_graal_debug_DebugContext_Invariants {
+final class Target_jdk_graal_compiler_debug_DebugContext_Invariants {
 }
 
 @TargetClass(value = DebugContext.class, innerClass = "Immutable", onlyWith = RuntimeCompilationFeature.IsEnabled.class)
-final class Target_jdk_compiler_graal_debug_DebugContext_Immutable {
+final class Target_jdk_graal_compiler_debug_DebugContext_Immutable {
     static class ClearImmutableCache implements FieldValueTransformer {
         @Override
         public Object transform(Object receiver, Object originalValue) {
@@ -179,11 +179,11 @@ public Object transform(Object receiver, Object originalValue) {
      */
     @Alias//
     @RecomputeFieldValue(kind = Custom, declClass = ClearImmutableCache.class)//
-    private static Target_jdk_compiler_graal_debug_DebugContext_Immutable[] CACHE;
+    private static Target_jdk_graal_compiler_debug_DebugContext_Immutable[] CACHE;
 }
 
 @TargetClass(value = DebugHandlersFactory.class, onlyWith = RuntimeCompilationFeature.IsEnabled.class)
-final class Target_jdk_compiler_graal_debug_DebugHandlersFactory {
+final class Target_jdk_graal_compiler_debug_DebugHandlersFactory {
     static class CachedFactories implements FieldValueTransformer {
         @Override
         public Object transform(Object receiver, Object originalValue) {
@@ -201,7 +201,7 @@ public Object transform(Object receiver, Object originalValue) {
 }
 
 @TargetClass(value = TimeSource.class, onlyWith = RuntimeCompilationFeature.IsEnabled.class)
-final class Target_jdk_compiler_graal_debug_TimeSource {
+final class Target_jdk_graal_compiler_debug_TimeSource {
     // Checkstyle: stop
     @Alias//
     @RecomputeFieldValue(kind = FromAlias)//
@@ -210,15 +210,15 @@ final class Target_jdk_compiler_graal_debug_TimeSource {
 }
 
 @TargetClass(value = TTY.class, onlyWith = RuntimeCompilationFeature.IsEnabledAndNotLibgraal.class)
-final class Target_jdk_compiler_graal_debug_TTY {
+final class Target_jdk_graal_compiler_debug_TTY {
 
     @Alias//
     @RecomputeFieldValue(kind = FromAlias)//
     private static PrintStream out = Log.logStream();
 }
 
-@TargetClass(className = "jdk.compiler.graal.serviceprovider.IsolateUtil", onlyWith = RuntimeCompilationFeature.IsEnabled.class)
-final class Target_jdk_compiler_graal_serviceprovider_IsolateUtil {
+@TargetClass(className = "jdk.graal.compiler.serviceprovider.IsolateUtil", onlyWith = RuntimeCompilationFeature.IsEnabled.class)
+final class Target_jdk_graal_compiler_serviceprovider_IsolateUtil {
 
     @Substitute
     public static long getIsolateAddress() {
@@ -239,8 +239,8 @@ public Object transform(Object receiver, Object originalValue) {
     }
 }
 
-@TargetClass(className = "jdk.compiler.graal.serviceprovider.GlobalAtomicLong", onlyWith = RuntimeCompilationFeature.IsEnabled.class)
-final class Target_jdk_compiler_graal_serviceprovider_GlobalAtomicLong {
+@TargetClass(className = "jdk.graal.compiler.serviceprovider.GlobalAtomicLong", onlyWith = RuntimeCompilationFeature.IsEnabled.class)
+final class Target_jdk_graal_compiler_serviceprovider_GlobalAtomicLong {
 
     @Inject//
     @RecomputeFieldValue(kind = Kind.Custom, declClass = GlobalAtomicLongAddressProvider.class) //
@@ -272,7 +272,7 @@ private long getAddress() {
  */
 
 @TargetClass(value = KeyRegistry.class, onlyWith = RuntimeCompilationFeature.IsEnabled.class)
-final class Target_jdk_compiler_graal_debug_KeyRegistry {
+final class Target_jdk_graal_compiler_debug_KeyRegistry {
 
     @Alias//
     @RecomputeFieldValue(kind = FromAlias)//
@@ -284,7 +284,7 @@ final class Target_jdk_compiler_graal_debug_KeyRegistry {
 }
 
 @TargetClass(value = MatchRuleRegistry.class, onlyWith = RuntimeCompilationFeature.IsEnabled.class)
-final class Target_jdk_compiler_graal_core_match_MatchRuleRegistry {
+final class Target_jdk_graal_compiler_core_match_MatchRuleRegistry {
 
     @Substitute
     public static EconomicMap, List> lookup(Class theClass, @SuppressWarnings("unused") OptionValues options,
@@ -299,7 +299,7 @@ public static EconomicMap, List> lookup(Cl
 
 @TargetClass(value = BinaryMathIntrinsicNode.class, onlyWith = RuntimeCompilationFeature.IsEnabledAndNotLibgraal.class)
 @SuppressWarnings({"unused", "static-method"})
-final class Target_jdk_compiler_graal_replacements_nodes_BinaryMathIntrinsicNode {
+final class Target_jdk_graal_compiler_replacements_nodes_BinaryMathIntrinsicNode {
 
     /*
      * The node is lowered to a foreign call, the LIR generation is only used for the compilation of
@@ -315,7 +315,7 @@ void generate(NodeLIRBuilderTool nodeValueMap, ArithmeticLIRGeneratorTool gen) {
 
 @TargetClass(value = UnaryMathIntrinsicNode.class, onlyWith = RuntimeCompilationFeature.IsEnabledAndNotLibgraal.class)
 @SuppressWarnings({"unused", "static-method"})
-final class Target_jdk_compiler_graal_replacements_nodes_UnaryMathIntrinsicNode {
+final class Target_jdk_graal_compiler_replacements_nodes_UnaryMathIntrinsicNode {
 
     @Substitute
     void generate(NodeLIRBuilderTool nodeValueMap, ArithmeticLIRGeneratorTool gen) {
@@ -324,7 +324,7 @@ void generate(NodeLIRBuilderTool nodeValueMap, ArithmeticLIRGeneratorTool gen) {
 }
 
 @TargetClass(value = BasePhase.class, onlyWith = RuntimeCompilationFeature.IsEnabled.class)
-final class Target_jdk_compiler_graal_phases_BasePhase {
+final class Target_jdk_graal_compiler_phases_BasePhase {
 
     @Substitute
     static BasePhase.BasePhaseStatistics getBasePhaseStatistics(Class clazz) {
@@ -337,7 +337,7 @@ static BasePhase.BasePhaseStatistics getBasePhaseStatistics(Class clazz) {
 }
 
 @TargetClass(value = LIRPhase.class, onlyWith = RuntimeCompilationFeature.IsEnabled.class)
-final class Target_jdk_compiler_graal_lir_phases_LIRPhase {
+final class Target_jdk_graal_compiler_lir_phases_LIRPhase {
 
     @Substitute
     static LIRPhase.LIRPhaseStatistics getLIRPhaseStatistics(Class clazz) {
@@ -350,7 +350,7 @@ static LIRPhase.LIRPhaseStatistics getLIRPhaseStatistics(Class clazz) {
 }
 
 @TargetClass(value = NodeClass.class, onlyWith = RuntimeCompilationFeature.IsEnabled.class)
-final class Target_jdk_compiler_graal_graph_NodeClass {
+final class Target_jdk_graal_compiler_graph_NodeClass {
 
     @Alias//
     @RecomputeFieldValue(kind = RecomputeFieldValue.Kind.Custom, declClass = FieldsOffsetsFeature.InputsIterationMaskRecomputation.class)//
@@ -382,7 +382,7 @@ public String shortName() {
 }
 
 @TargetClass(value = LIRInstructionClass.class, onlyWith = RuntimeCompilationFeature.IsEnabled.class)
-final class Target_jdk_compiler_graal_lir_LIRInstructionClass {
+final class Target_jdk_graal_compiler_lir_LIRInstructionClass {
 
     @Substitute
     @SuppressWarnings("unlikely-arg-type")
@@ -397,7 +397,7 @@ public static LIRInstructionClass get(Class clazz)
 }
 
 @TargetClass(value = CompositeValueClass.class, onlyWith = RuntimeCompilationFeature.IsEnabled.class)
-final class Target_jdk_compiler_graal_lir_CompositeValueClass {
+final class Target_jdk_graal_compiler_lir_CompositeValueClass {
 
     @Substitute
     @SuppressWarnings("unlikely-arg-type")
@@ -412,14 +412,14 @@ public static CompositeValueClass get(Class clazz)
 }
 
 @TargetClass(value = NoDeadCodeVerifyHandler.class)
-final class Target_jdk_compiler_graal_printer_NoDeadCodeVerifyHandler {
+final class Target_jdk_graal_compiler_printer_NoDeadCodeVerifyHandler {
     @Alias//
     @RecomputeFieldValue(kind = Kind.NewInstance, declClass = ConcurrentHashMap.class)//
     private static Map discovered;
 }
 
 @TargetClass(value = NamedLocationIdentity.class, innerClass = "DB", onlyWith = RuntimeCompilationFeature.IsEnabled.class)
-final class Target_jdk_compiler_graal_nodes_NamedLocationIdentity_DB {
+final class Target_jdk_graal_compiler_nodes_NamedLocationIdentity_DB {
     @Alias//
     @RecomputeFieldValue(kind = FromAlias, declClass = EconomicMap.class)//
     private static EconomicSet map = EconomicSet.create(Equivalence.DEFAULT);
diff --git a/substratevm/src/com.oracle.svm.hosted.foreign/src/com/oracle/svm/hosted/foreign/DowncallStub.java b/substratevm/src/com.oracle.svm.hosted.foreign/src/com/oracle/svm/hosted/foreign/DowncallStub.java
index cf48588fb51c..044a42b381b5 100644
--- a/substratevm/src/com.oracle.svm.hosted.foreign/src/com/oracle/svm/hosted/foreign/DowncallStub.java
+++ b/substratevm/src/com.oracle.svm.hosted.foreign/src/com/oracle/svm/hosted/foreign/DowncallStub.java
@@ -26,11 +26,11 @@
 
 import java.util.List;
 
-import jdk.compiler.graal.core.common.spi.ForeignCallDescriptor;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.java.FrameStateBuilder;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
+import jdk.graal.compiler.core.common.spi.ForeignCallDescriptor;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.java.FrameStateBuilder;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
 import org.graalvm.nativeimage.c.function.CFunction;
diff --git a/substratevm/src/com.oracle.svm.hosted.foreign/src/com/oracle/svm/hosted/foreign/ForeignFunctionsFeature.java b/substratevm/src/com.oracle.svm.hosted.foreign/src/com/oracle/svm/hosted/foreign/ForeignFunctionsFeature.java
index f70ce98280ee..aea603fa5035 100644
--- a/substratevm/src/com.oracle.svm.hosted.foreign/src/com/oracle/svm/hosted/foreign/ForeignFunctionsFeature.java
+++ b/substratevm/src/com.oracle.svm.hosted.foreign/src/com/oracle/svm/hosted/foreign/ForeignFunctionsFeature.java
@@ -35,8 +35,8 @@
 import java.util.function.Function;
 
 import org.graalvm.collections.Pair;
-import jdk.compiler.graal.api.replacements.Fold;
-import jdk.compiler.graal.serviceprovider.JavaVersionUtil;
+import jdk.graal.compiler.api.replacements.Fold;
+import jdk.graal.compiler.serviceprovider.JavaVersionUtil;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
diff --git a/substratevm/src/com.oracle.svm.hosted.foreign/src/com/oracle/svm/hosted/foreign/ForeignGraphKit.java b/substratevm/src/com.oracle.svm.hosted.foreign/src/com/oracle/svm/hosted/foreign/ForeignGraphKit.java
index a05d51150c72..413b09979d56 100644
--- a/substratevm/src/com.oracle.svm.hosted.foreign/src/com/oracle/svm/hosted/foreign/ForeignGraphKit.java
+++ b/substratevm/src/com.oracle.svm.hosted.foreign/src/com/oracle/svm/hosted/foreign/ForeignGraphKit.java
@@ -28,8 +28,8 @@
 import java.util.List;
 
 import org.graalvm.collections.Pair;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.nodes.ValueNode;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.nodes.ValueNode;
 
 import com.oracle.graal.pointsto.infrastructure.GraphProvider;
 import com.oracle.graal.pointsto.meta.HostedProviders;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/CPUFeatureAccessFeatureBase.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/CPUFeatureAccessFeatureBase.java
index 2f2267b54853..1e3afd80e1b4 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/CPUFeatureAccessFeatureBase.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/CPUFeatureAccessFeatureBase.java
@@ -31,7 +31,7 @@
 import java.util.EnumSet;
 
 import org.graalvm.collections.EconomicMap;
-import jdk.compiler.graal.debug.GraalError;
+import jdk.graal.compiler.debug.GraalError;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ExceptionSynthesizer.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ExceptionSynthesizer.java
index 46d4cd131f00..898e5b42028e 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ExceptionSynthesizer.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ExceptionSynthesizer.java
@@ -30,14 +30,14 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.core.common.type.StampPair;
-import jdk.compiler.graal.nodes.CallTargetNode.InvokeKind;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.InvokeWithExceptionNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext;
-import jdk.compiler.graal.nodes.java.MethodCallTargetNode;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.core.common.type.StampPair;
+import jdk.graal.compiler.nodes.CallTargetNode.InvokeKind;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.InvokeWithExceptionNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext;
+import jdk.graal.compiler.nodes.java.MethodCallTargetNode;
 
 import com.oracle.svm.core.graal.nodes.LoweredDeadEndNode;
 import com.oracle.svm.core.nodes.SubstrateMethodCallTargetNode;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/FeatureHandler.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/FeatureHandler.java
index 70c7c04ac37c..f45d4c64e29f 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/FeatureHandler.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/FeatureHandler.java
@@ -37,8 +37,8 @@
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.options.Option;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.options.Option;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.hosted.Feature;
 
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/FeatureImpl.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/FeatureImpl.java
index 64f83e160cc7..b9f0c0238583 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/FeatureImpl.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/FeatureImpl.java
@@ -46,8 +46,8 @@
 import java.util.stream.Collectors;
 
 import org.graalvm.collections.Pair;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.phases.util.Providers;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.phases.util.Providers;
 import org.graalvm.nativeimage.AnnotationAccess;
 import org.graalvm.nativeimage.hosted.Feature;
 import org.graalvm.nativeimage.hosted.Feature.DuringAnalysisAccess;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/HostedConfiguration.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/HostedConfiguration.java
index 63d26c1b0ca8..0465a396fe21 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/HostedConfiguration.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/HostedConfiguration.java
@@ -32,12 +32,12 @@
 import java.util.Set;
 import java.util.concurrent.ForkJoinPool;
 
-import jdk.compiler.graal.api.replacements.SnippetReflectionProvider;
-import jdk.compiler.graal.core.common.CompressEncoding;
-import jdk.compiler.graal.core.common.spi.MetaAccessExtensionProvider;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.options.OptionValues;
+import jdk.graal.compiler.api.replacements.SnippetReflectionProvider;
+import jdk.graal.compiler.core.common.CompressEncoding;
+import jdk.graal.compiler.core.common.spi.MetaAccessExtensionProvider;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.options.OptionValues;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
 
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ImageClassLoader.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ImageClassLoader.java
index 1547b12f8b77..d861bcca5010 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ImageClassLoader.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ImageClassLoader.java
@@ -42,8 +42,8 @@
 import java.util.stream.Collectors;
 
 import org.graalvm.collections.EconomicSet;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.word.Word;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.word.Word;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
 
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/LinkAtBuildTimeSupport.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/LinkAtBuildTimeSupport.java
index dc272eb547b9..3c2cdce910b4 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/LinkAtBuildTimeSupport.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/LinkAtBuildTimeSupport.java
@@ -28,7 +28,7 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import jdk.compiler.graal.options.Option;
+import jdk.graal.compiler.options.Option;
 import org.graalvm.nativeimage.ImageSingletons;
 
 import com.oracle.graal.pointsto.infrastructure.OriginalClassProvider;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/LoggingFeature.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/LoggingFeature.java
index dc16992722c1..37d0d607ab3e 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/LoggingFeature.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/LoggingFeature.java
@@ -27,8 +27,8 @@
 import java.lang.reflect.Field;
 import java.util.Optional;
 
-import jdk.compiler.graal.options.Option;
-import jdk.compiler.graal.options.OptionType;
+import jdk.graal.compiler.options.Option;
+import jdk.graal.compiler.options.OptionType;
 import org.graalvm.nativeimage.hosted.RuntimeReflection;
 
 import com.oracle.svm.core.feature.AutomaticallyRegisteredFeature;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageClassLoaderSupport.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageClassLoaderSupport.java
index 613b695d9248..be6d69b18ad1 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageClassLoaderSupport.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageClassLoaderSupport.java
@@ -77,8 +77,8 @@
 import org.graalvm.collections.EconomicSet;
 import org.graalvm.collections.MapCursor;
 import org.graalvm.collections.Pair;
-import jdk.compiler.graal.options.OptionKey;
-import jdk.compiler.graal.options.OptionValues;
+import jdk.graal.compiler.options.OptionKey;
+import jdk.graal.compiler.options.OptionValues;
 import org.graalvm.nativeimage.impl.AnnotationExtractor;
 
 import com.oracle.svm.core.NativeImageClassLoaderOptions;
@@ -652,7 +652,7 @@ private void run() {
                 }, 5, 1, TimeUnit.MINUTES);
 
                 List requiresInit = new ArrayList<>(Arrays.asList(
-                                "jdk.internal.vm.ci", "jdk.compiler.graal", "com.oracle.graal.graal_enterprise",
+                                "jdk.internal.vm.ci", "jdk.graal.compiler", "com.oracle.graal.graal_enterprise",
                                 "org.graalvm.nativeimage", "org.graalvm.truffle", "org.graalvm.truffle.runtime",
                                 "org.graalvm.truffle.compiler", "com.oracle.truffle.enterprise", "org.graalvm.jniutils",
                                 "org.graalvm.nativebridge"));
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageGenerator.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageGenerator.java
index 6d7b1698e24c..c159659fdfc2 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageGenerator.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageGenerator.java
@@ -27,8 +27,8 @@
 import static com.oracle.graal.pointsto.api.PointstoOptions.UseExperimentalReachabilityAnalysis;
 import static com.oracle.svm.hosted.NativeImageOptions.DiagnosticsDir;
 import static com.oracle.svm.hosted.NativeImageOptions.DiagnosticsMode;
-import static jdk.compiler.graal.hotspot.JVMCIVersionCheck.OPEN_LABSJDK_RELEASE_URL_PATTERN;
-import static jdk.compiler.graal.replacements.StandardGraphBuilderPlugins.registerInvocationPlugins;
+import static jdk.graal.compiler.hotspot.JVMCIVersionCheck.OPEN_LABSJDK_RELEASE_URL_PATTERN;
+import static jdk.graal.compiler.replacements.StandardGraphBuilderPlugins.registerInvocationPlugins;
 
 import java.io.IOException;
 import java.io.PrintWriter;
@@ -62,59 +62,59 @@
 import org.graalvm.collections.EconomicSet;
 import org.graalvm.collections.MapCursor;
 import org.graalvm.collections.Pair;
-import jdk.compiler.graal.api.replacements.Fold;
-import jdk.compiler.graal.api.replacements.SnippetReflectionProvider;
-import jdk.compiler.graal.bytecode.BytecodeProvider;
-import jdk.compiler.graal.bytecode.ResolvedJavaMethodBytecodeProvider;
-import jdk.compiler.graal.core.common.GraalOptions;
-import jdk.compiler.graal.core.common.spi.ForeignCallsProvider;
-import jdk.compiler.graal.core.common.spi.MetaAccessExtensionProvider;
-import jdk.compiler.graal.core.common.util.CompilationAlarm;
-import jdk.compiler.graal.core.riscv64.RISCV64ReflectionUtil;
-import jdk.compiler.graal.debug.DebugCloseable;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.debug.DebugContext.Builder;
-import jdk.compiler.graal.debug.DebugDumpScope;
-import jdk.compiler.graal.debug.Indent;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.hotspot.GraalHotSpotVMConfig;
-import jdk.compiler.graal.hotspot.HotSpotGraalCompiler;
-import jdk.compiler.graal.hotspot.HotSpotGraalRuntimeProvider;
-import jdk.compiler.graal.java.BciBlockMapping;
-import jdk.compiler.graal.lir.phases.LIRSuites;
-import jdk.compiler.graal.loop.phases.ConvertDeoptimizeToGuardPhase;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.gc.BarrierSet;
-import jdk.compiler.graal.nodes.graphbuilderconf.ClassInitializationPlugin;
-import jdk.compiler.graal.nodes.graphbuilderconf.GeneratedPluginFactory;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins;
-import jdk.compiler.graal.nodes.spi.CoreProviders;
-import jdk.compiler.graal.nodes.spi.LoweringProvider;
-import jdk.compiler.graal.nodes.spi.StampProvider;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.BasePhase;
-import jdk.compiler.graal.phases.FloatingGuardPhase;
-import jdk.compiler.graal.phases.PhaseSuite;
-import jdk.compiler.graal.phases.Speculative;
-import jdk.compiler.graal.phases.common.AddressLoweringPhase;
-import jdk.compiler.graal.phases.common.CanonicalizerPhase;
-import jdk.compiler.graal.phases.common.DeoptimizationGroupingPhase;
-import jdk.compiler.graal.phases.common.FrameStateAssignmentPhase;
-import jdk.compiler.graal.phases.common.LoopSafepointInsertionPhase;
-import jdk.compiler.graal.phases.common.inlining.InliningPhase;
-import jdk.compiler.graal.phases.tiers.HighTierContext;
-import jdk.compiler.graal.phases.tiers.LowTierContext;
-import jdk.compiler.graal.phases.tiers.MidTierContext;
-import jdk.compiler.graal.phases.tiers.Suites;
-import jdk.compiler.graal.phases.util.Providers;
-import jdk.compiler.graal.printer.GraalDebugHandlersFactory;
-import jdk.compiler.graal.replacements.MethodHandleWithExceptionPlugin;
-import jdk.compiler.graal.replacements.NodeIntrinsificationProvider;
-import jdk.compiler.graal.replacements.TargetGraphBuilderPlugins;
-import jdk.compiler.graal.word.WordOperationPlugin;
-import jdk.compiler.graal.word.WordTypes;
+import jdk.graal.compiler.api.replacements.Fold;
+import jdk.graal.compiler.api.replacements.SnippetReflectionProvider;
+import jdk.graal.compiler.bytecode.BytecodeProvider;
+import jdk.graal.compiler.bytecode.ResolvedJavaMethodBytecodeProvider;
+import jdk.graal.compiler.core.common.GraalOptions;
+import jdk.graal.compiler.core.common.spi.ForeignCallsProvider;
+import jdk.graal.compiler.core.common.spi.MetaAccessExtensionProvider;
+import jdk.graal.compiler.core.common.util.CompilationAlarm;
+import jdk.graal.compiler.core.riscv64.RISCV64ReflectionUtil;
+import jdk.graal.compiler.debug.DebugCloseable;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.debug.DebugContext.Builder;
+import jdk.graal.compiler.debug.DebugDumpScope;
+import jdk.graal.compiler.debug.Indent;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.hotspot.GraalHotSpotVMConfig;
+import jdk.graal.compiler.hotspot.HotSpotGraalCompiler;
+import jdk.graal.compiler.hotspot.HotSpotGraalRuntimeProvider;
+import jdk.graal.compiler.java.BciBlockMapping;
+import jdk.graal.compiler.lir.phases.LIRSuites;
+import jdk.graal.compiler.loop.phases.ConvertDeoptimizeToGuardPhase;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.gc.BarrierSet;
+import jdk.graal.compiler.nodes.graphbuilderconf.ClassInitializationPlugin;
+import jdk.graal.compiler.nodes.graphbuilderconf.GeneratedPluginFactory;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins;
+import jdk.graal.compiler.nodes.spi.CoreProviders;
+import jdk.graal.compiler.nodes.spi.LoweringProvider;
+import jdk.graal.compiler.nodes.spi.StampProvider;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.BasePhase;
+import jdk.graal.compiler.phases.FloatingGuardPhase;
+import jdk.graal.compiler.phases.PhaseSuite;
+import jdk.graal.compiler.phases.Speculative;
+import jdk.graal.compiler.phases.common.AddressLoweringPhase;
+import jdk.graal.compiler.phases.common.CanonicalizerPhase;
+import jdk.graal.compiler.phases.common.DeoptimizationGroupingPhase;
+import jdk.graal.compiler.phases.common.FrameStateAssignmentPhase;
+import jdk.graal.compiler.phases.common.LoopSafepointInsertionPhase;
+import jdk.graal.compiler.phases.common.inlining.InliningPhase;
+import jdk.graal.compiler.phases.tiers.HighTierContext;
+import jdk.graal.compiler.phases.tiers.LowTierContext;
+import jdk.graal.compiler.phases.tiers.MidTierContext;
+import jdk.graal.compiler.phases.tiers.Suites;
+import jdk.graal.compiler.phases.util.Providers;
+import jdk.graal.compiler.printer.GraalDebugHandlersFactory;
+import jdk.graal.compiler.replacements.MethodHandleWithExceptionPlugin;
+import jdk.graal.compiler.replacements.NodeIntrinsificationProvider;
+import jdk.graal.compiler.replacements.TargetGraphBuilderPlugins;
+import jdk.graal.compiler.word.WordOperationPlugin;
+import jdk.graal.compiler.word.WordTypes;
 import org.graalvm.nativeimage.AnnotationAccess;
 import org.graalvm.nativeimage.ImageInfo;
 import org.graalvm.nativeimage.ImageSingletons;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageGeneratorRunner.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageGeneratorRunner.java
index d59eb31b6f12..637698c13170 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageGeneratorRunner.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageGeneratorRunner.java
@@ -47,10 +47,10 @@
 import java.util.stream.Collectors;
 
 import org.graalvm.collections.Pair;
-import jdk.compiler.graal.core.riscv64.ShadowedRISCV64;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.printer.GraalDebugHandlersFactory;
+import jdk.graal.compiler.core.riscv64.ShadowedRISCV64;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.printer.GraalDebugHandlersFactory;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.c.function.CEntryPoint;
 import org.graalvm.nativeimage.c.type.CCharPointerPointer;
@@ -229,7 +229,7 @@ private static void transitiveRequires(boolean verbose, Module requiringModule,
                 if (potentialNeedModule.getName().equals("jdk.internal.vm.ci") || /* JVMCI */
                                 /* graal */
                                 potentialNeedModule.getName().startsWith("org.graalvm.") ||
-                                potentialNeedModule.getName().startsWith("jdk.compiler.graal") ||
+                                potentialNeedModule.getName().startsWith("jdk.graal.compiler") ||
                                 /* enterprise graal */
                                 potentialNeedModule.getName().startsWith("com.oracle.graal.") ||
                                 /* exclude all truffle modules */
@@ -743,8 +743,8 @@ public static void setModuleAccesses() {
             ModuleSupport.accessPackagesToClass(ModuleSupport.Access.OPEN, null, false, "org.graalvm.polyglot");
             ModuleSupport.accessPackagesToClass(ModuleSupport.Access.OPEN, null, false, "org.graalvm.truffle");
             ModuleSupport.accessPackagesToClass(ModuleSupport.Access.OPEN, null, false, "jdk.internal.vm.ci");
-            ModuleSupport.accessPackagesToClass(ModuleSupport.Access.OPEN, null, false, "jdk.compiler.graal");
-            ModuleSupport.accessPackagesToClass(ModuleSupport.Access.OPEN, null, true, "jdk.compiler.graal.management");
+            ModuleSupport.accessPackagesToClass(ModuleSupport.Access.OPEN, null, false, "jdk.graal.compiler");
+            ModuleSupport.accessPackagesToClass(ModuleSupport.Access.OPEN, null, true, "jdk.graal.compiler.management");
             ModuleSupport.accessPackagesToClass(ModuleSupport.Access.OPEN, null, true, "com.oracle.graal.graal_enterprise");
             ModuleSupport.accessPackagesToClass(ModuleSupport.Access.OPEN, null, false, "java.base", "jdk.internal.loader");
             ModuleSupport.accessPackagesToClass(ModuleSupport.Access.OPEN, null, false, "java.base", "jdk.internal.misc");
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageOptions.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageOptions.java
index a5c6da837e8a..18adab11e2a8 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageOptions.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageOptions.java
@@ -24,8 +24,8 @@
  */
 package com.oracle.svm.hosted;
 
-import static jdk.compiler.graal.options.OptionType.Debug;
-import static jdk.compiler.graal.options.OptionType.User;
+import static jdk.graal.compiler.options.OptionType.Debug;
+import static jdk.graal.compiler.options.OptionType.User;
 
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -33,11 +33,11 @@
 import java.util.Date;
 
 import org.graalvm.collections.EconomicMap;
-import jdk.compiler.graal.options.Option;
-import jdk.compiler.graal.options.OptionKey;
-import jdk.compiler.graal.options.OptionStability;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.serviceprovider.GraalServices;
+import jdk.graal.compiler.options.Option;
+import jdk.graal.compiler.options.OptionKey;
+import jdk.graal.compiler.options.OptionStability;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.serviceprovider.GraalServices;
 
 import com.oracle.graal.pointsto.reports.ReportUtils;
 import com.oracle.graal.pointsto.util.CompletionExecutor;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ProgressReporter.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ProgressReporter.java
index 34193a3f3ff7..64dceb12a375 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ProgressReporter.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ProgressReporter.java
@@ -52,10 +52,10 @@
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
-import jdk.compiler.graal.options.OptionKey;
-import jdk.compiler.graal.options.OptionStability;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.serviceprovider.GraalServices;
+import jdk.graal.compiler.options.OptionKey;
+import jdk.graal.compiler.options.OptionStability;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.serviceprovider.GraalServices;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.hosted.Feature;
 import org.graalvm.nativeimage.impl.ImageSingletonsSupport;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/RISCV64CPUFeatureAccessFeature.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/RISCV64CPUFeatureAccessFeature.java
index 5ef5fb404011..8b5db6c634e1 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/RISCV64CPUFeatureAccessFeature.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/RISCV64CPUFeatureAccessFeature.java
@@ -27,7 +27,7 @@
 import java.lang.reflect.Method;
 import java.util.EnumSet;
 
-import jdk.compiler.graal.core.riscv64.RISCV64ReflectionUtil;
+import jdk.graal.compiler.core.riscv64.RISCV64ReflectionUtil;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ReachabilityRegistrationNode.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ReachabilityRegistrationNode.java
index cb0a3f0fc8ab..94d12db5fdec 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ReachabilityRegistrationNode.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ReachabilityRegistrationNode.java
@@ -24,16 +24,16 @@
  */
 package com.oracle.svm.hosted;
 
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeCycles;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodeinfo.NodeSize;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.spi.Canonicalizable;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeCycles;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodeinfo.NodeSize;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.spi.Canonicalizable;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
 
 import com.oracle.graal.pointsto.util.AnalysisFuture;
 import com.oracle.svm.core.BuildPhaseProvider;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ResourcesFeature.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ResourcesFeature.java
index 46f500987f61..99f6b23593fe 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ResourcesFeature.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ResourcesFeature.java
@@ -48,16 +48,16 @@
 import java.util.concurrent.atomic.LongAdder;
 import java.util.regex.Pattern;
 
-import jdk.compiler.graal.api.replacements.SnippetReflectionProvider;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins;
-import jdk.compiler.graal.options.Option;
-import jdk.compiler.graal.options.OptionType;
-import jdk.compiler.graal.phases.util.Providers;
+import jdk.graal.compiler.api.replacements.SnippetReflectionProvider;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins;
+import jdk.graal.compiler.options.Option;
+import jdk.graal.compiler.options.OptionType;
+import jdk.graal.compiler.phases.util.Providers;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.hosted.RuntimeResourceAccess;
 import org.graalvm.nativeimage.impl.ConfigurationCondition;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/SVMHost.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/SVMHost.java
index 703c6c83cc89..2980c468cd20 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/SVMHost.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/SVMHost.java
@@ -51,27 +51,27 @@
 import java.util.function.BooleanSupplier;
 import java.util.function.Function;
 
-import jdk.compiler.graal.core.common.spi.ForeignCallDescriptor;
-import jdk.compiler.graal.core.common.spi.ForeignCallsProvider;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.debug.MethodFilter;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.java.GraphBuilderPhase.Instance;
-import jdk.compiler.graal.nodes.StaticDeoptimizingNode;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.extended.UnsafeAccessNode;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration;
-import jdk.compiler.graal.nodes.graphbuilderconf.IntrinsicContext;
-import jdk.compiler.graal.nodes.java.AccessFieldNode;
-import jdk.compiler.graal.nodes.java.AccessMonitorNode;
-import jdk.compiler.graal.options.Option;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.OptimisticOptimizations;
-import jdk.compiler.graal.phases.common.BoxNodeIdentityPhase;
-import jdk.compiler.graal.phases.common.CanonicalizerPhase;
-import jdk.compiler.graal.virtual.phases.ea.PartialEscapePhase;
+import jdk.graal.compiler.core.common.spi.ForeignCallDescriptor;
+import jdk.graal.compiler.core.common.spi.ForeignCallsProvider;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.debug.MethodFilter;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.java.GraphBuilderPhase.Instance;
+import jdk.graal.compiler.nodes.StaticDeoptimizingNode;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.extended.UnsafeAccessNode;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
+import jdk.graal.compiler.nodes.graphbuilderconf.IntrinsicContext;
+import jdk.graal.compiler.nodes.java.AccessFieldNode;
+import jdk.graal.compiler.nodes.java.AccessMonitorNode;
+import jdk.graal.compiler.options.Option;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.OptimisticOptimizations;
+import jdk.graal.compiler.phases.common.BoxNodeIdentityPhase;
+import jdk.graal.compiler.phases.common.CanonicalizerPhase;
+import jdk.graal.compiler.virtual.phases.ea.PartialEscapePhase;
 import org.graalvm.nativeimage.AnnotationAccess;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/SecurityServicesFeature.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/SecurityServicesFeature.java
index 222cad049dd2..9c29979a97c4 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/SecurityServicesFeature.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/SecurityServicesFeature.java
@@ -80,7 +80,7 @@
 import javax.security.auth.callback.CallbackHandler;
 import javax.security.auth.login.Configuration;
 
-import jdk.compiler.graal.options.Option;
+import jdk.graal.compiler.options.Option;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.hosted.RuntimeJNIAccess;
 import org.graalvm.nativeimage.hosted.RuntimeReflection;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ServiceLoaderFeature.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ServiceLoaderFeature.java
index 234bc520ab2b..fdfe8521ad34 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ServiceLoaderFeature.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ServiceLoaderFeature.java
@@ -33,8 +33,8 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import jdk.compiler.graal.options.Option;
-import jdk.compiler.graal.options.OptionType;
+import jdk.graal.compiler.options.Option;
+import jdk.graal.compiler.options.OptionType;
 import org.graalvm.nativeimage.hosted.RuntimeReflection;
 import org.graalvm.nativeimage.hosted.RuntimeResourceAccess;
 
@@ -92,11 +92,11 @@ public static class Options {
                     "sun.util.locale.provider.LocaleDataMetaInfo", // see LocaleSubstitutions
                     /* Graal hotspot-specific services */
                     "jdk.vm.ci.hotspot.HotSpotJVMCIBackendFactory",
-                    "jdk.compiler.graal.hotspot.CompilerConfigurationFactory",
-                    "jdk.compiler.graal.hotspot.HotSpotBackendFactory",
-                    "jdk.compiler.graal.hotspot.meta.DefaultHotSpotLoweringProvider$Extensions",
-                    "jdk.compiler.graal.hotspot.meta.HotSpotInvocationPluginProvider",
-                    "jdk.compiler.graal.truffle.hotspot.TruffleCallBoundaryInstrumentationFactory");
+                    "jdk.graal.compiler.hotspot.CompilerConfigurationFactory",
+                    "jdk.graal.compiler.hotspot.HotSpotBackendFactory",
+                    "jdk.graal.compiler.hotspot.meta.DefaultHotSpotLoweringProvider$Extensions",
+                    "jdk.graal.compiler.hotspot.meta.HotSpotInvocationPluginProvider",
+                    "jdk.graal.compiler.truffle.hotspot.TruffleCallBoundaryInstrumentationFactory");
 
     // NOTE: Platform class had to be added to this list since our analysis discovers that
     // Platform.includedIn is reachable regardless of fact that it is constant folded at
@@ -112,7 +112,7 @@ public static class Options {
 
     private static final Set SKIPPED_PROVIDERS = Set.of(
                     /* Graal hotspot-specific service-providers */
-                    "jdk.compiler.graal.hotspot.meta.HotSpotDisassemblerProvider",
+                    "jdk.graal.compiler.hotspot.meta.HotSpotDisassemblerProvider",
                     /* Skip console providers until GR-44085 is fixed */
                     "jdk.internal.org.jline.JdkConsoleProviderImpl", "jdk.jshell.execution.impl.ConsoleImpl$ConsoleProviderImpl");
 
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/SubstitutionReportFeature.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/SubstitutionReportFeature.java
index 187467f74f36..5bb641c25f80 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/SubstitutionReportFeature.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/SubstitutionReportFeature.java
@@ -30,7 +30,7 @@
 import java.util.TreeMap;
 import java.util.function.Function;
 
-import jdk.compiler.graal.options.Option;
+import jdk.graal.compiler.options.Option;
 
 import com.oracle.graal.pointsto.infrastructure.OriginalClassProvider;
 import com.oracle.graal.pointsto.meta.AnalysisField;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/SubstrateStrengthenGraphs.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/SubstrateStrengthenGraphs.java
index b6409848061c..39d166d7126d 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/SubstrateStrengthenGraphs.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/SubstrateStrengthenGraphs.java
@@ -26,15 +26,15 @@
 
 import java.util.function.Supplier;
 
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.DeoptimizeNode;
-import jdk.compiler.graal.nodes.FixedNode;
-import jdk.compiler.graal.nodes.Invoke;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.extended.ForeignCallNode;
-import jdk.compiler.graal.nodes.spi.CoreProviders;
-import jdk.compiler.graal.nodes.spi.SimplifierTool;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.DeoptimizeNode;
+import jdk.graal.compiler.nodes.FixedNode;
+import jdk.graal.compiler.nodes.Invoke;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.extended.ForeignCallNode;
+import jdk.graal.compiler.nodes.spi.CoreProviders;
+import jdk.graal.compiler.nodes.spi.SimplifierTool;
 
 import com.oracle.graal.pointsto.PointsToAnalysis;
 import com.oracle.graal.pointsto.infrastructure.Universe;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ameta/AnalysisConstantReflectionProvider.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ameta/AnalysisConstantReflectionProvider.java
index 5ea8c09d98dc..906840657422 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ameta/AnalysisConstantReflectionProvider.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ameta/AnalysisConstantReflectionProvider.java
@@ -28,8 +28,8 @@
 import java.util.Set;
 import java.util.function.ObjIntConsumer;
 
-import jdk.compiler.graal.core.common.type.TypedConstant;
-import jdk.compiler.graal.word.Word;
+import jdk.graal.compiler.core.common.type.TypedConstant;
+import jdk.graal.compiler.word.Word;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
 import org.graalvm.word.WordBase;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ameta/AnalysisMethodHandleAccessProvider.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ameta/AnalysisMethodHandleAccessProvider.java
index 120b85ad4102..bdd9e581aaa3 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ameta/AnalysisMethodHandleAccessProvider.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ameta/AnalysisMethodHandleAccessProvider.java
@@ -24,7 +24,7 @@
  */
 package com.oracle.svm.hosted.ameta;
 
-import jdk.compiler.graal.api.replacements.SnippetReflectionProvider;
+import jdk.graal.compiler.api.replacements.SnippetReflectionProvider;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
 
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/analysis/CallChecker.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/analysis/CallChecker.java
index 9c3acce90b90..123d974da314 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/analysis/CallChecker.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/analysis/CallChecker.java
@@ -26,7 +26,7 @@
 
 import java.util.regex.Pattern;
 
-import jdk.compiler.graal.core.common.SuppressSVMWarnings;
+import jdk.graal.compiler.core.common.SuppressSVMWarnings;
 
 import com.oracle.graal.pointsto.BigBang;
 import com.oracle.graal.pointsto.meta.AnalysisMethod;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/analysis/NativeImagePointsToAnalysis.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/analysis/NativeImagePointsToAnalysis.java
index fb6c1af69b3e..f096d25329d0 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/analysis/NativeImagePointsToAnalysis.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/analysis/NativeImagePointsToAnalysis.java
@@ -29,9 +29,9 @@
 import java.lang.reflect.Modifier;
 import java.util.concurrent.ForkJoinPool;
 
-import jdk.compiler.graal.api.replacements.SnippetReflectionProvider;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.word.WordTypes;
+import jdk.graal.compiler.api.replacements.SnippetReflectionProvider;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.word.WordTypes;
 
 import com.oracle.graal.pointsto.PointsToAnalysis;
 import com.oracle.graal.pointsto.constraints.UnsupportedFeatures;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/analysis/NativeImageReachabilityAnalysisEngine.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/analysis/NativeImageReachabilityAnalysisEngine.java
index 8978d4dc9854..0b129a9cf1c8 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/analysis/NativeImageReachabilityAnalysisEngine.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/analysis/NativeImageReachabilityAnalysisEngine.java
@@ -26,9 +26,9 @@
 
 import java.util.concurrent.ForkJoinPool;
 
-import jdk.compiler.graal.api.replacements.SnippetReflectionProvider;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.word.WordTypes;
+import jdk.graal.compiler.api.replacements.SnippetReflectionProvider;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.word.WordTypes;
 
 import com.oracle.graal.pointsto.meta.AnalysisField;
 import com.oracle.graal.pointsto.meta.AnalysisMetaAccess;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/analysis/ReachabilityTracePrinter.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/analysis/ReachabilityTracePrinter.java
index 7830ab86e1a7..31c80b19e042 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/analysis/ReachabilityTracePrinter.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/analysis/ReachabilityTracePrinter.java
@@ -29,9 +29,9 @@
 import java.nio.file.Path;
 import java.util.List;
 
-import jdk.compiler.graal.debug.MethodFilter;
-import jdk.compiler.graal.options.Option;
-import jdk.compiler.graal.options.OptionValues;
+import jdk.graal.compiler.debug.MethodFilter;
+import jdk.graal.compiler.options.Option;
+import jdk.graal.compiler.options.OptionValues;
 
 import com.oracle.graal.pointsto.BigBang;
 import com.oracle.graal.pointsto.meta.AnalysisElement;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/analysis/SVMParsingSupport.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/analysis/SVMParsingSupport.java
index b745c284d762..ae0911f99a81 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/analysis/SVMParsingSupport.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/analysis/SVMParsingSupport.java
@@ -26,9 +26,9 @@
 
 import java.util.function.Function;
 
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
 
 import com.oracle.graal.pointsto.BigBang;
 import com.oracle.graal.pointsto.PointsToAnalysis;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/analysis/SubstrateUnsupportedFeatures.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/analysis/SubstrateUnsupportedFeatures.java
index f8071aa604dd..31cd22f6a815 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/analysis/SubstrateUnsupportedFeatures.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/analysis/SubstrateUnsupportedFeatures.java
@@ -24,7 +24,7 @@
  */
 package com.oracle.svm.hosted.analysis;
 
-import jdk.compiler.graal.debug.GraalError;
+import jdk.graal.compiler.debug.GraalError;
 
 import com.oracle.graal.pointsto.constraints.UnsupportedFeatures;
 import com.oracle.graal.pointsto.meta.AnalysisMethod;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/analysis/flow/SVMMethodTypeFlowBuilder.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/analysis/flow/SVMMethodTypeFlowBuilder.java
index b1f9b8058236..726c0e165308 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/analysis/flow/SVMMethodTypeFlowBuilder.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/analysis/flow/SVMMethodTypeFlowBuilder.java
@@ -25,17 +25,17 @@
 
 package com.oracle.svm.hosted.analysis.flow;
 
-import jdk.compiler.graal.core.common.type.ObjectStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.nodes.CallTargetNode.InvokeKind;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.FixedNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.java.LoadFieldNode;
+import jdk.graal.compiler.core.common.type.ObjectStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.nodes.CallTargetNode.InvokeKind;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.FixedNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.java.LoadFieldNode;
 
 import com.oracle.graal.pointsto.AbstractAnalysisEngine;
 import com.oracle.graal.pointsto.PointsToAnalysis;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/annotation/AnnotationArrayValue.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/annotation/AnnotationArrayValue.java
index 3a868a141048..7239b9f06193 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/annotation/AnnotationArrayValue.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/annotation/AnnotationArrayValue.java
@@ -31,7 +31,7 @@
 import java.util.List;
 import java.util.function.Consumer;
 
-import jdk.compiler.graal.api.replacements.SnippetReflectionProvider;
+import jdk.graal.compiler.api.replacements.SnippetReflectionProvider;
 
 import jdk.internal.reflect.ConstantPool;
 import jdk.vm.ci.meta.JavaConstant;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/annotation/AnnotationExceptionProxyValue.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/annotation/AnnotationExceptionProxyValue.java
index 674707879f3a..9cabd2355d21 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/annotation/AnnotationExceptionProxyValue.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/annotation/AnnotationExceptionProxyValue.java
@@ -28,7 +28,7 @@
 import java.util.List;
 import java.util.Objects;
 
-import jdk.compiler.graal.api.replacements.SnippetReflectionProvider;
+import jdk.graal.compiler.api.replacements.SnippetReflectionProvider;
 
 import jdk.vm.ci.meta.JavaConstant;
 import sun.reflect.annotation.ExceptionProxy;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/annotation/AnnotationMemberValue.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/annotation/AnnotationMemberValue.java
index f5d114e6cea0..4ff80c2a03af 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/annotation/AnnotationMemberValue.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/annotation/AnnotationMemberValue.java
@@ -29,7 +29,7 @@
 import java.util.Collections;
 import java.util.List;
 
-import jdk.compiler.graal.api.replacements.SnippetReflectionProvider;
+import jdk.graal.compiler.api.replacements.SnippetReflectionProvider;
 
 import jdk.internal.reflect.ConstantPool;
 import jdk.vm.ci.meta.JavaConstant;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/annotation/AnnotationMetadata.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/annotation/AnnotationMetadata.java
index b64cc9a4266b..3b6952543e61 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/annotation/AnnotationMetadata.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/annotation/AnnotationMetadata.java
@@ -30,7 +30,7 @@
 import java.lang.reflect.Method;
 import java.nio.ByteBuffer;
 
-import jdk.compiler.graal.debug.GraalError;
+import jdk.graal.compiler.debug.GraalError;
 
 import com.oracle.svm.util.ReflectionUtil;
 
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/annotation/AnnotationValue.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/annotation/AnnotationValue.java
index a345265323aa..0b4b09728f5f 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/annotation/AnnotationValue.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/annotation/AnnotationValue.java
@@ -35,7 +35,7 @@
 import java.util.Objects;
 import java.util.function.BiConsumer;
 
-import jdk.compiler.graal.api.replacements.SnippetReflectionProvider;
+import jdk.graal.compiler.api.replacements.SnippetReflectionProvider;
 
 import jdk.internal.reflect.ConstantPool;
 import jdk.vm.ci.meta.JavaConstant;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/CAnnotationProcessorCache.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/CAnnotationProcessorCache.java
index 3a31ee6b8217..533fb863537b 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/CAnnotationProcessorCache.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/CAnnotationProcessorCache.java
@@ -41,15 +41,15 @@
 
 import com.oracle.svm.core.SubstrateUtil;
 import org.graalvm.collections.UnmodifiableEconomicMap;
-import jdk.compiler.graal.options.Option;
+import jdk.graal.compiler.options.Option;
 
 import com.oracle.svm.core.option.HostedOptionKey;
 import com.oracle.svm.core.option.SubstrateOptionsParser;
 import com.oracle.svm.core.util.UserError;
 import com.oracle.svm.hosted.c.info.NativeCodeInfo;
 import com.oracle.svm.hosted.c.query.QueryResultParser;
-import jdk.compiler.graal.options.OptionKey;
-import jdk.compiler.graal.options.OptionValues;
+import jdk.graal.compiler.options.OptionKey;
+import jdk.graal.compiler.options.OptionValues;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
 
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/CGlobalDataFeature.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/CGlobalDataFeature.java
index 1f400326c26a..05e57d0f36fc 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/CGlobalDataFeature.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/CGlobalDataFeature.java
@@ -24,7 +24,7 @@
  */
 package com.oracle.svm.hosted.c;
 
-import static jdk.compiler.graal.nodes.CallTargetNode.InvokeKind;
+import static jdk.graal.compiler.nodes.CallTargetNode.InvokeKind;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
@@ -36,37 +36,37 @@
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
-import jdk.compiler.graal.api.replacements.SnippetReflectionProvider;
-import jdk.compiler.graal.core.common.memory.BarrierType;
-import jdk.compiler.graal.core.common.memory.MemoryOrderMode;
-import jdk.compiler.graal.core.common.type.IntegerStamp;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.nodes.AbstractBeginNode;
-import jdk.compiler.graal.nodes.AbstractMergeNode;
-import jdk.compiler.graal.nodes.BeginNode;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.EndNode;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.IfNode;
-import jdk.compiler.graal.nodes.LogicNode;
-import jdk.compiler.graal.nodes.MergeNode;
-import jdk.compiler.graal.nodes.NamedLocationIdentity;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.ValuePhiNode;
-import jdk.compiler.graal.nodes.calc.AddNode;
-import jdk.compiler.graal.nodes.calc.IntegerEqualsNode;
-import jdk.compiler.graal.nodes.calc.SignExtendNode;
-import jdk.compiler.graal.nodes.extended.BranchProbabilityNode;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin.Receiver;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin.RequiredInvocationPlugin;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins.Registration;
-import jdk.compiler.graal.nodes.java.LoadFieldNode;
-import jdk.compiler.graal.nodes.memory.ReadNode;
-import jdk.compiler.graal.nodes.memory.address.OffsetAddressNode;
-import jdk.compiler.graal.phases.util.Providers;
+import jdk.graal.compiler.api.replacements.SnippetReflectionProvider;
+import jdk.graal.compiler.core.common.memory.BarrierType;
+import jdk.graal.compiler.core.common.memory.MemoryOrderMode;
+import jdk.graal.compiler.core.common.type.IntegerStamp;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.nodes.AbstractBeginNode;
+import jdk.graal.compiler.nodes.AbstractMergeNode;
+import jdk.graal.compiler.nodes.BeginNode;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.EndNode;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.IfNode;
+import jdk.graal.compiler.nodes.LogicNode;
+import jdk.graal.compiler.nodes.MergeNode;
+import jdk.graal.compiler.nodes.NamedLocationIdentity;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.ValuePhiNode;
+import jdk.graal.compiler.nodes.calc.AddNode;
+import jdk.graal.compiler.nodes.calc.IntegerEqualsNode;
+import jdk.graal.compiler.nodes.calc.SignExtendNode;
+import jdk.graal.compiler.nodes.extended.BranchProbabilityNode;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin.Receiver;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin.RequiredInvocationPlugin;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins.Registration;
+import jdk.graal.compiler.nodes.java.LoadFieldNode;
+import jdk.graal.compiler.nodes.memory.ReadNode;
+import jdk.graal.compiler.nodes.memory.address.OffsetAddressNode;
+import jdk.graal.compiler.phases.util.Providers;
 import org.graalvm.nativeimage.ImageSingletons;
 
 import com.oracle.graal.pointsto.meta.AnalysisType;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/NativeLibraries.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/NativeLibraries.java
index e7e98bc6f6da..58d362087f25 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/NativeLibraries.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/NativeLibraries.java
@@ -47,12 +47,12 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import jdk.compiler.graal.api.replacements.SnippetReflectionProvider;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.hotspot.JVMCIVersionCheck;
-import jdk.compiler.graal.word.BarrieredAccess;
-import jdk.compiler.graal.word.ObjectAccess;
-import jdk.compiler.graal.word.Word;
+import jdk.graal.compiler.api.replacements.SnippetReflectionProvider;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.hotspot.JVMCIVersionCheck;
+import jdk.graal.compiler.word.BarrieredAccess;
+import jdk.graal.compiler.word.ObjectAccess;
+import jdk.graal.compiler.word.Word;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.c.CContext;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/codegen/CCompilerInvoker.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/codegen/CCompilerInvoker.java
index c26e0a7afc85..86ca3bf3bd68 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/codegen/CCompilerInvoker.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/codegen/CCompilerInvoker.java
@@ -40,8 +40,8 @@
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
-import jdk.compiler.graal.core.riscv64.RISCV64ReflectionUtil;
-import jdk.compiler.graal.serviceprovider.JavaVersionUtil;
+import jdk.graal.compiler.core.riscv64.RISCV64ReflectionUtil;
+import jdk.graal.compiler.serviceprovider.JavaVersionUtil;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
 
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/function/CEntryPointSupport.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/function/CEntryPointSupport.java
index 24676fd4d675..c9bb4ea53679 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/function/CEntryPointSupport.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/function/CEntryPointSupport.java
@@ -24,20 +24,20 @@
  */
 package com.oracle.svm.hosted.c.function;
 
-import jdk.compiler.graal.api.replacements.SnippetReflectionProvider;
-import jdk.compiler.graal.nodes.AbstractBeginNode;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.IfNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.calc.AddNode;
-import jdk.compiler.graal.nodes.extended.BranchProbabilityNode;
-import jdk.compiler.graal.nodes.extended.StateSplitProxyNode;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin.RequiredInvocationPlugin;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins.Registration;
-import jdk.compiler.graal.phases.util.Providers;
+import jdk.graal.compiler.api.replacements.SnippetReflectionProvider;
+import jdk.graal.compiler.nodes.AbstractBeginNode;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.IfNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.calc.AddNode;
+import jdk.graal.compiler.nodes.extended.BranchProbabilityNode;
+import jdk.graal.compiler.nodes.extended.StateSplitProxyNode;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin.RequiredInvocationPlugin;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins.Registration;
+import jdk.graal.compiler.phases.util.Providers;
 import org.graalvm.nativeimage.CurrentIsolate;
 import org.graalvm.nativeimage.Isolate;
 import org.graalvm.nativeimage.IsolateThread;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/info/InfoTreeBuilder.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/info/InfoTreeBuilder.java
index d125516be323..27efaa2fc74c 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/info/InfoTreeBuilder.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/info/InfoTreeBuilder.java
@@ -32,8 +32,8 @@
 import java.util.Map;
 import java.util.TreeMap;
 
-import jdk.compiler.graal.bytecode.BridgeMethodUtils;
-import jdk.compiler.graal.phases.util.Providers;
+import jdk.graal.compiler.bytecode.BridgeMethodUtils;
+import jdk.graal.compiler.phases.util.Providers;
 import org.graalvm.nativeimage.c.constant.CConstant;
 import org.graalvm.nativeimage.c.constant.CEnum;
 import org.graalvm.nativeimage.c.constant.CEnumConstant;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/util/FileUtils.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/util/FileUtils.java
index 079eebc3992c..8a0826779075 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/util/FileUtils.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/util/FileUtils.java
@@ -39,7 +39,7 @@
 import java.util.Arrays;
 import java.util.List;
 
-import jdk.compiler.graal.debug.DebugContext;
+import jdk.graal.compiler.debug.DebugContext;
 import org.graalvm.nativeimage.ImageSingletons;
 
 import com.oracle.svm.core.SubstrateOptions;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/cenum/CEnumCallWrapperMethod.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/cenum/CEnumCallWrapperMethod.java
index ca70bf09ccbd..b6991e90ae08 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/cenum/CEnumCallWrapperMethod.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/cenum/CEnumCallWrapperMethod.java
@@ -26,12 +26,12 @@
 
 import java.lang.reflect.Modifier;
 
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
 import org.graalvm.nativeimage.c.constant.CEnumLookup;
 import org.graalvm.nativeimage.c.constant.CEnumValue;
 
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/classinitialization/AllowAllHostedUsagesClassInitializationSupport.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/classinitialization/AllowAllHostedUsagesClassInitializationSupport.java
index 1125d2766b3e..3e0d94661338 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/classinitialization/AllowAllHostedUsagesClassInitializationSupport.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/classinitialization/AllowAllHostedUsagesClassInitializationSupport.java
@@ -26,7 +26,7 @@
 
 import java.lang.reflect.Proxy;
 
-import jdk.compiler.graal.java.LambdaUtils;
+import jdk.graal.compiler.java.LambdaUtils;
 
 import com.oracle.graal.pointsto.meta.AnalysisMetaAccess;
 import com.oracle.graal.pointsto.meta.AnalysisUniverse;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/classinitialization/ClassInitializationFeature.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/classinitialization/ClassInitializationFeature.java
index 82124effa5b8..4ae08fda305e 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/classinitialization/ClassInitializationFeature.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/classinitialization/ClassInitializationFeature.java
@@ -39,10 +39,10 @@
 import java.util.stream.StreamSupport;
 
 import org.graalvm.collections.Pair;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.java.LambdaUtils;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.util.Providers;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.java.LambdaUtils;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.util.Providers;
 import org.graalvm.nativeimage.impl.clinit.ClassInitializationTracking;
 
 import com.oracle.graal.pointsto.constraints.UnsupportedFeatureException;
@@ -99,7 +99,7 @@ private static void initializeNativeImagePackagesAtBuildTime(ClassInitialization
         initializationSupport.initializeAtBuildTime("com.oracle.objectfile", NATIVE_IMAGE_CLASS_REASON);
 
         initializationSupport.initializeAtBuildTime("org.graalvm.collections", NATIVE_IMAGE_CLASS_REASON);
-        initializationSupport.initializeAtBuildTime("jdk.compiler.graal", NATIVE_IMAGE_CLASS_REASON);
+        initializationSupport.initializeAtBuildTime("jdk.graal.compiler", NATIVE_IMAGE_CLASS_REASON);
         initializationSupport.initializeAtBuildTime("org.graalvm.word", NATIVE_IMAGE_CLASS_REASON);
         initializationSupport.initializeAtBuildTime("org.graalvm.nativeimage", NATIVE_IMAGE_CLASS_REASON);
         initializationSupport.initializeAtBuildTime("org.graalvm.nativebridge", NATIVE_IMAGE_CLASS_REASON);
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/classinitialization/ClassInitializationOptions.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/classinitialization/ClassInitializationOptions.java
index 45ebd9853676..fd812adf1b3e 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/classinitialization/ClassInitializationOptions.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/classinitialization/ClassInitializationOptions.java
@@ -31,8 +31,8 @@
 
 import java.util.function.Function;
 
-import jdk.compiler.graal.options.Option;
-import jdk.compiler.graal.options.OptionType;
+import jdk.graal.compiler.options.Option;
+import jdk.graal.compiler.options.OptionType;
 
 import com.oracle.svm.core.option.APIOption;
 import com.oracle.svm.core.option.HostedOptionKey;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/classinitialization/ClassInitializationSupport.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/classinitialization/ClassInitializationSupport.java
index 8c80cc235e97..1cc927af9261 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/classinitialization/ClassInitializationSupport.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/classinitialization/ClassInitializationSupport.java
@@ -37,7 +37,7 @@
 import java.util.stream.Collectors;
 
 import org.graalvm.collections.EconomicSet;
-import jdk.compiler.graal.java.LambdaUtils;
+import jdk.graal.compiler.java.LambdaUtils;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.impl.RuntimeClassInitializationSupport;
 import org.graalvm.nativeimage.impl.clinit.ClassInitializationTracking;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/classinitialization/ClassInitializerGraphBuilderPhase.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/classinitialization/ClassInitializerGraphBuilderPhase.java
index aece10072b5b..95b87a71573c 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/classinitialization/ClassInitializerGraphBuilderPhase.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/classinitialization/ClassInitializerGraphBuilderPhase.java
@@ -24,13 +24,13 @@
  */
 package com.oracle.svm.hosted.classinitialization;
 
-import jdk.compiler.graal.java.BytecodeParser;
-import jdk.compiler.graal.java.GraphBuilderPhase;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration;
-import jdk.compiler.graal.nodes.graphbuilderconf.IntrinsicContext;
-import jdk.compiler.graal.nodes.spi.CoreProviders;
-import jdk.compiler.graal.phases.OptimisticOptimizations;
+import jdk.graal.compiler.java.BytecodeParser;
+import jdk.graal.compiler.java.GraphBuilderPhase;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
+import jdk.graal.compiler.nodes.graphbuilderconf.IntrinsicContext;
+import jdk.graal.compiler.nodes.spi.CoreProviders;
+import jdk.graal.compiler.phases.OptimisticOptimizations;
 
 import com.oracle.svm.hosted.phases.SharedGraphBuilderPhase;
 
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/classinitialization/EarlyClassInitializerAnalysis.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/classinitialization/EarlyClassInitializerAnalysis.java
index 229e55c879e7..a7e0fa1687a9 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/classinitialization/EarlyClassInitializerAnalysis.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/classinitialization/EarlyClassInitializerAnalysis.java
@@ -24,40 +24,40 @@
  */
 package com.oracle.svm.hosted.classinitialization;
 
-import static jdk.compiler.graal.nodes.graphbuilderconf.InlineInvokePlugin.InlineInfo.createStandardInlineInfo;
+import static jdk.graal.compiler.nodes.graphbuilderconf.InlineInvokePlugin.InlineInfo.createStandardInlineInfo;
 
 import java.lang.reflect.Proxy;
 import java.util.HashSet;
 import java.util.Set;
 import java.util.function.Supplier;
 
-import jdk.compiler.graal.core.common.GraalBailoutException;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.debug.DebugContext.Builder;
-import jdk.compiler.graal.graph.Graph;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.java.BytecodeParser;
-import jdk.compiler.graal.java.GraphBuilderPhase;
-import jdk.compiler.graal.nodes.FrameState;
-import jdk.compiler.graal.nodes.GraphState.GuardsStage;
-import jdk.compiler.graal.nodes.GraphState.StageFlag;
-import jdk.compiler.graal.nodes.Invoke;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.extended.UnsafeAccessNode;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext;
-import jdk.compiler.graal.nodes.graphbuilderconf.InlineInvokePlugin;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins;
-import jdk.compiler.graal.nodes.java.AccessFieldNode;
-import jdk.compiler.graal.nodes.java.AccessMonitorNode;
-import jdk.compiler.graal.nodes.java.NewArrayNode;
-import jdk.compiler.graal.nodes.java.NewMultiArrayNode;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.OptimisticOptimizations;
-import jdk.compiler.graal.phases.tiers.HighTierContext;
-import jdk.compiler.graal.phases.util.Providers;
+import jdk.graal.compiler.core.common.GraalBailoutException;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.debug.DebugContext.Builder;
+import jdk.graal.compiler.graph.Graph;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.java.BytecodeParser;
+import jdk.graal.compiler.java.GraphBuilderPhase;
+import jdk.graal.compiler.nodes.FrameState;
+import jdk.graal.compiler.nodes.GraphState.GuardsStage;
+import jdk.graal.compiler.nodes.GraphState.StageFlag;
+import jdk.graal.compiler.nodes.Invoke;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.extended.UnsafeAccessNode;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext;
+import jdk.graal.compiler.nodes.graphbuilderconf.InlineInvokePlugin;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins;
+import jdk.graal.compiler.nodes.java.AccessFieldNode;
+import jdk.graal.compiler.nodes.java.AccessMonitorNode;
+import jdk.graal.compiler.nodes.java.NewArrayNode;
+import jdk.graal.compiler.nodes.java.NewMultiArrayNode;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.OptimisticOptimizations;
+import jdk.graal.compiler.phases.tiers.HighTierContext;
+import jdk.graal.compiler.phases.util.Providers;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.impl.RuntimeClassInitializationSupport;
 
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/classinitialization/SimulateClassInitializerAbortException.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/classinitialization/SimulateClassInitializerAbortException.java
index 141a862b2846..d376eba14d4e 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/classinitialization/SimulateClassInitializerAbortException.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/classinitialization/SimulateClassInitializerAbortException.java
@@ -24,9 +24,9 @@
  */
 package com.oracle.svm.hosted.classinitialization;
 
-import jdk.compiler.graal.core.common.GraalBailoutException;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.nodes.StructuredGraph;
+import jdk.graal.compiler.core.common.GraalBailoutException;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.nodes.StructuredGraph;
 
 /**
  * Exception used to abort a simulation when it is known that simulation cannot succeed. This avoids
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/classinitialization/SimulateClassInitializerGraphDecoder.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/classinitialization/SimulateClassInitializerGraphDecoder.java
index b945c51642b8..2bbee446a63e 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/classinitialization/SimulateClassInitializerGraphDecoder.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/classinitialization/SimulateClassInitializerGraphDecoder.java
@@ -52,32 +52,32 @@
 
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.EconomicSet;
-import jdk.compiler.graal.core.common.type.TypedConstant;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.nodes.AbstractBeginNode;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.ControlSplitNode;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.extended.BoxNode;
-import jdk.compiler.graal.nodes.graphbuilderconf.LoopExplosionPlugin.LoopExplosionKind;
-import jdk.compiler.graal.nodes.java.AccessMonitorNode;
-import jdk.compiler.graal.nodes.java.LoadFieldNode;
-import jdk.compiler.graal.nodes.java.LoadIndexedNode;
-import jdk.compiler.graal.nodes.java.NewArrayNode;
-import jdk.compiler.graal.nodes.java.NewInstanceNode;
-import jdk.compiler.graal.nodes.java.NewMultiArrayNode;
-import jdk.compiler.graal.nodes.java.StoreFieldNode;
-import jdk.compiler.graal.nodes.java.StoreIndexedNode;
-import jdk.compiler.graal.nodes.virtual.AllocatedObjectNode;
-import jdk.compiler.graal.nodes.virtual.CommitAllocationNode;
-import jdk.compiler.graal.nodes.virtual.VirtualArrayNode;
-import jdk.compiler.graal.nodes.virtual.VirtualBoxingNode;
-import jdk.compiler.graal.nodes.virtual.VirtualInstanceNode;
-import jdk.compiler.graal.nodes.virtual.VirtualObjectNode;
-import jdk.compiler.graal.replacements.arraycopy.ArrayCopyNode;
-import jdk.compiler.graal.replacements.nodes.ObjectClone;
+import jdk.graal.compiler.core.common.type.TypedConstant;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.nodes.AbstractBeginNode;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.ControlSplitNode;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.extended.BoxNode;
+import jdk.graal.compiler.nodes.graphbuilderconf.LoopExplosionPlugin.LoopExplosionKind;
+import jdk.graal.compiler.nodes.java.AccessMonitorNode;
+import jdk.graal.compiler.nodes.java.LoadFieldNode;
+import jdk.graal.compiler.nodes.java.LoadIndexedNode;
+import jdk.graal.compiler.nodes.java.NewArrayNode;
+import jdk.graal.compiler.nodes.java.NewInstanceNode;
+import jdk.graal.compiler.nodes.java.NewMultiArrayNode;
+import jdk.graal.compiler.nodes.java.StoreFieldNode;
+import jdk.graal.compiler.nodes.java.StoreIndexedNode;
+import jdk.graal.compiler.nodes.virtual.AllocatedObjectNode;
+import jdk.graal.compiler.nodes.virtual.CommitAllocationNode;
+import jdk.graal.compiler.nodes.virtual.VirtualArrayNode;
+import jdk.graal.compiler.nodes.virtual.VirtualBoxingNode;
+import jdk.graal.compiler.nodes.virtual.VirtualInstanceNode;
+import jdk.graal.compiler.nodes.virtual.VirtualObjectNode;
+import jdk.graal.compiler.replacements.arraycopy.ArrayCopyNode;
+import jdk.graal.compiler.replacements.nodes.ObjectClone;
 import org.graalvm.nativeimage.ImageSingletons;
 
 import com.oracle.graal.pointsto.BigBang;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/classinitialization/SimulateClassInitializerPolicy.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/classinitialization/SimulateClassInitializerPolicy.java
index 33f27282e5a8..e1b48fc71639 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/classinitialization/SimulateClassInitializerPolicy.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/classinitialization/SimulateClassInitializerPolicy.java
@@ -24,7 +24,7 @@
  */
 package com.oracle.svm.hosted.classinitialization;
 
-import jdk.compiler.graal.graph.NodeSourcePosition;
+import jdk.graal.compiler.graph.NodeSourcePosition;
 import org.graalvm.nativeimage.AnnotationAccess;
 
 import com.oracle.graal.pointsto.meta.AnalysisMetaAccess;
@@ -36,12 +36,12 @@
 import com.oracle.svm.hosted.phases.ConstantFoldLoadFieldPlugin;
 import com.oracle.svm.hosted.phases.InlineBeforeAnalysisPolicyUtils;
 
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext;
-import jdk.compiler.graal.nodes.graphbuilderconf.InlineInvokePlugin;
-import jdk.compiler.graal.nodes.graphbuilderconf.NodePlugin;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext;
+import jdk.graal.compiler.nodes.graphbuilderconf.InlineInvokePlugin;
+import jdk.graal.compiler.nodes.graphbuilderconf.NodePlugin;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 
 /**
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/classinitialization/SimulateClassInitializerSupport.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/classinitialization/SimulateClassInitializerSupport.java
index d34cc1a31bdb..029d0b2b8fef 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/classinitialization/SimulateClassInitializerSupport.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/classinitialization/SimulateClassInitializerSupport.java
@@ -29,29 +29,29 @@
 import java.util.stream.Collectors;
 
 import org.graalvm.collections.EconomicSet;
-import jdk.compiler.graal.core.common.spi.ConstantFieldProvider;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.nodes.BeginNode;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.EndNode;
-import jdk.compiler.graal.nodes.FullInfopointNode;
-import jdk.compiler.graal.nodes.MergeNode;
-import jdk.compiler.graal.nodes.ReturnNode;
-import jdk.compiler.graal.nodes.StartNode;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.UnreachableBeginNode;
-import jdk.compiler.graal.nodes.UnreachableControlSinkNode;
-import jdk.compiler.graal.nodes.VirtualState;
-import jdk.compiler.graal.nodes.java.ExceptionObjectNode;
-import jdk.compiler.graal.nodes.java.FinalFieldBarrierNode;
-import jdk.compiler.graal.nodes.java.LoadFieldNode;
-import jdk.compiler.graal.nodes.java.StoreFieldNode;
-import jdk.compiler.graal.nodes.virtual.VirtualObjectNode;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.common.CanonicalizerPhase;
-import jdk.compiler.graal.printer.GraalDebugHandlersFactory;
-import jdk.compiler.graal.replacements.PEGraphDecoder;
+import jdk.graal.compiler.core.common.spi.ConstantFieldProvider;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.nodes.BeginNode;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.EndNode;
+import jdk.graal.compiler.nodes.FullInfopointNode;
+import jdk.graal.compiler.nodes.MergeNode;
+import jdk.graal.compiler.nodes.ReturnNode;
+import jdk.graal.compiler.nodes.StartNode;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.UnreachableBeginNode;
+import jdk.graal.compiler.nodes.UnreachableControlSinkNode;
+import jdk.graal.compiler.nodes.VirtualState;
+import jdk.graal.compiler.nodes.java.ExceptionObjectNode;
+import jdk.graal.compiler.nodes.java.FinalFieldBarrierNode;
+import jdk.graal.compiler.nodes.java.LoadFieldNode;
+import jdk.graal.compiler.nodes.java.StoreFieldNode;
+import jdk.graal.compiler.nodes.virtual.VirtualObjectNode;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.common.CanonicalizerPhase;
+import jdk.graal.compiler.printer.GraalDebugHandlersFactory;
+import jdk.graal.compiler.replacements.PEGraphDecoder;
 import org.graalvm.nativeimage.ImageSingletons;
 
 import com.oracle.graal.pointsto.BigBang;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/AnalysisToHostedGraphTransplanter.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/AnalysisToHostedGraphTransplanter.java
index 18cc563a2d47..9784a07756cb 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/AnalysisToHostedGraphTransplanter.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/AnalysisToHostedGraphTransplanter.java
@@ -30,27 +30,27 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
-import jdk.compiler.graal.bytecode.ResolvedJavaMethodBytecode;
-import jdk.compiler.graal.core.common.Fields;
-import jdk.compiler.graal.core.common.GraalOptions;
-import jdk.compiler.graal.core.common.type.AbstractObjectStamp;
-import jdk.compiler.graal.core.common.type.ObjectStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.core.common.type.StampPair;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.graph.NodeSourcePosition;
-import jdk.compiler.graal.nodes.FieldLocationIdentity;
-import jdk.compiler.graal.nodes.PiNode;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.virtual.CommitAllocationNode;
-import jdk.compiler.graal.nodes.virtual.VirtualInstanceNode;
-import jdk.compiler.graal.nodes.virtual.VirtualObjectNode;
-import jdk.compiler.graal.nodes.virtual.VirtualObjectState;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.replacements.SnippetTemplate;
+import jdk.graal.compiler.bytecode.ResolvedJavaMethodBytecode;
+import jdk.graal.compiler.core.common.Fields;
+import jdk.graal.compiler.core.common.GraalOptions;
+import jdk.graal.compiler.core.common.type.AbstractObjectStamp;
+import jdk.graal.compiler.core.common.type.ObjectStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.core.common.type.StampPair;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.graph.NodeSourcePosition;
+import jdk.graal.compiler.nodes.FieldLocationIdentity;
+import jdk.graal.compiler.nodes.PiNode;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.virtual.CommitAllocationNode;
+import jdk.graal.compiler.nodes.virtual.VirtualInstanceNode;
+import jdk.graal.compiler.nodes.virtual.VirtualObjectNode;
+import jdk.graal.compiler.nodes.virtual.VirtualObjectState;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.replacements.SnippetTemplate;
 
 import com.oracle.graal.pointsto.heap.ImageHeapConstant;
 import com.oracle.graal.pointsto.meta.AnalysisField;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/CCallStubMethod.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/CCallStubMethod.java
index a94ce6c4a9b5..af95c9973032 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/CCallStubMethod.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/CCallStubMethod.java
@@ -26,10 +26,10 @@
 
 import java.util.List;
 
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.java.FrameStateBuilder;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.java.FrameStateBuilder;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
 import org.graalvm.nativeimage.c.constant.CEnum;
 import org.graalvm.nativeimage.c.constant.CEnumLookup;
 
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/CEntryPointCallStubMethod.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/CEntryPointCallStubMethod.java
index 9aff43033e8b..1a0f857332a1 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/CEntryPointCallStubMethod.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/CEntryPointCallStubMethod.java
@@ -28,24 +28,24 @@
 import java.util.Arrays;
 import java.util.Iterator;
 
-import jdk.compiler.graal.core.common.calc.FloatConvert;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.graph.NodeSourcePosition;
-import jdk.compiler.graal.nodes.CallTargetNode.InvokeKind;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.DeadEndNode;
-import jdk.compiler.graal.nodes.FrameState;
-import jdk.compiler.graal.nodes.InvokeWithExceptionNode;
-import jdk.compiler.graal.nodes.ParameterNode;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.calc.FloatConvertNode;
-import jdk.compiler.graal.nodes.calc.IntegerEqualsNode;
-import jdk.compiler.graal.nodes.calc.SignExtendNode;
-import jdk.compiler.graal.nodes.calc.ZeroExtendNode;
-import jdk.compiler.graal.nodes.extended.BranchProbabilityNode;
-import jdk.compiler.graal.nodes.java.ExceptionObjectNode;
+import jdk.graal.compiler.core.common.calc.FloatConvert;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.graph.NodeSourcePosition;
+import jdk.graal.compiler.nodes.CallTargetNode.InvokeKind;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.DeadEndNode;
+import jdk.graal.compiler.nodes.FrameState;
+import jdk.graal.compiler.nodes.InvokeWithExceptionNode;
+import jdk.graal.compiler.nodes.ParameterNode;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.calc.FloatConvertNode;
+import jdk.graal.compiler.nodes.calc.IntegerEqualsNode;
+import jdk.graal.compiler.nodes.calc.SignExtendNode;
+import jdk.graal.compiler.nodes.calc.ZeroExtendNode;
+import jdk.graal.compiler.nodes.extended.BranchProbabilityNode;
+import jdk.graal.compiler.nodes.java.ExceptionObjectNode;
 import org.graalvm.nativeimage.Isolate;
 import org.graalvm.nativeimage.IsolateThread;
 import org.graalvm.nativeimage.c.constant.CEnum;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/CEntryPointJavaCallStubMethod.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/CEntryPointJavaCallStubMethod.java
index d78b60539899..9e5f4e18ac25 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/CEntryPointJavaCallStubMethod.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/CEntryPointJavaCallStubMethod.java
@@ -27,9 +27,9 @@
 import java.lang.reflect.AnnotatedElement;
 import java.util.List;
 
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.java.LoadFieldNode;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.java.LoadFieldNode;
 import org.graalvm.nativeimage.c.function.CEntryPoint;
 import org.graalvm.nativeimage.c.function.CFunctionPointer;
 
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/CFunctionCallStubMethod.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/CFunctionCallStubMethod.java
index bfd6aabd193d..59d29d9e537f 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/CFunctionCallStubMethod.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/CFunctionCallStubMethod.java
@@ -27,9 +27,9 @@
 import java.util.Arrays;
 import java.util.List;
 
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
 import org.graalvm.nativeimage.c.function.CFunction;
 
 import com.oracle.graal.pointsto.meta.HostedProviders;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/CFunctionLinkages.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/CFunctionLinkages.java
index 47a56c03584c..bfc4e4c31dc9 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/CFunctionLinkages.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/CFunctionLinkages.java
@@ -27,8 +27,8 @@
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-import jdk.compiler.graal.graph.Node.NodeIntrinsic;
-import jdk.compiler.graal.word.Word;
+import jdk.graal.compiler.graph.Node.NodeIntrinsic;
+import jdk.graal.compiler.word.Word;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.c.function.CFunction;
 import org.graalvm.nativeimage.c.function.CFunctionPointer;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/CFunctionPointerCallStubMethod.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/CFunctionPointerCallStubMethod.java
index 3b0212f8a509..d68c3a439113 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/CFunctionPointerCallStubMethod.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/CFunctionPointerCallStubMethod.java
@@ -28,9 +28,9 @@
 import java.util.Arrays;
 import java.util.List;
 
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
 import org.graalvm.nativeimage.c.function.InvokeCFunctionPointer;
 
 import com.oracle.graal.pointsto.meta.AnalysisMethod;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/CompilationGraph.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/CompilationGraph.java
index 785e21a396a7..9077f39d738c 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/CompilationGraph.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/CompilationGraph.java
@@ -28,12 +28,12 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import jdk.compiler.graal.graph.NodeSourcePosition;
-import jdk.compiler.graal.nodes.CallTargetNode.InvokeKind;
-import jdk.compiler.graal.nodes.EncodedGraph;
-import jdk.compiler.graal.nodes.GraphEncoder;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.java.MethodCallTargetNode;
+import jdk.graal.compiler.graph.NodeSourcePosition;
+import jdk.graal.compiler.nodes.CallTargetNode.InvokeKind;
+import jdk.graal.compiler.nodes.EncodedGraph;
+import jdk.graal.compiler.nodes.GraphEncoder;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.java.MethodCallTargetNode;
 
 import com.oracle.graal.pointsto.flow.AnalysisParsedGraph;
 import com.oracle.svm.hosted.meta.HostedMethod;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/CompilationInfo.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/CompilationInfo.java
index 46ab9140bd92..390ccfc3dc78 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/CompilationInfo.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/CompilationInfo.java
@@ -27,12 +27,12 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicLong;
 
-import jdk.compiler.graal.core.common.CompilationIdentifier;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.GraphDecoder;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.options.OptionValues;
+import jdk.graal.compiler.core.common.CompilationIdentifier;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.GraphDecoder;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.options.OptionValues;
 
 import com.oracle.graal.pointsto.flow.AnalysisParsedGraph;
 import com.oracle.svm.common.meta.MultiMethod;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/CompileQueue.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/CompileQueue.java
index 5a897ce00248..b7592f7e9287 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/CompileQueue.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/CompileQueue.java
@@ -40,64 +40,64 @@
 import java.util.concurrent.ForkJoinPool;
 
 import org.graalvm.collections.EconomicMap;
-import jdk.compiler.graal.api.replacements.Fold;
-import jdk.compiler.graal.api.replacements.SnippetReflectionProvider;
-import jdk.compiler.graal.asm.Assembler;
-import jdk.compiler.graal.bytecode.Bytecode;
-import jdk.compiler.graal.bytecode.BytecodeProvider;
-import jdk.compiler.graal.bytecode.ResolvedJavaMethodBytecode;
-import jdk.compiler.graal.code.CompilationResult;
-import jdk.compiler.graal.code.DataSection;
-import jdk.compiler.graal.core.GraalCompiler;
-import jdk.compiler.graal.core.common.CompilationIdentifier;
-import jdk.compiler.graal.core.common.CompilationIdentifier.Verbosity;
-import jdk.compiler.graal.core.common.spi.CodeGenProviders;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.debug.DebugContext.Description;
-import jdk.compiler.graal.debug.DebugHandlersFactory;
-import jdk.compiler.graal.debug.GlobalMetrics;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.debug.Indent;
-import jdk.compiler.graal.debug.TTY;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.Node.NodeIntrinsic;
-import jdk.compiler.graal.java.StableMethodNameFormatter;
-import jdk.compiler.graal.lir.LIR;
-import jdk.compiler.graal.lir.asm.CompilationResultBuilder;
-import jdk.compiler.graal.lir.asm.CompilationResultBuilderFactory;
-import jdk.compiler.graal.lir.asm.DataBuilder;
-import jdk.compiler.graal.lir.asm.FrameContext;
-import jdk.compiler.graal.lir.framemap.FrameMap;
-import jdk.compiler.graal.lir.phases.LIRSuites;
-import jdk.compiler.graal.nodes.CallTargetNode;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.EncodedGraph;
-import jdk.compiler.graal.nodes.FrameState;
-import jdk.compiler.graal.nodes.GraphState.GuardsStage;
-import jdk.compiler.graal.nodes.GraphState.StageFlag;
-import jdk.compiler.graal.nodes.IndirectCallTargetNode;
-import jdk.compiler.graal.nodes.Invoke;
-import jdk.compiler.graal.nodes.ParameterNode;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.graphbuilderconf.GeneratedFoldInvocationPlugin;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration.BytecodeExceptionMode;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext;
-import jdk.compiler.graal.nodes.graphbuilderconf.InlineInvokePlugin;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin;
-import jdk.compiler.graal.nodes.java.MethodCallTargetNode;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.OptimisticOptimizations;
-import jdk.compiler.graal.phases.Phase;
-import jdk.compiler.graal.phases.PhaseSuite;
-import jdk.compiler.graal.phases.common.CanonicalizerPhase;
-import jdk.compiler.graal.phases.tiers.HighTierContext;
-import jdk.compiler.graal.phases.tiers.Suites;
-import jdk.compiler.graal.phases.util.GraphOrder;
-import jdk.compiler.graal.phases.util.Providers;
-import jdk.compiler.graal.replacements.PEGraphDecoder;
-import jdk.compiler.graal.replacements.nodes.MacroInvokable;
+import jdk.graal.compiler.api.replacements.Fold;
+import jdk.graal.compiler.api.replacements.SnippetReflectionProvider;
+import jdk.graal.compiler.asm.Assembler;
+import jdk.graal.compiler.bytecode.Bytecode;
+import jdk.graal.compiler.bytecode.BytecodeProvider;
+import jdk.graal.compiler.bytecode.ResolvedJavaMethodBytecode;
+import jdk.graal.compiler.code.CompilationResult;
+import jdk.graal.compiler.code.DataSection;
+import jdk.graal.compiler.core.GraalCompiler;
+import jdk.graal.compiler.core.common.CompilationIdentifier;
+import jdk.graal.compiler.core.common.CompilationIdentifier.Verbosity;
+import jdk.graal.compiler.core.common.spi.CodeGenProviders;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.debug.DebugContext.Description;
+import jdk.graal.compiler.debug.DebugHandlersFactory;
+import jdk.graal.compiler.debug.GlobalMetrics;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.debug.Indent;
+import jdk.graal.compiler.debug.TTY;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.Node.NodeIntrinsic;
+import jdk.graal.compiler.java.StableMethodNameFormatter;
+import jdk.graal.compiler.lir.LIR;
+import jdk.graal.compiler.lir.asm.CompilationResultBuilder;
+import jdk.graal.compiler.lir.asm.CompilationResultBuilderFactory;
+import jdk.graal.compiler.lir.asm.DataBuilder;
+import jdk.graal.compiler.lir.asm.FrameContext;
+import jdk.graal.compiler.lir.framemap.FrameMap;
+import jdk.graal.compiler.lir.phases.LIRSuites;
+import jdk.graal.compiler.nodes.CallTargetNode;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.EncodedGraph;
+import jdk.graal.compiler.nodes.FrameState;
+import jdk.graal.compiler.nodes.GraphState.GuardsStage;
+import jdk.graal.compiler.nodes.GraphState.StageFlag;
+import jdk.graal.compiler.nodes.IndirectCallTargetNode;
+import jdk.graal.compiler.nodes.Invoke;
+import jdk.graal.compiler.nodes.ParameterNode;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.graphbuilderconf.GeneratedFoldInvocationPlugin;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.BytecodeExceptionMode;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext;
+import jdk.graal.compiler.nodes.graphbuilderconf.InlineInvokePlugin;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin;
+import jdk.graal.compiler.nodes.java.MethodCallTargetNode;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.OptimisticOptimizations;
+import jdk.graal.compiler.phases.Phase;
+import jdk.graal.compiler.phases.PhaseSuite;
+import jdk.graal.compiler.phases.common.CanonicalizerPhase;
+import jdk.graal.compiler.phases.tiers.HighTierContext;
+import jdk.graal.compiler.phases.tiers.Suites;
+import jdk.graal.compiler.phases.util.GraphOrder;
+import jdk.graal.compiler.phases.util.Providers;
+import jdk.graal.compiler.replacements.PEGraphDecoder;
+import jdk.graal.compiler.replacements.nodes.MacroInvokable;
 import org.graalvm.nativeimage.ImageSingletons;
 
 import com.oracle.graal.pointsto.api.PointstoOptions;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/DeoptimizationUtils.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/DeoptimizationUtils.java
index d09f3f0cb835..8f9e8acbcad5 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/DeoptimizationUtils.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/DeoptimizationUtils.java
@@ -35,37 +35,37 @@
 import java.util.Set;
 import java.util.function.Supplier;
 
-import jdk.compiler.graal.code.CompilationResult;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.iterators.NodePredicate;
-import jdk.compiler.graal.graph.iterators.NodePredicates;
-import jdk.compiler.graal.lir.RedundantMoveElimination;
-import jdk.compiler.graal.lir.alloc.RegisterAllocationPhase;
-import jdk.compiler.graal.lir.phases.LIRPhase;
-import jdk.compiler.graal.lir.phases.LIRSuites;
-import jdk.compiler.graal.lir.phases.PostAllocationOptimizationPhase;
-import jdk.compiler.graal.nodes.AbstractBeginNode;
-import jdk.compiler.graal.nodes.FixedNode;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.FrameState;
-import jdk.compiler.graal.nodes.Invoke;
-import jdk.compiler.graal.nodes.InvokeNode;
-import jdk.compiler.graal.nodes.StartNode;
-import jdk.compiler.graal.nodes.StateSplit;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.extended.ForeignCallNode;
-import jdk.compiler.graal.nodes.util.GraphUtil;
-import jdk.compiler.graal.phases.BasePhase;
-import jdk.compiler.graal.phases.PhaseSuite;
-import jdk.compiler.graal.phases.common.BoxNodeOptimizationPhase;
-import jdk.compiler.graal.phases.common.FixReadsPhase;
-import jdk.compiler.graal.phases.common.FloatingReadPhase;
-import jdk.compiler.graal.phases.tiers.HighTierContext;
-import jdk.compiler.graal.phases.tiers.LowTierContext;
-import jdk.compiler.graal.phases.tiers.MidTierContext;
-import jdk.compiler.graal.phases.tiers.Suites;
-import jdk.compiler.graal.virtual.phases.ea.PartialEscapePhase;
-import jdk.compiler.graal.virtual.phases.ea.ReadEliminationPhase;
+import jdk.graal.compiler.code.CompilationResult;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.iterators.NodePredicate;
+import jdk.graal.compiler.graph.iterators.NodePredicates;
+import jdk.graal.compiler.lir.RedundantMoveElimination;
+import jdk.graal.compiler.lir.alloc.RegisterAllocationPhase;
+import jdk.graal.compiler.lir.phases.LIRPhase;
+import jdk.graal.compiler.lir.phases.LIRSuites;
+import jdk.graal.compiler.lir.phases.PostAllocationOptimizationPhase;
+import jdk.graal.compiler.nodes.AbstractBeginNode;
+import jdk.graal.compiler.nodes.FixedNode;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.FrameState;
+import jdk.graal.compiler.nodes.Invoke;
+import jdk.graal.compiler.nodes.InvokeNode;
+import jdk.graal.compiler.nodes.StartNode;
+import jdk.graal.compiler.nodes.StateSplit;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.extended.ForeignCallNode;
+import jdk.graal.compiler.nodes.util.GraphUtil;
+import jdk.graal.compiler.phases.BasePhase;
+import jdk.graal.compiler.phases.PhaseSuite;
+import jdk.graal.compiler.phases.common.BoxNodeOptimizationPhase;
+import jdk.graal.compiler.phases.common.FixReadsPhase;
+import jdk.graal.compiler.phases.common.FloatingReadPhase;
+import jdk.graal.compiler.phases.tiers.HighTierContext;
+import jdk.graal.compiler.phases.tiers.LowTierContext;
+import jdk.graal.compiler.phases.tiers.MidTierContext;
+import jdk.graal.compiler.phases.tiers.Suites;
+import jdk.graal.compiler.virtual.phases.ea.PartialEscapePhase;
+import jdk.graal.compiler.virtual.phases.ea.ReadEliminationPhase;
 
 import com.oracle.graal.pointsto.PointsToAnalysis;
 import com.oracle.graal.pointsto.flow.MethodFlowsGraph;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/FactoryMethod.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/FactoryMethod.java
index 91e50a8f178c..871b6b94165a 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/FactoryMethod.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/FactoryMethod.java
@@ -24,12 +24,12 @@
  */
 package com.oracle.svm.hosted.code;
 
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.nodes.CallTargetNode.InvokeKind;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.UnwindNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.java.AbstractNewObjectNode;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.nodes.CallTargetNode.InvokeKind;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.UnwindNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.java.AbstractNewObjectNode;
 import org.graalvm.nativeimage.ImageSingletons;
 
 import com.oracle.graal.pointsto.infrastructure.UniverseMetaAccess;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/FactoryMethodSupport.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/FactoryMethodSupport.java
index e9a40b16cab8..2a10c80aa937 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/FactoryMethodSupport.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/FactoryMethodSupport.java
@@ -27,8 +27,8 @@
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-import jdk.compiler.graal.nodes.java.AbstractNewObjectNode;
-import jdk.compiler.graal.nodes.java.NewInstanceNode;
+import jdk.graal.compiler.nodes.java.AbstractNewObjectNode;
+import jdk.graal.compiler.nodes.java.NewInstanceNode;
 import org.graalvm.nativeimage.ImageSingletons;
 
 import com.oracle.graal.pointsto.infrastructure.UniverseMetaAccess;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/HostedImageHeapConstantPatch.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/HostedImageHeapConstantPatch.java
index c60e418079d0..1e966e0317c0 100755
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/HostedImageHeapConstantPatch.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/HostedImageHeapConstantPatch.java
@@ -24,7 +24,7 @@
  */
 package com.oracle.svm.hosted.code;
 
-import jdk.compiler.graal.code.CompilationResult;
+import jdk.graal.compiler.code.CompilationResult;
 
 import jdk.vm.ci.meta.JavaConstant;
 
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/HostedReplacements.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/HostedReplacements.java
index cfe8bebb6741..1c232bf0b700 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/HostedReplacements.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/HostedReplacements.java
@@ -26,12 +26,12 @@
 
 import java.util.IdentityHashMap;
 
-import jdk.compiler.graal.api.replacements.SnippetReflectionProvider;
-import jdk.compiler.graal.bytecode.BytecodeProvider;
-import jdk.compiler.graal.java.BytecodeParser;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.util.Providers;
-import jdk.compiler.graal.word.WordTypes;
+import jdk.graal.compiler.api.replacements.SnippetReflectionProvider;
+import jdk.graal.compiler.bytecode.BytecodeProvider;
+import jdk.graal.compiler.java.BytecodeParser;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.util.Providers;
+import jdk.graal.compiler.word.WordTypes;
 
 import com.oracle.graal.pointsto.meta.AnalysisUniverse;
 import com.oracle.graal.pointsto.meta.HostedProviders;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/HostedRuntimeConfigurationBuilder.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/HostedRuntimeConfigurationBuilder.java
index 865adbb14cf8..3f19e31dc9e9 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/HostedRuntimeConfigurationBuilder.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/HostedRuntimeConfigurationBuilder.java
@@ -24,20 +24,20 @@
  */
 package com.oracle.svm.hosted.code;
 
-import jdk.compiler.graal.api.replacements.SnippetReflectionProvider;
-import jdk.compiler.graal.bytecode.BytecodeProvider;
-import jdk.compiler.graal.bytecode.ResolvedJavaMethodBytecodeProvider;
-import jdk.compiler.graal.core.common.spi.ConstantFieldProvider;
-import jdk.compiler.graal.core.common.spi.ForeignCallsProvider;
-import jdk.compiler.graal.core.common.spi.MetaAccessExtensionProvider;
-import jdk.compiler.graal.nodes.spi.LoopsDataProvider;
-import jdk.compiler.graal.nodes.spi.LoweringProvider;
-import jdk.compiler.graal.nodes.spi.PlatformConfigurationProvider;
-import jdk.compiler.graal.nodes.spi.Replacements;
-import jdk.compiler.graal.nodes.spi.StampProvider;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.util.Providers;
-import jdk.compiler.graal.word.WordTypes;
+import jdk.graal.compiler.api.replacements.SnippetReflectionProvider;
+import jdk.graal.compiler.bytecode.BytecodeProvider;
+import jdk.graal.compiler.bytecode.ResolvedJavaMethodBytecodeProvider;
+import jdk.graal.compiler.core.common.spi.ConstantFieldProvider;
+import jdk.graal.compiler.core.common.spi.ForeignCallsProvider;
+import jdk.graal.compiler.core.common.spi.MetaAccessExtensionProvider;
+import jdk.graal.compiler.nodes.spi.LoopsDataProvider;
+import jdk.graal.compiler.nodes.spi.LoweringProvider;
+import jdk.graal.compiler.nodes.spi.PlatformConfigurationProvider;
+import jdk.graal.compiler.nodes.spi.Replacements;
+import jdk.graal.compiler.nodes.spi.StampProvider;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.util.Providers;
+import jdk.graal.compiler.word.WordTypes;
 
 import com.oracle.graal.pointsto.heap.ImageHeapScanner;
 import com.oracle.graal.pointsto.meta.HostedProviders;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/IncompatibleClassChangeFallbackMethod.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/IncompatibleClassChangeFallbackMethod.java
index f985cb09a055..3928b216ccba 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/IncompatibleClassChangeFallbackMethod.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/IncompatibleClassChangeFallbackMethod.java
@@ -24,12 +24,12 @@
  */
 package com.oracle.svm.hosted.code;
 
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.nodes.CallTargetNode.InvokeKind;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.UnwindNode;
-import jdk.compiler.graal.nodes.java.AbstractNewObjectNode;
-import jdk.compiler.graal.nodes.java.NewInstanceNode;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.nodes.CallTargetNode.InvokeKind;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.UnwindNode;
+import jdk.graal.compiler.nodes.java.AbstractNewObjectNode;
+import jdk.graal.compiler.nodes.java.NewInstanceNode;
 
 import com.oracle.graal.pointsto.meta.HostedProviders;
 import com.oracle.svm.hosted.analysis.NativeImagePointsToAnalysis;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/InliningUtilities.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/InliningUtilities.java
index b77d8fd6ae18..f97a13851c95 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/InliningUtilities.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/InliningUtilities.java
@@ -24,16 +24,16 @@
  */
 package com.oracle.svm.hosted.code;
 
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.nodes.FrameState;
-import jdk.compiler.graal.nodes.FullInfopointNode;
-import jdk.compiler.graal.nodes.ParameterNode;
-import jdk.compiler.graal.nodes.StartNode;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.extended.ValueAnchorNode;
-import jdk.compiler.graal.nodes.java.MethodCallTargetNode;
-import jdk.compiler.graal.nodes.spi.ValueProxy;
-import jdk.compiler.graal.replacements.nodes.MethodHandleWithExceptionNode;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.nodes.FrameState;
+import jdk.graal.compiler.nodes.FullInfopointNode;
+import jdk.graal.compiler.nodes.ParameterNode;
+import jdk.graal.compiler.nodes.StartNode;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.extended.ValueAnchorNode;
+import jdk.graal.compiler.nodes.java.MethodCallTargetNode;
+import jdk.graal.compiler.nodes.spi.ValueProxy;
+import jdk.graal.compiler.replacements.nodes.MethodHandleWithExceptionNode;
 
 import com.oracle.svm.core.SubstrateOptions;
 
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/NativeMethodSubstitutionProcessor.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/NativeMethodSubstitutionProcessor.java
index 43314ebe9f2a..cad7c56205eb 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/NativeMethodSubstitutionProcessor.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/NativeMethodSubstitutionProcessor.java
@@ -24,10 +24,10 @@
  */
 package com.oracle.svm.hosted.code;
 
-import jdk.compiler.graal.graph.Node.NodeIntrinsic;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin;
-import jdk.compiler.graal.nodes.spi.Replacements;
-import jdk.compiler.graal.word.Word.Operation;
+import jdk.graal.compiler.graph.Node.NodeIntrinsic;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin;
+import jdk.graal.compiler.nodes.spi.Replacements;
+import jdk.graal.compiler.word.Word.Operation;
 import org.graalvm.nativeimage.AnnotationAccess;
 import org.graalvm.nativeimage.c.constant.CConstant;
 import org.graalvm.nativeimage.c.function.CFunction;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/RestrictHeapAccessAnnotationChecker.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/RestrictHeapAccessAnnotationChecker.java
index 9a70c3b88d00..24b28f9863cd 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/RestrictHeapAccessAnnotationChecker.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/RestrictHeapAccessAnnotationChecker.java
@@ -29,9 +29,9 @@
 import java.util.Deque;
 import java.util.Map;
 
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.graph.NodeSourcePosition;
-import jdk.compiler.graal.options.Option;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.graph.NodeSourcePosition;
+import jdk.graal.compiler.options.Option;
 import org.graalvm.nativeimage.ImageSingletons;
 
 import com.oracle.graal.pointsto.meta.AnalysisMethod;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/SharedRuntimeConfigurationBuilder.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/SharedRuntimeConfigurationBuilder.java
index e897b132cff1..517c7f1315e0 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/SharedRuntimeConfigurationBuilder.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/SharedRuntimeConfigurationBuilder.java
@@ -29,21 +29,21 @@
 import java.util.List;
 import java.util.function.Function;
 
-import jdk.compiler.graal.api.replacements.SnippetReflectionProvider;
-import jdk.compiler.graal.core.common.spi.ConstantFieldProvider;
-import jdk.compiler.graal.core.common.spi.ForeignCallsProvider;
-import jdk.compiler.graal.core.common.spi.MetaAccessExtensionProvider;
-import jdk.compiler.graal.debug.DebugHandlersFactory;
-import jdk.compiler.graal.nodes.spi.LoopsDataProvider;
-import jdk.compiler.graal.nodes.spi.LoweringProvider;
-import jdk.compiler.graal.nodes.spi.PlatformConfigurationProvider;
-import jdk.compiler.graal.nodes.spi.Replacements;
-import jdk.compiler.graal.nodes.spi.StampProvider;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.util.Providers;
-import jdk.compiler.graal.printer.GraalDebugHandlersFactory;
-import jdk.compiler.graal.serviceprovider.GraalServices;
-import jdk.compiler.graal.word.WordTypes;
+import jdk.graal.compiler.api.replacements.SnippetReflectionProvider;
+import jdk.graal.compiler.core.common.spi.ConstantFieldProvider;
+import jdk.graal.compiler.core.common.spi.ForeignCallsProvider;
+import jdk.graal.compiler.core.common.spi.MetaAccessExtensionProvider;
+import jdk.graal.compiler.debug.DebugHandlersFactory;
+import jdk.graal.compiler.nodes.spi.LoopsDataProvider;
+import jdk.graal.compiler.nodes.spi.LoweringProvider;
+import jdk.graal.compiler.nodes.spi.PlatformConfigurationProvider;
+import jdk.graal.compiler.nodes.spi.Replacements;
+import jdk.graal.compiler.nodes.spi.StampProvider;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.util.Providers;
+import jdk.graal.compiler.printer.GraalDebugHandlersFactory;
+import jdk.graal.compiler.serviceprovider.GraalServices;
+import jdk.graal.compiler.word.WordTypes;
 import org.graalvm.nativeimage.ImageSingletons;
 
 import com.oracle.graal.pointsto.infrastructure.UniverseMetaAccess;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/SubstrateCompilationDirectives.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/SubstrateCompilationDirectives.java
index a55c1b1efdd0..2723e047985e 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/SubstrateCompilationDirectives.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/SubstrateCompilationDirectives.java
@@ -28,9 +28,9 @@
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
-import jdk.compiler.graal.debug.Assertions;
-import jdk.compiler.graal.nodes.FrameState;
-import jdk.compiler.graal.nodes.ValueNode;
+import jdk.graal.compiler.debug.Assertions;
+import jdk.graal.compiler.nodes.FrameState;
+import jdk.graal.compiler.nodes.ValueNode;
 import org.graalvm.nativeimage.ImageSingletons;
 
 import com.oracle.graal.pointsto.meta.AnalysisMethod;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/SubstrateGraphMaker.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/SubstrateGraphMaker.java
index 0f4190e40c9e..dd7ce7eed105 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/SubstrateGraphMaker.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/SubstrateGraphMaker.java
@@ -26,18 +26,18 @@
 
 import java.util.BitSet;
 
-import jdk.compiler.graal.bytecode.BytecodeProvider;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.graph.NodeSourcePosition;
-import jdk.compiler.graal.java.GraphBuilderPhase.Instance;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration;
-import jdk.compiler.graal.nodes.graphbuilderconf.IntrinsicContext;
-import jdk.compiler.graal.phases.OptimisticOptimizations;
-import jdk.compiler.graal.phases.util.Providers;
-import jdk.compiler.graal.replacements.ReplacementsImpl;
-import jdk.compiler.graal.replacements.ReplacementsImpl.GraphMaker;
-import jdk.compiler.graal.word.WordTypes;
+import jdk.graal.compiler.bytecode.BytecodeProvider;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.graph.NodeSourcePosition;
+import jdk.graal.compiler.java.GraphBuilderPhase.Instance;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
+import jdk.graal.compiler.nodes.graphbuilderconf.IntrinsicContext;
+import jdk.graal.compiler.phases.OptimisticOptimizations;
+import jdk.graal.compiler.phases.util.Providers;
+import jdk.graal.compiler.replacements.ReplacementsImpl;
+import jdk.graal.compiler.replacements.ReplacementsImpl.GraphMaker;
+import jdk.graal.compiler.word.WordTypes;
 
 import com.oracle.svm.hosted.phases.SubstrateGraphBuilderPhase;
 
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/SubstrateGraphMakerFactory.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/SubstrateGraphMakerFactory.java
index 8804009b635a..1143be0a296f 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/SubstrateGraphMakerFactory.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/SubstrateGraphMakerFactory.java
@@ -25,9 +25,9 @@
 package com.oracle.svm.hosted.code;
 
 import jdk.vm.ci.meta.MetaAccessProvider;
-import jdk.compiler.graal.replacements.ReplacementsImpl;
-import jdk.compiler.graal.replacements.ReplacementsImpl.GraphMaker;
-import jdk.compiler.graal.word.WordTypes;
+import jdk.graal.compiler.replacements.ReplacementsImpl;
+import jdk.graal.compiler.replacements.ReplacementsImpl.GraphMaker;
+import jdk.graal.compiler.word.WordTypes;
 
 import com.oracle.svm.core.graal.meta.SubstrateReplacements;
 
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/SubstrateHostedCompilationIdentifier.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/SubstrateHostedCompilationIdentifier.java
index e00e808d8bf4..d97f7a65fbcd 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/SubstrateHostedCompilationIdentifier.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/SubstrateHostedCompilationIdentifier.java
@@ -26,8 +26,8 @@
 
 import java.util.concurrent.atomic.AtomicLong;
 
-import jdk.compiler.graal.core.common.CompilationIdentifier;
-import jdk.compiler.graal.debug.GraalError;
+import jdk.graal.compiler.core.common.CompilationIdentifier;
+import jdk.graal.compiler.debug.GraalError;
 
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/SubstrateLIRBackendFeature.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/SubstrateLIRBackendFeature.java
index 57bf7aad9944..1a74490603d8 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/SubstrateLIRBackendFeature.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/SubstrateLIRBackendFeature.java
@@ -26,10 +26,10 @@
 
 import java.util.Map;
 
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.nodes.java.LoadExceptionObjectNode;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.util.Providers;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.nodes.java.LoadExceptionObjectNode;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.util.Providers;
 import org.graalvm.nativeimage.ImageSingletons;
 
 import com.oracle.svm.core.SubstrateOptions;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/UninterruptibleAnnotationChecker.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/UninterruptibleAnnotationChecker.java
index 2a541239e91d..20fa428f8aaa 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/UninterruptibleAnnotationChecker.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/UninterruptibleAnnotationChecker.java
@@ -28,14 +28,14 @@
 import java.util.Set;
 import java.util.TreeSet;
 
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.java.AbstractNewObjectNode;
-import jdk.compiler.graal.nodes.java.MonitorEnterNode;
-import jdk.compiler.graal.nodes.java.NewMultiArrayNode;
-import jdk.compiler.graal.nodes.virtual.CommitAllocationNode;
-import jdk.compiler.graal.options.Option;
-import jdk.compiler.graal.options.OptionsParser;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.java.AbstractNewObjectNode;
+import jdk.graal.compiler.nodes.java.MonitorEnterNode;
+import jdk.graal.compiler.nodes.java.NewMultiArrayNode;
+import jdk.graal.compiler.nodes.virtual.CommitAllocationNode;
+import jdk.graal.compiler.options.Option;
+import jdk.graal.compiler.options.OptionsParser;
 import org.graalvm.nativeimage.AnnotationAccess;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/aarch64/AArch64HostedPatcherFeature.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/aarch64/AArch64HostedPatcherFeature.java
index 9c95a0c66055..0c7606a08a8f 100755
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/aarch64/AArch64HostedPatcherFeature.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/aarch64/AArch64HostedPatcherFeature.java
@@ -26,11 +26,11 @@
 
 import java.util.function.Consumer;
 
-import jdk.compiler.graal.asm.Assembler.CodeAnnotation;
-import jdk.compiler.graal.asm.aarch64.AArch64Assembler.SingleInstructionAnnotation;
-import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler;
-import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler.MovSequenceAnnotation.MovAction;
-import jdk.compiler.graal.code.CompilationResult;
+import jdk.graal.compiler.asm.Assembler.CodeAnnotation;
+import jdk.graal.compiler.asm.aarch64.AArch64Assembler.SingleInstructionAnnotation;
+import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler;
+import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler.MovSequenceAnnotation.MovAction;
+import jdk.graal.compiler.code.CompilationResult;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/aarch64/AArch64HostedTrampolineSupport.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/aarch64/AArch64HostedTrampolineSupport.java
index 9d162cc44045..a5b2f5bf9675 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/aarch64/AArch64HostedTrampolineSupport.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/aarch64/AArch64HostedTrampolineSupport.java
@@ -26,10 +26,10 @@
 
 import java.util.function.Consumer;
 
-import jdk.compiler.graal.asm.Assembler;
-import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler;
-import jdk.compiler.graal.code.CompilationResult;
-import jdk.compiler.graal.core.common.NumUtil;
+import jdk.graal.compiler.asm.Assembler;
+import jdk.graal.compiler.asm.aarch64.AArch64MacroAssembler;
+import jdk.graal.compiler.code.CompilationResult;
+import jdk.graal.compiler.core.common.NumUtil;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
 
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/amd64/AMD64HostedPatcherFeature.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/amd64/AMD64HostedPatcherFeature.java
index ed32cb9746f2..580b8cd59175 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/amd64/AMD64HostedPatcherFeature.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/amd64/AMD64HostedPatcherFeature.java
@@ -26,10 +26,10 @@
 
 import java.util.function.Consumer;
 
-import jdk.compiler.graal.asm.Assembler;
-import jdk.compiler.graal.asm.amd64.AMD64BaseAssembler.AddressDisplacementAnnotation;
-import jdk.compiler.graal.asm.amd64.AMD64BaseAssembler.OperandDataAnnotation;
-import jdk.compiler.graal.code.CompilationResult;
+import jdk.graal.compiler.asm.Assembler;
+import jdk.graal.compiler.asm.amd64.AMD64BaseAssembler.AddressDisplacementAnnotation;
+import jdk.graal.compiler.asm.amd64.AMD64BaseAssembler.OperandDataAnnotation;
+import jdk.graal.compiler.code.CompilationResult;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/amd64/AMD64HostedTrampolineSupport.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/amd64/AMD64HostedTrampolineSupport.java
index 820a91ab7421..1b21808d5e1f 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/amd64/AMD64HostedTrampolineSupport.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/amd64/AMD64HostedTrampolineSupport.java
@@ -26,11 +26,11 @@
 
 import java.util.function.Consumer;
 
-import jdk.compiler.graal.asm.Assembler;
-import jdk.compiler.graal.asm.amd64.AMD64Assembler;
-import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler;
-import jdk.compiler.graal.code.CompilationResult;
-import jdk.compiler.graal.core.common.NumUtil;
+import jdk.graal.compiler.asm.Assembler;
+import jdk.graal.compiler.asm.amd64.AMD64Assembler;
+import jdk.graal.compiler.asm.amd64.AMD64MacroAssembler;
+import jdk.graal.compiler.code.CompilationResult;
+import jdk.graal.compiler.core.common.NumUtil;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
 
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/config/ConfigurationParserUtils.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/config/ConfigurationParserUtils.java
index 93f3ff2a612f..a16806ea2790 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/config/ConfigurationParserUtils.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/config/ConfigurationParserUtils.java
@@ -39,7 +39,7 @@
 import java.util.stream.StreamSupport;
 
 import org.graalvm.nativeimage.impl.ReflectionRegistry;
-import jdk.compiler.graal.util.json.JSONParserException;
+import jdk.graal.compiler.util.json.JSONParserException;
 
 import com.oracle.svm.core.configure.ConditionalElement;
 import com.oracle.svm.core.configure.ConfigurationFiles;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/config/HybridLayout.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/config/HybridLayout.java
index 426bc32ee1cc..054d59ecfd69 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/config/HybridLayout.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/config/HybridLayout.java
@@ -24,7 +24,7 @@
  */
 package com.oracle.svm.hosted.config;
 
-import jdk.compiler.graal.core.common.NumUtil;
+import jdk.graal.compiler.core.common.NumUtil;
 
 import com.oracle.svm.core.config.ObjectLayout;
 import com.oracle.svm.core.hub.Hybrid;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/config/HybridLayoutSupport.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/config/HybridLayoutSupport.java
index 9ec3d3ea6b86..c03cbe544ef5 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/config/HybridLayoutSupport.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/config/HybridLayoutSupport.java
@@ -26,7 +26,7 @@
 
 import java.lang.reflect.Modifier;
 
-import jdk.compiler.graal.api.replacements.Fold;
+import jdk.graal.compiler.api.replacements.Fold;
 import org.graalvm.nativeimage.ImageSingletons;
 
 import com.oracle.svm.core.hub.Hybrid;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/dashboard/DashboardDumpFeature.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/dashboard/DashboardDumpFeature.java
index 5e4aa158e4f1..65d7f4db54da 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/dashboard/DashboardDumpFeature.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/dashboard/DashboardDumpFeature.java
@@ -34,8 +34,8 @@
 import java.util.Collections;
 import java.util.Map;
 
-import jdk.compiler.graal.graphio.GraphOutput;
-import jdk.compiler.graal.graphio.GraphStructure;
+import jdk.graal.compiler.graphio.GraphOutput;
+import jdk.graal.compiler.graphio.GraphStructure;
 
 import com.oracle.graal.pointsto.reports.ReportUtils;
 import com.oracle.svm.core.SubstrateOptions;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/dashboard/DashboardOptions.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/dashboard/DashboardOptions.java
index 0241924a6a08..febaf81fad35 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/dashboard/DashboardOptions.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/dashboard/DashboardOptions.java
@@ -25,8 +25,8 @@
 package com.oracle.svm.hosted.dashboard;
 
 import com.oracle.svm.core.option.HostedOptionKey;
-import jdk.compiler.graal.options.Option;
-import jdk.compiler.graal.options.OptionType;
+import jdk.graal.compiler.options.Option;
+import jdk.graal.compiler.options.OptionType;
 
 class DashboardOptions {
 
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/dashboard/PointsToJsonObject.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/dashboard/PointsToJsonObject.java
index 75a48c836b3b..64c61424a9d2 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/dashboard/PointsToJsonObject.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/dashboard/PointsToJsonObject.java
@@ -36,8 +36,8 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import jdk.compiler.graal.graphio.GraphOutput;
-import jdk.compiler.graal.graphio.GraphStructure;
+import jdk.graal.compiler.graphio.GraphOutput;
+import jdk.graal.compiler.graphio.GraphStructure;
 import org.graalvm.nativeimage.hosted.Feature.OnAnalysisExitAccess;
 
 import com.oracle.graal.pointsto.BigBang;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/diagnostic/HostedHeapDumpFeature.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/diagnostic/HostedHeapDumpFeature.java
index 6d375eb790d6..8ee8492c0686 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/diagnostic/HostedHeapDumpFeature.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/diagnostic/HostedHeapDumpFeature.java
@@ -35,7 +35,7 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import jdk.compiler.graal.options.Option;
+import jdk.graal.compiler.options.Option;
 
 import com.oracle.graal.pointsto.reports.ReportUtils;
 import com.oracle.svm.core.SubstrateOptions;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/fieldfolding/IsStaticFinalFieldInitializedNode.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/fieldfolding/IsStaticFinalFieldInitializedNode.java
index 4a10ca69fe62..345f0b83f360 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/fieldfolding/IsStaticFinalFieldInitializedNode.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/fieldfolding/IsStaticFinalFieldInitializedNode.java
@@ -24,17 +24,17 @@
  */
 package com.oracle.svm.hosted.fieldfolding;
 
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeCycles;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodeinfo.NodeSize;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.java.LoadIndexedNode;
-import jdk.compiler.graal.nodes.spi.Simplifiable;
-import jdk.compiler.graal.nodes.spi.SimplifierTool;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeCycles;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodeinfo.NodeSize;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.java.LoadIndexedNode;
+import jdk.graal.compiler.nodes.spi.Simplifiable;
+import jdk.graal.compiler.nodes.spi.SimplifierTool;
 
 import com.oracle.graal.pointsto.meta.AnalysisField;
 import com.oracle.svm.hosted.code.AnalysisToHostedGraphTransplanter;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/fieldfolding/MarkStaticFinalFieldInitializedNode.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/fieldfolding/MarkStaticFinalFieldInitializedNode.java
index ed3528fe6a6a..d352a1d6e199 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/fieldfolding/MarkStaticFinalFieldInitializedNode.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/fieldfolding/MarkStaticFinalFieldInitializedNode.java
@@ -24,16 +24,16 @@
  */
 package com.oracle.svm.hosted.fieldfolding;
 
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.NodeCycles;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodeinfo.NodeSize;
-import jdk.compiler.graal.nodes.AbstractStateSplit;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.java.StoreIndexedNode;
-import jdk.compiler.graal.nodes.spi.Simplifiable;
-import jdk.compiler.graal.nodes.spi.SimplifierTool;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.NodeCycles;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodeinfo.NodeSize;
+import jdk.graal.compiler.nodes.AbstractStateSplit;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.java.StoreIndexedNode;
+import jdk.graal.compiler.nodes.spi.Simplifiable;
+import jdk.graal.compiler.nodes.spi.SimplifierTool;
 
 import com.oracle.graal.pointsto.meta.AnalysisField;
 import com.oracle.svm.hosted.code.AnalysisToHostedGraphTransplanter;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/fieldfolding/StaticFinalFieldFoldingFeature.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/fieldfolding/StaticFinalFieldFoldingFeature.java
index 7e4cbb4bf7f4..97c42656b450 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/fieldfolding/StaticFinalFieldFoldingFeature.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/fieldfolding/StaticFinalFieldFoldingFeature.java
@@ -33,12 +33,12 @@
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
-import jdk.compiler.graal.nodes.java.StoreFieldNode;
-import jdk.compiler.graal.options.Option;
-import jdk.compiler.graal.phases.util.Providers;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
+import jdk.graal.compiler.nodes.java.StoreFieldNode;
+import jdk.graal.compiler.options.Option;
+import jdk.graal.compiler.phases.util.Providers;
 import org.graalvm.nativeimage.ImageSingletons;
 
 import com.oracle.graal.pointsto.BigBang;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/fieldfolding/StaticFinalFieldFoldingNodePlugin.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/fieldfolding/StaticFinalFieldFoldingNodePlugin.java
index 0c3b96f87fee..8c57bf0f90e2 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/fieldfolding/StaticFinalFieldFoldingNodePlugin.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/fieldfolding/StaticFinalFieldFoldingNodePlugin.java
@@ -26,19 +26,19 @@
 
 import java.util.Arrays;
 
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.EndNode;
-import jdk.compiler.graal.nodes.IfNode;
-import jdk.compiler.graal.nodes.LogicNode;
-import jdk.compiler.graal.nodes.MergeNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.ValuePhiNode;
-import jdk.compiler.graal.nodes.calc.IntegerEqualsNode;
-import jdk.compiler.graal.nodes.extended.BranchProbabilityNode;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext;
-import jdk.compiler.graal.nodes.graphbuilderconf.NodePlugin;
-import jdk.compiler.graal.nodes.type.StampTool;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.EndNode;
+import jdk.graal.compiler.nodes.IfNode;
+import jdk.graal.compiler.nodes.LogicNode;
+import jdk.graal.compiler.nodes.MergeNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.ValuePhiNode;
+import jdk.graal.compiler.nodes.calc.IntegerEqualsNode;
+import jdk.graal.compiler.nodes.extended.BranchProbabilityNode;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext;
+import jdk.graal.compiler.nodes.graphbuilderconf.NodePlugin;
+import jdk.graal.compiler.nodes.type.StampTool;
 
 import com.oracle.graal.pointsto.meta.AnalysisField;
 import com.oracle.graal.pointsto.meta.AnalysisMethod;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/heap/HeapDumpFeature.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/heap/HeapDumpFeature.java
index f2e93640ad95..fb89f3d9bede 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/heap/HeapDumpFeature.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/heap/HeapDumpFeature.java
@@ -31,8 +31,8 @@
 
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.MapCursor;
-import jdk.compiler.graal.core.common.util.TypeConversion;
-import jdk.compiler.graal.core.common.util.UnsafeArrayTypeWriter;
+import jdk.graal.compiler.core.common.util.TypeConversion;
+import jdk.graal.compiler.core.common.util.UnsafeArrayTypeWriter;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.hosted.Feature;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/heap/HeapDumpHostedUtils.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/heap/HeapDumpHostedUtils.java
index b597147a647e..ceb2491d81ab 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/heap/HeapDumpHostedUtils.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/heap/HeapDumpHostedUtils.java
@@ -27,8 +27,8 @@
 import java.io.UnsupportedEncodingException;
 import java.util.Collection;
 
-import jdk.compiler.graal.core.common.util.TypeConversion;
-import jdk.compiler.graal.core.common.util.UnsafeArrayTypeWriter;
+import jdk.graal.compiler.core.common.util.TypeConversion;
+import jdk.graal.compiler.core.common.util.UnsafeArrayTypeWriter;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
 
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/heap/PodFactorySubstitutionMethod.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/heap/PodFactorySubstitutionMethod.java
index 339454b6a2bb..23aaec479c2f 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/heap/PodFactorySubstitutionMethod.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/heap/PodFactorySubstitutionMethod.java
@@ -29,22 +29,22 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.NodeSourcePosition;
-import jdk.compiler.graal.nodes.CallTargetNode.InvokeKind;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.FixedNode;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.FrameState;
-import jdk.compiler.graal.nodes.InvokeWithExceptionNode;
-import jdk.compiler.graal.nodes.PiNode;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.UnreachableBeginNode;
-import jdk.compiler.graal.nodes.UnwindNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.java.ExceptionObjectNode;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.NodeSourcePosition;
+import jdk.graal.compiler.nodes.CallTargetNode.InvokeKind;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.FixedNode;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.FrameState;
+import jdk.graal.compiler.nodes.InvokeWithExceptionNode;
+import jdk.graal.compiler.nodes.PiNode;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.UnreachableBeginNode;
+import jdk.graal.compiler.nodes.UnwindNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.java.ExceptionObjectNode;
 import org.graalvm.nativeimage.AnnotationAccess;
 
 import com.oracle.graal.pointsto.infrastructure.SubstitutionProcessor;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/heap/SVMImageHeapScanner.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/heap/SVMImageHeapScanner.java
index 5a1ab1ef1fc2..a77765ef534a 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/heap/SVMImageHeapScanner.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/heap/SVMImageHeapScanner.java
@@ -33,8 +33,8 @@
 import java.util.function.Consumer;
 
 import org.graalvm.collections.EconomicMap;
-import jdk.compiler.graal.api.replacements.SnippetReflectionProvider;
-import jdk.compiler.graal.core.common.type.TypedConstant;
+import jdk.graal.compiler.api.replacements.SnippetReflectionProvider;
+import jdk.graal.compiler.core.common.type.TypedConstant;
 import org.graalvm.nativeimage.ImageSingletons;
 
 import com.oracle.graal.pointsto.BigBang;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/AbstractImage.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/AbstractImage.java
index 6a18a08f1754..8efb24238a98 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/AbstractImage.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/AbstractImage.java
@@ -28,7 +28,7 @@
 import java.util.List;
 import java.util.concurrent.ForkJoinPool;
 
-import jdk.compiler.graal.debug.DebugContext;
+import jdk.graal.compiler.debug.DebugContext;
 
 import com.oracle.objectfile.ObjectFile;
 import com.oracle.svm.core.LinkerInvocation;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/CCLinkerInvocation.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/CCLinkerInvocation.java
index 2d2e6b7d8b01..91604578a5be 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/CCLinkerInvocation.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/CCLinkerInvocation.java
@@ -36,8 +36,8 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import jdk.compiler.graal.options.Option;
-import jdk.compiler.graal.options.OptionStability;
+import jdk.graal.compiler.options.Option;
+import jdk.graal.compiler.options.OptionStability;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
 
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/HostedInstantReferenceAdjuster.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/HostedInstantReferenceAdjuster.java
index c4d27d093d00..c5f32bbd89dd 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/HostedInstantReferenceAdjuster.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/HostedInstantReferenceAdjuster.java
@@ -24,7 +24,7 @@
  */
 package com.oracle.svm.hosted.image;
 
-import jdk.compiler.graal.api.replacements.SnippetReflectionProvider;
+import jdk.graal.compiler.api.replacements.SnippetReflectionProvider;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
 
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/ImageHeapConnectedComponentsFeature.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/ImageHeapConnectedComponentsFeature.java
index 52d04393a547..c093b5d9f716 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/ImageHeapConnectedComponentsFeature.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/ImageHeapConnectedComponentsFeature.java
@@ -30,8 +30,8 @@
 import com.oracle.svm.core.feature.InternalFeature;
 import com.oracle.svm.core.option.HostedOptionKey;
 import com.oracle.svm.hosted.FeatureImpl;
-import jdk.compiler.graal.options.Option;
-import jdk.compiler.graal.options.OptionType;
+import jdk.graal.compiler.options.Option;
+import jdk.graal.compiler.options.OptionType;
 
 import java.io.File;
 import java.io.PrintWriter;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/LIRNativeImageCodeCache.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/LIRNativeImageCodeCache.java
index de31e57b7c38..efa5b82136b4 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/LIRNativeImageCodeCache.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/LIRNativeImageCodeCache.java
@@ -35,11 +35,11 @@
 import java.util.stream.StreamSupport;
 
 import org.graalvm.collections.Pair;
-import jdk.compiler.graal.code.CompilationResult;
-import jdk.compiler.graal.code.CompilationResult.CodeAnnotation;
-import jdk.compiler.graal.core.common.NumUtil;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.debug.Indent;
+import jdk.graal.compiler.code.CompilationResult;
+import jdk.graal.compiler.code.CompilationResult.CodeAnnotation;
+import jdk.graal.compiler.core.common.NumUtil;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.debug.Indent;
 
 import com.oracle.graal.pointsto.BigBang;
 import com.oracle.objectfile.ObjectFile;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeImage.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeImage.java
index a2c45b1deefc..68bb406bb11a 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeImage.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeImage.java
@@ -50,12 +50,12 @@
 import java.util.stream.Collectors;
 
 import org.graalvm.collections.Pair;
-import jdk.compiler.graal.asm.aarch64.AArch64Assembler;
-import jdk.compiler.graal.code.CompilationResult;
-import jdk.compiler.graal.core.common.CompressEncoding;
-import jdk.compiler.graal.core.common.NumUtil;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.debug.Indent;
+import jdk.graal.compiler.asm.aarch64.AArch64Assembler;
+import jdk.graal.compiler.code.CompilationResult;
+import jdk.graal.compiler.core.common.CompressEncoding;
+import jdk.graal.compiler.core.common.NumUtil;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.debug.Indent;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.c.CHeader;
 import org.graalvm.nativeimage.c.CHeader.Header;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeImageCodeCache.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeImageCodeCache.java
index d9adb0517ace..195f666b8952 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeImageCodeCache.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeImageCodeCache.java
@@ -51,11 +51,11 @@
 
 import com.oracle.svm.hosted.DeadlockWatchdog;
 import org.graalvm.collections.Pair;
-import jdk.compiler.graal.api.replacements.SnippetReflectionProvider;
-import jdk.compiler.graal.code.CompilationResult;
-import jdk.compiler.graal.code.DataSection;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.options.Option;
+import jdk.graal.compiler.api.replacements.SnippetReflectionProvider;
+import jdk.graal.compiler.code.CompilationResult;
+import jdk.graal.compiler.code.DataSection;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.options.Option;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.c.function.CFunctionPointer;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeImageDebugInfoFeature.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeImageDebugInfoFeature.java
index 2d145136e443..b7d3fbb8a212 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeImageDebugInfoFeature.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeImageDebugInfoFeature.java
@@ -27,8 +27,8 @@
 import java.util.List;
 import java.util.function.Function;
 
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.printer.GraalDebugHandlersFactory;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.printer.GraalDebugHandlersFactory;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
 
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeImageDebugInfoProvider.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeImageDebugInfoProvider.java
index 41fb83e08638..13b0fd1d4c31 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeImageDebugInfoProvider.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeImageDebugInfoProvider.java
@@ -44,10 +44,10 @@
 
 import com.oracle.svm.hosted.DeadlockWatchdog;
 import org.graalvm.collections.EconomicMap;
-import jdk.compiler.graal.code.CompilationResult;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.graph.NodeSourcePosition;
-import jdk.compiler.graal.java.StableMethodNameFormatter;
+import jdk.graal.compiler.code.CompilationResult;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.graph.NodeSourcePosition;
+import jdk.graal.compiler.java.StableMethodNameFormatter;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.c.struct.CPointerTo;
 import org.graalvm.nativeimage.c.struct.RawPointerTo;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeImageDebugInfoProviderBase.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeImageDebugInfoProviderBase.java
index 2149de0ef35c..b570f879f253 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeImageDebugInfoProviderBase.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeImageDebugInfoProviderBase.java
@@ -51,7 +51,7 @@
 import jdk.vm.ci.meta.JavaType;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 import jdk.vm.ci.meta.ResolvedJavaType;
-import jdk.compiler.graal.core.common.CompressEncoding;
+import jdk.graal.compiler.core.common.CompressEncoding;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.word.WordBase;
 
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeImageDebugInfoStripFeature.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeImageDebugInfoStripFeature.java
index d95d5676173e..3d454d147768 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeImageDebugInfoStripFeature.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeImageDebugInfoStripFeature.java
@@ -28,10 +28,10 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.debug.DebugContext.Builder;
-import jdk.compiler.graal.debug.Indent;
-import jdk.compiler.graal.printer.GraalDebugHandlersFactory;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.debug.DebugContext.Builder;
+import jdk.graal.compiler.debug.Indent;
+import jdk.graal.compiler.printer.GraalDebugHandlersFactory;
 
 import com.oracle.graal.pointsto.util.GraalAccess;
 import com.oracle.objectfile.ObjectFile;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeImageHeap.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeImageHeap.java
index ff6fcab9ca09..c45a4c1612d6 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeImageHeap.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeImageHeap.java
@@ -41,11 +41,11 @@
 import java.util.Set;
 import java.util.function.Predicate;
 
-import jdk.compiler.graal.api.replacements.Fold;
-import jdk.compiler.graal.core.common.CompressEncoding;
-import jdk.compiler.graal.core.common.NumUtil;
-import jdk.compiler.graal.core.common.type.CompressibleConstant;
-import jdk.compiler.graal.core.common.type.TypedConstant;
+import jdk.graal.compiler.api.replacements.Fold;
+import jdk.graal.compiler.core.common.CompressEncoding;
+import jdk.graal.compiler.core.common.NumUtil;
+import jdk.graal.compiler.core.common.type.CompressibleConstant;
+import jdk.graal.compiler.core.common.type.TypedConstant;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.c.function.RelocatedPointer;
 import org.graalvm.word.UnsignedWord;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeImageHeapWriter.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeImageHeapWriter.java
index 7a8ec094296b..35b968da87c0 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeImageHeapWriter.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeImageHeapWriter.java
@@ -31,11 +31,11 @@
 import java.lang.reflect.Modifier;
 import java.nio.ByteBuffer;
 
-import jdk.compiler.graal.api.replacements.SnippetReflectionProvider;
-import jdk.compiler.graal.core.common.CompressEncoding;
-import jdk.compiler.graal.core.common.NumUtil;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.debug.Indent;
+import jdk.graal.compiler.api.replacements.SnippetReflectionProvider;
+import jdk.graal.compiler.core.common.CompressEncoding;
+import jdk.graal.compiler.core.common.NumUtil;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.debug.Indent;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.c.function.CFunctionPointer;
 import org.graalvm.nativeimage.c.function.RelocatedPointer;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeImageViaCC.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeImageViaCC.java
index c5cb5704558b..7870870bc43f 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeImageViaCC.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeImageViaCC.java
@@ -39,8 +39,8 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.debug.Indent;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.debug.Indent;
 import org.graalvm.nativeimage.Platform;
 
 import com.oracle.objectfile.ObjectFile;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/RelocatableBuffer.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/RelocatableBuffer.java
index 16ccce6fa007..cb4491ca1bf5 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/RelocatableBuffer.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/RelocatableBuffer.java
@@ -33,7 +33,7 @@
 import java.util.SortedMap;
 import java.util.TreeMap;
 
-import jdk.compiler.graal.core.common.NumUtil;
+import jdk.graal.compiler.core.common.NumUtil;
 import org.graalvm.nativeimage.c.function.RelocatedPointer;
 
 import com.oracle.graal.pointsto.heap.ImageHeapConstant;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/SharedLibraryImageViaCC.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/SharedLibraryImageViaCC.java
index 5344465e563e..44e18ba9c9c0 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/SharedLibraryImageViaCC.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/SharedLibraryImageViaCC.java
@@ -30,7 +30,7 @@
 import java.util.List;
 import java.util.concurrent.ForkJoinPool;
 
-import jdk.compiler.graal.debug.DebugContext;
+import jdk.graal.compiler.debug.DebugContext;
 
 import com.oracle.svm.core.LinkerInvocation;
 import com.oracle.svm.core.util.VMError;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/sources/SourceCache.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/sources/SourceCache.java
index 5c039934c5c7..04957dc4d8bc 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/sources/SourceCache.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/sources/SourceCache.java
@@ -39,7 +39,7 @@
 import java.util.HashMap;
 import java.util.List;
 
-import jdk.compiler.graal.options.Option;
+import jdk.graal.compiler.options.Option;
 import org.graalvm.nativeimage.ImageSingletons;
 
 import com.oracle.svm.core.SubstrateOptions;
@@ -75,7 +75,7 @@ private static class SourceRoots {
          */
         private static final String[] specialRootModules = {
                         "jdk.internal.vm.ci",
-                        "jdk.compiler.graal",
+                        "jdk.graal.compiler",
         };
 
         /**
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/sources/SourceManager.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/sources/SourceManager.java
index e076da6c804d..a07904a260f8 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/sources/SourceManager.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/sources/SourceManager.java
@@ -30,7 +30,7 @@
 import java.nio.file.Paths;
 import java.util.HashMap;
 
-import jdk.compiler.graal.debug.DebugContext;
+import jdk.graal.compiler.debug.DebugContext;
 
 import jdk.vm.ci.meta.ResolvedJavaType;
 
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jdk/AccessControlContextReplacerFeature.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jdk/AccessControlContextReplacerFeature.java
index a5d223b74a3b..e6c26597d24f 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jdk/AccessControlContextReplacerFeature.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jdk/AccessControlContextReplacerFeature.java
@@ -31,7 +31,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import jdk.compiler.graal.serviceprovider.JavaVersionUtil;
+import jdk.graal.compiler.serviceprovider.JavaVersionUtil;
 
 import com.oracle.svm.core.feature.AutomaticallyRegisteredFeature;
 import com.oracle.svm.core.feature.InternalFeature;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jdk/JNIRegistrationSupport.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jdk/JNIRegistrationSupport.java
index 15d562dc9a53..b3bcebee8397 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jdk/JNIRegistrationSupport.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jdk/JNIRegistrationSupport.java
@@ -41,17 +41,17 @@
 import java.util.concurrent.ConcurrentMap;
 import java.util.stream.Stream;
 
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.debug.DebugContext.Activation;
-import jdk.compiler.graal.debug.DebugContext.Scope;
-import jdk.compiler.graal.debug.Indent;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin.RequiredInvocationPlugin;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins.Registration;
-import jdk.compiler.graal.options.Option;
-import jdk.compiler.graal.phases.util.Providers;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.debug.DebugContext.Activation;
+import jdk.graal.compiler.debug.DebugContext.Scope;
+import jdk.graal.compiler.debug.Indent;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin.RequiredInvocationPlugin;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins.Registration;
+import jdk.graal.compiler.options.Option;
+import jdk.graal.compiler.phases.util.Providers;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platforms;
 import org.graalvm.nativeimage.impl.InternalPlatform;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jdk/localization/LocalizationFeature.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jdk/localization/LocalizationFeature.java
index 8cb5c41a07ad..573ef4ddb6d9 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jdk/localization/LocalizationFeature.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jdk/localization/LocalizationFeature.java
@@ -61,12 +61,12 @@
 import java.util.stream.Collectors;
 
 import org.graalvm.collections.Pair;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext;
-import jdk.compiler.graal.nodes.graphbuilderconf.NodePlugin;
-import jdk.compiler.graal.options.Option;
-import jdk.compiler.graal.options.OptionStability;
-import jdk.compiler.graal.options.OptionType;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext;
+import jdk.graal.compiler.nodes.graphbuilderconf.NodePlugin;
+import jdk.graal.compiler.options.Option;
+import jdk.graal.compiler.options.OptionStability;
+import jdk.graal.compiler.options.OptionType;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jni/JNIAccessFeature.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jni/JNIAccessFeature.java
index f1ab4fa4b6b5..85ce7145b778 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jni/JNIAccessFeature.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jni/JNIAccessFeature.java
@@ -42,9 +42,9 @@
 import org.graalvm.collections.EconomicSet;
 import org.graalvm.collections.Equivalence;
 import org.graalvm.collections.UnmodifiableMapCursor;
-import jdk.compiler.graal.api.replacements.Fold;
-import jdk.compiler.graal.options.Option;
-import jdk.compiler.graal.word.WordTypes;
+import jdk.graal.compiler.api.replacements.Fold;
+import jdk.graal.compiler.options.Option;
+import jdk.graal.compiler.word.WordTypes;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.c.function.CodePointer;
 import org.graalvm.nativeimage.hosted.Feature;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jni/JNICallTrampolineMethod.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jni/JNICallTrampolineMethod.java
index 34227daac84e..665254269950 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jni/JNICallTrampolineMethod.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jni/JNICallTrampolineMethod.java
@@ -28,8 +28,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.nodes.StructuredGraph;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.nodes.StructuredGraph;
 import org.graalvm.nativeimage.ImageSingletons;
 
 import com.oracle.graal.pointsto.meta.AnalysisUniverse;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jni/JNIFieldAccessorMethod.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jni/JNIFieldAccessorMethod.java
index 2a42994f9411..946e813e4746 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jni/JNIFieldAccessorMethod.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jni/JNIFieldAccessorMethod.java
@@ -28,12 +28,12 @@
 import java.util.EnumSet;
 import java.util.List;
 
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.java.FrameStateBuilder;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.extended.RawLoadNode;
-import jdk.compiler.graal.nodes.extended.RawStoreNode;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.java.FrameStateBuilder;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.extended.RawLoadNode;
+import jdk.graal.compiler.nodes.extended.RawStoreNode;
 import org.graalvm.nativeimage.c.function.CEntryPoint.FatalExceptionHandler;
 import org.graalvm.nativeimage.c.function.CEntryPoint.Publish;
 import org.graalvm.word.LocationIdentity;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jni/JNIGraphKit.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jni/JNIGraphKit.java
index b7e3fa53024a..24dd690d412d 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jni/JNIGraphKit.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jni/JNIGraphKit.java
@@ -24,28 +24,28 @@
  */
 package com.oracle.svm.hosted.jni;
 
-import jdk.compiler.graal.core.common.type.ObjectStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.core.common.type.TypeReference;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.nodes.CallTargetNode.InvokeKind;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.InvokeWithExceptionNode;
-import jdk.compiler.graal.nodes.LogicNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.PiNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.calc.ConditionalNode;
-import jdk.compiler.graal.nodes.calc.IntegerEqualsNode;
-import jdk.compiler.graal.nodes.calc.NarrowNode;
-import jdk.compiler.graal.nodes.calc.SignExtendNode;
-import jdk.compiler.graal.nodes.calc.ZeroExtendNode;
-import jdk.compiler.graal.nodes.extended.BytecodeExceptionNode;
-import jdk.compiler.graal.nodes.extended.GuardingNode;
-import jdk.compiler.graal.nodes.java.ExceptionObjectNode;
-import jdk.compiler.graal.nodes.java.InstanceOfNode;
+import jdk.graal.compiler.core.common.type.ObjectStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.core.common.type.TypeReference;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.nodes.CallTargetNode.InvokeKind;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.InvokeWithExceptionNode;
+import jdk.graal.compiler.nodes.LogicNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.PiNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.calc.ConditionalNode;
+import jdk.graal.compiler.nodes.calc.IntegerEqualsNode;
+import jdk.graal.compiler.nodes.calc.NarrowNode;
+import jdk.graal.compiler.nodes.calc.SignExtendNode;
+import jdk.graal.compiler.nodes.calc.ZeroExtendNode;
+import jdk.graal.compiler.nodes.extended.BytecodeExceptionNode;
+import jdk.graal.compiler.nodes.extended.GuardingNode;
+import jdk.graal.compiler.nodes.java.ExceptionObjectNode;
+import jdk.graal.compiler.nodes.java.InstanceOfNode;
 
 import com.oracle.graal.pointsto.infrastructure.GraphProvider;
 import com.oracle.graal.pointsto.meta.HostedProviders;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jni/JNIJavaCallVariantWrapperMethod.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jni/JNIJavaCallVariantWrapperMethod.java
index 1f378c1b738c..c7a057e5b8fc 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jni/JNIJavaCallVariantWrapperMethod.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jni/JNIJavaCallVariantWrapperMethod.java
@@ -27,28 +27,28 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import jdk.compiler.graal.core.common.calc.FloatConvert;
-import jdk.compiler.graal.core.common.memory.BarrierType;
-import jdk.compiler.graal.core.common.memory.MemoryOrderMode;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.core.common.type.StampPair;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.nodes.AbstractMergeNode;
-import jdk.compiler.graal.nodes.CallTargetNode;
-import jdk.compiler.graal.nodes.CallTargetNode.InvokeKind;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.IndirectCallTargetNode;
-import jdk.compiler.graal.nodes.InvokeWithExceptionNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.ValuePhiNode;
-import jdk.compiler.graal.nodes.calc.FloatConvertNode;
-import jdk.compiler.graal.nodes.calc.ReinterpretNode;
-import jdk.compiler.graal.nodes.memory.address.OffsetAddressNode;
-import jdk.compiler.graal.word.WordTypes;
+import jdk.graal.compiler.core.common.calc.FloatConvert;
+import jdk.graal.compiler.core.common.memory.BarrierType;
+import jdk.graal.compiler.core.common.memory.MemoryOrderMode;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.core.common.type.StampPair;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.nodes.AbstractMergeNode;
+import jdk.graal.compiler.nodes.CallTargetNode;
+import jdk.graal.compiler.nodes.CallTargetNode.InvokeKind;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.IndirectCallTargetNode;
+import jdk.graal.compiler.nodes.InvokeWithExceptionNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.ValuePhiNode;
+import jdk.graal.compiler.nodes.calc.FloatConvertNode;
+import jdk.graal.compiler.nodes.calc.ReinterpretNode;
+import jdk.graal.compiler.nodes.memory.address.OffsetAddressNode;
+import jdk.graal.compiler.word.WordTypes;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.word.LocationIdentity;
 
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jni/JNIJavaCallWrapperMethod.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jni/JNIJavaCallWrapperMethod.java
index b5cc82965b03..3d8c805e994f 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jni/JNIJavaCallWrapperMethod.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jni/JNIJavaCallWrapperMethod.java
@@ -27,27 +27,27 @@
 import java.lang.reflect.Constructor;
 import java.util.List;
 
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.core.common.type.StampPair;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.nodes.AbstractMergeNode;
-import jdk.compiler.graal.nodes.CallTargetNode;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.IndirectCallTargetNode;
-import jdk.compiler.graal.nodes.InvokeWithExceptionNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ProfileData.BranchProbabilityData;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.UnwindNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.ValuePhiNode;
-import jdk.compiler.graal.nodes.calc.IntegerEqualsNode;
-import jdk.compiler.graal.nodes.calc.ObjectEqualsNode;
-import jdk.compiler.graal.nodes.extended.BranchProbabilityNode;
-import jdk.compiler.graal.nodes.java.ExceptionObjectNode;
-import jdk.compiler.graal.nodes.type.StampTool;
-import jdk.compiler.graal.word.WordTypes;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.core.common.type.StampPair;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.nodes.AbstractMergeNode;
+import jdk.graal.compiler.nodes.CallTargetNode;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.IndirectCallTargetNode;
+import jdk.graal.compiler.nodes.InvokeWithExceptionNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ProfileData.BranchProbabilityData;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.UnwindNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.ValuePhiNode;
+import jdk.graal.compiler.nodes.calc.IntegerEqualsNode;
+import jdk.graal.compiler.nodes.calc.ObjectEqualsNode;
+import jdk.graal.compiler.nodes.extended.BranchProbabilityNode;
+import jdk.graal.compiler.nodes.java.ExceptionObjectNode;
+import jdk.graal.compiler.nodes.type.StampTool;
+import jdk.graal.compiler.word.WordTypes;
 
 import com.oracle.graal.pointsto.infrastructure.UniverseMetaAccess;
 import com.oracle.graal.pointsto.infrastructure.WrappedSignature;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jni/JNINativeCallWrapperMethod.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jni/JNINativeCallWrapperMethod.java
index 11b261939cb2..5fd0ce5341fb 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jni/JNINativeCallWrapperMethod.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jni/JNINativeCallWrapperMethod.java
@@ -30,14 +30,14 @@
 import java.util.List;
 import java.util.function.Function;
 
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.InvokeWithExceptionNode;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.java.MonitorEnterNode;
-import jdk.compiler.graal.nodes.java.MonitorExitNode;
-import jdk.compiler.graal.nodes.java.MonitorIdNode;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.InvokeWithExceptionNode;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.java.MonitorEnterNode;
+import jdk.graal.compiler.nodes.java.MonitorExitNode;
+import jdk.graal.compiler.nodes.java.MonitorIdNode;
 
 import com.oracle.graal.pointsto.infrastructure.WrappedJavaMethod;
 import com.oracle.graal.pointsto.meta.HostedProviders;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jni/JNIPrimitiveArrayOperationMethod.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jni/JNIPrimitiveArrayOperationMethod.java
index f02ba916b71c..76eee57ae931 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jni/JNIPrimitiveArrayOperationMethod.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jni/JNIPrimitiveArrayOperationMethod.java
@@ -28,12 +28,12 @@
 import java.util.EnumSet;
 import java.util.List;
 
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.java.FrameStateBuilder;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.MergeNode;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.java.FrameStateBuilder;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.MergeNode;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
 import org.graalvm.nativeimage.c.function.CEntryPoint.FatalExceptionHandler;
 import org.graalvm.nativeimage.c.function.CEntryPoint.Publish;
 import org.graalvm.nativeimage.c.type.CCharPointer;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/lambda/LambdaProxyRenamingSubstitutionProcessor.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/lambda/LambdaProxyRenamingSubstitutionProcessor.java
index fa344d06472d..58b93a1a8207 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/lambda/LambdaProxyRenamingSubstitutionProcessor.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/lambda/LambdaProxyRenamingSubstitutionProcessor.java
@@ -28,12 +28,12 @@
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.debug.DebugContext.Builder;
-import jdk.compiler.graal.java.LambdaUtils;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.util.Providers;
-import jdk.compiler.graal.printer.GraalDebugHandlersFactory;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.debug.DebugContext.Builder;
+import jdk.graal.compiler.java.LambdaUtils;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.util.Providers;
+import jdk.graal.compiler.printer.GraalDebugHandlersFactory;
 
 import com.oracle.graal.pointsto.BigBang;
 import com.oracle.graal.pointsto.infrastructure.SubstitutionProcessor;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/lambda/StableLambdaProxyNameFeature.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/lambda/StableLambdaProxyNameFeature.java
index c6dc8fd2d224..99470a7f54c9 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/lambda/StableLambdaProxyNameFeature.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/lambda/StableLambdaProxyNameFeature.java
@@ -28,7 +28,7 @@
 import java.util.List;
 import java.util.Set;
 
-import jdk.compiler.graal.java.LambdaUtils;
+import jdk.graal.compiler.java.LambdaUtils;
 
 import com.oracle.graal.pointsto.meta.AnalysisType;
 import com.oracle.svm.core.SubstrateUtil;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/meta/HostedLookupSnippetReflectionProvider.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/meta/HostedLookupSnippetReflectionProvider.java
index 52d1b7bd1b94..5de9690835ab 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/meta/HostedLookupSnippetReflectionProvider.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/meta/HostedLookupSnippetReflectionProvider.java
@@ -24,7 +24,7 @@
  */
 package com.oracle.svm.hosted.meta;
 
-import jdk.compiler.graal.word.WordTypes;
+import jdk.graal.compiler.word.WordTypes;
 import org.graalvm.nativeimage.c.function.RelocatedPointer;
 import org.graalvm.word.WordBase;
 
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/meta/HostedMemoryAccessProvider.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/meta/HostedMemoryAccessProvider.java
index 33a078d2218b..03bf29215fee 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/meta/HostedMemoryAccessProvider.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/meta/HostedMemoryAccessProvider.java
@@ -24,8 +24,8 @@
  */
 package com.oracle.svm.hosted.meta;
 
-import jdk.compiler.graal.core.common.CompressEncoding;
-import jdk.compiler.graal.core.common.type.CompressibleConstant;
+import jdk.graal.compiler.core.common.CompressEncoding;
+import jdk.graal.compiler.core.common.type.CompressibleConstant;
 
 import com.oracle.svm.core.SubstrateOptions;
 import com.oracle.svm.core.graal.meta.SubstrateMemoryAccessProvider;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/meta/HostedMetaAccess.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/meta/HostedMetaAccess.java
index 1d7cfce60c13..b91752e7a556 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/meta/HostedMetaAccess.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/meta/HostedMetaAccess.java
@@ -33,7 +33,7 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import jdk.compiler.graal.core.common.type.TypedConstant;
+import jdk.graal.compiler.core.common.type.TypedConstant;
 
 import com.oracle.graal.pointsto.heap.ImageHeapConstant;
 import com.oracle.graal.pointsto.infrastructure.UniverseMetaAccess;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/meta/HostedMethod.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/meta/HostedMethod.java
index 090c543bfc3c..2aa9216c2718 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/meta/HostedMethod.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/meta/HostedMethod.java
@@ -39,11 +39,11 @@
 import java.util.function.Function;
 
 import org.graalvm.collections.Pair;
-import jdk.compiler.graal.api.replacements.Snippet;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.debug.JavaMethodContext;
-import jdk.compiler.graal.java.StableMethodNameFormatter;
-import jdk.compiler.graal.nodes.StructuredGraph;
+import jdk.graal.compiler.api.replacements.Snippet;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.debug.JavaMethodContext;
+import jdk.graal.compiler.java.StableMethodNameFormatter;
+import jdk.graal.compiler.nodes.StructuredGraph;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/meta/HostedSnippetReflectionProvider.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/meta/HostedSnippetReflectionProvider.java
index 572190742a7d..daf82d2411a8 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/meta/HostedSnippetReflectionProvider.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/meta/HostedSnippetReflectionProvider.java
@@ -24,7 +24,7 @@
  */
 package com.oracle.svm.hosted.meta;
 
-import jdk.compiler.graal.word.WordTypes;
+import jdk.graal.compiler.word.WordTypes;
 import org.graalvm.nativeimage.c.function.RelocatedPointer;
 import org.graalvm.word.WordBase;
 
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/meta/HostedUniverse.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/meta/HostedUniverse.java
index 43c5db3028b6..be06ee0698b7 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/meta/HostedUniverse.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/meta/HostedUniverse.java
@@ -38,8 +38,8 @@
 import java.util.Map;
 import java.util.Optional;
 
-import jdk.compiler.graal.api.replacements.SnippetReflectionProvider;
-import jdk.compiler.graal.nodes.StructuredGraph;
+import jdk.graal.compiler.api.replacements.SnippetReflectionProvider;
+import jdk.graal.compiler.nodes.StructuredGraph;
 import org.graalvm.nativeimage.hosted.Feature;
 
 import com.oracle.graal.pointsto.BigBang;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/meta/RelocatableConstant.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/meta/RelocatableConstant.java
index 9ed18ebffd9c..4b147e6d68d1 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/meta/RelocatableConstant.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/meta/RelocatableConstant.java
@@ -24,7 +24,7 @@
  */
 package com.oracle.svm.hosted.meta;
 
-import jdk.compiler.graal.core.common.type.TypedConstant;
+import jdk.graal.compiler.core.common.type.TypedConstant;
 import org.graalvm.nativeimage.c.function.RelocatedPointer;
 
 import jdk.vm.ci.meta.JavaConstant;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/meta/SharedConstantFieldProvider.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/meta/SharedConstantFieldProvider.java
index d6f19a0f7087..af5e9b8b83c3 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/meta/SharedConstantFieldProvider.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/meta/SharedConstantFieldProvider.java
@@ -24,7 +24,7 @@
  */
 package com.oracle.svm.hosted.meta;
 
-import jdk.compiler.graal.core.common.spi.JavaConstantFieldProvider;
+import jdk.graal.compiler.core.common.spi.JavaConstantFieldProvider;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
 
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/meta/TypeCheckBuilder.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/meta/TypeCheckBuilder.java
index cc2134ec392f..7bfd1053bb11 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/meta/TypeCheckBuilder.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/meta/TypeCheckBuilder.java
@@ -38,7 +38,7 @@
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
-import jdk.compiler.graal.core.common.calc.UnsignedMath;
+import jdk.graal.compiler.core.common.calc.UnsignedMath;
 import org.graalvm.nativeimage.ImageSingletons;
 
 import com.oracle.svm.core.SubstrateOptions;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/meta/UniverseBuilder.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/meta/UniverseBuilder.java
index af1edb7e9627..963fe2772af8 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/meta/UniverseBuilder.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/meta/UniverseBuilder.java
@@ -45,9 +45,9 @@
 import java.util.stream.Collectors;
 
 import org.graalvm.collections.Pair;
-import jdk.compiler.graal.core.common.NumUtil;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.debug.Indent;
+import jdk.graal.compiler.core.common.NumUtil;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.debug.Indent;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.c.function.CEntryPointLiteral;
 import org.graalvm.nativeimage.c.function.CFunction;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/methodhandles/MethodHandleFeature.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/methodhandles/MethodHandleFeature.java
index 3d274202323d..affb067d166b 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/methodhandles/MethodHandleFeature.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/methodhandles/MethodHandleFeature.java
@@ -37,7 +37,7 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Supplier;
 
-import jdk.compiler.graal.serviceprovider.JavaVersionUtil;
+import jdk.graal.compiler.serviceprovider.JavaVersionUtil;
 import org.graalvm.nativeimage.hosted.RuntimeReflection;
 
 import com.oracle.graal.pointsto.meta.AnalysisMetaAccess;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/nodes/DeoptProxyNode.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/nodes/DeoptProxyNode.java
index c69b64121f56..9a49f8142380 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/nodes/DeoptProxyNode.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/nodes/DeoptProxyNode.java
@@ -24,23 +24,23 @@
  */
 package com.oracle.svm.hosted.nodes;
 
-import jdk.compiler.graal.graph.IterableNodeType;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.Node.ValueNumberable;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.nodeinfo.InputType;
-import jdk.compiler.graal.nodeinfo.NodeCycles;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodeinfo.NodeSize;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ParameterNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.calc.FloatingNode;
-import jdk.compiler.graal.nodes.spi.Canonicalizable;
-import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
-import jdk.compiler.graal.nodes.spi.LIRLowerable;
-import jdk.compiler.graal.nodes.spi.LimitedValueProxy;
-import jdk.compiler.graal.nodes.spi.NodeLIRBuilderTool;
+import jdk.graal.compiler.graph.IterableNodeType;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.Node.ValueNumberable;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.nodeinfo.InputType;
+import jdk.graal.compiler.nodeinfo.NodeCycles;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodeinfo.NodeSize;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ParameterNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.calc.FloatingNode;
+import jdk.graal.compiler.nodes.spi.Canonicalizable;
+import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
+import jdk.graal.compiler.nodes.spi.LIRLowerable;
+import jdk.graal.compiler.nodes.spi.LimitedValueProxy;
+import jdk.graal.compiler.nodes.spi.NodeLIRBuilderTool;
 
 import com.oracle.svm.core.deopt.Deoptimizer;
 
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/option/HostedOptionCustomizer.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/option/HostedOptionCustomizer.java
index 9c111fffaa03..f73f7f2d1542 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/option/HostedOptionCustomizer.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/option/HostedOptionCustomizer.java
@@ -25,8 +25,8 @@
 package com.oracle.svm.hosted.option;
 
 import org.graalvm.collections.EconomicMap;
-import jdk.compiler.graal.options.OptionKey;
-import jdk.compiler.graal.options.OptionValues;
+import jdk.graal.compiler.options.OptionKey;
+import jdk.graal.compiler.options.OptionValues;
 
 public class HostedOptionCustomizer implements HostedOptionProvider {
 
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/option/HostedOptionParser.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/option/HostedOptionParser.java
index c9f7fef9faa1..35083fef44a9 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/option/HostedOptionParser.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/option/HostedOptionParser.java
@@ -36,10 +36,10 @@
 
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.EconomicSet;
-import jdk.compiler.graal.options.OptionDescriptor;
-import jdk.compiler.graal.options.OptionDescriptors;
-import jdk.compiler.graal.options.OptionKey;
-import jdk.compiler.graal.options.OptionValues;
+import jdk.graal.compiler.options.OptionDescriptor;
+import jdk.graal.compiler.options.OptionDescriptors;
+import jdk.graal.compiler.options.OptionKey;
+import jdk.graal.compiler.options.OptionValues;
 import org.graalvm.nativeimage.Platforms;
 
 import com.oracle.svm.core.option.HostedOptionKey;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/option/HostedOptionProvider.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/option/HostedOptionProvider.java
index b6ea47f4529c..5a1114c49e27 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/option/HostedOptionProvider.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/option/HostedOptionProvider.java
@@ -25,7 +25,7 @@
 package com.oracle.svm.hosted.option;
 
 import org.graalvm.collections.EconomicMap;
-import jdk.compiler.graal.options.OptionKey;
+import jdk.graal.compiler.options.OptionKey;
 
 public interface HostedOptionProvider {
     EconomicMap, Object> getHostedValues();
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/option/RuntimeOptionFeature.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/option/RuntimeOptionFeature.java
index 641b5f50cf09..9d9c1bf25165 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/option/RuntimeOptionFeature.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/option/RuntimeOptionFeature.java
@@ -24,9 +24,9 @@
  */
 package com.oracle.svm.hosted.option;
 
-import jdk.compiler.graal.options.OptionDescriptor;
-import jdk.compiler.graal.options.OptionGroup;
-import jdk.compiler.graal.options.OptionKey;
+import jdk.graal.compiler.options.OptionDescriptor;
+import jdk.graal.compiler.options.OptionGroup;
+import jdk.graal.compiler.options.OptionKey;
 import org.graalvm.nativeimage.ImageSingletons;
 
 import com.oracle.svm.core.feature.InternalFeature;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/AnalysisGraphBuilderPhase.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/AnalysisGraphBuilderPhase.java
index 8c57bc2c63d0..127df6fb7f62 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/AnalysisGraphBuilderPhase.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/AnalysisGraphBuilderPhase.java
@@ -24,22 +24,22 @@
  */
 package com.oracle.svm.hosted.phases;
 
-import jdk.compiler.graal.core.common.BootstrapMethodIntrospection;
-import jdk.compiler.graal.java.BciBlockMapping;
-import jdk.compiler.graal.java.BytecodeParser;
-import jdk.compiler.graal.java.FrameStateBuilder;
-import jdk.compiler.graal.java.GraphBuilderPhase;
-import jdk.compiler.graal.nodes.CallTargetNode.InvokeKind;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration;
-import jdk.compiler.graal.nodes.graphbuilderconf.InlineInvokePlugin.InlineInfo;
-import jdk.compiler.graal.nodes.graphbuilderconf.IntrinsicContext;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin;
-import jdk.compiler.graal.nodes.graphbuilderconf.NodePlugin;
-import jdk.compiler.graal.nodes.spi.CoreProviders;
-import jdk.compiler.graal.phases.OptimisticOptimizations;
-import jdk.compiler.graal.word.WordTypes;
+import jdk.graal.compiler.core.common.BootstrapMethodIntrospection;
+import jdk.graal.compiler.java.BciBlockMapping;
+import jdk.graal.compiler.java.BytecodeParser;
+import jdk.graal.compiler.java.FrameStateBuilder;
+import jdk.graal.compiler.java.GraphBuilderPhase;
+import jdk.graal.compiler.nodes.CallTargetNode.InvokeKind;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
+import jdk.graal.compiler.nodes.graphbuilderconf.InlineInvokePlugin.InlineInfo;
+import jdk.graal.compiler.nodes.graphbuilderconf.IntrinsicContext;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin;
+import jdk.graal.compiler.nodes.graphbuilderconf.NodePlugin;
+import jdk.graal.compiler.nodes.spi.CoreProviders;
+import jdk.graal.compiler.phases.OptimisticOptimizations;
+import jdk.graal.compiler.word.WordTypes;
 
 import com.oracle.graal.pointsto.infrastructure.AnalysisConstantPool;
 import com.oracle.graal.pointsto.meta.AnalysisMethod;
@@ -101,7 +101,7 @@ protected boolean applyInvocationPlugin(InvokeKind invokeKind, ValueNode[] args,
              * access.
              */
             ModuleSupport.accessPackagesToClass(ModuleSupport.Access.OPEN, accessingClass, false, "jdk.internal.vm.ci", "jdk.vm.ci.meta");
-            ModuleSupport.accessPackagesToClass(ModuleSupport.Access.OPEN, accessingClass, false, "jdk.compiler.graal", "jdk.compiler.graal.nodes");
+            ModuleSupport.accessPackagesToClass(ModuleSupport.Access.OPEN, accessingClass, false, "jdk.graal.compiler", "jdk.graal.compiler.nodes");
             return super.applyInvocationPlugin(invokeKind, args, targetMethod, resultType, plugin);
         }
 
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/CInterfaceEnumTool.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/CInterfaceEnumTool.java
index 058bd058b91c..16c0f6df0e7b 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/CInterfaceEnumTool.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/CInterfaceEnumTool.java
@@ -26,23 +26,23 @@
 
 import java.lang.reflect.Modifier;
 
-import jdk.compiler.graal.api.replacements.SnippetReflectionProvider;
-import jdk.compiler.graal.core.common.type.ObjectStamp;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.core.common.type.StampPair;
-import jdk.compiler.graal.core.common.type.TypeReference;
-import jdk.compiler.graal.java.BytecodeParser;
-import jdk.compiler.graal.nodes.CallTargetNode.InvokeKind;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.InvokeWithExceptionNode;
-import jdk.compiler.graal.nodes.LogicNode;
-import jdk.compiler.graal.nodes.PiNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.extended.BytecodeExceptionNode;
-import jdk.compiler.graal.nodes.extended.GuardingNode;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderTool;
-import jdk.compiler.graal.nodes.java.InstanceOfNode;
-import jdk.compiler.graal.nodes.java.MethodCallTargetNode;
+import jdk.graal.compiler.api.replacements.SnippetReflectionProvider;
+import jdk.graal.compiler.core.common.type.ObjectStamp;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.core.common.type.StampPair;
+import jdk.graal.compiler.core.common.type.TypeReference;
+import jdk.graal.compiler.java.BytecodeParser;
+import jdk.graal.compiler.nodes.CallTargetNode.InvokeKind;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.InvokeWithExceptionNode;
+import jdk.graal.compiler.nodes.LogicNode;
+import jdk.graal.compiler.nodes.PiNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.extended.BytecodeExceptionNode;
+import jdk.graal.compiler.nodes.extended.GuardingNode;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderTool;
+import jdk.graal.compiler.nodes.java.InstanceOfNode;
+import jdk.graal.compiler.nodes.java.MethodCallTargetNode;
 
 import com.oracle.svm.core.c.enums.EnumRuntimeData;
 import com.oracle.svm.core.util.VMError;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/CInterfaceInvocationPlugin.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/CInterfaceInvocationPlugin.java
index 30d673994c63..3f1b534d43e8 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/CInterfaceInvocationPlugin.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/CInterfaceInvocationPlugin.java
@@ -29,40 +29,40 @@
 
 import java.util.Arrays;
 
-import jdk.compiler.graal.api.replacements.SnippetReflectionProvider;
-import jdk.compiler.graal.core.common.calc.FloatConvert;
-import jdk.compiler.graal.core.common.memory.BarrierType;
-import jdk.compiler.graal.core.common.memory.MemoryOrderMode;
-import jdk.compiler.graal.core.common.type.IntegerStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.core.common.type.StampPair;
-import jdk.compiler.graal.nodes.CallTargetNode;
-import jdk.compiler.graal.nodes.CallTargetNode.InvokeKind;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.IndirectCallTargetNode;
-import jdk.compiler.graal.nodes.LogicNode;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.calc.AddNode;
-import jdk.compiler.graal.nodes.calc.AndNode;
-import jdk.compiler.graal.nodes.calc.ConditionalNode;
-import jdk.compiler.graal.nodes.calc.FloatConvertNode;
-import jdk.compiler.graal.nodes.calc.IntegerEqualsNode;
-import jdk.compiler.graal.nodes.calc.LeftShiftNode;
-import jdk.compiler.graal.nodes.calc.MulNode;
-import jdk.compiler.graal.nodes.calc.NarrowNode;
-import jdk.compiler.graal.nodes.calc.OrNode;
-import jdk.compiler.graal.nodes.calc.RightShiftNode;
-import jdk.compiler.graal.nodes.calc.SignExtendNode;
-import jdk.compiler.graal.nodes.calc.ZeroExtendNode;
-import jdk.compiler.graal.nodes.extended.JavaReadNode;
-import jdk.compiler.graal.nodes.extended.JavaWriteNode;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext;
-import jdk.compiler.graal.nodes.graphbuilderconf.NodePlugin;
-import jdk.compiler.graal.nodes.memory.address.AddressNode;
-import jdk.compiler.graal.nodes.memory.address.OffsetAddressNode;
-import jdk.compiler.graal.word.WordTypes;
+import jdk.graal.compiler.api.replacements.SnippetReflectionProvider;
+import jdk.graal.compiler.core.common.calc.FloatConvert;
+import jdk.graal.compiler.core.common.memory.BarrierType;
+import jdk.graal.compiler.core.common.memory.MemoryOrderMode;
+import jdk.graal.compiler.core.common.type.IntegerStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.core.common.type.StampPair;
+import jdk.graal.compiler.nodes.CallTargetNode;
+import jdk.graal.compiler.nodes.CallTargetNode.InvokeKind;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.IndirectCallTargetNode;
+import jdk.graal.compiler.nodes.LogicNode;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.calc.AddNode;
+import jdk.graal.compiler.nodes.calc.AndNode;
+import jdk.graal.compiler.nodes.calc.ConditionalNode;
+import jdk.graal.compiler.nodes.calc.FloatConvertNode;
+import jdk.graal.compiler.nodes.calc.IntegerEqualsNode;
+import jdk.graal.compiler.nodes.calc.LeftShiftNode;
+import jdk.graal.compiler.nodes.calc.MulNode;
+import jdk.graal.compiler.nodes.calc.NarrowNode;
+import jdk.graal.compiler.nodes.calc.OrNode;
+import jdk.graal.compiler.nodes.calc.RightShiftNode;
+import jdk.graal.compiler.nodes.calc.SignExtendNode;
+import jdk.graal.compiler.nodes.calc.ZeroExtendNode;
+import jdk.graal.compiler.nodes.extended.JavaReadNode;
+import jdk.graal.compiler.nodes.extended.JavaWriteNode;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext;
+import jdk.graal.compiler.nodes.graphbuilderconf.NodePlugin;
+import jdk.graal.compiler.nodes.memory.address.AddressNode;
+import jdk.graal.compiler.nodes.memory.address.OffsetAddressNode;
+import jdk.graal.compiler.word.WordTypes;
 import org.graalvm.nativeimage.c.function.CEntryPoint;
 import org.graalvm.nativeimage.c.function.CFunctionPointer;
 import org.graalvm.nativeimage.c.function.InvokeCFunctionPointer;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/ConstantFoldLoadFieldPlugin.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/ConstantFoldLoadFieldPlugin.java
index 73adc4550206..767ab0dae9f1 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/ConstantFoldLoadFieldPlugin.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/ConstantFoldLoadFieldPlugin.java
@@ -24,11 +24,11 @@
  */
 package com.oracle.svm.hosted.phases;
 
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext;
-import jdk.compiler.graal.nodes.graphbuilderconf.NodePlugin;
-import jdk.compiler.graal.nodes.util.ConstantFoldUtil;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext;
+import jdk.graal.compiler.nodes.graphbuilderconf.NodePlugin;
+import jdk.graal.compiler.nodes.util.ConstantFoldUtil;
 
 import com.oracle.graal.pointsto.ObjectScanner;
 import com.oracle.graal.pointsto.constraints.UnsupportedFeatureException;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/DeoptimizationTargetBciBlockMapping.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/DeoptimizationTargetBciBlockMapping.java
index 7d86f34e2fb4..3897e40dbd73 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/DeoptimizationTargetBciBlockMapping.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/DeoptimizationTargetBciBlockMapping.java
@@ -27,13 +27,13 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import jdk.compiler.graal.bytecode.Bytecode;
-import jdk.compiler.graal.bytecode.BytecodeStream;
-import jdk.compiler.graal.core.common.PermanentBailoutException;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.java.BciBlockMapping;
-import jdk.compiler.graal.options.OptionValues;
+import jdk.graal.compiler.bytecode.Bytecode;
+import jdk.graal.compiler.bytecode.BytecodeStream;
+import jdk.graal.compiler.core.common.PermanentBailoutException;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.java.BciBlockMapping;
+import jdk.graal.compiler.options.OptionValues;
 
 import com.oracle.svm.common.meta.MultiMethod;
 import com.oracle.svm.core.code.FrameInfoEncoder;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/DevirtualizeCallsPhase.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/DevirtualizeCallsPhase.java
index 6046e8e720f7..ce882d97ef81 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/DevirtualizeCallsPhase.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/DevirtualizeCallsPhase.java
@@ -27,20 +27,20 @@
 import static com.oracle.svm.core.graal.snippets.DeoptHostedSnippets.AnalysisSpeculation;
 import static com.oracle.svm.core.graal.snippets.DeoptHostedSnippets.AnalysisSpeculationReason;
 
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.core.common.type.TypeReference;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.nodes.CallTargetNode.InvokeKind;
-import jdk.compiler.graal.nodes.FixedGuardNode;
-import jdk.compiler.graal.nodes.Invoke;
-import jdk.compiler.graal.nodes.LogicConstantNode;
-import jdk.compiler.graal.nodes.PiNode;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.extended.ValueAnchorNode;
-import jdk.compiler.graal.phases.Phase;
-import jdk.compiler.graal.phases.common.inlining.InliningUtil;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.core.common.type.TypeReference;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.nodes.CallTargetNode.InvokeKind;
+import jdk.graal.compiler.nodes.FixedGuardNode;
+import jdk.graal.compiler.nodes.Invoke;
+import jdk.graal.compiler.nodes.LogicConstantNode;
+import jdk.graal.compiler.nodes.PiNode;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.extended.ValueAnchorNode;
+import jdk.graal.compiler.phases.Phase;
+import jdk.graal.compiler.phases.common.inlining.InliningUtil;
 
 import com.oracle.svm.core.SubstrateOptions;
 import com.oracle.svm.core.nodes.SubstrateMethodCallTargetNode;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/EarlyConstantFoldLoadFieldPlugin.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/EarlyConstantFoldLoadFieldPlugin.java
index af05e670d840..ac384b383949 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/EarlyConstantFoldLoadFieldPlugin.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/EarlyConstantFoldLoadFieldPlugin.java
@@ -27,9 +27,9 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext;
-import jdk.compiler.graal.nodes.graphbuilderconf.NodePlugin;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext;
+import jdk.graal.compiler.nodes.graphbuilderconf.NodePlugin;
 
 import com.oracle.graal.pointsto.infrastructure.OriginalClassProvider;
 import com.oracle.svm.core.RuntimeAssertionsSupport;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/EnumSwitchPlugin.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/EnumSwitchPlugin.java
index 2539eda7b3ee..5107aa6d5199 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/EnumSwitchPlugin.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/EnumSwitchPlugin.java
@@ -28,15 +28,15 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
-import jdk.compiler.graal.api.replacements.SnippetReflectionProvider;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext;
-import jdk.compiler.graal.nodes.graphbuilderconf.NodePlugin;
-import jdk.compiler.graal.phases.util.Providers;
+import jdk.graal.compiler.api.replacements.SnippetReflectionProvider;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext;
+import jdk.graal.compiler.nodes.graphbuilderconf.NodePlugin;
+import jdk.graal.compiler.phases.util.Providers;
 import org.graalvm.nativeimage.ImageSingletons;
 
 import com.oracle.graal.pointsto.BigBang;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/HostedGraphBuilderPhase.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/HostedGraphBuilderPhase.java
index 1a258b3fb4b7..ab13b7a20dbe 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/HostedGraphBuilderPhase.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/HostedGraphBuilderPhase.java
@@ -24,20 +24,20 @@
  */
 package com.oracle.svm.hosted.phases;
 
-import jdk.compiler.graal.core.common.type.StampPair;
-import jdk.compiler.graal.java.BytecodeParser;
-import jdk.compiler.graal.java.FrameStateBuilder;
-import jdk.compiler.graal.java.GraphBuilderPhase;
-import jdk.compiler.graal.nodes.CallTargetNode.InvokeKind;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration;
-import jdk.compiler.graal.nodes.graphbuilderconf.IntrinsicContext;
-import jdk.compiler.graal.nodes.java.MethodCallTargetNode;
-import jdk.compiler.graal.nodes.spi.CoreProviders;
-import jdk.compiler.graal.phases.OptimisticOptimizations;
-import jdk.compiler.graal.word.WordTypes;
+import jdk.graal.compiler.core.common.type.StampPair;
+import jdk.graal.compiler.java.BytecodeParser;
+import jdk.graal.compiler.java.FrameStateBuilder;
+import jdk.graal.compiler.java.GraphBuilderPhase;
+import jdk.graal.compiler.nodes.CallTargetNode.InvokeKind;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
+import jdk.graal.compiler.nodes.graphbuilderconf.IntrinsicContext;
+import jdk.graal.compiler.nodes.java.MethodCallTargetNode;
+import jdk.graal.compiler.nodes.spi.CoreProviders;
+import jdk.graal.compiler.phases.OptimisticOptimizations;
+import jdk.graal.compiler.word.WordTypes;
 
 import com.oracle.graal.pointsto.results.StaticAnalysisResults;
 import com.oracle.svm.core.nodes.SubstrateMethodCallTargetNode;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/HostedGraphKit.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/HostedGraphKit.java
index d2cbd39e5e16..f5fdb77473df 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/HostedGraphKit.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/HostedGraphKit.java
@@ -28,27 +28,27 @@
 import java.util.Arrays;
 import java.util.List;
 
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.core.common.type.StampPair;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.nodes.AbstractMergeNode;
-import jdk.compiler.graal.nodes.CallTargetNode.InvokeKind;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.IfNode;
-import jdk.compiler.graal.nodes.LogicNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.PiNode;
-import jdk.compiler.graal.nodes.ProfileData.BranchProbabilityData;
-import jdk.compiler.graal.nodes.UnwindNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.WithExceptionNode;
-import jdk.compiler.graal.nodes.calc.IsNullNode;
-import jdk.compiler.graal.nodes.extended.BranchProbabilityNode;
-import jdk.compiler.graal.nodes.extended.BytecodeExceptionNode;
-import jdk.compiler.graal.nodes.extended.GuardingNode;
-import jdk.compiler.graal.nodes.java.LoadFieldNode;
-import jdk.compiler.graal.nodes.java.MethodCallTargetNode;
-import jdk.compiler.graal.nodes.type.StampTool;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.core.common.type.StampPair;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.nodes.AbstractMergeNode;
+import jdk.graal.compiler.nodes.CallTargetNode.InvokeKind;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.IfNode;
+import jdk.graal.compiler.nodes.LogicNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.PiNode;
+import jdk.graal.compiler.nodes.ProfileData.BranchProbabilityData;
+import jdk.graal.compiler.nodes.UnwindNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.WithExceptionNode;
+import jdk.graal.compiler.nodes.calc.IsNullNode;
+import jdk.graal.compiler.nodes.extended.BranchProbabilityNode;
+import jdk.graal.compiler.nodes.extended.BytecodeExceptionNode;
+import jdk.graal.compiler.nodes.extended.GuardingNode;
+import jdk.graal.compiler.nodes.java.LoadFieldNode;
+import jdk.graal.compiler.nodes.java.MethodCallTargetNode;
+import jdk.graal.compiler.nodes.type.StampTool;
 
 import com.oracle.graal.pointsto.infrastructure.GraphProvider;
 import com.oracle.graal.pointsto.meta.HostedProviders;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/ImageBuildStatisticsCounterPhase.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/ImageBuildStatisticsCounterPhase.java
index 254c4f570bec..e67d690d5c51 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/ImageBuildStatisticsCounterPhase.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/ImageBuildStatisticsCounterPhase.java
@@ -24,10 +24,10 @@
  */
 package com.oracle.svm.hosted.phases;
 
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.extended.BytecodeExceptionNode;
-import jdk.compiler.graal.phases.Phase;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.extended.BytecodeExceptionNode;
+import jdk.graal.compiler.phases.Phase;
 
 import com.oracle.svm.core.graal.nodes.ThrowBytecodeExceptionNode;
 import com.oracle.svm.util.ImageBuildStatistics.CheckCountLocation;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/ImplicitAssertionsPhase.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/ImplicitAssertionsPhase.java
index 05a9a5261390..ab91140b74d6 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/ImplicitAssertionsPhase.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/ImplicitAssertionsPhase.java
@@ -30,24 +30,24 @@
 import java.util.List;
 import java.util.Set;
 
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.nodes.FixedNode;
-import jdk.compiler.graal.nodes.FrameState;
-import jdk.compiler.graal.nodes.FullInfopointNode;
-import jdk.compiler.graal.nodes.Invoke;
-import jdk.compiler.graal.nodes.InvokeNode;
-import jdk.compiler.graal.nodes.InvokeWithExceptionNode;
-import jdk.compiler.graal.nodes.PhiNode;
-import jdk.compiler.graal.nodes.StateSplit;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.UnwindNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.extended.BytecodeExceptionNode;
-import jdk.compiler.graal.nodes.extended.BytecodeExceptionNode.BytecodeExceptionKind;
-import jdk.compiler.graal.nodes.java.MethodCallTargetNode;
-import jdk.compiler.graal.nodes.java.NewInstanceNode;
-import jdk.compiler.graal.nodes.spi.CoreProviders;
-import jdk.compiler.graal.phases.BasePhase;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.nodes.FixedNode;
+import jdk.graal.compiler.nodes.FrameState;
+import jdk.graal.compiler.nodes.FullInfopointNode;
+import jdk.graal.compiler.nodes.Invoke;
+import jdk.graal.compiler.nodes.InvokeNode;
+import jdk.graal.compiler.nodes.InvokeWithExceptionNode;
+import jdk.graal.compiler.nodes.PhiNode;
+import jdk.graal.compiler.nodes.StateSplit;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.UnwindNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.extended.BytecodeExceptionNode;
+import jdk.graal.compiler.nodes.extended.BytecodeExceptionNode.BytecodeExceptionKind;
+import jdk.graal.compiler.nodes.java.MethodCallTargetNode;
+import jdk.graal.compiler.nodes.java.NewInstanceNode;
+import jdk.graal.compiler.nodes.spi.CoreProviders;
+import jdk.graal.compiler.phases.BasePhase;
 
 import com.oracle.svm.core.code.FactoryMethodMarker;
 import com.oracle.svm.core.snippets.ImplicitExceptions;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/InjectedAccessorsPlugin.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/InjectedAccessorsPlugin.java
index cc3484dc2377..060804123006 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/InjectedAccessorsPlugin.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/InjectedAccessorsPlugin.java
@@ -27,10 +27,10 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import jdk.compiler.graal.nodes.CallTargetNode.InvokeKind;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext;
-import jdk.compiler.graal.nodes.graphbuilderconf.NodePlugin;
+import jdk.graal.compiler.nodes.CallTargetNode.InvokeKind;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext;
+import jdk.graal.compiler.nodes.graphbuilderconf.NodePlugin;
 
 import com.oracle.svm.core.annotate.InjectAccessors;
 import com.oracle.svm.core.util.VMError;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/InlineBeforeAnalysisGraphDecoderImpl.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/InlineBeforeAnalysisGraphDecoderImpl.java
index 2f88d9254839..fd6bb04e0a5e 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/InlineBeforeAnalysisGraphDecoderImpl.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/InlineBeforeAnalysisGraphDecoderImpl.java
@@ -24,10 +24,10 @@
  */
 package com.oracle.svm.hosted.phases;
 
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.java.LoadFieldNode;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.java.LoadFieldNode;
 
 import com.oracle.graal.pointsto.BigBang;
 import com.oracle.graal.pointsto.meta.AnalysisField;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/InlineBeforeAnalysisPolicyImpl.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/InlineBeforeAnalysisPolicyImpl.java
index 2501844a5b7e..17bce495f3ff 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/InlineBeforeAnalysisPolicyImpl.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/InlineBeforeAnalysisPolicyImpl.java
@@ -29,12 +29,12 @@
 import com.oracle.svm.core.ParsingReason;
 import com.oracle.svm.hosted.SVMHost;
 
-import jdk.compiler.graal.graph.NodeSourcePosition;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext;
-import jdk.compiler.graal.nodes.graphbuilderconf.InlineInvokePlugin.InlineInfo;
-import jdk.compiler.graal.nodes.graphbuilderconf.NodePlugin;
+import jdk.graal.compiler.graph.NodeSourcePosition;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext;
+import jdk.graal.compiler.nodes.graphbuilderconf.InlineInvokePlugin.InlineInfo;
+import jdk.graal.compiler.nodes.graphbuilderconf.NodePlugin;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 
 /**
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/InlineBeforeAnalysisPolicyUtils.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/InlineBeforeAnalysisPolicyUtils.java
index b8d10d03f457..9aecd9816ca3 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/InlineBeforeAnalysisPolicyUtils.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/InlineBeforeAnalysisPolicyUtils.java
@@ -30,32 +30,32 @@
 import java.util.Map;
 import java.util.Set;
 
-import jdk.compiler.graal.api.replacements.Fold;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.nodes.AbstractBeginNode;
-import jdk.compiler.graal.nodes.AbstractEndNode;
-import jdk.compiler.graal.nodes.CallTargetNode;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.FrameState;
-import jdk.compiler.graal.nodes.FullInfopointNode;
-import jdk.compiler.graal.nodes.Invoke;
-import jdk.compiler.graal.nodes.LogicConstantNode;
-import jdk.compiler.graal.nodes.ParameterNode;
-import jdk.compiler.graal.nodes.ReturnNode;
-import jdk.compiler.graal.nodes.StartNode;
-import jdk.compiler.graal.nodes.UnwindNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.extended.ValueAnchorNode;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext;
-import jdk.compiler.graal.nodes.java.AbstractNewObjectNode;
-import jdk.compiler.graal.nodes.java.NewArrayNode;
-import jdk.compiler.graal.nodes.spi.ValueProxy;
-import jdk.compiler.graal.nodes.virtual.AllocatedObjectNode;
-import jdk.compiler.graal.nodes.virtual.CommitAllocationNode;
-import jdk.compiler.graal.nodes.virtual.VirtualArrayNode;
-import jdk.compiler.graal.nodes.virtual.VirtualObjectNode;
-import jdk.compiler.graal.options.Option;
-import jdk.compiler.graal.replacements.nodes.MethodHandleWithExceptionNode;
+import jdk.graal.compiler.api.replacements.Fold;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.nodes.AbstractBeginNode;
+import jdk.graal.compiler.nodes.AbstractEndNode;
+import jdk.graal.compiler.nodes.CallTargetNode;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.FrameState;
+import jdk.graal.compiler.nodes.FullInfopointNode;
+import jdk.graal.compiler.nodes.Invoke;
+import jdk.graal.compiler.nodes.LogicConstantNode;
+import jdk.graal.compiler.nodes.ParameterNode;
+import jdk.graal.compiler.nodes.ReturnNode;
+import jdk.graal.compiler.nodes.StartNode;
+import jdk.graal.compiler.nodes.UnwindNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.extended.ValueAnchorNode;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext;
+import jdk.graal.compiler.nodes.java.AbstractNewObjectNode;
+import jdk.graal.compiler.nodes.java.NewArrayNode;
+import jdk.graal.compiler.nodes.spi.ValueProxy;
+import jdk.graal.compiler.nodes.virtual.AllocatedObjectNode;
+import jdk.graal.compiler.nodes.virtual.CommitAllocationNode;
+import jdk.graal.compiler.nodes.virtual.VirtualArrayNode;
+import jdk.graal.compiler.nodes.virtual.VirtualObjectNode;
+import jdk.graal.compiler.options.Option;
+import jdk.graal.compiler.replacements.nodes.MethodHandleWithExceptionNode;
 import org.graalvm.nativeimage.AnnotationAccess;
 
 import com.oracle.graal.pointsto.infrastructure.OriginalClassProvider;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/IntrinsifyMethodHandlesInvocationPlugin.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/IntrinsifyMethodHandlesInvocationPlugin.java
index 334b1c1ccdd9..2242bff7b9ac 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/IntrinsifyMethodHandlesInvocationPlugin.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/IntrinsifyMethodHandlesInvocationPlugin.java
@@ -24,7 +24,7 @@
  */
 package com.oracle.svm.hosted.phases;
 
-import static jdk.compiler.graal.nodes.graphbuilderconf.InlineInvokePlugin.InlineInfo.createStandardInlineInfo;
+import static jdk.graal.compiler.nodes.graphbuilderconf.InlineInvokePlugin.InlineInfo.createStandardInlineInfo;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodType;
@@ -40,73 +40,73 @@
 
 import org.graalvm.collections.Pair;
 import org.graalvm.collections.UnmodifiableEconomicMap;
-import jdk.compiler.graal.api.replacements.SnippetReflectionProvider;
-import jdk.compiler.graal.core.common.spi.MetaAccessExtensionProvider;
-import jdk.compiler.graal.core.common.type.ObjectStamp;
-import jdk.compiler.graal.core.common.type.PrimitiveStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.core.common.type.StampPair;
-import jdk.compiler.graal.core.common.type.TypeReference;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeClass;
-import jdk.compiler.graal.graph.NodeMap;
-import jdk.compiler.graal.java.BytecodeParser;
-import jdk.compiler.graal.java.GraphBuilderPhase;
-import jdk.compiler.graal.nodeinfo.NodeCycles;
-import jdk.compiler.graal.nodeinfo.NodeInfo;
-import jdk.compiler.graal.nodeinfo.NodeSize;
-import jdk.compiler.graal.nodes.AbstractBeginNode;
-import jdk.compiler.graal.nodes.ArithmeticOperation;
-import jdk.compiler.graal.nodes.BeginNode;
-import jdk.compiler.graal.nodes.CallTargetNode.InvokeKind;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.FixedGuardNode;
-import jdk.compiler.graal.nodes.FixedNode;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.InvokeNode;
-import jdk.compiler.graal.nodes.LogicNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ParameterNode;
-import jdk.compiler.graal.nodes.PhiNode;
-import jdk.compiler.graal.nodes.PiNode;
-import jdk.compiler.graal.nodes.ReturnNode;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.calc.FloatingNode;
-import jdk.compiler.graal.nodes.calc.IsNullNode;
-import jdk.compiler.graal.nodes.extended.AnchoringNode;
-import jdk.compiler.graal.nodes.extended.BytecodeExceptionNode.BytecodeExceptionKind;
-import jdk.compiler.graal.nodes.graphbuilderconf.ClassInitializationPlugin;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderTool;
-import jdk.compiler.graal.nodes.graphbuilderconf.InlineInvokePlugin;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin.OptionalInvocationPlugin;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin.Receiver;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin.RequiredInvocationPlugin;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins.Registration;
-import jdk.compiler.graal.nodes.graphbuilderconf.NodePlugin;
-import jdk.compiler.graal.nodes.graphbuilderconf.ParameterPlugin;
-import jdk.compiler.graal.nodes.java.FinalFieldBarrierNode;
-import jdk.compiler.graal.nodes.java.InstanceOfNode;
-import jdk.compiler.graal.nodes.java.LoadFieldNode;
-import jdk.compiler.graal.nodes.java.MethodCallTargetNode;
-import jdk.compiler.graal.nodes.java.NewArrayNode;
-import jdk.compiler.graal.nodes.java.NewInstanceNode;
-import jdk.compiler.graal.nodes.java.StoreFieldNode;
-import jdk.compiler.graal.nodes.spi.Replacements;
-import jdk.compiler.graal.nodes.type.StampTool;
-import jdk.compiler.graal.phases.OptimisticOptimizations;
-import jdk.compiler.graal.phases.common.CanonicalizerPhase;
-import jdk.compiler.graal.phases.util.Providers;
-import jdk.compiler.graal.replacements.InlineDuringParsingPlugin;
-import jdk.compiler.graal.replacements.MethodHandlePlugin;
-import jdk.compiler.graal.word.WordOperationPlugin;
+import jdk.graal.compiler.api.replacements.SnippetReflectionProvider;
+import jdk.graal.compiler.core.common.spi.MetaAccessExtensionProvider;
+import jdk.graal.compiler.core.common.type.ObjectStamp;
+import jdk.graal.compiler.core.common.type.PrimitiveStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.core.common.type.StampPair;
+import jdk.graal.compiler.core.common.type.TypeReference;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeClass;
+import jdk.graal.compiler.graph.NodeMap;
+import jdk.graal.compiler.java.BytecodeParser;
+import jdk.graal.compiler.java.GraphBuilderPhase;
+import jdk.graal.compiler.nodeinfo.NodeCycles;
+import jdk.graal.compiler.nodeinfo.NodeInfo;
+import jdk.graal.compiler.nodeinfo.NodeSize;
+import jdk.graal.compiler.nodes.AbstractBeginNode;
+import jdk.graal.compiler.nodes.ArithmeticOperation;
+import jdk.graal.compiler.nodes.BeginNode;
+import jdk.graal.compiler.nodes.CallTargetNode.InvokeKind;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.FixedGuardNode;
+import jdk.graal.compiler.nodes.FixedNode;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.InvokeNode;
+import jdk.graal.compiler.nodes.LogicNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ParameterNode;
+import jdk.graal.compiler.nodes.PhiNode;
+import jdk.graal.compiler.nodes.PiNode;
+import jdk.graal.compiler.nodes.ReturnNode;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.calc.FloatingNode;
+import jdk.graal.compiler.nodes.calc.IsNullNode;
+import jdk.graal.compiler.nodes.extended.AnchoringNode;
+import jdk.graal.compiler.nodes.extended.BytecodeExceptionNode.BytecodeExceptionKind;
+import jdk.graal.compiler.nodes.graphbuilderconf.ClassInitializationPlugin;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderTool;
+import jdk.graal.compiler.nodes.graphbuilderconf.InlineInvokePlugin;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin.OptionalInvocationPlugin;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin.Receiver;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin.RequiredInvocationPlugin;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins.Registration;
+import jdk.graal.compiler.nodes.graphbuilderconf.NodePlugin;
+import jdk.graal.compiler.nodes.graphbuilderconf.ParameterPlugin;
+import jdk.graal.compiler.nodes.java.FinalFieldBarrierNode;
+import jdk.graal.compiler.nodes.java.InstanceOfNode;
+import jdk.graal.compiler.nodes.java.LoadFieldNode;
+import jdk.graal.compiler.nodes.java.MethodCallTargetNode;
+import jdk.graal.compiler.nodes.java.NewArrayNode;
+import jdk.graal.compiler.nodes.java.NewInstanceNode;
+import jdk.graal.compiler.nodes.java.StoreFieldNode;
+import jdk.graal.compiler.nodes.spi.Replacements;
+import jdk.graal.compiler.nodes.type.StampTool;
+import jdk.graal.compiler.phases.OptimisticOptimizations;
+import jdk.graal.compiler.phases.common.CanonicalizerPhase;
+import jdk.graal.compiler.phases.util.Providers;
+import jdk.graal.compiler.replacements.InlineDuringParsingPlugin;
+import jdk.graal.compiler.replacements.MethodHandlePlugin;
+import jdk.graal.compiler.word.WordOperationPlugin;
 import org.graalvm.nativeimage.ImageSingletons;
 
 import com.oracle.graal.pointsto.infrastructure.UniverseMetaAccess;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/SharedGraphBuilderPhase.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/SharedGraphBuilderPhase.java
index 14d6e9285970..88b90c98dc78 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/SharedGraphBuilderPhase.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/SharedGraphBuilderPhase.java
@@ -31,40 +31,40 @@
 import java.util.Arrays;
 import java.util.List;
 
-import jdk.compiler.graal.api.replacements.Fold;
-import jdk.compiler.graal.core.common.calc.Condition;
-import jdk.compiler.graal.core.common.type.StampPair;
-import jdk.compiler.graal.debug.DebugCloseable;
-import jdk.compiler.graal.graph.Node.NodeIntrinsic;
-import jdk.compiler.graal.graph.NodeSourcePosition;
-import jdk.compiler.graal.java.BciBlockMapping;
-import jdk.compiler.graal.java.BytecodeParser;
-import jdk.compiler.graal.java.FrameStateBuilder;
-import jdk.compiler.graal.java.GraphBuilderPhase;
-import jdk.compiler.graal.nodes.AbstractBeginNode;
-import jdk.compiler.graal.nodes.BeginNode;
-import jdk.compiler.graal.nodes.CallTargetNode.InvokeKind;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.FixedNode;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.FrameState;
-import jdk.compiler.graal.nodes.IfNode;
-import jdk.compiler.graal.nodes.Invoke;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.UnreachableBeginNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.calc.IsNullNode;
-import jdk.compiler.graal.nodes.extended.BranchProbabilityNode;
-import jdk.compiler.graal.nodes.graphbuilderconf.GeneratedInvocationPlugin;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderPlugin;
-import jdk.compiler.graal.nodes.graphbuilderconf.IntrinsicContext;
-import jdk.compiler.graal.nodes.java.ExceptionObjectNode;
-import jdk.compiler.graal.nodes.java.MethodCallTargetNode;
-import jdk.compiler.graal.nodes.spi.CoreProviders;
-import jdk.compiler.graal.phases.OptimisticOptimizations;
-import jdk.compiler.graal.replacements.SnippetTemplate;
-import jdk.compiler.graal.word.WordTypes;
+import jdk.graal.compiler.api.replacements.Fold;
+import jdk.graal.compiler.core.common.calc.Condition;
+import jdk.graal.compiler.core.common.type.StampPair;
+import jdk.graal.compiler.debug.DebugCloseable;
+import jdk.graal.compiler.graph.Node.NodeIntrinsic;
+import jdk.graal.compiler.graph.NodeSourcePosition;
+import jdk.graal.compiler.java.BciBlockMapping;
+import jdk.graal.compiler.java.BytecodeParser;
+import jdk.graal.compiler.java.FrameStateBuilder;
+import jdk.graal.compiler.java.GraphBuilderPhase;
+import jdk.graal.compiler.nodes.AbstractBeginNode;
+import jdk.graal.compiler.nodes.BeginNode;
+import jdk.graal.compiler.nodes.CallTargetNode.InvokeKind;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.FixedNode;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.FrameState;
+import jdk.graal.compiler.nodes.IfNode;
+import jdk.graal.compiler.nodes.Invoke;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.UnreachableBeginNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.calc.IsNullNode;
+import jdk.graal.compiler.nodes.extended.BranchProbabilityNode;
+import jdk.graal.compiler.nodes.graphbuilderconf.GeneratedInvocationPlugin;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderPlugin;
+import jdk.graal.compiler.nodes.graphbuilderconf.IntrinsicContext;
+import jdk.graal.compiler.nodes.java.ExceptionObjectNode;
+import jdk.graal.compiler.nodes.java.MethodCallTargetNode;
+import jdk.graal.compiler.nodes.spi.CoreProviders;
+import jdk.graal.compiler.phases.OptimisticOptimizations;
+import jdk.graal.compiler.replacements.SnippetTemplate;
+import jdk.graal.compiler.word.WordTypes;
 
 import com.oracle.graal.pointsto.constraints.TypeInstantiationException;
 import com.oracle.graal.pointsto.constraints.UnresolvedElementException;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/StrengthenStampsPhase.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/StrengthenStampsPhase.java
index 702bd8ce12d9..b7e81d5fa3be 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/StrengthenStampsPhase.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/StrengthenStampsPhase.java
@@ -24,26 +24,26 @@
  */
 package com.oracle.svm.hosted.phases;
 
-import jdk.compiler.graal.core.common.type.AbstractObjectStamp;
-import jdk.compiler.graal.core.common.type.ObjectStamp;
-import jdk.compiler.graal.core.common.type.Stamp;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.core.common.type.TypeReference;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.nodes.FixedGuardNode;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.InvokeWithExceptionNode;
-import jdk.compiler.graal.nodes.LogicConstantNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.ParameterNode;
-import jdk.compiler.graal.nodes.PhiNode;
-import jdk.compiler.graal.nodes.PiNode;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.java.InstanceOfNode;
-import jdk.compiler.graal.nodes.java.LoadFieldNode;
-import jdk.compiler.graal.nodes.spi.LimitedValueProxy;
-import jdk.compiler.graal.phases.Phase;
+import jdk.graal.compiler.core.common.type.AbstractObjectStamp;
+import jdk.graal.compiler.core.common.type.ObjectStamp;
+import jdk.graal.compiler.core.common.type.Stamp;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.core.common.type.TypeReference;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.nodes.FixedGuardNode;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.InvokeWithExceptionNode;
+import jdk.graal.compiler.nodes.LogicConstantNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.ParameterNode;
+import jdk.graal.compiler.nodes.PhiNode;
+import jdk.graal.compiler.nodes.PiNode;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.java.InstanceOfNode;
+import jdk.graal.compiler.nodes.java.LoadFieldNode;
+import jdk.graal.compiler.nodes.spi.LimitedValueProxy;
+import jdk.graal.compiler.phases.Phase;
 
 import com.oracle.svm.core.SubstrateOptions;
 import com.oracle.svm.hosted.meta.HostedField;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/SubstrateClassInitializationPlugin.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/SubstrateClassInitializationPlugin.java
index 6095d3504b65..b515f15b3835 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/SubstrateClassInitializationPlugin.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/SubstrateClassInitializationPlugin.java
@@ -26,12 +26,12 @@
 
 import java.util.function.Supplier;
 
-import jdk.compiler.graal.api.replacements.SnippetReflectionProvider;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.FrameState;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.graphbuilderconf.ClassInitializationPlugin;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext;
+import jdk.graal.compiler.api.replacements.SnippetReflectionProvider;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.FrameState;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.graphbuilderconf.ClassInitializationPlugin;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext;
 
 import com.oracle.svm.core.classinitialization.EnsureClassInitializedNode;
 import com.oracle.svm.hosted.SVMHost;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/SubstrateGraphBuilderPhase.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/SubstrateGraphBuilderPhase.java
index 18644a5ef3cf..4d80120d8d41 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/SubstrateGraphBuilderPhase.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/SubstrateGraphBuilderPhase.java
@@ -24,16 +24,16 @@
  */
 package com.oracle.svm.hosted.phases;
 
-import jdk.compiler.graal.java.BytecodeParser;
-import jdk.compiler.graal.java.GraphBuilderPhase;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration;
-import jdk.compiler.graal.nodes.graphbuilderconf.InlineInvokePlugin.InlineInfo;
-import jdk.compiler.graal.nodes.graphbuilderconf.IntrinsicContext;
-import jdk.compiler.graal.nodes.spi.CoreProviders;
-import jdk.compiler.graal.phases.OptimisticOptimizations;
-import jdk.compiler.graal.word.WordTypes;
+import jdk.graal.compiler.java.BytecodeParser;
+import jdk.graal.compiler.java.GraphBuilderPhase;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
+import jdk.graal.compiler.nodes.graphbuilderconf.InlineInvokePlugin.InlineInfo;
+import jdk.graal.compiler.nodes.graphbuilderconf.IntrinsicContext;
+import jdk.graal.compiler.nodes.spi.CoreProviders;
+import jdk.graal.compiler.phases.OptimisticOptimizations;
+import jdk.graal.compiler.word.WordTypes;
 
 import com.oracle.graal.pointsto.meta.AnalysisMethod;
 
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/VerifyDeoptLIRFrameStatesPhase.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/VerifyDeoptLIRFrameStatesPhase.java
index c2e73a9d963b..55dee93520e5 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/VerifyDeoptLIRFrameStatesPhase.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/VerifyDeoptLIRFrameStatesPhase.java
@@ -27,14 +27,14 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import jdk.compiler.graal.core.common.cfg.BasicBlock;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.lir.LIR;
-import jdk.compiler.graal.lir.LIRFrameState;
-import jdk.compiler.graal.lir.LIRInstruction;
-import jdk.compiler.graal.lir.framemap.FrameMap;
-import jdk.compiler.graal.lir.gen.LIRGenerationResult;
-import jdk.compiler.graal.lir.phases.FinalCodeAnalysisPhase;
+import jdk.graal.compiler.core.common.cfg.BasicBlock;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.lir.LIR;
+import jdk.graal.compiler.lir.LIRFrameState;
+import jdk.graal.compiler.lir.LIRInstruction;
+import jdk.graal.compiler.lir.framemap.FrameMap;
+import jdk.graal.compiler.lir.gen.LIRGenerationResult;
+import jdk.graal.compiler.lir.phases.FinalCodeAnalysisPhase;
 
 import com.oracle.svm.core.ReservedRegisters;
 import com.oracle.svm.core.graal.lir.DeoptEntryOp;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/VerifyNoGuardsPhase.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/VerifyNoGuardsPhase.java
index 1995fbd3456c..55b2940e9768 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/VerifyNoGuardsPhase.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/VerifyNoGuardsPhase.java
@@ -28,10 +28,10 @@
 
 import java.util.List;
 
-import jdk.compiler.graal.nodes.FixedGuardNode;
-import jdk.compiler.graal.nodes.GuardNode;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.phases.Phase;
+import jdk.graal.compiler.nodes.FixedGuardNode;
+import jdk.graal.compiler.nodes.GuardNode;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.phases.Phase;
 
 public class VerifyNoGuardsPhase extends Phase {
 
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/reflect/AnnotationEncoder.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/reflect/AnnotationEncoder.java
index b886462eb25b..65a5931434b4 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/reflect/AnnotationEncoder.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/reflect/AnnotationEncoder.java
@@ -26,8 +26,8 @@
 
 import java.util.function.Consumer;
 
-import jdk.compiler.graal.core.common.util.UnsafeArrayTypeWriter;
-import jdk.compiler.graal.debug.GraalError;
+import jdk.graal.compiler.core.common.util.UnsafeArrayTypeWriter;
+import jdk.graal.compiler.debug.GraalError;
 
 import com.oracle.svm.core.code.CodeInfoEncoder.Encoders;
 import com.oracle.svm.hosted.annotation.AnnotationArrayValue;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/reflect/FoldedReflectionFeature.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/reflect/FoldedReflectionFeature.java
index 7b0570c3a87a..292d576cebdc 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/reflect/FoldedReflectionFeature.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/reflect/FoldedReflectionFeature.java
@@ -39,7 +39,7 @@
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
-import jdk.compiler.graal.options.Option;
+import jdk.graal.compiler.options.Option;
 
 import com.oracle.graal.pointsto.BigBang;
 import com.oracle.graal.pointsto.meta.AnalysisField;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/reflect/ReflectionExpandSignatureMethod.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/reflect/ReflectionExpandSignatureMethod.java
index b752247977a0..c7729a701ed0 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/reflect/ReflectionExpandSignatureMethod.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/reflect/ReflectionExpandSignatureMethod.java
@@ -24,15 +24,15 @@
  */
 package com.oracle.svm.hosted.reflect;
 
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.core.common.type.StampPair;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.nodes.CallTargetNode;
-import jdk.compiler.graal.nodes.CallTargetNode.InvokeKind;
-import jdk.compiler.graal.nodes.IndirectCallTargetNode;
-import jdk.compiler.graal.nodes.InvokeWithExceptionNode;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.core.common.type.StampPair;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.nodes.CallTargetNode;
+import jdk.graal.compiler.nodes.CallTargetNode.InvokeKind;
+import jdk.graal.compiler.nodes.IndirectCallTargetNode;
+import jdk.graal.compiler.nodes.InvokeWithExceptionNode;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
 
 import com.oracle.graal.pointsto.meta.HostedProviders;
 import com.oracle.svm.core.graal.code.SubstrateCallingConventionKind;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/reflect/ReflectionFeature.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/reflect/ReflectionFeature.java
index 56e747beec17..b0805cc60225 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/reflect/ReflectionFeature.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/reflect/ReflectionFeature.java
@@ -35,9 +35,9 @@
 import java.util.Objects;
 import java.util.concurrent.ConcurrentHashMap;
 
-import jdk.compiler.graal.api.replacements.SnippetReflectionProvider;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
-import jdk.compiler.graal.phases.util.Providers;
+import jdk.graal.compiler.api.replacements.SnippetReflectionProvider;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
+import jdk.graal.compiler.phases.util.Providers;
 import org.graalvm.nativeimage.AnnotationAccess;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.c.function.CFunctionPointer;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/reflect/ReflectionGraphKit.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/reflect/ReflectionGraphKit.java
index 7bdd42ad389a..cde0662dba41 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/reflect/ReflectionGraphKit.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/reflect/ReflectionGraphKit.java
@@ -33,34 +33,34 @@
 import java.util.Map;
 
 import com.oracle.graal.pointsto.infrastructure.GraphProvider;
-import jdk.compiler.graal.core.common.calc.FloatConvert;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.core.common.type.TypeReference;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.nodes.AbstractBeginNode;
-import jdk.compiler.graal.nodes.AbstractMergeNode;
-import jdk.compiler.graal.nodes.CallTargetNode;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.EndNode;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.Invoke;
-import jdk.compiler.graal.nodes.InvokeWithExceptionNode;
-import jdk.compiler.graal.nodes.LogicNode;
-import jdk.compiler.graal.nodes.MergeNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.PiNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.ValuePhiNode;
-import jdk.compiler.graal.nodes.calc.FloatConvertNode;
-import jdk.compiler.graal.nodes.calc.IntegerEqualsNode;
-import jdk.compiler.graal.nodes.calc.IsNullNode;
-import jdk.compiler.graal.nodes.calc.SignExtendNode;
-import jdk.compiler.graal.nodes.extended.BranchProbabilityNode;
-import jdk.compiler.graal.nodes.extended.GuardingNode;
-import jdk.compiler.graal.nodes.java.ArrayLengthNode;
-import jdk.compiler.graal.nodes.java.ExceptionObjectNode;
-import jdk.compiler.graal.nodes.java.InstanceOfNode;
-import jdk.compiler.graal.nodes.type.StampTool;
+import jdk.graal.compiler.core.common.calc.FloatConvert;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.core.common.type.TypeReference;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.nodes.AbstractBeginNode;
+import jdk.graal.compiler.nodes.AbstractMergeNode;
+import jdk.graal.compiler.nodes.CallTargetNode;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.EndNode;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.Invoke;
+import jdk.graal.compiler.nodes.InvokeWithExceptionNode;
+import jdk.graal.compiler.nodes.LogicNode;
+import jdk.graal.compiler.nodes.MergeNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.PiNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.ValuePhiNode;
+import jdk.graal.compiler.nodes.calc.FloatConvertNode;
+import jdk.graal.compiler.nodes.calc.IntegerEqualsNode;
+import jdk.graal.compiler.nodes.calc.IsNullNode;
+import jdk.graal.compiler.nodes.calc.SignExtendNode;
+import jdk.graal.compiler.nodes.extended.BranchProbabilityNode;
+import jdk.graal.compiler.nodes.extended.GuardingNode;
+import jdk.graal.compiler.nodes.java.ArrayLengthNode;
+import jdk.graal.compiler.nodes.java.ExceptionObjectNode;
+import jdk.graal.compiler.nodes.java.InstanceOfNode;
+import jdk.graal.compiler.nodes.type.StampTool;
 
 import com.oracle.graal.pointsto.infrastructure.UniverseMetaAccess;
 import com.oracle.graal.pointsto.meta.HostedProviders;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/reflect/ReflectionMetadataEncoderImpl.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/reflect/ReflectionMetadataEncoderImpl.java
index ba1b7911168e..718e85e5d938 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/reflect/ReflectionMetadataEncoderImpl.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/reflect/ReflectionMetadataEncoderImpl.java
@@ -66,9 +66,9 @@
 import java.util.function.Consumer;
 
 import org.graalvm.collections.Pair;
-import jdk.compiler.graal.api.replacements.SnippetReflectionProvider;
-import jdk.compiler.graal.core.common.util.TypeConversion;
-import jdk.compiler.graal.core.common.util.UnsafeArrayTypeWriter;
+import jdk.graal.compiler.api.replacements.SnippetReflectionProvider;
+import jdk.graal.compiler.core.common.util.TypeConversion;
+import jdk.graal.compiler.core.common.util.UnsafeArrayTypeWriter;
 import org.graalvm.nativeimage.AnnotationAccess;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.impl.RuntimeReflectionSupport;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/reflect/serialize/SerializationFeature.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/reflect/serialize/SerializationFeature.java
index 347744c590b1..290f56e45fd1 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/reflect/serialize/SerializationFeature.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/reflect/serialize/SerializationFeature.java
@@ -48,19 +48,19 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Stream;
 
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.graph.iterators.NodeIterable;
-import jdk.compiler.graal.java.GraphBuilderPhase;
-import jdk.compiler.graal.java.LambdaUtils;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.OptimisticOptimizations;
-import jdk.compiler.graal.phases.tiers.HighTierContext;
-import jdk.compiler.graal.printer.GraalDebugHandlersFactory;
-import jdk.compiler.graal.replacements.MethodHandlePlugin;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.graph.iterators.NodeIterable;
+import jdk.graal.compiler.java.GraphBuilderPhase;
+import jdk.graal.compiler.java.LambdaUtils;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.OptimisticOptimizations;
+import jdk.graal.compiler.phases.tiers.HighTierContext;
+import jdk.graal.compiler.printer.GraalDebugHandlersFactory;
+import jdk.graal.compiler.replacements.MethodHandlePlugin;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.hosted.Feature;
 import org.graalvm.nativeimage.hosted.RuntimeReflection;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/snippets/ReflectionPlugins.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/snippets/ReflectionPlugins.java
index e838ce127ea0..74b2971940af 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/snippets/ReflectionPlugins.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/snippets/ReflectionPlugins.java
@@ -48,18 +48,18 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import jdk.compiler.graal.api.replacements.SnippetReflectionProvider;
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.graphbuilderconf.ClassInitializationPlugin;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin.Receiver;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin.RequiredInlineOnlyInvocationPlugin;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin.RequiredInvocationPlugin;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins.Registration;
-import jdk.compiler.graal.options.Option;
+import jdk.graal.compiler.api.replacements.SnippetReflectionProvider;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.graphbuilderconf.ClassInitializationPlugin;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin.Receiver;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin.RequiredInlineOnlyInvocationPlugin;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin.RequiredInvocationPlugin;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins.Registration;
+import jdk.graal.compiler.options.Option;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.hosted.RuntimeReflection;
 import org.graalvm.nativeimage.impl.RuntimeClassInitializationSupport;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/snippets/SubstrateGraphBuilderPlugins.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/snippets/SubstrateGraphBuilderPlugins.java
index 8e2620660805..23ab1ac7fb42 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/snippets/SubstrateGraphBuilderPlugins.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/snippets/SubstrateGraphBuilderPlugins.java
@@ -39,64 +39,64 @@
 import java.util.function.Function;
 import java.util.stream.Stream;
 
-import jdk.compiler.graal.api.replacements.SnippetReflectionProvider;
-import jdk.compiler.graal.core.common.CompressEncoding;
-import jdk.compiler.graal.core.common.type.AbstractObjectStamp;
-import jdk.compiler.graal.core.common.type.IntegerStamp;
-import jdk.compiler.graal.core.common.type.StampFactory;
-import jdk.compiler.graal.graph.Edges;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.NodeList;
-import jdk.compiler.graal.graph.NodeSourcePosition;
-import jdk.compiler.graal.java.BytecodeParser;
-import jdk.compiler.graal.java.LambdaUtils;
-import jdk.compiler.graal.nodes.AbstractBeginNode;
-import jdk.compiler.graal.nodes.BeginNode;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.DynamicPiNode;
-import jdk.compiler.graal.nodes.FixedNode;
-import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.nodes.FullInfopointNode;
-import jdk.compiler.graal.nodes.LogicNode;
-import jdk.compiler.graal.nodes.NodeView;
-import jdk.compiler.graal.nodes.PiNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.calc.NarrowNode;
-import jdk.compiler.graal.nodes.calc.ZeroExtendNode;
-import jdk.compiler.graal.nodes.extended.BytecodeExceptionNode;
-import jdk.compiler.graal.nodes.extended.LoadHubNode;
-import jdk.compiler.graal.nodes.extended.StateSplitProxyNode;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin.Receiver;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin.RequiredInlineOnlyInvocationPlugin;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin.RequiredInvocationPlugin;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins.Registration;
-import jdk.compiler.graal.nodes.java.DynamicNewInstanceNode;
-import jdk.compiler.graal.nodes.java.InstanceOfDynamicNode;
-import jdk.compiler.graal.nodes.java.NewArrayNode;
-import jdk.compiler.graal.nodes.java.StoreIndexedNode;
-import jdk.compiler.graal.nodes.spi.ArrayLengthProvider;
-import jdk.compiler.graal.nodes.spi.CoreProviders;
-import jdk.compiler.graal.nodes.spi.Replacements;
-import jdk.compiler.graal.nodes.type.NarrowOopStamp;
-import jdk.compiler.graal.nodes.type.StampTool;
-import jdk.compiler.graal.nodes.util.GraphUtil;
-import jdk.compiler.graal.nodes.virtual.AllocatedObjectNode;
-import jdk.compiler.graal.nodes.virtual.CommitAllocationNode;
-import jdk.compiler.graal.nodes.virtual.VirtualArrayNode;
-import jdk.compiler.graal.nodes.virtual.VirtualObjectNode;
-import jdk.compiler.graal.options.Option;
-import jdk.compiler.graal.replacements.StandardGraphBuilderPlugins;
-import jdk.compiler.graal.replacements.StandardGraphBuilderPlugins.AllocateUninitializedArrayPlugin;
-import jdk.compiler.graal.replacements.StandardGraphBuilderPlugins.CounterModeCryptPlugin;
-import jdk.compiler.graal.replacements.StandardGraphBuilderPlugins.ReachabilityFencePlugin;
-import jdk.compiler.graal.replacements.nodes.AESNode;
-import jdk.compiler.graal.replacements.nodes.CipherBlockChainingAESNode;
-import jdk.compiler.graal.replacements.nodes.CounterModeAESNode;
-import jdk.compiler.graal.replacements.nodes.MacroNode.MacroParams;
-import jdk.compiler.graal.word.WordCastNode;
+import jdk.graal.compiler.api.replacements.SnippetReflectionProvider;
+import jdk.graal.compiler.core.common.CompressEncoding;
+import jdk.graal.compiler.core.common.type.AbstractObjectStamp;
+import jdk.graal.compiler.core.common.type.IntegerStamp;
+import jdk.graal.compiler.core.common.type.StampFactory;
+import jdk.graal.compiler.graph.Edges;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.NodeList;
+import jdk.graal.compiler.graph.NodeSourcePosition;
+import jdk.graal.compiler.java.BytecodeParser;
+import jdk.graal.compiler.java.LambdaUtils;
+import jdk.graal.compiler.nodes.AbstractBeginNode;
+import jdk.graal.compiler.nodes.BeginNode;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.DynamicPiNode;
+import jdk.graal.compiler.nodes.FixedNode;
+import jdk.graal.compiler.nodes.FixedWithNextNode;
+import jdk.graal.compiler.nodes.FullInfopointNode;
+import jdk.graal.compiler.nodes.LogicNode;
+import jdk.graal.compiler.nodes.NodeView;
+import jdk.graal.compiler.nodes.PiNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.calc.NarrowNode;
+import jdk.graal.compiler.nodes.calc.ZeroExtendNode;
+import jdk.graal.compiler.nodes.extended.BytecodeExceptionNode;
+import jdk.graal.compiler.nodes.extended.LoadHubNode;
+import jdk.graal.compiler.nodes.extended.StateSplitProxyNode;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin.Receiver;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin.RequiredInlineOnlyInvocationPlugin;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin.RequiredInvocationPlugin;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins.Registration;
+import jdk.graal.compiler.nodes.java.DynamicNewInstanceNode;
+import jdk.graal.compiler.nodes.java.InstanceOfDynamicNode;
+import jdk.graal.compiler.nodes.java.NewArrayNode;
+import jdk.graal.compiler.nodes.java.StoreIndexedNode;
+import jdk.graal.compiler.nodes.spi.ArrayLengthProvider;
+import jdk.graal.compiler.nodes.spi.CoreProviders;
+import jdk.graal.compiler.nodes.spi.Replacements;
+import jdk.graal.compiler.nodes.type.NarrowOopStamp;
+import jdk.graal.compiler.nodes.type.StampTool;
+import jdk.graal.compiler.nodes.util.GraphUtil;
+import jdk.graal.compiler.nodes.virtual.AllocatedObjectNode;
+import jdk.graal.compiler.nodes.virtual.CommitAllocationNode;
+import jdk.graal.compiler.nodes.virtual.VirtualArrayNode;
+import jdk.graal.compiler.nodes.virtual.VirtualObjectNode;
+import jdk.graal.compiler.options.Option;
+import jdk.graal.compiler.replacements.StandardGraphBuilderPlugins;
+import jdk.graal.compiler.replacements.StandardGraphBuilderPlugins.AllocateUninitializedArrayPlugin;
+import jdk.graal.compiler.replacements.StandardGraphBuilderPlugins.CounterModeCryptPlugin;
+import jdk.graal.compiler.replacements.StandardGraphBuilderPlugins.ReachabilityFencePlugin;
+import jdk.graal.compiler.replacements.nodes.AESNode;
+import jdk.graal.compiler.replacements.nodes.CipherBlockChainingAESNode;
+import jdk.graal.compiler.replacements.nodes.CounterModeAESNode;
+import jdk.graal.compiler.replacements.nodes.MacroNode.MacroParams;
+import jdk.graal.compiler.word.WordCastNode;
 import org.graalvm.nativeimage.AnnotationAccess;
 import org.graalvm.nativeimage.ImageInfo;
 import org.graalvm.nativeimage.ImageSingletons;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/substitute/AnnotatedMethod.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/substitute/AnnotatedMethod.java
index 6e6c0021f1f9..d7b03ca04a42 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/substitute/AnnotatedMethod.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/substitute/AnnotatedMethod.java
@@ -30,8 +30,8 @@
 import java.lang.reflect.Type;
 import java.util.Arrays;
 
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.nodes.StructuredGraph;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.nodes.StructuredGraph;
 import org.graalvm.nativeimage.AnnotationAccess;
 
 import com.oracle.graal.pointsto.infrastructure.GraphProvider;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/substitute/ComputedValueField.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/substitute/ComputedValueField.java
index 6c5c7dbb7800..75fab2f43059 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/substitute/ComputedValueField.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/substitute/ComputedValueField.java
@@ -42,7 +42,7 @@
 import java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock;
 
 import org.graalvm.collections.EconomicMap;
-import jdk.compiler.graal.api.replacements.SnippetReflectionProvider;
+import jdk.graal.compiler.api.replacements.SnippetReflectionProvider;
 import org.graalvm.nativeimage.hosted.FieldValueTransformer;
 
 import com.oracle.graal.pointsto.infrastructure.OriginalFieldProvider;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/substitute/DeletedFieldsPlugin.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/substitute/DeletedFieldsPlugin.java
index bf8de5135085..19611fd151fe 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/substitute/DeletedFieldsPlugin.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/substitute/DeletedFieldsPlugin.java
@@ -24,12 +24,12 @@
  */
 package com.oracle.svm.hosted.substitute;
 
-import jdk.compiler.graal.nodes.CallTargetNode.InvokeKind;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.DeadEndNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext;
-import jdk.compiler.graal.nodes.graphbuilderconf.NodePlugin;
+import jdk.graal.compiler.nodes.CallTargetNode.InvokeKind;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.DeadEndNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext;
+import jdk.graal.compiler.nodes.graphbuilderconf.NodePlugin;
 
 import com.oracle.svm.core.annotate.Delete;
 
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/substitute/DeletedMethod.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/substitute/DeletedMethod.java
index e9b961162d6d..947e7b4a30d8 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/substitute/DeletedMethod.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/substitute/DeletedMethod.java
@@ -27,13 +27,13 @@
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.java.FrameStateBuilder;
-import jdk.compiler.graal.nodes.CallTargetNode.InvokeKind;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.UnwindNode;
-import jdk.compiler.graal.nodes.ValueNode;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.java.FrameStateBuilder;
+import jdk.graal.compiler.nodes.CallTargetNode.InvokeKind;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.UnwindNode;
+import jdk.graal.compiler.nodes.ValueNode;
 
 import com.oracle.graal.pointsto.meta.HostedProviders;
 import com.oracle.svm.core.annotate.Delete;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/substitute/PolymorphicSignatureWrapperMethod.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/substitute/PolymorphicSignatureWrapperMethod.java
index 87787be2e62d..1f943dfb8114 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/substitute/PolymorphicSignatureWrapperMethod.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/substitute/PolymorphicSignatureWrapperMethod.java
@@ -33,13 +33,13 @@
 import java.lang.reflect.Type;
 import java.util.List;
 
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.nodes.CallTargetNode;
-import jdk.compiler.graal.nodes.InvokeWithExceptionNode;
-import jdk.compiler.graal.nodes.StateSplit;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.java.NewArrayNode;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.nodes.CallTargetNode;
+import jdk.graal.compiler.nodes.InvokeWithExceptionNode;
+import jdk.graal.compiler.nodes.StateSplit;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.java.NewArrayNode;
 
 import com.oracle.graal.pointsto.infrastructure.GraphProvider;
 import com.oracle.graal.pointsto.infrastructure.UniverseMetaAccess;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/substitute/SubstitutionMethod.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/substitute/SubstitutionMethod.java
index 5a44ad15a162..3a41c9d2a0f8 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/substitute/SubstitutionMethod.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/substitute/SubstitutionMethod.java
@@ -32,8 +32,8 @@
 import java.lang.reflect.Executable;
 import java.lang.reflect.Type;
 
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.nodes.StructuredGraph;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.nodes.StructuredGraph;
 
 import com.oracle.graal.pointsto.infrastructure.GraphProvider;
 import com.oracle.graal.pointsto.infrastructure.OriginalMethodProvider;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/substitute/UnsafeAutomaticSubstitutionProcessor.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/substitute/UnsafeAutomaticSubstitutionProcessor.java
index 8f69dffd5003..83754b3fdf1a 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/substitute/UnsafeAutomaticSubstitutionProcessor.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/substitute/UnsafeAutomaticSubstitutionProcessor.java
@@ -30,7 +30,7 @@
 import static com.oracle.svm.core.annotate.RecomputeFieldValue.Kind.ArrayIndexShift;
 import static com.oracle.svm.core.annotate.RecomputeFieldValue.Kind.FieldOffset;
 import static com.oracle.svm.core.annotate.RecomputeFieldValue.Kind.StaticFieldBase;
-import static jdk.compiler.graal.nodes.graphbuilderconf.InlineInvokePlugin.InlineInfo.createStandardInlineInfo;
+import static jdk.graal.compiler.nodes.graphbuilderconf.InlineInvokePlugin.InlineInfo.createStandardInlineInfo;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
@@ -43,35 +43,35 @@
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
-import jdk.compiler.graal.api.replacements.SnippetReflectionProvider;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.debug.DebugContext.Builder;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.iterators.NodeIterable;
-import jdk.compiler.graal.java.GraphBuilderPhase;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.FrameState;
-import jdk.compiler.graal.nodes.Invoke;
-import jdk.compiler.graal.nodes.InvokeWithExceptionNode;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.calc.SignExtendNode;
-import jdk.compiler.graal.nodes.calc.SubNode;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext;
-import jdk.compiler.graal.nodes.graphbuilderconf.InlineInvokePlugin;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins;
-import jdk.compiler.graal.nodes.java.LoadFieldNode;
-import jdk.compiler.graal.nodes.java.MethodCallTargetNode;
-import jdk.compiler.graal.nodes.java.StoreFieldNode;
-import jdk.compiler.graal.nodes.util.ConstantFoldUtil;
-import jdk.compiler.graal.options.Option;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.OptimisticOptimizations;
-import jdk.compiler.graal.phases.common.CanonicalizerPhase;
-import jdk.compiler.graal.phases.tiers.HighTierContext;
-import jdk.compiler.graal.phases.util.Providers;
+import jdk.graal.compiler.api.replacements.SnippetReflectionProvider;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.debug.DebugContext.Builder;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.iterators.NodeIterable;
+import jdk.graal.compiler.java.GraphBuilderPhase;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.FrameState;
+import jdk.graal.compiler.nodes.Invoke;
+import jdk.graal.compiler.nodes.InvokeWithExceptionNode;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.calc.SignExtendNode;
+import jdk.graal.compiler.nodes.calc.SubNode;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext;
+import jdk.graal.compiler.nodes.graphbuilderconf.InlineInvokePlugin;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins;
+import jdk.graal.compiler.nodes.java.LoadFieldNode;
+import jdk.graal.compiler.nodes.java.MethodCallTargetNode;
+import jdk.graal.compiler.nodes.java.StoreFieldNode;
+import jdk.graal.compiler.nodes.util.ConstantFoldUtil;
+import jdk.graal.compiler.options.Option;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.OptimisticOptimizations;
+import jdk.graal.compiler.phases.common.CanonicalizerPhase;
+import jdk.graal.compiler.phases.tiers.HighTierContext;
+import jdk.graal.compiler.phases.util.Providers;
 import org.graalvm.nativeimage.ImageSingletons;
 
 import com.oracle.graal.pointsto.infrastructure.SubstitutionProcessor;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/thread/CEntryPointFeature.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/thread/CEntryPointFeature.java
index 6354e5206300..0d5e5a41f9b8 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/thread/CEntryPointFeature.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/thread/CEntryPointFeature.java
@@ -29,9 +29,9 @@
 import java.util.List;
 import java.util.Map;
 
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.util.Providers;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.util.Providers;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platforms;
 import org.graalvm.nativeimage.hosted.Feature;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/thread/VMThreadLocalCollector.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/thread/VMThreadLocalCollector.java
index aff9a599cb41..35578af1f3e7 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/thread/VMThreadLocalCollector.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/thread/VMThreadLocalCollector.java
@@ -31,11 +31,11 @@
 import java.util.Map;
 import java.util.function.Function;
 
-import jdk.compiler.graal.api.replacements.SnippetReflectionProvider;
-import jdk.compiler.graal.core.common.NumUtil;
-import jdk.compiler.graal.nodes.PiNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext;
+import jdk.graal.compiler.api.replacements.SnippetReflectionProvider;
+import jdk.graal.compiler.core.common.NumUtil;
+import jdk.graal.compiler.nodes.PiNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext;
 
 import com.oracle.svm.core.config.ConfigurationValues;
 import com.oracle.svm.core.threadlocal.FastThreadLocal;
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/thread/VMThreadMTFeature.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/thread/VMThreadMTFeature.java
index fbc40cec6ea3..ab7102424f9d 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/thread/VMThreadMTFeature.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/thread/VMThreadMTFeature.java
@@ -26,17 +26,17 @@
 
 import java.util.List;
 
-import jdk.compiler.graal.api.replacements.SnippetReflectionProvider;
-import jdk.compiler.graal.core.common.NumUtil;
-import jdk.compiler.graal.core.common.memory.BarrierType;
-import jdk.compiler.graal.core.common.memory.MemoryOrderMode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin.Receiver;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin.RequiredInvocationPlugin;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins.Registration;
-import jdk.compiler.graal.phases.util.Providers;
+import jdk.graal.compiler.api.replacements.SnippetReflectionProvider;
+import jdk.graal.compiler.core.common.NumUtil;
+import jdk.graal.compiler.core.common.memory.BarrierType;
+import jdk.graal.compiler.core.common.memory.MemoryOrderMode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin.Receiver;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin.RequiredInvocationPlugin;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins.Registration;
+import jdk.graal.compiler.phases.util.Providers;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.IsolateThread;
 
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/thread/VMThreadSTFeature.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/thread/VMThreadSTFeature.java
index e89189dc3ee7..a896eca1c47a 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/thread/VMThreadSTFeature.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/thread/VMThreadSTFeature.java
@@ -26,17 +26,17 @@
 
 import java.util.List;
 
-import jdk.compiler.graal.api.replacements.SnippetReflectionProvider;
-import jdk.compiler.graal.core.common.NumUtil;
-import jdk.compiler.graal.core.common.memory.BarrierType;
-import jdk.compiler.graal.core.common.memory.MemoryOrderMode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin.Receiver;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin.RequiredInvocationPlugin;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins.Registration;
-import jdk.compiler.graal.phases.util.Providers;
+import jdk.graal.compiler.api.replacements.SnippetReflectionProvider;
+import jdk.graal.compiler.core.common.NumUtil;
+import jdk.graal.compiler.core.common.memory.BarrierType;
+import jdk.graal.compiler.core.common.memory.MemoryOrderMode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin.Receiver;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin.RequiredInvocationPlugin;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins.Registration;
+import jdk.graal.compiler.phases.util.Providers;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.IsolateThread;
 import org.graalvm.nativeimage.Platforms;
diff --git a/substratevm/src/com.oracle.svm.junit/src/com/oracle/svm/junit/JUnitFeature.java b/substratevm/src/com.oracle.svm.junit/src/com/oracle/svm/junit/JUnitFeature.java
index 8741269d3ed1..90993aef28ae 100644
--- a/substratevm/src/com.oracle.svm.junit/src/com/oracle/svm/junit/JUnitFeature.java
+++ b/substratevm/src/com.oracle.svm.junit/src/com/oracle/svm/junit/JUnitFeature.java
@@ -69,7 +69,7 @@ private static boolean includesClass(Description dn, Class clazz) {
     public void afterRegistration(AfterRegistrationAccess access) {
         /* Open up builder to allow whitebox testing */
         ModuleSupport.accessPackagesToClass(ModuleSupport.Access.EXPORT, null, true, "org.graalvm.nativeimage.builder");
-        ModuleSupport.accessPackagesToClass(ModuleSupport.Access.EXPORT, null, true, "jdk.compiler.graal");
+        ModuleSupport.accessPackagesToClass(ModuleSupport.Access.EXPORT, null, true, "jdk.graal.compiler");
         ModuleSupport.accessPackagesToClass(ModuleSupport.Access.EXPORT, null, true, "jdk.internal.vm.ci");
         SVMJUnitRunner svmRunner = new SVMJUnitRunner(access);
         ImageSingletons.add(SVMJUnitRunner.class, svmRunner);
diff --git a/substratevm/src/com.oracle.svm.junit/src/com/oracle/svm/junit/SVMJUnitRunner.java b/substratevm/src/com.oracle.svm.junit/src/com/oracle/svm/junit/SVMJUnitRunner.java
index 570aadb7db09..dd4e08ed56bd 100644
--- a/substratevm/src/com.oracle.svm.junit/src/com/oracle/svm/junit/SVMJUnitRunner.java
+++ b/substratevm/src/com.oracle.svm.junit/src/com/oracle/svm/junit/SVMJUnitRunner.java
@@ -28,7 +28,7 @@
 import java.io.FileReader;
 import java.util.List;
 
-import jdk.compiler.graal.options.Option;
+import jdk.graal.compiler.options.Option;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
diff --git a/substratevm/src/com.oracle.svm.polyglot/src/com/oracle/svm/polyglot/scala/ScalaAnalysisPlugin.java b/substratevm/src/com.oracle.svm.polyglot/src/com/oracle/svm/polyglot/scala/ScalaAnalysisPlugin.java
index ad6389d1897a..2fe757954d18 100644
--- a/substratevm/src/com.oracle.svm.polyglot/src/com/oracle/svm/polyglot/scala/ScalaAnalysisPlugin.java
+++ b/substratevm/src/com.oracle.svm.polyglot/src/com/oracle/svm/polyglot/scala/ScalaAnalysisPlugin.java
@@ -24,9 +24,9 @@
  */
 package com.oracle.svm.polyglot.scala;
 
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext;
-import jdk.compiler.graal.nodes.graphbuilderconf.NodePlugin;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext;
+import jdk.graal.compiler.nodes.graphbuilderconf.NodePlugin;
 
 import com.oracle.graal.pointsto.meta.AnalysisType;
 
diff --git a/substratevm/src/com.oracle.svm.polyglot/src/com/oracle/svm/polyglot/scala/ScalaFeature.java b/substratevm/src/com.oracle.svm.polyglot/src/com/oracle/svm/polyglot/scala/ScalaFeature.java
index 04b1f61be285..0ca9f145fe32 100644
--- a/substratevm/src/com.oracle.svm.polyglot/src/com/oracle/svm/polyglot/scala/ScalaFeature.java
+++ b/substratevm/src/com.oracle.svm.polyglot/src/com/oracle/svm/polyglot/scala/ScalaFeature.java
@@ -29,8 +29,8 @@
 import java.util.Arrays;
 import java.util.function.BooleanSupplier;
 
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
-import jdk.compiler.graal.phases.util.Providers;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
+import jdk.graal.compiler.phases.util.Providers;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.hosted.RuntimeClassInitialization;
 import org.graalvm.nativeimage.hosted.RuntimeReflection;
@@ -67,7 +67,7 @@ public void beforeAnalysis(BeforeAnalysisAccess access) {
         RuntimeClassInitialization.initializeAtBuildTime("scala.runtime.LambdaDeserialize");
         RuntimeClassInitialization.initializeAtBuildTime("scala.runtime.StructuralCallSite");
         RuntimeClassInitialization.initializeAtBuildTime("scala.runtime.EmptyMethodCache");
-        ModuleSupport.accessPackagesToClass(ModuleSupport.Access.EXPORT, ScalaFeature.class, false, "jdk.compiler.graal", "jdk.compiler.graal.nodes");
+        ModuleSupport.accessPackagesToClass(ModuleSupport.Access.EXPORT, ScalaFeature.class, false, "jdk.graal.compiler", "jdk.graal.compiler.nodes");
     }
 
     @Override
diff --git a/substratevm/src/com.oracle.svm.processor/src/com/oracle/svm/processor/AutomaticallyRegisteredFeatureProcessor.java b/substratevm/src/com.oracle.svm.processor/src/com/oracle/svm/processor/AutomaticallyRegisteredFeatureProcessor.java
index cbd2cb089e4a..89d58b54cebe 100644
--- a/substratevm/src/com.oracle.svm.processor/src/com/oracle/svm/processor/AutomaticallyRegisteredFeatureProcessor.java
+++ b/substratevm/src/com.oracle.svm.processor/src/com/oracle/svm/processor/AutomaticallyRegisteredFeatureProcessor.java
@@ -34,7 +34,7 @@
 import javax.lang.model.element.TypeElement;
 import javax.tools.Diagnostic.Kind;
 
-import jdk.compiler.graal.processor.AbstractProcessor;
+import jdk.graal.compiler.processor.AbstractProcessor;
 
 // Checkstyle: allow Class.getSimpleName
 
diff --git a/substratevm/src/com.oracle.svm.processor/src/com/oracle/svm/processor/AutomaticallyRegisteredImageSingletonProcessor.java b/substratevm/src/com.oracle.svm.processor/src/com/oracle/svm/processor/AutomaticallyRegisteredImageSingletonProcessor.java
index f72aebc99fb5..b59c76b8aab3 100644
--- a/substratevm/src/com.oracle.svm.processor/src/com/oracle/svm/processor/AutomaticallyRegisteredImageSingletonProcessor.java
+++ b/substratevm/src/com.oracle.svm.processor/src/com/oracle/svm/processor/AutomaticallyRegisteredImageSingletonProcessor.java
@@ -37,7 +37,7 @@
 import javax.lang.model.element.TypeElement;
 import javax.lang.model.type.TypeMirror;
 
-import jdk.compiler.graal.processor.AbstractProcessor;
+import jdk.graal.compiler.processor.AbstractProcessor;
 
 // Checkstyle: allow Class.getSimpleName
 
diff --git a/substratevm/src/com.oracle.svm.test/src/com/oracle/svm/test/jfr/TestVirtualThreadsBasic.java b/substratevm/src/com.oracle.svm.test/src/com/oracle/svm/test/jfr/TestVirtualThreadsBasic.java
index a41c8a0937fd..c8812e4931e5 100644
--- a/substratevm/src/com.oracle.svm.test/src/com/oracle/svm/test/jfr/TestVirtualThreadsBasic.java
+++ b/substratevm/src/com.oracle.svm.test/src/com/oracle/svm/test/jfr/TestVirtualThreadsBasic.java
@@ -43,7 +43,7 @@
 
 import com.oracle.svm.core.jfr.JfrEvent;
 
-import jdk.compiler.graal.serviceprovider.JavaVersionUtil;
+import jdk.graal.compiler.serviceprovider.JavaVersionUtil;
 
 import jdk.jfr.consumer.RecordedClass;
 import jdk.jfr.consumer.RecordedEvent;
diff --git a/substratevm/src/com.oracle.svm.test/src/com/oracle/svm/test/jfr/TestVirtualThreadsChunkRotation.java b/substratevm/src/com.oracle.svm.test/src/com/oracle/svm/test/jfr/TestVirtualThreadsChunkRotation.java
index 0f2096f2e7f5..c9d92f52bc40 100644
--- a/substratevm/src/com.oracle.svm.test/src/com/oracle/svm/test/jfr/TestVirtualThreadsChunkRotation.java
+++ b/substratevm/src/com.oracle.svm.test/src/com/oracle/svm/test/jfr/TestVirtualThreadsChunkRotation.java
@@ -37,7 +37,7 @@
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import jdk.compiler.graal.serviceprovider.JavaVersionUtil;
+import jdk.graal.compiler.serviceprovider.JavaVersionUtil;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/substratevm/src/com.oracle.svm.test/src/com/oracle/svm/test/jfr/TestVirtualThreadsJfrStreaming.java b/substratevm/src/com.oracle.svm.test/src/com/oracle/svm/test/jfr/TestVirtualThreadsJfrStreaming.java
index f4db713bd5a1..ca479f2eb6cd 100644
--- a/substratevm/src/com.oracle.svm.test/src/com/oracle/svm/test/jfr/TestVirtualThreadsJfrStreaming.java
+++ b/substratevm/src/com.oracle.svm.test/src/com/oracle/svm/test/jfr/TestVirtualThreadsJfrStreaming.java
@@ -34,7 +34,7 @@
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import jdk.compiler.graal.serviceprovider.JavaVersionUtil;
+import jdk.graal.compiler.serviceprovider.JavaVersionUtil;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/substratevm/src/com.oracle.svm.test/src/com/oracle/svm/test/jfr/utils/poolparsers/ThreadConstantPoolParser.java b/substratevm/src/com.oracle.svm.test/src/com/oracle/svm/test/jfr/utils/poolparsers/ThreadConstantPoolParser.java
index 2b6065fd7e28..e3082a791085 100644
--- a/substratevm/src/com.oracle.svm.test/src/com/oracle/svm/test/jfr/utils/poolparsers/ThreadConstantPoolParser.java
+++ b/substratevm/src/com.oracle.svm.test/src/com/oracle/svm/test/jfr/utils/poolparsers/ThreadConstantPoolParser.java
@@ -28,7 +28,7 @@
 
 import java.io.IOException;
 
-import jdk.compiler.graal.serviceprovider.JavaVersionUtil;
+import jdk.graal.compiler.serviceprovider.JavaVersionUtil;
 import org.junit.Assert;
 
 import com.oracle.svm.core.jfr.JfrType;
diff --git a/substratevm/src/com.oracle.svm.truffle.nfi/src/com/oracle/svm/truffle/nfi/LocalNativeScope.java b/substratevm/src/com.oracle.svm.truffle.nfi/src/com/oracle/svm/truffle/nfi/LocalNativeScope.java
index cc4f5e3cea09..2770ea6658d1 100644
--- a/substratevm/src/com.oracle.svm.truffle.nfi/src/com/oracle/svm/truffle/nfi/LocalNativeScope.java
+++ b/substratevm/src/com.oracle.svm.truffle.nfi/src/com/oracle/svm/truffle/nfi/LocalNativeScope.java
@@ -26,7 +26,7 @@
 
 import java.util.ArrayList;
 
-import jdk.compiler.graal.word.Word;
+import jdk.graal.compiler.word.Word;
 import org.graalvm.word.PointerBase;
 import org.graalvm.word.WordFactory;
 
diff --git a/substratevm/src/com.oracle.svm.truffle.tck/src/META-INF/native-image/native-image.properties b/substratevm/src/com.oracle.svm.truffle.tck/src/META-INF/native-image/native-image.properties
index dea7b7e68a81..60b1acc1dd02 100644
--- a/substratevm/src/com.oracle.svm.truffle.tck/src/META-INF/native-image/native-image.properties
+++ b/substratevm/src/com.oracle.svm.truffle.tck/src/META-INF/native-image/native-image.properties
@@ -6,12 +6,12 @@ JavaArgs = --add-exports org.graalvm.nativeimage.base/com.oracle.svm.util=ALL-UN
            --add-exports org.graalvm.nativeimage.builder/com.oracle.svm.core.util=ALL-UNNAMED \
            --add-exports org.graalvm.nativeimage.builder/com.oracle.svm.hosted=ALL-UNNAMED \
            --add-exports org.graalvm.nativeimage.builder/com.oracle.svm.hosted.config=ALL-UNNAMED \
-           --add-exports jdk.compiler.graal/jdk.compiler.graal.debug=ALL-UNNAMED \
-           --add-exports jdk.compiler.graal/jdk.compiler.graal.graph=ALL-UNNAMED \
-           --add-exports jdk.compiler.graal/jdk.compiler.graal.nodes=ALL-UNNAMED \
-           --add-exports jdk.compiler.graal/jdk.compiler.graal.nodes.java=ALL-UNNAMED \
-           --add-exports jdk.compiler.graal/jdk.compiler.graal.options=ALL-UNNAMED \
+           --add-exports jdk.graal.compiler/jdk.graal.compiler.debug=ALL-UNNAMED \
+           --add-exports jdk.graal.compiler/jdk.graal.compiler.graph=ALL-UNNAMED \
+           --add-exports jdk.graal.compiler/jdk.graal.compiler.nodes=ALL-UNNAMED \
+           --add-exports jdk.graal.compiler/jdk.graal.compiler.nodes.java=ALL-UNNAMED \
+           --add-exports jdk.graal.compiler/jdk.graal.compiler.options=ALL-UNNAMED \
            --add-exports org.graalvm.truffle.runtime/com.oracle.truffle.runtime=ALL-UNNAMED \
-           --add-exports jdk.compiler.graal/jdk.compiler.graal.util.json=ALL-UNNAMED \
+           --add-exports jdk.graal.compiler/jdk.graal.compiler.util.json=ALL-UNNAMED \
            --add-exports jdk.internal.vm.ci/jdk.vm.ci.common=ALL-UNNAMED \
            --add-exports jdk.internal.vm.ci/jdk.vm.ci.meta=ALL-UNNAMED
diff --git a/substratevm/src/com.oracle.svm.truffle.tck/src/com/oracle/svm/truffle/tck/PermissionsFeature.java b/substratevm/src/com.oracle.svm.truffle.tck/src/com/oracle/svm/truffle/tck/PermissionsFeature.java
index a4e7158a2dc8..592f90e285dd 100644
--- a/substratevm/src/com.oracle.svm.truffle.tck/src/com/oracle/svm/truffle/tck/PermissionsFeature.java
+++ b/substratevm/src/com.oracle.svm.truffle.tck/src/com/oracle/svm/truffle/tck/PermissionsFeature.java
@@ -51,15 +51,15 @@
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.graph.NodeInputList;
-import jdk.compiler.graal.nodes.Invoke;
-import jdk.compiler.graal.nodes.PiNode;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.java.NewInstanceNode;
-import jdk.compiler.graal.options.Option;
-import jdk.compiler.graal.options.OptionType;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.graph.NodeInputList;
+import jdk.graal.compiler.nodes.Invoke;
+import jdk.graal.compiler.nodes.PiNode;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.java.NewInstanceNode;
+import jdk.graal.compiler.options.Option;
+import jdk.graal.compiler.options.OptionType;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.hosted.Feature;
 import org.graalvm.polyglot.io.FileSystem;
diff --git a/substratevm/src/com.oracle.svm.truffle.tck/src/com/oracle/svm/truffle/tck/WhiteListParser.java b/substratevm/src/com.oracle.svm.truffle.tck/src/com/oracle/svm/truffle/tck/WhiteListParser.java
index 568c9aee59c2..7c101f0eba5e 100644
--- a/substratevm/src/com.oracle.svm.truffle.tck/src/com/oracle/svm/truffle/tck/WhiteListParser.java
+++ b/substratevm/src/com.oracle.svm.truffle.tck/src/com/oracle/svm/truffle/tck/WhiteListParser.java
@@ -37,7 +37,7 @@
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.MapCursor;
 import org.graalvm.nativeimage.Platforms;
-import jdk.compiler.graal.util.json.JSONParserException;
+import jdk.graal.compiler.util.json.JSONParserException;
 
 import com.oracle.graal.pointsto.BigBang;
 import com.oracle.graal.pointsto.meta.AnalysisMethod;
diff --git a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/HostedTruffleConstantFieldProvider.java b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/HostedTruffleConstantFieldProvider.java
index b71a22f31a2b..c3ccc7e6c32f 100644
--- a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/HostedTruffleConstantFieldProvider.java
+++ b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/HostedTruffleConstantFieldProvider.java
@@ -24,7 +24,7 @@
  */
 package com.oracle.svm.truffle;
 
-import jdk.compiler.graal.core.common.spi.ConstantFieldProvider;
+import jdk.graal.compiler.core.common.spi.ConstantFieldProvider;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
 
diff --git a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/SubstrateHostInliningPhase.java b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/SubstrateHostInliningPhase.java
index c1f3247d620e..7d525a2f7396 100644
--- a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/SubstrateHostInliningPhase.java
+++ b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/SubstrateHostInliningPhase.java
@@ -24,12 +24,12 @@
  */
 package com.oracle.svm.truffle;
 
-import jdk.compiler.graal.core.common.CompilationIdentifier;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.phases.common.CanonicalizerPhase;
-import jdk.compiler.graal.phases.tiers.HighTierContext;
-import jdk.compiler.graal.truffle.host.TruffleHostEnvironment;
-import jdk.compiler.graal.truffle.host.HostInliningPhase;
+import jdk.graal.compiler.core.common.CompilationIdentifier;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.phases.common.CanonicalizerPhase;
+import jdk.graal.compiler.phases.tiers.HighTierContext;
+import jdk.graal.compiler.truffle.host.TruffleHostEnvironment;
+import jdk.graal.compiler.truffle.host.HostInliningPhase;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
diff --git a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/SubstrateTruffleCompilationIdentifier.java b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/SubstrateTruffleCompilationIdentifier.java
index a1a0d7f89b01..36fc6a63a137 100644
--- a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/SubstrateTruffleCompilationIdentifier.java
+++ b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/SubstrateTruffleCompilationIdentifier.java
@@ -24,8 +24,8 @@
  */
 package com.oracle.svm.truffle;
 
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.truffle.TruffleCompilationIdentifier;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.truffle.TruffleCompilationIdentifier;
 
 import com.oracle.svm.core.graal.code.SubstrateCompilationIdentifier;
 import com.oracle.truffle.compiler.TruffleCompilable;
diff --git a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/SubstrateTruffleHostEnvironment.java b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/SubstrateTruffleHostEnvironment.java
index ffaf997f8876..bbd1c9b50999 100644
--- a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/SubstrateTruffleHostEnvironment.java
+++ b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/SubstrateTruffleHostEnvironment.java
@@ -24,9 +24,9 @@
  */
 package com.oracle.svm.truffle;
 
-import jdk.compiler.graal.truffle.TruffleCompilerImpl;
-import jdk.compiler.graal.truffle.TruffleElementCache;
-import jdk.compiler.graal.truffle.host.TruffleHostEnvironment;
+import jdk.graal.compiler.truffle.TruffleCompilerImpl;
+import jdk.graal.compiler.truffle.TruffleElementCache;
+import jdk.graal.compiler.truffle.host.TruffleHostEnvironment;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
 
diff --git a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/SubstrateTruffleHostEnvironmentLookup.java b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/SubstrateTruffleHostEnvironmentLookup.java
index 76ff2e4ff9d1..a2ad99b38d1e 100644
--- a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/SubstrateTruffleHostEnvironmentLookup.java
+++ b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/SubstrateTruffleHostEnvironmentLookup.java
@@ -24,7 +24,7 @@
  */
 package com.oracle.svm.truffle;
 
-import jdk.compiler.graal.truffle.host.TruffleHostEnvironment;
+import jdk.graal.compiler.truffle.host.TruffleHostEnvironment;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
 
diff --git a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/TruffleBaseFeature.java b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/TruffleBaseFeature.java
index c0fee5f35bd0..75f89555ad7b 100644
--- a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/TruffleBaseFeature.java
+++ b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/TruffleBaseFeature.java
@@ -26,7 +26,7 @@
 
 import static com.oracle.svm.core.util.VMError.shouldNotReachHere;
 import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;
-import static jdk.compiler.graal.options.OptionType.User;
+import static jdk.graal.compiler.options.OptionType.User;
 
 import java.io.IOException;
 import java.lang.annotation.Annotation;
@@ -60,23 +60,23 @@
 import java.util.stream.Stream;
 
 import org.graalvm.collections.Pair;
-import jdk.compiler.graal.api.replacements.SnippetReflectionProvider;
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin.RequiredInlineOnlyInvocationPlugin;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin.RequiredInvocationPlugin;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins.Registration;
-import jdk.compiler.graal.options.Option;
-import jdk.compiler.graal.options.OptionStability;
-import jdk.compiler.graal.phases.tiers.Suites;
-import jdk.compiler.graal.phases.util.Providers;
-import jdk.compiler.graal.truffle.host.InjectImmutableFrameFieldsPhase;
-import jdk.compiler.graal.truffle.host.TruffleHostEnvironment;
-import jdk.compiler.graal.truffle.substitutions.TruffleInvocationPlugins;
+import jdk.graal.compiler.api.replacements.SnippetReflectionProvider;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin.RequiredInlineOnlyInvocationPlugin;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin.RequiredInvocationPlugin;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins.Registration;
+import jdk.graal.compiler.options.Option;
+import jdk.graal.compiler.options.OptionStability;
+import jdk.graal.compiler.phases.tiers.Suites;
+import jdk.graal.compiler.phases.util.Providers;
+import jdk.graal.compiler.truffle.host.InjectImmutableFrameFieldsPhase;
+import jdk.graal.compiler.truffle.host.TruffleHostEnvironment;
+import jdk.graal.compiler.truffle.substitutions.TruffleInvocationPlugins;
 import org.graalvm.home.HomeFinder;
 import org.graalvm.home.impl.DefaultHomeFinder;
 import org.graalvm.nativeimage.AnnotationAccess;
@@ -1343,9 +1343,9 @@ final class Target_java_lang_ProcessBuilder_Redirect {
  * If allowProcess() is disabled at build time, then we ensure ObjdumpDisassemblerProvider does not
  * try to invoke the nonexistent ProcessBuilder.
  */
-@TargetClass(className = "jdk.compiler.graal.code.ObjdumpDisassemblerProvider", onlyWith = {
+@TargetClass(className = "jdk.graal.compiler.code.ObjdumpDisassemblerProvider", onlyWith = {
                 TruffleBaseFeature.IsEnabled.class, TruffleBaseFeature.IsCreateProcessDisabled.class})
-final class Target_jdk_compiler_graal_code_ObjdumpDisassemblerProvider {
+final class Target_jdk_graal_compiler_code_ObjdumpDisassemblerProvider {
 
     @Substitute
     @SuppressWarnings("unused")
diff --git a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/TruffleFeature.java b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/TruffleFeature.java
index b9305b2fd7e6..324217b1eb77 100644
--- a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/TruffleFeature.java
+++ b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/TruffleFeature.java
@@ -28,9 +28,9 @@
 import static com.oracle.svm.graal.hosted.RuntimeCompilationFeature.AllowInliningPredicate.InlineDecision.INLINE;
 import static com.oracle.svm.graal.hosted.RuntimeCompilationFeature.AllowInliningPredicate.InlineDecision.INLINING_DISALLOWED;
 import static com.oracle.svm.graal.hosted.RuntimeCompilationFeature.AllowInliningPredicate.InlineDecision.NO_DECISION;
-import static jdk.compiler.graal.java.BytecodeParserOptions.InlineDuringParsingMaxDepth;
-import static jdk.compiler.graal.nodes.graphbuilderconf.InlineInvokePlugin.InlineInfo.DO_NOT_INLINE_WITH_EXCEPTION;
-import static jdk.compiler.graal.nodes.graphbuilderconf.InlineInvokePlugin.InlineInfo.createStandardInlineInfo;
+import static jdk.graal.compiler.java.BytecodeParserOptions.InlineDuringParsingMaxDepth;
+import static jdk.graal.compiler.nodes.graphbuilderconf.InlineInvokePlugin.InlineInfo.DO_NOT_INLINE_WITH_EXCEPTION;
+import static jdk.graal.compiler.nodes.graphbuilderconf.InlineInvokePlugin.InlineInfo.createStandardInlineInfo;
 
 import java.lang.reflect.Executable;
 import java.lang.reflect.Field;
@@ -104,27 +104,27 @@
 import java.util.function.UnaryOperator;
 
 import org.graalvm.collections.Pair;
-import jdk.compiler.graal.api.replacements.SnippetReflectionProvider;
-import jdk.compiler.graal.core.phases.HighTier;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.nodes.FrameState;
-import jdk.compiler.graal.nodes.ValueNode;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext;
-import jdk.compiler.graal.nodes.graphbuilderconf.InlineInvokePlugin;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin.RequiredInvocationPlugin;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins;
-import jdk.compiler.graal.nodes.spi.Replacements;
-import jdk.compiler.graal.options.Option;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.common.CanonicalizerPhase;
-import jdk.compiler.graal.phases.tiers.Suites;
-import jdk.compiler.graal.phases.util.Providers;
-import jdk.compiler.graal.truffle.KnownTruffleTypes;
-import jdk.compiler.graal.truffle.PartialEvaluator;
-import jdk.compiler.graal.truffle.host.HostInliningPhase;
-import jdk.compiler.graal.truffle.host.TruffleHostEnvironment;
-import jdk.compiler.graal.truffle.nodes.asserts.NeverPartOfCompilationNode;
+import jdk.graal.compiler.api.replacements.SnippetReflectionProvider;
+import jdk.graal.compiler.core.phases.HighTier;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.nodes.FrameState;
+import jdk.graal.compiler.nodes.ValueNode;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext;
+import jdk.graal.compiler.nodes.graphbuilderconf.InlineInvokePlugin;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin.RequiredInvocationPlugin;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins;
+import jdk.graal.compiler.nodes.spi.Replacements;
+import jdk.graal.compiler.options.Option;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.common.CanonicalizerPhase;
+import jdk.graal.compiler.phases.tiers.Suites;
+import jdk.graal.compiler.phases.util.Providers;
+import jdk.graal.compiler.truffle.KnownTruffleTypes;
+import jdk.graal.compiler.truffle.PartialEvaluator;
+import jdk.graal.compiler.truffle.host.HostInliningPhase;
+import jdk.graal.compiler.truffle.host.TruffleHostEnvironment;
+import jdk.graal.compiler.truffle.nodes.asserts.NeverPartOfCompilationNode;
 import org.graalvm.nativeimage.AnnotationAccess;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.hosted.Feature;
diff --git a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/TruffleSupport.java b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/TruffleSupport.java
index 0e5a9ab03a98..d575d0af5fe5 100644
--- a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/TruffleSupport.java
+++ b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/TruffleSupport.java
@@ -28,14 +28,14 @@
 import java.util.function.Consumer;
 import java.util.function.Supplier;
 
-import jdk.compiler.graal.api.replacements.SnippetReflectionProvider;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration;
-import jdk.compiler.graal.phases.util.Providers;
-import jdk.compiler.graal.truffle.EconomyPartialEvaluatorConfiguration;
-import jdk.compiler.graal.truffle.PartialEvaluatorConfiguration;
-import jdk.compiler.graal.truffle.TruffleCompilerConfiguration;
-import jdk.compiler.graal.truffle.TruffleCompilerImpl;
-import jdk.compiler.graal.truffle.TruffleTierConfiguration;
+import jdk.graal.compiler.api.replacements.SnippetReflectionProvider;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
+import jdk.graal.compiler.phases.util.Providers;
+import jdk.graal.compiler.truffle.EconomyPartialEvaluatorConfiguration;
+import jdk.graal.compiler.truffle.PartialEvaluatorConfiguration;
+import jdk.graal.compiler.truffle.TruffleCompilerConfiguration;
+import jdk.graal.compiler.truffle.TruffleCompilerImpl;
+import jdk.graal.compiler.truffle.TruffleTierConfiguration;
 import org.graalvm.nativeimage.ImageSingletons;
 
 import com.oracle.svm.core.SubstrateOptions;
diff --git a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/SubstrateKnownTruffleTypes.java b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/SubstrateKnownTruffleTypes.java
index e1ee0484542e..02b1bb847e17 100644
--- a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/SubstrateKnownTruffleTypes.java
+++ b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/SubstrateKnownTruffleTypes.java
@@ -24,7 +24,7 @@
  */
 package com.oracle.svm.truffle.api;
 
-import jdk.compiler.graal.truffle.KnownTruffleTypes;
+import jdk.graal.compiler.truffle.KnownTruffleTypes;
 
 import com.oracle.graal.pointsto.meta.AnalysisType;
 import com.oracle.truffle.compiler.TruffleCompilerRuntime;
diff --git a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/SubstrateOptimizedCallTargetInstalledCode.java b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/SubstrateOptimizedCallTargetInstalledCode.java
index 8938afda5748..307e4a00b476 100644
--- a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/SubstrateOptimizedCallTargetInstalledCode.java
+++ b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/SubstrateOptimizedCallTargetInstalledCode.java
@@ -26,8 +26,8 @@
 
 import java.lang.ref.WeakReference;
 
-import jdk.compiler.graal.core.common.CompilationIdentifier;
-import jdk.compiler.graal.truffle.TruffleCompilerImpl;
+import jdk.graal.compiler.core.common.CompilationIdentifier;
+import jdk.graal.compiler.truffle.TruffleCompilerImpl;
 import org.graalvm.word.WordFactory;
 
 import com.oracle.svm.core.Uninterruptible;
diff --git a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/SubstratePEGraphDecoder.java b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/SubstratePEGraphDecoder.java
index fa938839ad5d..64946f8b93f6 100644
--- a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/SubstratePEGraphDecoder.java
+++ b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/SubstratePEGraphDecoder.java
@@ -29,17 +29,17 @@
 import java.util.concurrent.ConcurrentHashMap;
 
 import org.graalvm.collections.EconomicMap;
-import jdk.compiler.graal.bytecode.BytecodeProvider;
-import jdk.compiler.graal.graph.SourceLanguagePositionProvider;
-import jdk.compiler.graal.nodes.EncodedGraph;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.graphbuilderconf.InlineInvokePlugin;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins;
-import jdk.compiler.graal.nodes.graphbuilderconf.LoopExplosionPlugin;
-import jdk.compiler.graal.nodes.graphbuilderconf.NodePlugin;
-import jdk.compiler.graal.nodes.graphbuilderconf.ParameterPlugin;
-import jdk.compiler.graal.nodes.spi.CoreProviders;
-import jdk.compiler.graal.replacements.PEGraphDecoder;
+import jdk.graal.compiler.bytecode.BytecodeProvider;
+import jdk.graal.compiler.graph.SourceLanguagePositionProvider;
+import jdk.graal.compiler.nodes.EncodedGraph;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.graphbuilderconf.InlineInvokePlugin;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins;
+import jdk.graal.compiler.nodes.graphbuilderconf.LoopExplosionPlugin;
+import jdk.graal.compiler.nodes.graphbuilderconf.NodePlugin;
+import jdk.graal.compiler.nodes.graphbuilderconf.ParameterPlugin;
+import jdk.graal.compiler.nodes.spi.CoreProviders;
+import jdk.graal.compiler.replacements.PEGraphDecoder;
 
 import com.oracle.svm.core.graal.meta.SharedRuntimeMethod;
 import com.oracle.svm.graal.GraalSupport;
diff --git a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/SubstratePartialEvaluator.java b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/SubstratePartialEvaluator.java
index edfd748ab2b4..0bb5779e22e9 100644
--- a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/SubstratePartialEvaluator.java
+++ b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/SubstratePartialEvaluator.java
@@ -28,22 +28,22 @@
 import java.util.function.Supplier;
 
 import org.graalvm.collections.EconomicMap;
-import jdk.compiler.graal.graph.SourceLanguagePositionProvider;
-import jdk.compiler.graal.nodes.EncodedGraph;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
-import jdk.compiler.graal.nodes.graphbuilderconf.InlineInvokePlugin;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins;
-import jdk.compiler.graal.nodes.graphbuilderconf.NodePlugin;
-import jdk.compiler.graal.nodes.graphbuilderconf.ParameterPlugin;
-import jdk.compiler.graal.phases.util.Providers;
-import jdk.compiler.graal.replacements.PEGraphDecoder;
-import jdk.compiler.graal.replacements.PEGraphDecoder.SpecialCallTargetCacheKey;
-import jdk.compiler.graal.truffle.PartialEvaluator;
-import jdk.compiler.graal.truffle.PartialEvaluatorConfiguration;
-import jdk.compiler.graal.truffle.TruffleCompilerConfiguration;
-import jdk.compiler.graal.truffle.TruffleTierContext;
+import jdk.graal.compiler.graph.SourceLanguagePositionProvider;
+import jdk.graal.compiler.nodes.EncodedGraph;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
+import jdk.graal.compiler.nodes.graphbuilderconf.InlineInvokePlugin;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins;
+import jdk.graal.compiler.nodes.graphbuilderconf.NodePlugin;
+import jdk.graal.compiler.nodes.graphbuilderconf.ParameterPlugin;
+import jdk.graal.compiler.phases.util.Providers;
+import jdk.graal.compiler.replacements.PEGraphDecoder;
+import jdk.graal.compiler.replacements.PEGraphDecoder.SpecialCallTargetCacheKey;
+import jdk.graal.compiler.truffle.PartialEvaluator;
+import jdk.graal.compiler.truffle.PartialEvaluatorConfiguration;
+import jdk.graal.compiler.truffle.TruffleCompilerConfiguration;
+import jdk.graal.compiler.truffle.TruffleTierContext;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
 
diff --git a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/SubstratePostPartialEvaluationSuite.java b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/SubstratePostPartialEvaluationSuite.java
index b61c8df16cf5..add22b7f2217 100644
--- a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/SubstratePostPartialEvaluationSuite.java
+++ b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/SubstratePostPartialEvaluationSuite.java
@@ -24,8 +24,8 @@
  */
 package com.oracle.svm.truffle.api;
 
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.truffle.PostPartialEvaluationSuite;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.truffle.PostPartialEvaluationSuite;
 
 import com.oracle.svm.core.graal.phases.DeadStoreRemovalPhase;
 
diff --git a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/SubstrateThreadLocalHandshakeSnippets.java b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/SubstrateThreadLocalHandshakeSnippets.java
index 40f051c8c282..b3f67832f6fb 100644
--- a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/SubstrateThreadLocalHandshakeSnippets.java
+++ b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/SubstrateThreadLocalHandshakeSnippets.java
@@ -25,27 +25,27 @@
 package com.oracle.svm.truffle.api;
 
 import static com.oracle.svm.core.graal.snippets.SubstrateAllocationSnippets.GC_LOCATIONS;
-import static jdk.compiler.graal.replacements.SnippetTemplate.DEFAULT_REPLACER;
+import static jdk.graal.compiler.replacements.SnippetTemplate.DEFAULT_REPLACER;
 
 import java.util.Arrays;
 import java.util.Map;
 
-import jdk.compiler.graal.api.replacements.Snippet;
-import jdk.compiler.graal.core.common.spi.ForeignCallDescriptor;
-import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.graph.Node.ConstantNodeParameter;
-import jdk.compiler.graal.graph.Node.NodeIntrinsic;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.extended.BranchProbabilityNode;
-import jdk.compiler.graal.nodes.extended.ForeignCallNode;
-import jdk.compiler.graal.nodes.spi.LoweringTool;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.util.Providers;
-import jdk.compiler.graal.replacements.SnippetTemplate;
-import jdk.compiler.graal.replacements.SnippetTemplate.Arguments;
-import jdk.compiler.graal.replacements.SnippetTemplate.SnippetInfo;
-import jdk.compiler.graal.replacements.Snippets;
-import jdk.compiler.graal.truffle.nodes.TruffleSafepointNode;
+import jdk.graal.compiler.api.replacements.Snippet;
+import jdk.graal.compiler.core.common.spi.ForeignCallDescriptor;
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.graph.Node.ConstantNodeParameter;
+import jdk.graal.compiler.graph.Node.NodeIntrinsic;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.extended.BranchProbabilityNode;
+import jdk.graal.compiler.nodes.extended.ForeignCallNode;
+import jdk.graal.compiler.nodes.spi.LoweringTool;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.util.Providers;
+import jdk.graal.compiler.replacements.SnippetTemplate;
+import jdk.graal.compiler.replacements.SnippetTemplate.Arguments;
+import jdk.graal.compiler.replacements.SnippetTemplate.SnippetInfo;
+import jdk.graal.compiler.replacements.Snippets;
+import jdk.graal.compiler.truffle.nodes.TruffleSafepointNode;
 import org.graalvm.word.LocationIdentity;
 
 import com.oracle.svm.core.graal.snippets.NodeLoweringProvider;
diff --git a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/SubstrateTruffleCompilationSupport.java b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/SubstrateTruffleCompilationSupport.java
index 0494c5602f91..4dd8a1d77b99 100644
--- a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/SubstrateTruffleCompilationSupport.java
+++ b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/SubstrateTruffleCompilationSupport.java
@@ -24,7 +24,7 @@
  */
 package com.oracle.svm.truffle.api;
 
-import jdk.compiler.graal.truffle.AbstractTruffleCompilationSupport;
+import jdk.graal.compiler.truffle.AbstractTruffleCompilationSupport;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
 
diff --git a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/SubstrateTruffleCompiler.java b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/SubstrateTruffleCompiler.java
index 850bbbcd92e2..03d9fff0ac7b 100644
--- a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/SubstrateTruffleCompiler.java
+++ b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/SubstrateTruffleCompiler.java
@@ -24,8 +24,8 @@
  */
 package com.oracle.svm.truffle.api;
 
-import jdk.compiler.graal.truffle.PartialEvaluator;
-import jdk.compiler.graal.truffle.phases.TruffleTier;
+import jdk.graal.compiler.truffle.PartialEvaluator;
+import jdk.graal.compiler.truffle.phases.TruffleTier;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
 
diff --git a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/SubstrateTruffleCompilerImpl.java b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/SubstrateTruffleCompilerImpl.java
index 795dc9f46a1f..7adfb49a0c14 100644
--- a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/SubstrateTruffleCompilerImpl.java
+++ b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/SubstrateTruffleCompilerImpl.java
@@ -27,23 +27,23 @@
 import java.io.PrintStream;
 import java.util.Map;
 
-import jdk.compiler.graal.code.CompilationResult;
-import jdk.compiler.graal.core.CompilationWrapper;
-import jdk.compiler.graal.core.common.CompilationIdentifier;
-import jdk.compiler.graal.core.target.Backend;
-import jdk.compiler.graal.debug.DebugContext;
-import jdk.compiler.graal.debug.DiagnosticsOutputDirectory;
-import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.phases.PhaseSuite;
-import jdk.compiler.graal.phases.tiers.HighTierContext;
-import jdk.compiler.graal.truffle.PartialEvaluator;
-import jdk.compiler.graal.truffle.TruffleCompilationIdentifier;
-import jdk.compiler.graal.truffle.TruffleCompilerConfiguration;
-import jdk.compiler.graal.truffle.TruffleCompilerImpl;
-import jdk.compiler.graal.truffle.TruffleCompilerOptions;
-import jdk.compiler.graal.truffle.TruffleTierConfiguration;
-import jdk.compiler.graal.truffle.phases.InstrumentationSuite;
-import jdk.compiler.graal.truffle.phases.TruffleTier;
+import jdk.graal.compiler.code.CompilationResult;
+import jdk.graal.compiler.core.CompilationWrapper;
+import jdk.graal.compiler.core.common.CompilationIdentifier;
+import jdk.graal.compiler.core.target.Backend;
+import jdk.graal.compiler.debug.DebugContext;
+import jdk.graal.compiler.debug.DiagnosticsOutputDirectory;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.PhaseSuite;
+import jdk.graal.compiler.phases.tiers.HighTierContext;
+import jdk.graal.compiler.truffle.PartialEvaluator;
+import jdk.graal.compiler.truffle.TruffleCompilationIdentifier;
+import jdk.graal.compiler.truffle.TruffleCompilerConfiguration;
+import jdk.graal.compiler.truffle.TruffleCompilerImpl;
+import jdk.graal.compiler.truffle.TruffleCompilerOptions;
+import jdk.graal.compiler.truffle.TruffleTierConfiguration;
+import jdk.graal.compiler.truffle.phases.InstrumentationSuite;
+import jdk.graal.compiler.truffle.phases.TruffleTier;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
 
diff --git a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/SubstrateTruffleGraphBuilderPlugins.java b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/SubstrateTruffleGraphBuilderPlugins.java
index 34e4b5560e48..eabdaed65acc 100644
--- a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/SubstrateTruffleGraphBuilderPlugins.java
+++ b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/SubstrateTruffleGraphBuilderPlugins.java
@@ -26,11 +26,11 @@
 
 import java.lang.ref.Reference;
 
-import jdk.compiler.graal.nodes.ConstantNode;
-import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin.RequiredInvocationPlugin;
-import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins;
+import jdk.graal.compiler.nodes.ConstantNode;
+import jdk.graal.compiler.nodes.graphbuilderconf.GraphBuilderContext;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugin.RequiredInvocationPlugin;
+import jdk.graal.compiler.nodes.graphbuilderconf.InvocationPlugins;
 
 import jdk.vm.ci.meta.JavaConstant;
 import jdk.vm.ci.meta.JavaKind;
diff --git a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/SubstrateTruffleRuntime.java b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/SubstrateTruffleRuntime.java
index b41a9334f8e8..40f49abbb800 100644
--- a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/SubstrateTruffleRuntime.java
+++ b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/SubstrateTruffleRuntime.java
@@ -32,8 +32,8 @@
 import java.util.function.Consumer;
 import java.util.function.Supplier;
 
-import jdk.compiler.graal.api.replacements.Fold;
-import jdk.compiler.graal.options.Option;
+import jdk.graal.compiler.api.replacements.Fold;
+import jdk.graal.compiler.options.Option;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platform.HOSTED_ONLY;
diff --git a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/TruffleBoundaryPhase.java b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/TruffleBoundaryPhase.java
index 9d016b636577..b8bb2bff5020 100644
--- a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/TruffleBoundaryPhase.java
+++ b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/TruffleBoundaryPhase.java
@@ -24,15 +24,15 @@
  */
 package com.oracle.svm.truffle.api;
 
-import jdk.compiler.graal.nodes.DeoptimizeNode;
-import jdk.compiler.graal.nodes.FixedNode;
-import jdk.compiler.graal.nodes.Invoke;
-import jdk.compiler.graal.nodes.InvokeWithExceptionNode;
-import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.nodes.java.ExceptionObjectNode;
-import jdk.compiler.graal.nodes.util.GraphUtil;
-import jdk.compiler.graal.phases.Phase;
-import jdk.compiler.graal.truffle.PartialEvaluator;
+import jdk.graal.compiler.nodes.DeoptimizeNode;
+import jdk.graal.compiler.nodes.FixedNode;
+import jdk.graal.compiler.nodes.Invoke;
+import jdk.graal.compiler.nodes.InvokeWithExceptionNode;
+import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.java.ExceptionObjectNode;
+import jdk.graal.compiler.nodes.util.GraphUtil;
+import jdk.graal.compiler.phases.Phase;
+import jdk.graal.compiler.truffle.PartialEvaluator;
 
 import com.oracle.svm.hosted.phases.SubstrateGraphBuilderPhase.SubstrateBytecodeParser;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
diff --git a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/isolated/IsolateAwareTruffleCompiler.java b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/isolated/IsolateAwareTruffleCompiler.java
index 0ce13f18b131..eb7f9ae904b9 100644
--- a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/isolated/IsolateAwareTruffleCompiler.java
+++ b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/isolated/IsolateAwareTruffleCompiler.java
@@ -28,13 +28,13 @@
 import java.io.StringWriter;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import jdk.compiler.graal.core.common.CompilationIdentifier;
-import jdk.compiler.graal.core.common.SuppressFBWarnings;
-import jdk.compiler.graal.nodes.PauseNode;
-import jdk.compiler.graal.truffle.PartialEvaluator;
-import jdk.compiler.graal.truffle.TruffleCompilation;
-import jdk.compiler.graal.truffle.phases.TruffleTier;
-import jdk.compiler.graal.word.Word;
+import jdk.graal.compiler.core.common.CompilationIdentifier;
+import jdk.graal.compiler.core.common.SuppressFBWarnings;
+import jdk.graal.compiler.nodes.PauseNode;
+import jdk.graal.compiler.truffle.PartialEvaluator;
+import jdk.graal.compiler.truffle.TruffleCompilation;
+import jdk.graal.compiler.truffle.phases.TruffleTier;
+import jdk.graal.compiler.word.Word;
 import org.graalvm.nativeimage.CurrentIsolate;
 import org.graalvm.nativeimage.Isolate;
 import org.graalvm.nativeimage.IsolateThread;
diff --git a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/isolated/IsolatedCompilableTruffleAST.java b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/isolated/IsolatedCompilableTruffleAST.java
index 51a79fff6c4a..0f11153079d8 100644
--- a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/isolated/IsolatedCompilableTruffleAST.java
+++ b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/isolated/IsolatedCompilableTruffleAST.java
@@ -28,7 +28,7 @@
 import java.util.Map;
 import java.util.function.Supplier;
 
-import jdk.compiler.graal.debug.GraalError;
+import jdk.graal.compiler.debug.GraalError;
 import org.graalvm.nativeimage.c.function.CEntryPoint;
 import org.graalvm.nativeimage.c.type.CCharPointer;
 import org.graalvm.nativeimage.c.type.CTypeConversion;
diff --git a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/isolated/IsolatedTruffleCompilationIdentifier.java b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/isolated/IsolatedTruffleCompilationIdentifier.java
index 4ccd05fd2914..7358ba3767fc 100644
--- a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/isolated/IsolatedTruffleCompilationIdentifier.java
+++ b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/isolated/IsolatedTruffleCompilationIdentifier.java
@@ -24,8 +24,8 @@
  */
 package com.oracle.svm.truffle.isolated;
 
-import jdk.compiler.graal.core.common.CompilationIdentifier;
-import jdk.compiler.graal.truffle.TruffleCompilationIdentifier;
+import jdk.graal.compiler.core.common.CompilationIdentifier;
+import jdk.graal.compiler.truffle.TruffleCompilationIdentifier;
 import org.graalvm.nativeimage.c.function.CEntryPoint;
 
 import com.oracle.svm.graal.isolated.ClientHandle;
diff --git a/substratevm/src/com.oracle.svm.util/src/com/oracle/svm/util/ImageBuildStatistics.java b/substratevm/src/com.oracle.svm.util/src/com/oracle/svm/util/ImageBuildStatistics.java
index 432b3db19eeb..88e3f9b35980 100644
--- a/substratevm/src/com.oracle.svm.util/src/com/oracle/svm/util/ImageBuildStatistics.java
+++ b/substratevm/src/com.oracle.svm.util/src/com/oracle/svm/util/ImageBuildStatistics.java
@@ -31,10 +31,10 @@
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.function.Consumer;
 
-import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.nodes.extended.BytecodeExceptionNode;
-import jdk.compiler.graal.options.Option;
-import jdk.compiler.graal.options.OptionKey;
+import jdk.graal.compiler.debug.GraalError;
+import jdk.graal.compiler.nodes.extended.BytecodeExceptionNode;
+import jdk.graal.compiler.options.Option;
+import jdk.graal.compiler.options.OptionKey;
 import org.graalvm.nativeimage.ImageSingletons;
 
 public class ImageBuildStatistics {
diff --git a/truffle/docs/HostCompilation.md b/truffle/docs/HostCompilation.md
index 33d561d9add6..7a7e83b4f90a 100644
--- a/truffle/docs/HostCompilation.md
+++ b/truffle/docs/HostCompilation.md
@@ -27,7 +27,7 @@ Truffle host inlining leverages these properties and forces inlining during host
 The general assumption is that code important for runtime compilation is also important for interpreter execution.
 Whenever a PE boundary is detected, the host inlining phase no longer makes any inlining decisions and defers them to later inlining phases better suited for regular Java code.
 
-The source code for this phase can be found in [HostInliningPhase](https://github.com/oracle/graal/blob/master/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/host/HostInliningPhase.java).
+The source code for this phase can be found in [HostInliningPhase](../../compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/host/HostInliningPhase.java).
 
 Truffle host inlining is applied when compiling a method annotated with `@HostCompilerDirectives.BytecodeInterpreterSwitch`.
 The maximum node cost for such methods can be configured using `-H:TruffleHostInliningByteCodeInterpreterBudget=100000` for native images and `-Dgraal.TruffleHostInliningByteCodeInterpreterBudget=100000` on HotSpot. 
@@ -171,19 +171,19 @@ This prints:
   Context: StructuredGraph:1{HotSpotMethod}
       [thread:1] scope: main.Testing.EnterpriseHighTier.HostInliningPhase
       Truffle host inlining completed after 2 rounds. Graph cost changed from 136 to 137 after inlining:
-      Root[jdk.compiler.graal.truffle.test.HostInliningBytecodeInterpreterExampleTest$BytecodeNode.execute]
-          INLINE jdk.compiler.graal.truffle.test.HostInliningBytecodeInterpreterExampleTest$BytecodeNode.add(int, int)                      [inlined    2, monomorphic false, deopt false, inInterpreter false, propDeopt false, subTreeInvokes    0, subTreeCost    8, incomplete false,  reason null]
-          CUTOFF jdk.compiler.graal.truffle.test.HostInliningBytecodeInterpreterExampleTest$BytecodeNode.truffleBoundary()                  [inlined   -1, monomorphic false, deopt false, inInterpreter false, propDeopt false, subTreeInvokes    1, subTreeCost    0, incomplete false,  reason truffle boundary]
+      Root[jdk.graal.compiler.truffle.test.HostInliningBytecodeInterpreterExampleTest$BytecodeNode.execute]
+          INLINE jdk.graal.compiler.truffle.test.HostInliningBytecodeInterpreterExampleTest$BytecodeNode.add(int, int)                      [inlined    2, monomorphic false, deopt false, inInterpreter false, propDeopt false, subTreeInvokes    0, subTreeCost    8, incomplete false,  reason null]
+          CUTOFF jdk.graal.compiler.truffle.test.HostInliningBytecodeInterpreterExampleTest$BytecodeNode.truffleBoundary()                  [inlined   -1, monomorphic false, deopt false, inInterpreter false, propDeopt false, subTreeInvokes    1, subTreeCost    0, incomplete false,  reason truffle boundary]
           INLINE com.oracle.truffle.api.CompilerDirectives.inInterpreter()                                                                    [inlined    0, monomorphic false, deopt false, inInterpreter false, propDeopt false, subTreeInvokes    0, subTreeCost    6, incomplete false,  reason null]
-          CUTOFF jdk.compiler.graal.truffle.test.HostInliningBytecodeInterpreterExampleTest$BytecodeNode.protectedByInIntepreter()          [inlined   -1, monomorphic false, deopt false, inInterpreter  true, propDeopt false, subTreeInvokes    1, subTreeCost    0, incomplete false,  reason protected by inInterpreter()]
+          CUTOFF jdk.graal.compiler.truffle.test.HostInliningBytecodeInterpreterExampleTest$BytecodeNode.protectedByInIntepreter()          [inlined   -1, monomorphic false, deopt false, inInterpreter  true, propDeopt false, subTreeInvokes    1, subTreeCost    0, incomplete false,  reason protected by inInterpreter()]
           INLINE com.oracle.truffle.api.CompilerDirectives.transferToInterpreterAndInvalidate()                                               [inlined    3, monomorphic false, deopt  true, inInterpreter false, propDeopt false, subTreeInvokes    0, subTreeCost   32, incomplete false,  reason null]
             INLINE com.oracle.truffle.api.CompilerDirectives.inInterpreter()                                                                  [inlined    3, monomorphic false, deopt  true, inInterpreter false, propDeopt false, subTreeInvokes    0, subTreeCost    6, incomplete false,  reason null]
             CUTOFF com.oracle.truffle.runtime.hotspot.AbstractHotSpotTruffleRuntime.traceTransferToInterpreter()                              [inlined   -1, monomorphic false, deopt  true, inInterpreter  true, propDeopt false, subTreeInvokes    0, subTreeCost    0, incomplete false,  reason dominated by transferToInterpreter()]
-          CUTOFF jdk.compiler.graal.truffle.test.HostInliningBytecodeInterpreterExampleTest$BytecodeNode.dominatedByTransferToInterpreter() [inlined   -1, monomorphic false, deopt  true, inInterpreter false, propDeopt false, subTreeInvokes    0, subTreeCost    0, incomplete false,  reason dominated by transferToInterpreter()]
-          INLINE jdk.compiler.graal.truffle.test.HostInliningBytecodeInterpreterExampleTest$BytecodeNode.recursive(int)                     [inlined    4, monomorphic false, deopt false, inInterpreter false, propDeopt false, subTreeInvokes    1, subTreeCost   20, incomplete false,  reason null]
-            CUTOFF jdk.compiler.graal.truffle.test.HostInliningBytecodeInterpreterExampleTest$BytecodeNode.recursive(int)                   [inlined   -1, monomorphic false, deopt false, inInterpreter false, propDeopt false, subTreeInvokes    1, subTreeCost    0, incomplete false,  reason recursive]
-          INLINE jdk.compiler.graal.truffle.test.HostInliningBytecodeInterpreterExampleTest$BytecodeNode$SubNode1.execute()                 [inlined    1, monomorphic false, deopt false, inInterpreter false, propDeopt false, subTreeInvokes    0, subTreeCost    6, incomplete false,  reason null]
-          CUTOFF jdk.compiler.graal.truffle.test.HostInliningBytecodeInterpreterExampleTest$BytecodeNode$BaseNode.execute()                 [inlined   -1, monomorphic false, deopt false, inInterpreter false, propDeopt false, subTreeInvokes    1, subTreeCost    0, incomplete false,  reason not direct call: no type profile]
+          CUTOFF jdk.graal.compiler.truffle.test.HostInliningBytecodeInterpreterExampleTest$BytecodeNode.dominatedByTransferToInterpreter() [inlined   -1, monomorphic false, deopt  true, inInterpreter false, propDeopt false, subTreeInvokes    0, subTreeCost    0, incomplete false,  reason dominated by transferToInterpreter()]
+          INLINE jdk.graal.compiler.truffle.test.HostInliningBytecodeInterpreterExampleTest$BytecodeNode.recursive(int)                     [inlined    4, monomorphic false, deopt false, inInterpreter false, propDeopt false, subTreeInvokes    1, subTreeCost   20, incomplete false,  reason null]
+            CUTOFF jdk.graal.compiler.truffle.test.HostInliningBytecodeInterpreterExampleTest$BytecodeNode.recursive(int)                   [inlined   -1, monomorphic false, deopt false, inInterpreter false, propDeopt false, subTreeInvokes    1, subTreeCost    0, incomplete false,  reason recursive]
+          INLINE jdk.graal.compiler.truffle.test.HostInliningBytecodeInterpreterExampleTest$BytecodeNode$SubNode1.execute()                 [inlined    1, monomorphic false, deopt false, inInterpreter false, propDeopt false, subTreeInvokes    0, subTreeCost    6, incomplete false,  reason null]
+          CUTOFF jdk.graal.compiler.truffle.test.HostInliningBytecodeInterpreterExampleTest$BytecodeNode$BaseNode.execute()                 [inlined   -1, monomorphic false, deopt false, inInterpreter false, propDeopt false, subTreeInvokes    1, subTreeCost    0, incomplete false,  reason not direct call: no type profile]
           CUTOFF com.oracle.truffle.api.CompilerDirectives.shouldNotReachHere()                                                               [inlined   -1, monomorphic false, deopt false, inInterpreter false, propDeopt  true, subTreeInvokes    0, subTreeCost   98, incomplete false,  reason propagates transferToInterpreter]
 ```
 
diff --git a/truffle/docs/Inlining.md b/truffle/docs/Inlining.md
index 5609510fe0d9..9299bcf56cdb 100644
--- a/truffle/docs/Inlining.md
+++ b/truffle/docs/Inlining.md
@@ -58,7 +58,7 @@ The following sections explain the states in which calls in the call tree can be
 
 ### Call Tree States
 
-[Nodes](../../compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/inlining/CallNode.java) in the inline [call tree](../../compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/inlining/CallTree.java)
+[Nodes](../../compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/phases/inlining/CallNode.java) in the inline [call tree](../../compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/phases/inlining/CallTree.java)
 represent *calls* to particular targets.
 This means that if one target calls another twice, we will see this as two nodes despite it being the same call target.
 
diff --git a/truffle/docs/Optimizing.md b/truffle/docs/Optimizing.md
index d7a6b3c4bf66..cb4982b1f388 100644
--- a/truffle/docs/Optimizing.md
+++ b/truffle/docs/Optimizing.md
@@ -160,8 +160,8 @@ The `--engine.CompilationStatistics` command prints statistics on compilations a
     Compilations                : 2763
       Success                   : 2743
       Temporary Bailouts        : 17
-        jdk.compiler.graal.core.common.CancellationBailoutException: Compilation cancelled.: 16
-        jdk.compiler.graal.core.common.RetryableBailoutException: Assumption invalidated while compiling code: IsolatedObjectConstant[Object]: 1
+        jdk.graal.compiler.core.common.CancellationBailoutException: Compilation cancelled.: 16
+        jdk.graal.compiler.core.common.RetryableBailoutException: Assumption invalidated while compiling code: IsolatedObjectConstant[Object]: 1
       Permanent Bailouts        : 0
       Failed                    : 0
       Interrupted               : 3
diff --git a/truffle/mx.truffle/suite.py b/truffle/mx.truffle/suite.py
index fab691d921f3..5dc5da7d4293 100644
--- a/truffle/mx.truffle/suite.py
+++ b/truffle/mx.truffle/suite.py
@@ -1343,9 +1343,9 @@
         ],
         "exports" : [
           # Qualified exports
-          "com.oracle.truffle.compiler to org.graalvm.truffle.runtime, jdk.compiler.graal, org.graalvm.nativeimage.builder, com.oracle.truffle.enterprise, com.oracle.graal.graal_enterprise, org.graalvm.truffle.runtime.svm, com.oracle.truffle.enterprise.svm",
-          "com.oracle.truffle.compiler.hotspot to org.graalvm.truffle.runtime, jdk.compiler.graal",
-          "com.oracle.truffle.compiler.hotspot.libgraal to org.graalvm.truffle.runtime, jdk.compiler.graal"
+          "com.oracle.truffle.compiler to org.graalvm.truffle.runtime, jdk.graal.compiler, org.graalvm.nativeimage.builder, com.oracle.truffle.enterprise, com.oracle.graal.graal_enterprise, org.graalvm.truffle.runtime.svm, com.oracle.truffle.enterprise.svm",
+          "com.oracle.truffle.compiler.hotspot to org.graalvm.truffle.runtime, jdk.graal.compiler",
+          "com.oracle.truffle.compiler.hotspot.libgraal to org.graalvm.truffle.runtime, jdk.graal.compiler"
         ],
         "uses" : [
         ],
@@ -1384,7 +1384,7 @@
           # Qualified exports
           "* to org.graalvm.truffle, com.oracle.truffle.enterprise, org.graalvm.truffle.runtime.svm, com.oracle.truffle.enterprise.svm",
           # necessary to instantiate access truffle compiler from the runtime during host compilation
-          "com.oracle.truffle.runtime.hotspot to jdk.compiler.graal",
+          "com.oracle.truffle.runtime.hotspot to jdk.graal.compiler",
         ],
         "uses" : [
           "com.oracle.truffle.api.impl.TruffleLocator",
@@ -1992,7 +1992,7 @@
       "moduleInfo" : {
         "name" : "org.graalvm.locator",
         "exports" : [
-          "com.oracle.graalvm.locator to jdk.compiler.graal.management",
+          "com.oracle.graalvm.locator to jdk.graal.compiler.management",
         ],
       },
       "dependencies": ["com.oracle.graalvm.locator"],
diff --git a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/SubprocessTestUtils.java b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/SubprocessTestUtils.java
index db533f4c0a20..4a3db4d5f0c8 100644
--- a/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/SubprocessTestUtils.java
+++ b/truffle/src/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/SubprocessTestUtils.java
@@ -359,7 +359,7 @@ public void run() throws IOException, InterruptedException {
 
     }
 
-    // Methods and constants copied from jdk.compiler.graal.test.SubprocessUtil
+    // Methods and constants copied from jdk.graal.compiler.test.SubprocessUtil
 
     /**
      * The name of the boolean system property that can be set to preserve temporary files created
diff --git a/truffle/src/com.oracle.truffle.libgraal.processor/src/com/oracle/truffle/libgraal/processor/TruffleFromLibGraalProcessor.java b/truffle/src/com.oracle.truffle.libgraal.processor/src/com/oracle/truffle/libgraal/processor/TruffleFromLibGraalProcessor.java
index c85afac37848..cc1919bf6eb5 100644
--- a/truffle/src/com.oracle.truffle.libgraal.processor/src/com/oracle/truffle/libgraal/processor/TruffleFromLibGraalProcessor.java
+++ b/truffle/src/com.oracle.truffle.libgraal.processor/src/com/oracle/truffle/libgraal/processor/TruffleFromLibGraalProcessor.java
@@ -67,10 +67,10 @@
 import javax.lang.model.util.ElementFilter;
 
 /**
- * Processor for the {@code jdk.compiler.graal.truffle.common.hotspot.libgraal.TruffleFromLibGraal}
+ * Processor for the {@code jdk.graal.compiler.truffle.common.hotspot.libgraal.TruffleFromLibGraal}
  * annotation that generates code to push JNI arguments to the stack and make a JNI call
  * corresponding to a
- * {@code jdk.compiler.graal.truffle.common.hotspot.libgraal.TruffleFromLibGraal.Id}. This helps
+ * {@code jdk.graal.compiler.truffle.common.hotspot.libgraal.TruffleFromLibGraal.Id}. This helps
  * mitigate bugs where incorrect arguments are pushed for a JNI call. Given the low level nature of
  * {@code org.graalvm.nativeimage.StackValue}, it's very hard to use runtime assertion checking.
  */
diff --git a/truffle/src/com.oracle.truffle.runtime/src/com/oracle/truffle/runtime/OptimizedRuntimeOptions.java b/truffle/src/com.oracle.truffle.runtime/src/com/oracle/truffle/runtime/OptimizedRuntimeOptions.java
index 790f16876e13..8fd0e19696d9 100644
--- a/truffle/src/com.oracle.truffle.runtime/src/com/oracle/truffle/runtime/OptimizedRuntimeOptions.java
+++ b/truffle/src/com.oracle.truffle.runtime/src/com/oracle/truffle/runtime/OptimizedRuntimeOptions.java
@@ -56,7 +56,7 @@
 /**
  * Truffle compilation options that can be configured per {@link Engine engine} instance. These
  * options are accessed by the Truffle runtime and not the Truffle compiler, unlike
- * jdk.compiler.graal.truffle.TruffleCompilerOptions
+ * jdk.graal.compiler.truffle.TruffleCompilerOptions
  */
 @Option.Group("engine")
 public final class OptimizedRuntimeOptions {
@@ -74,7 +74,7 @@ public String toString() {
     /**
      * Actions to take upon an exception being raised during Truffle compilation. The actions are
      * with respect to what the user sees on the console. The enum constants and order are the same
-     * as defined in {@code jdk.compiler.graal.core.CompilationWrapper.ExceptionAction}.
+     * as defined in {@code jdk.graal.compiler.core.CompilationWrapper.ExceptionAction}.
      *
      * The actions are in ascending order of verbosity. Ordinal order is semantically significant!
      */
diff --git a/truffle/src/com.oracle.truffle.runtime/src/com/oracle/truffle/runtime/OptimizedTruffleRuntime.java b/truffle/src/com.oracle.truffle.runtime/src/com/oracle/truffle/runtime/OptimizedTruffleRuntime.java
index 6526bc99d13a..eafec8f7e67e 100644
--- a/truffle/src/com.oracle.truffle.runtime/src/com/oracle/truffle/runtime/OptimizedTruffleRuntime.java
+++ b/truffle/src/com.oracle.truffle.runtime/src/com/oracle/truffle/runtime/OptimizedTruffleRuntime.java
@@ -1034,7 +1034,7 @@ private static  List> loadService(Class service) {
         } else {
             ServiceLoader runtimeLoader = ServiceLoader.load(service, runtimeClassLoader);
             /*
-             * The Graal module (i.e., jdk.compiler.graal) is loaded by the platform class loader.
+             * The Graal module (i.e., jdk.graal.compiler) is loaded by the platform class loader.
              * Its module dependencies such as Truffle are supplied via --module-path which means
              * they are loaded by the app class loader. As such, we need to search the app class
              * loader path as well.
diff --git a/truffle/src/com.oracle.truffle.runtime/src/com/oracle/truffle/runtime/hotspot/HotSpotTruffleRuntimeAccess.java b/truffle/src/com.oracle.truffle.runtime/src/com/oracle/truffle/runtime/hotspot/HotSpotTruffleRuntimeAccess.java
index 7910831b111c..30f2e9c4fdb3 100644
--- a/truffle/src/com.oracle.truffle.runtime/src/com/oracle/truffle/runtime/hotspot/HotSpotTruffleRuntimeAccess.java
+++ b/truffle/src/com.oracle.truffle.runtime/src/com/oracle/truffle/runtime/hotspot/HotSpotTruffleRuntimeAccess.java
@@ -117,7 +117,7 @@ protected static TruffleRuntime createRuntime() {
         } else {
             // try jar graal
             try {
-                Module compilerModule = layer.findModule("jdk.compiler.graal").or(() -> layer.findModule("jdk.internal.vm.compiler")).orElse(null);
+                Module compilerModule = layer.findModule("jdk.graal.compiler").or(() -> layer.findModule("jdk.internal.vm.compiler")).orElse(null);
                 if (compilerModule == null) {
                     // jargraal compiler module not found -> fallback to default runtime
                     return new DefaultTruffleRuntime(
@@ -145,7 +145,7 @@ protected static TruffleRuntime createRuntime() {
      */
     private static String getTruffleGraalHotSpotPackage(Module compilerModule) {
         String[] history = {
-                        "jdk.compiler.graal.truffle.hotspot",
+                        "jdk.graal.compiler.truffle.hotspot",
                         "org.graalvm.compiler.truffle.compiler.hotspot"
         };
         Set packages = compilerModule.getPackages();
diff --git a/truffle/src/com.oracle.truffle.runtime/src/com/oracle/truffle/runtime/jfr/impl/CompilationEventImpl.java b/truffle/src/com.oracle.truffle.runtime/src/com/oracle/truffle/runtime/jfr/impl/CompilationEventImpl.java
index ccd368dc3ff7..a9d5afd19565 100644
--- a/truffle/src/com.oracle.truffle.runtime/src/com/oracle/truffle/runtime/jfr/impl/CompilationEventImpl.java
+++ b/truffle/src/com.oracle.truffle.runtime/src/com/oracle/truffle/runtime/jfr/impl/CompilationEventImpl.java
@@ -52,7 +52,7 @@
 import jdk.jfr.StackTrace;
 import jdk.jfr.Unsigned;
 
-@Name("jdk.compiler.graal.truffle.Compilation")
+@Name("jdk.graal.compiler.truffle.Compilation")
 @Category("Truffle Compiler")
 @Label("Compilation")
 @Description("Truffe Compilation")
diff --git a/truffle/src/com.oracle.truffle.runtime/src/com/oracle/truffle/runtime/jfr/impl/CompilationFailureEventImpl.java b/truffle/src/com.oracle.truffle.runtime/src/com/oracle/truffle/runtime/jfr/impl/CompilationFailureEventImpl.java
index 02543c2dbb47..69105dfd0783 100644
--- a/truffle/src/com.oracle.truffle.runtime/src/com/oracle/truffle/runtime/jfr/impl/CompilationFailureEventImpl.java
+++ b/truffle/src/com.oracle.truffle.runtime/src/com/oracle/truffle/runtime/jfr/impl/CompilationFailureEventImpl.java
@@ -47,7 +47,7 @@
 import jdk.jfr.Name;
 import jdk.jfr.StackTrace;
 
-@Name("jdk.compiler.graal.truffle.CompilationFailure")
+@Name("jdk.graal.compiler.truffle.CompilationFailure")
 @Category("Truffle Compiler")
 @Label("Compilation Failure")
 @Description("Truffe Compilation Failures")
diff --git a/truffle/src/com.oracle.truffle.runtime/src/com/oracle/truffle/runtime/jfr/impl/CompilationStatisticsEventImpl.java b/truffle/src/com.oracle.truffle.runtime/src/com/oracle/truffle/runtime/jfr/impl/CompilationStatisticsEventImpl.java
index 600115dbcc7a..d66f319e8364 100644
--- a/truffle/src/com.oracle.truffle.runtime/src/com/oracle/truffle/runtime/jfr/impl/CompilationStatisticsEventImpl.java
+++ b/truffle/src/com.oracle.truffle.runtime/src/com/oracle/truffle/runtime/jfr/impl/CompilationStatisticsEventImpl.java
@@ -53,7 +53,7 @@
 import jdk.jfr.Timespan;
 import jdk.jfr.Unsigned;
 
-@Name("jdk.compiler.graal.truffle.CompilerStatistics")
+@Name("jdk.graal.compiler.truffle.CompilerStatistics")
 @Category("Truffle Compiler")
 @Label("Compiler Statistics")
 @Description("Truffe Compiler Statistics")
diff --git a/truffle/src/com.oracle.truffle.runtime/src/com/oracle/truffle/runtime/jfr/impl/DeoptimizationEventImpl.java b/truffle/src/com.oracle.truffle.runtime/src/com/oracle/truffle/runtime/jfr/impl/DeoptimizationEventImpl.java
index fa60b86dfb43..e68072710953 100644
--- a/truffle/src/com.oracle.truffle.runtime/src/com/oracle/truffle/runtime/jfr/impl/DeoptimizationEventImpl.java
+++ b/truffle/src/com.oracle.truffle.runtime/src/com/oracle/truffle/runtime/jfr/impl/DeoptimizationEventImpl.java
@@ -48,7 +48,7 @@
 import jdk.jfr.Name;
 import jdk.jfr.StackTrace;
 
-@Name("jdk.compiler.graal.truffle.Deoptimization")
+@Name("jdk.graal.compiler.truffle.Deoptimization")
 @Category("Truffle Compiler")
 @Label("Deoptimization")
 @Description("Truffle Call Target Deoptimization")
diff --git a/truffle/src/com.oracle.truffle.runtime/src/com/oracle/truffle/runtime/jfr/impl/InvalidationEventImpl.java b/truffle/src/com.oracle.truffle.runtime/src/com/oracle/truffle/runtime/jfr/impl/InvalidationEventImpl.java
index 16ce34fadd02..f808b2dca83f 100644
--- a/truffle/src/com.oracle.truffle.runtime/src/com/oracle/truffle/runtime/jfr/impl/InvalidationEventImpl.java
+++ b/truffle/src/com.oracle.truffle.runtime/src/com/oracle/truffle/runtime/jfr/impl/InvalidationEventImpl.java
@@ -48,7 +48,7 @@
 import jdk.jfr.Name;
 import jdk.jfr.StackTrace;
 
-@Name("jdk.compiler.graal.truffle.AssumptionInvalidation")
+@Name("jdk.graal.compiler.truffle.AssumptionInvalidation")
 @Category("Truffle Compiler")
 @Label("Assumption Invalidation")
 @Description("Truffle Assumption Invalidation")
diff --git a/truffle/src/com.oracle.truffle.runtime/src/com/oracle/truffle/runtime/serviceprovider/TruffleRuntimeServices.java b/truffle/src/com.oracle.truffle.runtime/src/com/oracle/truffle/runtime/serviceprovider/TruffleRuntimeServices.java
index 331d92755987..ee5ff2fc8e5d 100644
--- a/truffle/src/com.oracle.truffle.runtime/src/com/oracle/truffle/runtime/serviceprovider/TruffleRuntimeServices.java
+++ b/truffle/src/com.oracle.truffle.runtime/src/com/oracle/truffle/runtime/serviceprovider/TruffleRuntimeServices.java
@@ -43,7 +43,7 @@
 import java.util.ServiceLoader;
 
 /**
- * A subset of the methods defined in {@code jdk.compiler.graal.serviceprovider.GraalServices}.
+ * A subset of the methods defined in {@code jdk.graal.compiler.serviceprovider.GraalServices}.
  */
 public final class TruffleRuntimeServices {
 
diff --git a/vm/mx.vm/mx_vm_gate.py b/vm/mx.vm/mx_vm_gate.py
index c3642f78ce30..603b75bc1262 100644
--- a/vm/mx.vm/mx_vm_gate.py
+++ b/vm/mx.vm/mx_vm_gate.py
@@ -87,8 +87,8 @@ def _unittest_config_participant(config):
 mx_unittest.add_config_participant(_unittest_config_participant)
 
 def _get_CountUppercase_vmargs():
-    cp = mx.project("jdk.compiler.graal.test").classpath_repr()
-    return ['-cp', cp, 'jdk.compiler.graal.test.CountUppercase']
+    cp = mx.project("jdk.graal.compiler.test").classpath_repr()
+    return ['-cp', cp, 'jdk.graal.compiler.test.CountUppercase']
 
 def _check_compiler_log(compiler_log_file, expectations, extra_check=None, extra_log_files=None):
     """
@@ -372,7 +372,7 @@ def _test_libgraal_CompilationTimeout_JIT():
         expectations = ['detected long running compilation'] + (['a stuck compilation'] if vm_can_exit else [])
         _check_compiler_log(compiler_log_file, expectations)
         if vm_can_exit:
-            # jdk.compiler.graal.core.CompilationWatchDog.EventHandler.STUCK_COMPILATION_EXIT_CODE
+            # jdk.graal.compiler.core.CompilationWatchDog.EventHandler.STUCK_COMPILATION_EXIT_CODE
             if exit_code != 84:
                 mx.abort(f'expected process to exit with 84 (indicating a stuck compilation) instead of {exit_code}')
         elif exit_code != 0:
@@ -418,7 +418,7 @@ def _test_libgraal_CompilationTimeout_Truffle(extra_vm_arguments):
         expectations = ['detected long running compilation'] + (['a stuck compilation'] if vm_can_exit else [])
         _check_compiler_log(compiler_log_file, expectations, extra_log_files=[truffle_log_file])
         if vm_can_exit:
-            # jdk.compiler.graal.core.CompilationWatchDog.EventHandler.STUCK_COMPILATION_EXIT_CODE
+            # jdk.graal.compiler.core.CompilationWatchDog.EventHandler.STUCK_COMPILATION_EXIT_CODE
             if exit_code != 84:
                 mx.abort(f'expected process to exit with 84 (indicating a stuck compilation) instead of {exit_code}')
         elif exit_code != 0:
diff --git a/vm/src/org.graalvm.polybench/src/org/graalvm/polybench/PolyBenchLauncher.java b/vm/src/org.graalvm.polybench/src/org/graalvm/polybench/PolyBenchLauncher.java
index c9f018870ad1..07a1c3eff7ad 100644
--- a/vm/src/org.graalvm.polybench/src/org/graalvm/polybench/PolyBenchLauncher.java
+++ b/vm/src/org.graalvm.polybench/src/org/graalvm/polybench/PolyBenchLauncher.java
@@ -358,7 +358,7 @@ String getLanguageId(String path) {
     private EvalResult evalSource(Context context) {
         if (config.compileTheWorld) {
             try {
-                Class ctwClass = Class.forName("jdk.compiler.graal.hotspot.test.CompileTheWorld");
+                Class ctwClass = Class.forName("jdk.graal.compiler.hotspot.test.CompileTheWorld");
                 Method createMethod = ctwClass.getDeclaredMethod("create");
                 Method prepareMethod = ctwClass.getDeclaredMethod("prepare");
                 Object ctw = createMethod.invoke(null);